diff --git a/404.php b/404.php deleted file mode 100644 index 9fd4270f4..000000000 --- a/404.php +++ /dev/null @@ -1,29 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -require_once(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); -Controller::getController('PageNotFoundController')->run(); diff --git a/address.php b/address.php deleted file mode 100644 index 4dbf1d223..000000000 --- a/address.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=address'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/addresses.php b/addresses.php deleted file mode 100644 index cda46efcf..000000000 --- a/addresses.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=addresses'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl index bf1bc5c87..3aa767ef6 100644 --- a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl @@ -26,21 +26,44 @@ {block name="input"} {if $input.type == 'file'} - {if isset($input.display_image) && $input.display_image} - {if isset($fields_value.image) && $fields_value.image} -
- {$fields_value.image} -

{l s='File size'} {$fields_value.size}kb

- {if $shared_category} -

{l s='If you delete this picture, it will be deleted in all of your shared shops!'}

- {/if} - + +
+ + + + + +
+ {if isset($input.desc)}

{$input.desc}

{/if} + {if isset($fields_value.image) && $fields_value.image} +
 
+
+ {$fields_value.image} +
+

{l s='File size'} {$fields_value.size}kb

+ {l s='Delete'}
- {/if} +
{/if} - + {else} {$smarty.block.parent} {/if} diff --git a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl index 73a3f68d4..d85cfd7dd 100644 --- a/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl @@ -137,7 +137,7 @@
  • {l s='Age:'} {if isset($customer->birthday)} - {$customer_stats['age']} {l s='years old'} ({l s='Birth date:'} {$customer_birthday}) + {l s='%d years old' sprintf=[$customer_stats['age']]} ({l s='Birth date:'} {$customer_birthday}) {else} {l s='Unknown'} {/if} @@ -625,4 +625,4 @@
    • -{/block} \ No newline at end of file +{/block} diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl index 87e499166..bd2524857 100644 --- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl @@ -48,7 +48,7 @@ {$hookDashboardZoneTwo}
    - + {l s='Add more graph and data'}
    diff --git a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl index 1a52d930f..0eb93f213 100644 --- a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl @@ -117,7 +117,7 @@ {$server.port} {$server.weight} - {l s='Remove'} + {l s='Remove'} {/foreach} diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl index 0e4da98d6..9cb895ff6 100644 --- a/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl @@ -35,13 +35,18 @@ {block name="input"} {if $input.type == 'latitude'}
    -
    +
    / + value="{$fields_value[$input.name]|escape:'htmlall'}" /> +
    +
    +
    /
    +
    +
    +
    -
    - +
    + +
    + + + + + +
    {if isset($input.desc)}

    {$input.desc}

    {/if} {if isset($fields_value.image) && $fields_value.image} -
    +
     
    +
    {$fields_value.image} -

    {l s='File size'} {$fields_value.size}kb

    - - - {l s='Delete'} - +
    +

    {l s='File size'} {$fields_value.size}kb

    + + {l s='Delete'} + +
    {/if} +
    {/if} -
    +

    {l s='e.g. 10:00AM - 9:30PM'}

    {foreach $fields_value.days as $k => $value} -
    +
    {/foreach} {/foreach} {/if} -{/block} - +{/block} \ No newline at end of file diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index f42ac760b..142b04d77 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -496,6 +496,9 @@ $('#{$input.name}-selectbutton').click(function(e){ $('#{$input.name}').trigger('click'); }); + $('#{$input.name}-name').click(function(e){ + $('#{$input.name}').trigger('click'); + }); $('#{$input.name}').change(function(e){ var val = $(this).val(); var file = val.split(/[\\/]/); diff --git a/attachment.php b/attachment.php deleted file mode 100644 index b279b5a60..000000000 --- a/attachment.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=attachment'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/authentication.php b/authentication.php deleted file mode 100644 index 71afb055d..000000000 --- a/authentication.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=authentication'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/best-sales.php b/best-sales.php deleted file mode 100644 index 0de3b406a..000000000 --- a/best-sales.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=best-sales'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/cart.php b/cart.php deleted file mode 100644 index ab2437822..000000000 --- a/cart.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=cart'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/category.php b/category.php deleted file mode 100644 index a4113606e..000000000 --- a/category.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=category'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/changecurrency.php b/changecurrency.php deleted file mode 100644 index fe8e4a65d..000000000 --- a/changecurrency.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=change-currency'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/cms.php b/cms.php deleted file mode 100644 index ff2c40d7c..000000000 --- a/cms.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=cms'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/config/defines.inc.php b/config/defines.inc.php index ab72ff105..9a19f3641 100755 --- a/config/defines.inc.php +++ b/config/defines.inc.php @@ -75,6 +75,8 @@ define('_PS_SCENE_IMG_DIR_', _PS_IMG_DIR_.'scenes/'); define('_PS_SCENE_THUMB_IMG_DIR_', _PS_IMG_DIR_.'scenes/thumbs/'); define('_PS_MANU_IMG_DIR_', _PS_IMG_DIR_.'m/'); define('_PS_SHIP_IMG_DIR_', _PS_IMG_DIR_.'s/'); +define('_PS_ORDER_STATE_IMG_DIR_', _PS_IMG_DIR_.'os/'); +define('_PS_LANG_IMG_DIR_', _PS_IMG_DIR_.'l/'); define('_PS_SUPP_IMG_DIR_', _PS_IMG_DIR_.'su/'); define('_PS_COL_IMG_DIR_', _PS_IMG_DIR_.'co/'); define('_PS_TMP_IMG_DIR_', _PS_IMG_DIR_.'tmp/'); diff --git a/contact-form.php b/contact-form.php deleted file mode 100644 index 5891e5b0a..000000000 --- a/contact-form.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=contact'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index ad111d833..403fcc1ee 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -202,6 +202,22 @@ class AdminGendersControllerCore extends AdminController } return !count($this->errors) ? true : false; } + + protected function afterImageUpload() + { + parent::afterImageUpload(); + + if (($id_gender = (int)Tools::getValue('id_gender')) && + isset($_FILES) && count($_FILES) && file_exists(_PS_GENDERS_DIR_.$id_gender.'.jpg')) + { + $current_file = _PS_TMP_IMG_DIR_.'gender_mini_'.$id_gender.'_'.$this->context->shop->id.'.jpg'; + + if (file_exists($current_file)) + unlink($current_file); + } + + return true; + } } diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php index ed5638fed..1f999e9c4 100644 --- a/controllers/admin/AdminLanguagesController.php +++ b/controllers/admin/AdminLanguagesController.php @@ -530,4 +530,20 @@ class AdminLanguagesControllerCore extends AdminController //update employee lang if current id lang is disabled Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'employee` set `id_lang`='.(int)Configuration::get('PS_LANG_DEFAULT').' WHERE `id_lang`='.(int)$current_id_lang); } + + protected function afterImageUpload() + { + parent::afterImageUpload(); + + if (($id_lang = (int)Tools::getValue('id_lang')) && + isset($_FILES) && count($_FILES) && file_exists(_PS_LANG_IMG_DIR_.$id_lang.'.jpg')) + { + $current_file = _PS_TMP_IMG_DIR_.'lang_mini_'.$id_lang.'_'.$this->context->shop->id.'.jpg'; + + if (file_exists($current_file)) + unlink($current_file); + } + + return true; + } } \ No newline at end of file diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php index c384493c5..98d45bf10 100644 --- a/controllers/admin/AdminLocalizationController.php +++ b/controllers/admin/AdminLocalizationController.php @@ -133,9 +133,9 @@ class AdminLocalizationControllerCore extends AdminController public function initPageHeaderToolbar() { - $this->page_header_toolbar_title = $this->l('Localizations'); - parent::initPageHeaderToolbar(); + + $this->page_header_toolbar_title = $this->l('Localization'); } public function postProcess() diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php index 90995cc23..65d92663d 100755 --- a/controllers/admin/AdminLoginController.php +++ b/controllers/admin/AdminLoginController.php @@ -67,9 +67,9 @@ class AdminLoginControllerCore extends AdminController if ($clientIsMaintenanceOrLocal) $this->errors[] = Tools::displayError('SSL is activated. However, your IP is allowed to enter unsecure mode for maintenance or local IP issues.'); else - { - $warningSslMessage = Tools::displayError('SSL is activated. Please connect using the following link to '); - $warningSslMessage .= 'log into secure mode (https://)'; + { + $url = 'https://'.Tools::safeOutput(Tools::getServerName()).Tools::safeOutput($_SERVER['REQUEST_URI']); + $warningSslMessage = sprintf(Tools::displayError('SSL is activated. Please connect using the following link to log into secure mode (https://)'), $url); $this->context->smarty->assign(array('warningSslMessage' => $warningSslMessage)); } } diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 6ad143c0c..2b86fee8c 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -752,6 +752,11 @@ class AdminManufacturersControllerCore extends AdminController (int)$image_type['height'] ); } + + $current_logo_file = _PS_TMP_IMG_DIR_.'manufacturer_mini_'.$id_manufacturer.'_'.$this->context->shop->id.'.jpg'; + + if ($res && file_exists($current_logo_file)) + unlink($current_logo_file); } if (!$res) @@ -759,7 +764,7 @@ class AdminManufacturersControllerCore extends AdminController return $res; } - + protected function beforeDelete($object) { return true; diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php index fa5a663ef..cc02d23ef 100644 --- a/controllers/admin/AdminStatusesController.php +++ b/controllers/admin/AdminStatusesController.php @@ -560,4 +560,20 @@ class AdminStatusesControllerCore extends AdminController $this->initOrdersReturnsList(); return parent::filterToField($key, $filter); } + + protected function afterImageUpload() + { + parent::afterImageUpload(); + + if (($id_order_state = (int)Tools::getValue('id_order_state')) && + isset($_FILES) && count($_FILES) && file_exists(_PS_ORDER_STATE_IMG_DIR_.$id_order_state.'.gif')) + { + $current_file = _PS_TMP_IMG_DIR_.'order_state_mini_'.$id_order_state.'_'.$this->context->shop->id.'.gif'; + + if (file_exists($current_file)) + unlink($current_file); + } + + return true; + } } diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php index 813635d82..a86b8c9cf 100644 --- a/controllers/admin/AdminSuppliersController.php +++ b/controllers/admin/AdminSuppliersController.php @@ -371,6 +371,11 @@ class AdminSuppliersControllerCore extends AdminController if (!ImageManager::resize($file, _PS_SUPP_IMG_DIR_.$id_supplier.'-'.stripslashes($image_type['name']).'.jpg', (int)$image_type['width'], (int)$image_type['height'])) $return = false; } + + $current_logo_file = _PS_TMP_IMG_DIR_.'supplier_mini_'.$id_supplier.'_'.$this->context->shop->id.'.jpg'; + + if (file_exists($current_logo_file)) + unlink($current_logo_file); } return $return; } diff --git a/discount.php b/discount.php deleted file mode 100644 index 173f8d5a5..000000000 --- a/discount.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=discount'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/get-file.php b/get-file.php deleted file mode 100644 index 70507df4a..000000000 --- a/get-file.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=get-file'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/guest-tracking.php b/guest-tracking.php deleted file mode 100644 index b5e2d6065..000000000 --- a/guest-tracking.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=guest-tracking'.($_REQUEST ? '&'.http_build_query($_REQUEST, '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/history.php b/history.php deleted file mode 100644 index e4a97510b..000000000 --- a/history.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=history'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/identity.php b/identity.php deleted file mode 100644 index 845738311..000000000 --- a/identity.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=identity'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/manufacturer.php b/manufacturer.php deleted file mode 100644 index 92715f48d..000000000 --- a/manufacturer.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=manufacturer'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/modules/blockmanufacturer/blockmanufacturer.php b/modules/blockmanufacturer/blockmanufacturer.php index b9184a5f3..5a3d4f8b9 100644 --- a/modules/blockmanufacturer/blockmanufacturer.php +++ b/modules/blockmanufacturer/blockmanufacturer.php @@ -150,7 +150,7 @@ class BlockManufacturer extends Module ), array( 'type' => 'text', - 'label' => $this->l('Elements number'), + 'label' => $this->l('Number of elements to display'), 'name' => 'MANUFACTURER_DISPLAY_TEXT_NB', 'class' => 'fixed-width-xs' ), diff --git a/modules/blocksupplier/blocksupplier.php b/modules/blocksupplier/blocksupplier.php index 70b99ee84..a97c532b7 100644 --- a/modules/blocksupplier/blocksupplier.php +++ b/modules/blocksupplier/blocksupplier.php @@ -169,7 +169,7 @@ class BlockSupplier extends Module ), array( 'type' => 'text', - 'label' => $this->l('Elements number'), + 'label' => $this->l('Number of elements to display'), 'name' => 'SUPPLIER_DISPLAY_TEXT_NB', 'class' => 'fixed-width-xs' ), diff --git a/modules/carriercompare/carriercompare.php b/modules/carriercompare/carriercompare.php index a4a7a419a..a2029b489 100755 --- a/modules/carriercompare/carriercompare.php +++ b/modules/carriercompare/carriercompare.php @@ -290,15 +290,15 @@ class CarrierCompare extends Module 'input' => array( array( 'type' => 'select', - 'label' => $this->l('Refresh carrier list method'), + 'label' => $this->l('How to refresh the carrier list?'), 'name' => 'SE_RERESH_METHOD', 'required' => false, - 'desc' => $this->l('How would you like to refresh information for a customer?'), + 'desc' => $this->l('This determines when the list of carriers presented to the customer is updated.'), 'default_value' => (int)$this->context->country->id, 'options' => array( 'query' => array( - array('id' => 0, 'name' => $this->l('Anytime')), - array('id' => 1, 'name' => $this->l('The required information is set.')) + array('id' => 0, 'name' => $this->l('Automatically with each field change')), + array('id' => 1, 'name' => $this->l('When the customer clicks on the "Estimate Shipping Cost" button')) ), 'id' => 'id', 'name' => 'name', diff --git a/modules/carriercompare/template/carriercompare.tpl b/modules/carriercompare/template/carriercompare.tpl index 0f28d8f18..ceb265ea2 100755 --- a/modules/carriercompare/template/carriercompare.tpl +++ b/modules/carriercompare/template/carriercompare.tpl @@ -88,7 +88,7 @@ PS_SE_HandleEvent();

    - +

    diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php index bc95c7000..7faa0e3c9 100644 --- a/modules/dashactivity/dashactivity.php +++ b/modules/dashactivity/dashactivity.php @@ -298,9 +298,9 @@ class Dashactivity extends Module $sub_widget = array( array('label' => $this->l('Show Pending'), 'config_name' => 'DASHACTIVITY_SHOW_PENDING'), - array('label' => $this->l('Show Notification'), 'config_name' => 'DASHACTIVITY_SHOW_NOTIFICATION'), - array('label' => $this->l('Show Customers'), 'config_name' => 'DASHACTIVITY_SHOW_CUSTOMERS'), - array('label' => $this->l('Show Newsletter'), 'config_name' => 'DASHACTIVITY_SHOW_NEWSLETTER'), + array('label' => $this->l('Show Notifications'), 'config_name' => 'DASHACTIVITY_SHOW_NOTIFICATION'), + array('label' => $this->l('Show Clients'), 'config_name' => 'DASHACTIVITY_SHOW_CUSTOMERS'), + array('label' => $this->l('Show Newsletters'), 'config_name' => 'DASHACTIVITY_SHOW_NEWSLETTER'), array('label' => $this->l('Show Traffic'), 'config_name' => 'DASHACTIVITY_SHOW_TRAFFIC'), ); diff --git a/modules/producttooltip/producttooltip.php b/modules/producttooltip/producttooltip.php index 8778a3d73..a8d3c0f1b 100644 --- a/modules/producttooltip/producttooltip.php +++ b/modules/producttooltip/producttooltip.php @@ -159,8 +159,8 @@ class ProductToolTip extends Module 'input' => array( array( 'type' => 'switch', - 'label' => $this->l('Number of people:'), - 'desc' => $this->l('Display the number of people who are currently watching this product?').'
    '. + 'label' => $this->l('Number of visitors'), + 'desc' => $this->l('Display the number of visitors who are currently watching this product?').'
    '. $this->l('If you activate the option above, you must activate the first option of StatData module'), 'name' => 'PS_PTOOLTIP_PEOPLE', 'values' => array( @@ -178,7 +178,8 @@ class ProductToolTip extends Module ), array( 'type' => 'text', - 'label' => $this->l('Lifetime:'), + 'label' => $this->l('Period length'), + 'desc' => 'For instance, if set to 30 minutes, display the number of visitors in the last 30 minutes.', 'name' => 'PS_PTOOLTIP_LIFETIME', 'suffix' => 'minutes', 'values' => array( @@ -196,7 +197,7 @@ class ProductToolTip extends Module ), array( 'type' => 'switch', - 'label' => $this->l('Product ordered:'), + 'label' => $this->l('Last order date'), 'desc' => $this->l('Display the last time the product has been ordered?'), 'name' => 'PS_PTOOLTIP_DATE_ORDER', 'values' => array( @@ -214,8 +215,8 @@ class ProductToolTip extends Module ), array( 'type' => 'switch', - 'label' => $this->l('Added to a cart:'), - 'label' => $this->l('If not ordered yet, display the last time the product has been added to a cart?'), + 'label' => $this->l('Added to a cart'), + 'desc' => $this->l('If not ordered yet, display the last time the product has been added to a cart?'), 'name' => 'PS_PTOOLTIP_DATE_CART', 'values' => array( array( @@ -232,7 +233,7 @@ class ProductToolTip extends Module ), array( 'type' => 'text', - 'label' => $this->l('Do not display events older than:'), + 'label' => $this->l('Do not display events older than'), 'name' => 'PS_PTOOLTIP_DAYS', 'suffix' => 'days' ), diff --git a/my-account.php b/my-account.php deleted file mode 100644 index 9569dfa8f..000000000 --- a/my-account.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=my-account'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/new-products.php b/new-products.php deleted file mode 100644 index 49d26cdbf..000000000 --- a/new-products.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=new-products'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/order-confirmation.php b/order-confirmation.php deleted file mode 100644 index eeef146d8..000000000 --- a/order-confirmation.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=order-confirmation'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/order-detail.php b/order-detail.php deleted file mode 100644 index 7ef3b3d24..000000000 --- a/order-detail.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=order-detail'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/order-follow.php b/order-follow.php deleted file mode 100644 index 9cc7e6e45..000000000 --- a/order-follow.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=order-follow'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/order-opc.php b/order-opc.php deleted file mode 100644 index 1f7ae4f84..000000000 --- a/order-opc.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=order-opc'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/order-return.php b/order-return.php deleted file mode 100644 index 07e8afcaa..000000000 --- a/order-return.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=order-return'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/order-slip.php b/order-slip.php deleted file mode 100644 index b43f6b0cb..000000000 --- a/order-slip.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=order-slip'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/order.php b/order.php deleted file mode 100644 index bfcd72554..000000000 --- a/order.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=order'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/password.php b/password.php deleted file mode 100644 index bd8bbf774..000000000 --- a/password.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=password'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/pdf-invoice.php b/pdf-invoice.php deleted file mode 100644 index 485d8fdfe..000000000 --- a/pdf-invoice.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -include(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=pdf-invoice'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/pdf-order-return.php b/pdf-order-return.php deleted file mode 100644 index 209bc5251..000000000 --- a/pdf-order-return.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -include(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=pdf-order-return'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/pdf-order-slip.php b/pdf-order-slip.php deleted file mode 100644 index c466ed015..000000000 --- a/pdf-order-slip.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -include(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=pdf-order-slip'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/prices-drop.php b/prices-drop.php deleted file mode 100644 index 0fda5fdb7..000000000 --- a/prices-drop.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=prices-drop'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/product-sort.php b/product-sort.php deleted file mode 100644 index c472c2474..000000000 --- a/product-sort.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=product-sort'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/product.php b/product.php deleted file mode 100644 index 141b69045..000000000 --- a/product.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=product'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/products-comparison.php b/products-comparison.php deleted file mode 100644 index 392451103..000000000 --- a/products-comparison.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=products-comparison'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/search.php b/search.php deleted file mode 100644 index 765f22017..000000000 --- a/search.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=search'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/sitemap.php b/sitemap.php deleted file mode 100644 index 32fc34936..000000000 --- a/sitemap.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=sitemap'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/statistics.php b/statistics.php deleted file mode 100644 index f1837c308..000000000 --- a/statistics.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=statistics'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/stores.php b/stores.php deleted file mode 100644 index 48d74257a..000000000 --- a/stores.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=stores'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file diff --git a/supplier.php b/supplier.php deleted file mode 100644 index dea782448..000000000 --- a/supplier.php +++ /dev/null @@ -1,37 +0,0 @@ - -* @copyright 2007-2013 PrestaShop SA -* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -/** - * This file will be removed in 1.6 - * You have to use index.php?controller=page_name instead of this page - * - * @deprecated 1.5.0 - */ - -require(dirname(__FILE__).'/config/config.inc.php'); -Tools::displayFileAsDeprecated(); - -Tools::redirect('index.php?controller=supplier'.((count($_GET) || count($_POST)) ? '&'.http_build_query(array_merge($_GET, $_POST), '', '&') : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently'); \ No newline at end of file