diff --git a/README.md b/README.md index 2e0765795..036397fb9 100644 --- a/README.md +++ b/README.md @@ -130,9 +130,9 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.6.15 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **181318** ++ *Line count*: **181747** + *Field count*: **1639** -+ *File count*: **1166** ++ *File count*: **1167** + *Folder count*: **188** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index 2e0765795..036397fb9 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -130,9 +130,9 @@ Component Builder is mapped as a component in itself on my local development env + *Version*: 2.6.15 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **181318** ++ *Line count*: **181747** + *Field count*: **1639** -+ *File count*: **1166** ++ *File count*: **1167** + *Folder count*: **188** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php index 3ab9b997e..370746aca 100644 --- a/admin/helpers/compiler.php +++ b/admin/helpers/compiler.php @@ -538,9 +538,9 @@ class Compiler extends Infusion if ($sftp = ComponentbuilderHelper::getSftp((int) $this->componentData->sales_server)) { // now move the file - if (!$sftp->put($sftp->remote_server_path . $this->componentFolderName . '.zip', ComponentbuilderHelper::getFileContents($this->filepath, null))) + if (!$sftp->put($sftp->remote_server_path . $this->componentSalesName . '.zip', ComponentbuilderHelper::getFileContents($this->filepath, null))) { - $this->app->enqueueMessage(JText::sprintf('The %s file could not be moved to %s path on %s server.', $this->componentFolderName . '.zip', $sftp->remote_server_path, $sftp->remote_server_name), 'Error'); + $this->app->enqueueMessage(JText::sprintf('The %s file could not be moved to %s path on %s server.', $this->componentSalesName . '.zip', $sftp->remote_server_path, $sftp->remote_server_name), 'Error'); } } } diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index 3e36c5c75..93825d073 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -1169,7 +1169,11 @@ class Get else { $component->{$server} = 0; - $component->{'add_'.$server} = 0; + // only change this for sales server (update server can be added loacaly to the zip file) + if ('sales_server' === $server) + { + $component->{'add_'.$server} = 0; + } $component->{$server.'_protocol'} = 0; } } diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index ec87cc0c8..616b54fd2 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -12228,7 +12228,7 @@ class Interpretation extends Fields { foreach ($this->componentData->custom_admin_views as $nr => $menu) { - if (!isset($this->customAdminAdded[$menu['settings']->code]) && $menu['dashboard_list'] == 1 && $menu['before'] == $view['adminview']) + if (!isset($this->customAdminAdded[$menu['settings']->code]) && isset($menu['dashboard_list']) && $menu['dashboard_list'] == 1 && $menu['before'] == $view['adminview']) { $type = ComponentbuilderHelper::imageInfo($menu['settings']->icon); if ($type) @@ -12258,7 +12258,7 @@ class Interpretation extends Fields $icon .= ", '" . $type . $menu['settings']->code . "'"; } } - elseif (!isset($this->customAdminAdded[$menu['settings']->code]) && $menu['dashboard_list'] == 1 && empty($menu['before'])) + elseif (!isset($this->customAdminAdded[$menu['settings']->code]) && isset($menu['dashboard_list']) && $menu['dashboard_list'] == 1 && empty($menu['before'])) { $type = ComponentbuilderHelper::imageInfo($menu['settings']->icon); if ($type) @@ -12289,7 +12289,7 @@ class Interpretation extends Fields $nr = $nr + 100; $nameList = ComponentbuilderHelper::safeString($menu['name_code']); $nameUpper = ComponentbuilderHelper::safeString($menu['name_code'], 'U'); - if ($menu['dashboard_list'] == 1 && $view['adminview'] == $menu['before']) + if (isset($menu['dashboard_list']) && $menu['dashboard_list'] == 1 && $view['adminview'] == $menu['before']) { if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link'])) { @@ -12327,7 +12327,7 @@ class Interpretation extends Fields } } } - elseif ($menu['dashboard_list'] == 1 && empty($menu['before'])) + elseif (isset($menu['dashboard_list']) && $menu['dashboard_list'] == 1 && empty($menu['before'])) { if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link'])) { @@ -12484,7 +12484,7 @@ class Interpretation extends Fields $nameUpper = $menu['settings']->CODE; } - if ($menu['submenu'] == 1 && $view['adminview'] == $menu['before']) + if (isset($menu['submenu']) && $menu['submenu'] == 1 && $view['adminview'] == $menu['before']) { // setup access defaults $tab = ""; @@ -12531,7 +12531,7 @@ class Interpretation extends Fields return $custom; } - elseif ($menu['submenu'] == 1 && empty($menu['before'])) + elseif (isset($menu['submenu']) && $menu['submenu'] == 1 && empty($menu['before'])) { // setup access defaults $tab = ""; @@ -12622,13 +12622,13 @@ class Interpretation extends Fields { if (!isset($this->customAdminAdded[$menu['settings']->code])) { - if ($menu['mainmenu'] == 1 && $view['adminview'] == $menu['before']) + if (isset($menu['mainmenu']) && $menu['mainmenu'] == 1 && $view['adminview'] == $menu['before']) { $this->langContent['adminsys'][$lang . '_' . $menu['settings']->CODE] = $menu['settings']->name; // add custom menu $customMenu .= PHP_EOL . "\t\t\t" . '' . $lang . '_' . $menu['settings']->CODE . ''; } - elseif ($menu['mainmenu'] == 1 && empty($menu['before'])) + elseif (isset($menu['mainmenu']) && $menu['mainmenu'] == 1 && empty($menu['before'])) { $this->langContent['adminsys'][$lang . '_' . $menu['settings']->CODE] = $menu['settings']->name; // add custom menu @@ -12643,7 +12643,7 @@ class Interpretation extends Fields foreach ($this->componentData->custommenus as $nr => $menu) { $nr = $nr + 100; - if ($menu['mainmenu'] == 1 && $view['adminview'] == $menu['before']) + if (isset($menu['mainmenu']) && $menu['mainmenu'] == 1 && $view['adminview'] == $menu['before']) { if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link'])) { @@ -12664,7 +12664,7 @@ class Interpretation extends Fields $customMenu .= PHP_EOL . "\t\t\t" . '' . $lang . '_' . $nameUpper . ''; } } - elseif ($menu['mainmenu'] == 1 && empty($menu['before'])) + elseif (isset($menu['mainmenu']) && $menu['mainmenu'] == 1 && empty($menu['before'])) { if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link'])) { diff --git a/componentbuilder.xml b/componentbuilder.xml index 6ed3a4090..20d4d515c 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -112,5 +112,8 @@ Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/compo language/en-GB/en-GB.com_componentbuilder.sys.ini - + + + https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/componentbuilder_update_server.xml + \ No newline at end of file diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml new file mode 100644 index 000000000..2fb63636a --- /dev/null +++ b/componentbuilder_update_server.xml @@ -0,0 +1,427 @@ + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.5.0 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.0/JCB_v2.5.0.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.5.1 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.1/JCB_v2.5.1.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.5.2 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.4/JCB_v2.5.4.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.5.3 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.4/JCB_v2.5.4.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.5.4 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.4/JCB_v2.5.4.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.5.5 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.5/JCB_v2.5.5.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.5.6 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.6/JCB_v2.5.6.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.5.7 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.8/JCB_v2.5.8.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.5.8 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.5.8/JCB_v2.5.8.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.0 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.0/JCB_v2.6.0.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.1 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.1/JCB_v2.6.1.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.2 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.2/JCB_v2.6.2.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.3 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.3/JCB_v2.6.3.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.4 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.5/JCB_v2.6.5.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.5 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.5/JCB_v2.6.5.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.6 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.6/JCB_v2.6.6.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.7 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.7/JCB_v2.6.7.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.8 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.8/JCB_v2.6.8.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.9 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.9/JCB_v2.6.9.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.10 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.10/JCB_v2.6.10.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.11 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.11/JCB_v2.6.11.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.12 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.12/JCB_v2.6.12.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.13 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.13/JCB_v2.6.13.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.14 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.14/JCB_v2.6.14.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.15 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.15/JCB_v2.6.15.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + + \ No newline at end of file