From 0b1e2ba0a368da7fd3bb6f6c2cc22335fa4677ab Mon Sep 17 00:00:00 2001 From: fSerny Date: Tue, 20 Dec 2011 17:37:14 +0000 Subject: [PATCH] [-] PROJECT : Moving xml files to xml directory git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11438 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Module.php | 4 +- config/xml/.htaccess | 2 + config/xml/index.php | 37 +++++++++++++++++++ config/{ => xml}/modules_list.xml | 0 controllers/admin/AdminModulesController.php | 16 ++++---- install-dev/classes/Module.php | 2 +- install-dev/php/desactivatecustommodules.php | 2 +- install-new/upgrade/classes/Module.php | 2 +- .../functions/desactivate_custom_modules.php | 2 +- 9 files changed, 53 insertions(+), 14 deletions(-) create mode 100755 config/xml/.htaccess create mode 100755 config/xml/index.php rename config/{ => xml}/modules_list.xml (100%) diff --git a/classes/Module.php b/classes/Module.php index 4b6ad0ecb..0d4bd0850 100644 --- a/classes/Module.php +++ b/classes/Module.php @@ -1000,7 +1000,7 @@ abstract class ModuleCore // Get Default Country Modules and customer module if ($loggedOnAddons) { - $filesList = array(_PS_ROOT_DIR_.'/config/default_country_modules_list.xml', _PS_ROOT_DIR_.'/config/customer_modules_list.xml'); + $filesList = array(_PS_ROOT_DIR_.'/config/xml/default_country_modules_list.xml', _PS_ROOT_DIR_.'/config/xml/customer_modules_list.xml'); foreach ($filesList as $file) if (file_exists($file)) { @@ -1091,7 +1091,7 @@ abstract class ModuleCore { $db = Db::getInstance(); - $module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'modules_list.xml'; + $module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'modules_list.xml'; $nativeModules = simplexml_load_file($module_list_xml); $nativeModules = $nativeModules->modules; foreach ($nativeModules as $nativeModulesType) diff --git a/config/xml/.htaccess b/config/xml/.htaccess new file mode 100755 index 000000000..93169e4eb --- /dev/null +++ b/config/xml/.htaccess @@ -0,0 +1,2 @@ +Order deny,allow +Deny from all diff --git a/config/xml/index.php b/config/xml/index.php new file mode 100755 index 000000000..5ff8ef28c --- /dev/null +++ b/config/xml/index.php @@ -0,0 +1,37 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision: 6844 $ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); +header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); + +header("Cache-Control: no-store, no-cache, must-revalidate"); +header("Cache-Control: post-check=0, pre-check=0", false); +header("Pragma: no-cache"); + +header("Location: ../"); +exit; +?> \ No newline at end of file diff --git a/config/modules_list.xml b/config/xml/modules_list.xml similarity index 100% rename from config/modules_list.xml rename to config/xml/modules_list.xml diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index 6c1aa3057..b939a0b2a 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -41,8 +41,6 @@ class AdminModulesControllerCore extends AdminController private $list_modules_categories = array(); private $list_partners_modules = array(); private $list_natives_modules = array(); - private $cache_file_modules_list = '/config/modules_list.xml'; - private $xml_modules_list = 'http://api.prestashop.com/xml/modules_list.xml'; private $nb_modules_total = 0; private $nb_modules_installed = 0; @@ -55,10 +53,12 @@ class AdminModulesControllerCore extends AdminController private $iso_default_country; private $filter_configuration = array(); - private $addons_url = 'https://addons.prestashop.com/webservice/151/'; + private $xml_modules_list = 'http://api.prestashop.com/xml/modules_list.xml'; + private $addons_url = 'http://api.addons.prestashop.com/151/'; private $logged_on_addons = false; - private $cache_file_default_country_modules_list = '/config/default_country_modules_list.xml'; - private $cache_file_customer_modules_list = '/config/customer_modules_list.xml'; + private $cache_file_modules_list = '/config/xml/modules_list.xml'; + private $cache_file_default_country_modules_list = '/config/xml/default_country_modules_list.xml'; + private $cache_file_customer_modules_list = '/config/xml/customer_modules_list.xml'; /* ** Admin Modules Controller Constructor @@ -167,12 +167,12 @@ class AdminModulesControllerCore extends AdminController $this->status = 'cache'; - // If logged to Addons Webservices, refresh default country modules list every day + // If logged to Addons Webservices, refresh default country native modules list every day if ($this->logged_on_addons && $this->status != 'error') { if (!$this->isFresh($this->cache_file_default_country_modules_list, 86400)) { - if ($this->refresh($this->cache_file_default_country_modules_list, $this->addons_url.'listing/'.strtolower(Configuration::get('PS_LOCALE_COUNTRY')))) + if ($this->refresh($this->cache_file_default_country_modules_list, $this->addons_url.'listing/native/'.strtolower(Configuration::get('PS_LOCALE_COUNTRY')))) $this->status = 'refresh'; else $this->status = 'error'; @@ -208,7 +208,7 @@ class AdminModulesControllerCore extends AdminController $xml = @simplexml_load_string($content, NULL, LIBXML_NOCDATA); if (!$xml) die('KO'); - $result = strtoupper((string)$xml->msg); + $result = strtoupper((string)$xml->success); if (!in_array($result, array('OK', 'KO'))) die ('KO'); if ($result == 'OK') diff --git a/install-dev/classes/Module.php b/install-dev/classes/Module.php index 8d7bc16fa..3a313b170 100644 --- a/install-dev/classes/Module.php +++ b/install-dev/classes/Module.php @@ -608,7 +608,7 @@ abstract class Module { $db = Db::getInstance(); - $module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'modules_list.xml'; + $module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'modules_list.xml'; $nativeModules = simplexml_load_file($module_list_xml); $nativeModules = $nativeModules->modules; foreach ($nativeModules as $nativeModulesType) diff --git a/install-dev/php/desactivatecustommodules.php b/install-dev/php/desactivatecustommodules.php index bdc555283..ad01d1a89 100644 --- a/install-dev/php/desactivatecustommodules.php +++ b/install-dev/php/desactivatecustommodules.php @@ -30,7 +30,7 @@ function desactivate_custom_modules() $db = Db::getInstance(); $modulesDirOnDisk = Module::getModulesDirOnDisk(); - $module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'modules_list.xml'; + $module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'modules_list.xml'; $nativeModules = simplexml_load_file($module_list_xml); $nativeModules = $nativeModules->modules; foreach ($nativeModules as $nativeModulesType) diff --git a/install-new/upgrade/classes/Module.php b/install-new/upgrade/classes/Module.php index 181bfa992..588d696d6 100644 --- a/install-new/upgrade/classes/Module.php +++ b/install-new/upgrade/classes/Module.php @@ -608,7 +608,7 @@ abstract class Module { $db = Db::getInstance(); - $module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'modules_list.xml'; + $module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'modules_list.xml'; $nativeModules = simplexml_load_file($module_list_xml); $nativeModules = $nativeModules->modules; foreach ($nativeModules as $nativeModulesType) diff --git a/install-new/upgrade/functions/desactivate_custom_modules.php b/install-new/upgrade/functions/desactivate_custom_modules.php index d448eef0d..295ec2fba 100644 --- a/install-new/upgrade/functions/desactivate_custom_modules.php +++ b/install-new/upgrade/functions/desactivate_custom_modules.php @@ -30,7 +30,7 @@ function desactivate_custom_modules() $db = Db::getInstance(); $modulesDirOnDisk = Module::getModulesDirOnDisk(); - $module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'modules_list.xml'; + $module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'modules_list.xml'; $nativeModules = simplexml_load_file($module_list_xml); $nativeModules = $nativeModules->modules; foreach ($nativeModules as $nativeModulesType)