'.$this->l('If you turn on this feature, you must').' '.$this->l('generate a .htaccess file').'
', 'validation' => 'isBool', 'cast' => 'intval', 'type' => 'bool'), 'PS_CANONICAL_REDIRECT' => array('title' => $this->l('Automatically redirect to Canonical url'), 'desc' => $this->l('Recommended but your theme must be compliant'), 'validation' => 'isBool', 'cast' => 'intval', 'type' => 'bool'), ); diff --git a/classes/AdminTab.php b/classes/AdminTab.php index 5d0de2e2f..4690709f5 100644 --- a/classes/AdminTab.php +++ b/classes/AdminTab.php @@ -1192,7 +1192,7 @@ abstract class AdminTabCore $this->_group .= ', a.'.pSQL($this->identifier); $filterShop = 'JOIN `'._DB_PREFIX_.$this->table.'_'.$filterKey.'` sa ON (sa.'.$this->identifier.' = a.'.$this->identifier.' AND sa.id_'.$filterKey.' IN ('.implode(', ', $idenfierShop).'))'; } - + /* Query in order to get results with all fields */ $sql = 'SELECT SQL_CALC_FOUND_ROWS '.($this->_tmpTableFilter ? ' * FROM (SELECT ' : '').' diff --git a/controllers/AddressController.php b/controllers/AddressController.php index 29ebad6cf..7715bc486 100644 --- a/controllers/AddressController.php +++ b/controllers/AddressController.php @@ -32,8 +32,8 @@ class AddressControllerCore extends FrontController { public $auth = true; public $guestAllowed = true; - public $php_self = 'address.php'; - public $authRedirection = 'addresses.php'; + public $php_self = 'address'; + public $authRedirection = 'addresses'; public $ssl = true; protected $_address; diff --git a/controllers/AddressesController.php b/controllers/AddressesController.php index 5469edb8f..611d99523 100644 --- a/controllers/AddressesController.php +++ b/controllers/AddressesController.php @@ -28,8 +28,8 @@ class AddressesControllerCore extends FrontController { public $auth = true; - public $php_self = 'addresses.php'; - public $authRedirection = 'addresses.php'; + public $php_self = 'addresses'; + public $authRedirection = 'addresses'; public $ssl = true; public function setMedia() diff --git a/controllers/AuthController.php b/controllers/AuthController.php index 0c8175d87..8d4749146 100644 --- a/controllers/AuthController.php +++ b/controllers/AuthController.php @@ -28,7 +28,7 @@ class AuthControllerCore extends FrontController { public $ssl = true; - public $php_self = 'authentication.php'; + public $php_self = 'authentication'; public function preProcess() { @@ -196,7 +196,7 @@ class AuthControllerCore extends FrontController die(Tools::jsonEncode($return)); } if ($back = Tools::getValue('back')) - Tools::redirect($back); + Tools::redirect('index.php?controller='.$back); Tools::redirect('index.php?controller=my-account'); } } diff --git a/controllers/BestSalesController.php b/controllers/BestSalesController.php index 1318f90e2..11df6f373 100644 --- a/controllers/BestSalesController.php +++ b/controllers/BestSalesController.php @@ -27,7 +27,7 @@ class BestSalesControllerCore extends FrontController { - public $php_self = 'best-sales.php'; + public $php_self = 'best-sales'; public function process() { diff --git a/controllers/CartController.php b/controllers/CartController.php index 177faa8da..c86acc68a 100644 --- a/controllers/CartController.php +++ b/controllers/CartController.php @@ -27,7 +27,7 @@ class CartControllerCore extends FrontController { - public $php_self = 'cart.php'; + public $php_self = 'cart'; // This is not a public page, so the canonical redirection is disabled public function canonicalRedirection(){} diff --git a/controllers/CompareController.php b/controllers/CompareController.php index 909589604..5cf637970 100644 --- a/controllers/CompareController.php +++ b/controllers/CompareController.php @@ -27,7 +27,7 @@ class CompareControllerCore extends FrontController { - public $php_self = 'products-comparison.php'; + public $php_self = 'products-comparison'; public function setMedia() { diff --git a/controllers/DiscountController.php b/controllers/DiscountController.php index 34d85bd9e..9c72879b3 100644 --- a/controllers/DiscountController.php +++ b/controllers/DiscountController.php @@ -28,8 +28,8 @@ class DiscountControllerCore extends FrontController { public $auth = true; - public $php_self = 'discount.php'; - public $authRedirection = 'discount.php'; + public $php_self = 'discount'; + public $authRedirection = 'discount'; public $ssl = true; public function process() diff --git a/controllers/GuestTrackingController.php b/controllers/GuestTrackingController.php index f883d882e..951387ead 100644 --- a/controllers/GuestTrackingController.php +++ b/controllers/GuestTrackingController.php @@ -27,7 +27,7 @@ class GuestTrackingControllerCore extends FrontController { - public $php_self = 'guest-tracking.php'; + public $php_self = 'guest-tracking'; public function preProcess() { diff --git a/controllers/HistoryController.php b/controllers/HistoryController.php index 0008a6205..181ee0b1a 100644 --- a/controllers/HistoryController.php +++ b/controllers/HistoryController.php @@ -28,8 +28,8 @@ class HistoryControllerCore extends FrontController { public $auth = true; - public $php_self = 'history.php'; - public $authRedirection = 'history.php'; + public $php_self = 'history'; + public $authRedirection = 'history'; public $ssl = true; public function setMedia() diff --git a/controllers/IdentityController.php b/controllers/IdentityController.php index e08feef90..38e1b3ca8 100644 --- a/controllers/IdentityController.php +++ b/controllers/IdentityController.php @@ -28,8 +28,8 @@ class IdentityControllerCore extends FrontController { public $auth = true; - public $php_self = 'identity.php'; - public $authRedirection = 'identity.php'; + public $php_self = 'identity'; + public $authRedirection = 'identity'; public $ssl = true; public function preProcess() diff --git a/controllers/IndexController.php b/controllers/IndexController.php index 9300043d7..a4c13f54a 100644 --- a/controllers/IndexController.php +++ b/controllers/IndexController.php @@ -29,7 +29,7 @@ class IndexControllerCore extends FrontController { public function __construct() { - $this->php_self = Configuration::get('PS_HOMEPAGE_PHP_SELF'); + $this->php_self = 'index'; parent::__construct(); } diff --git a/controllers/MyAccountController.php b/controllers/MyAccountController.php index 5e18b0f98..dc9dc5800 100644 --- a/controllers/MyAccountController.php +++ b/controllers/MyAccountController.php @@ -28,8 +28,8 @@ class MyAccountControllerCore extends FrontController { public $auth = true; - public $php_self = 'my-account.php'; - public $authRedirection = 'my-account.php'; + public $php_self = 'my-account'; + public $authRedirection = 'my-account'; public $ssl = true; public function setMedia() diff --git a/controllers/NewProductsController.php b/controllers/NewProductsController.php index afc449d13..f65b3c464 100644 --- a/controllers/NewProductsController.php +++ b/controllers/NewProductsController.php @@ -27,7 +27,7 @@ class NewProductsControllerCore extends FrontController { - public $php_self = 'new-products.php'; + public $php_self = 'new-products'; public function setMedia() { diff --git a/controllers/OrderConfirmationController.php b/controllers/OrderConfirmationController.php index ad4081f04..5d0f4ea5a 100644 --- a/controllers/OrderConfirmationController.php +++ b/controllers/OrderConfirmationController.php @@ -27,7 +27,7 @@ class OrderConfirmationControllerCore extends FrontController { - public $php_self = 'order-confirmation.php'; + public $php_self = 'order-confirmation'; public $id_cart; public $id_module; diff --git a/controllers/OrderDetailController.php b/controllers/OrderDetailController.php index b4e0c9ade..7355e9e7c 100644 --- a/controllers/OrderDetailController.php +++ b/controllers/OrderDetailController.php @@ -28,7 +28,7 @@ class OrderDetailControllerCore extends FrontController { public $auth = true; - public $authRedirection = 'history.php'; + public $authRedirection = 'history'; public $ssl = true; public function __construct() diff --git a/controllers/OrderFollowController.php b/controllers/OrderFollowController.php index c927c38a7..1f652ee1f 100644 --- a/controllers/OrderFollowController.php +++ b/controllers/OrderFollowController.php @@ -28,8 +28,8 @@ class OrderFollowControllerCore extends FrontController { public $auth = true; - public $php_self = 'order-follow.php'; - public $authRedirection = 'order-follow.php'; + public $php_self = 'order-follow'; + public $authRedirection = 'order-follow'; public $ssl = true; public function preProcess() diff --git a/controllers/OrderOpcController.php b/controllers/OrderOpcController.php index 4108f493a..08843c4e6 100644 --- a/controllers/OrderOpcController.php +++ b/controllers/OrderOpcController.php @@ -29,7 +29,7 @@ ControllerFactory::includeController('ParentOrderController'); class OrderOpcControllerCore extends ParentOrderController { - public $php_self = 'order-opc.php'; + public $php_self = 'order-opc'; public $isLogged; public function preProcess() diff --git a/controllers/OrderReturnController.php b/controllers/OrderReturnController.php index f07c0cc42..5df706bd3 100644 --- a/controllers/OrderReturnController.php +++ b/controllers/OrderReturnController.php @@ -28,8 +28,8 @@ class OrderReturnControllerCore extends FrontController { public $auth = true; - public $php_self = 'order-return.php'; - public $authRedirection = 'order-follow.php'; + public $php_self = 'order-return'; + public $authRedirection = 'order-follow'; public $ssl = true; public function __construct() diff --git a/controllers/OrderSlipController.php b/controllers/OrderSlipController.php index fe826ffb7..0f789ae6d 100644 --- a/controllers/OrderSlipController.php +++ b/controllers/OrderSlipController.php @@ -28,8 +28,8 @@ class OrderSlipControllerCore extends FrontController { public $auth = true; - public $php_self = 'order-slip.php'; - public $authRedirection = 'order-slip.php'; + public $php_self = 'order-slip'; + public $authRedirection = 'order-slip'; public $ssl = true; public function setMedia() diff --git a/controllers/PageNotFoundController.php b/controllers/PageNotFoundController.php index 17bc1f680..3e5b34cde 100644 --- a/controllers/PageNotFoundController.php +++ b/controllers/PageNotFoundController.php @@ -27,7 +27,7 @@ class PageNotFoundControllerCore extends FrontController { - public $php_self = '404.php'; + public $php_self = '404'; public function displayContent() { diff --git a/controllers/ParentOrderController.php b/controllers/ParentOrderController.php index 8ba48736e..c61bce17a 100644 --- a/controllers/ParentOrderController.php +++ b/controllers/ParentOrderController.php @@ -31,7 +31,7 @@ class FreeOrder extends PaymentModule {} class ParentOrderControllerCore extends FrontController { public $ssl = true; - public $php_self = 'order.php'; + public $php_self = 'order'; public $nbProducts; diff --git a/controllers/PasswordController.php b/controllers/PasswordController.php index 00646b68a..fb46f5a3c 100644 --- a/controllers/PasswordController.php +++ b/controllers/PasswordController.php @@ -29,7 +29,7 @@ define('MIN_PASSWD_LENGTH', 8); class PasswordControllerCore extends FrontController { - public $php_self = 'password.php'; + public $php_self = 'password'; public function process() { diff --git a/controllers/PricesDropController.php b/controllers/PricesDropController.php index f63d64371..78a693e51 100644 --- a/controllers/PricesDropController.php +++ b/controllers/PricesDropController.php @@ -27,7 +27,7 @@ class PricesDropControllerCore extends FrontController { - public $php_self = 'prices-drop.php'; + public $php_self = 'prices-drop'; public function setMedia() { diff --git a/controllers/SearchController.php b/controllers/SearchController.php index 52e2fbede..e9d0376a9 100644 --- a/controllers/SearchController.php +++ b/controllers/SearchController.php @@ -27,7 +27,7 @@ class SearchControllerCore extends FrontController { - public $php_self = 'search.php'; + public $php_self = 'search'; public $instantSearch; public $ajaxSearch; diff --git a/controllers/SitemapController.php b/controllers/SitemapController.php index 394260071..bfca0e815 100644 --- a/controllers/SitemapController.php +++ b/controllers/SitemapController.php @@ -27,7 +27,7 @@ class SitemapControllerCore extends FrontController { - public $php_self = 'sitemap.php'; + public $php_self = 'sitemap'; public function setMedia() { diff --git a/controllers/StoresController.php b/controllers/StoresController.php index 5cf0d8300..649a484ca 100644 --- a/controllers/StoresController.php +++ b/controllers/StoresController.php @@ -27,7 +27,7 @@ class StoresControllerCore extends FrontController { - public $php_self = 'stores.php'; + public $php_self = 'stores'; public function preProcess() { diff --git a/controllers/SupplierController.php b/controllers/SupplierController.php index d363e4a63..9e26e5816 100644 --- a/controllers/SupplierController.php +++ b/controllers/SupplierController.php @@ -27,7 +27,7 @@ class SupplierControllerCore extends FrontController { - public $php_self = 'supplier.php'; + public $php_self = 'supplier'; protected $supplier; diff --git a/install-dev/sql/db_settings_lite.sql b/install-dev/sql/db_settings_lite.sql index 74e701900..4583de69c 100644 --- a/install-dev/sql/db_settings_lite.sql +++ b/install-dev/sql/db_settings_lite.sql @@ -180,7 +180,6 @@ INSERT INTO `PREFIX_configuration` (`id_configuration`, `name`, `value`, `date_a (109, 'PS_COOKIE_CHECKIP', '1', NOW(), NOW()), (110, 'PS_STORES_CENTER_LAT', '25.948969', NOW(), NOW()), (111, 'PS_STORES_CENTER_LONG', '-80.226439', NOW(), NOW()), -(112, 'PS_HOMEPAGE_PHP_SELF', 'index.php', NOW(), NOW()), (113, 'PS_USE_ECOTAX', '0', NOW(), NOW()), (114, 'PS_CANONICAL_REDIRECT', '1', NOW(), NOW()), (115, 'PS_IMG_UPDATE_TIME', UNIX_TIMESTAMP(), NOW(), NOW()),