From 88dcbf56df2d627b56ced1011d8f982143ecbd47 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Mon, 12 Mar 2012 16:04:22 +0000 Subject: [PATCH] // Deletion of subdomains --- classes/Cookie.php | 10 +-- classes/SubDomain.php | 53 ----------- .../admin/AdminSubDomainsController.php | 89 ------------------- install-dev/data/db_structure.sql | 5 -- install-dev/data/xml/subdomain.xml | 9 -- install-dev/upgrade/sql/1.5.0.9.sql | 2 + 6 files changed, 3 insertions(+), 165 deletions(-) delete mode 100644 classes/SubDomain.php delete mode 100644 controllers/admin/AdminSubDomainsController.php delete mode 100644 install-dev/data/xml/subdomain.xml diff --git a/classes/Cookie.php b/classes/Cookie.php index af0fe1dc8..643e2e467 100644 --- a/classes/Cookie.php +++ b/classes/Cookie.php @@ -90,15 +90,7 @@ class CookieCore if (!strstr(Tools::getHttpHost(false, false), '.')) return false; $domain = $out[4]; - $subDomains = SubDomain::getSubDomains(); - if ($subDomains === false) - die(Tools::displayError('Bad SubDomain SQL query.')); - foreach ($subDomains as $subDomain) - { - $subDomainLength = strlen($subDomain) + 1; - if (strncmp($subDomain.'.', $domain, $subDomainLength) == 0) - $domain = substr($domain, $subDomainLength); - } + return $domain; } diff --git a/classes/SubDomain.php b/classes/SubDomain.php deleted file mode 100644 index 7eccc23ee..000000000 --- a/classes/SubDomain.php +++ /dev/null @@ -1,53 +0,0 @@ - -* @copyright 2007-2012 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 -*/ - -class SubDomainCore extends ObjectModel -{ - public $name; - - /** - * @see ObjectModel::$definition - */ - public static $definition = array( - 'table' => 'subdomain', - 'primary' => 'id_subdomain', - 'fields' => array( - 'name' => array('type' => self::TYPE_STRING, 'validate' => 'isSubDomainName', 'required' => true, 'size' => 16), - ), - ); - - public static function getSubDomains() - { - if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT `name` FROM `'._DB_PREFIX_.'subdomain`')) - return false; - $domains = array(); - foreach ($result as $row) - $domains[] = $row['name']; - return $domains; - } -} - diff --git a/controllers/admin/AdminSubDomainsController.php b/controllers/admin/AdminSubDomainsController.php deleted file mode 100644 index 4e774dd7e..000000000 --- a/controllers/admin/AdminSubDomainsController.php +++ /dev/null @@ -1,89 +0,0 @@ - -* @copyright 2007-2012 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 -*/ - -class AdminSubDomainsControllerCore extends AdminController -{ - public function __construct() - { - $this->table = 'subdomain'; - $this->className = 'SubDomain'; - $this->edit = true; - $this->delete = true; - - $this->fieldsDisplay = array( - 'id_subdomain' => array('title' => $this->l('ID'), 'width' => 25), - 'name' => array('title' => $this->l('Subdomain'), 'width' => 200) - ); - - $this->fields_form = array( - 'legend' => array( - 'title' => $this->l('Subdomains'), - 'image' => '../img/admin/subdomain.gif', - ), - 'input' => array( - array( - 'type' => 'text', - 'label' => $this->l('Subdomains:'), - 'name' => 'name', - 'size' => '33', - 'required' => true, - 'hint' => $this->l('Invalid characters:').' <>;=#{}', - ), - ), - 'submit' => array( - 'title' => $this->l(' Save '), - 'class' => 'button' - ) - ); - - - parent::__construct(); - } - - public function renderList() - { - $this->addRowAction('delete'); - $this->warnings[] = $this->l('Cookies are different on each subdomain of your Website. If you want to use the same cookie, please add here the subdomains used by your shop. The most common is "www".'); - return parent::renderList(); - } - - - public function postProcess() - { - $result = Db::getInstance()->executeS(' - SELECT `id_subdomain` - FROM `'._DB_PREFIX_.'subdomain` - '); - if (count($result) === 1) - foreach ($result as $row) - $this->_listSkipDelete = array($row['id_subdomain']); - - return parent::postProcess(); - } -} - - diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql index 82b9f8134..47f035669 100644 --- a/install-dev/data/db_structure.sql +++ b/install-dev/data/db_structure.sql @@ -1651,11 +1651,6 @@ CREATE TABLE `PREFIX_state` ( KEY `id_zone` (`id_zone`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -CREATE TABLE `PREFIX_subdomain` ( - `id_subdomain` int(10) unsigned NOT NULL auto_increment, - `name` varchar(16) NOT NULL, - PRIMARY KEY (`id_subdomain`) -) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE `PREFIX_supplier` ( `id_supplier` int(10) unsigned NOT NULL auto_increment, diff --git a/install-dev/data/xml/subdomain.xml b/install-dev/data/xml/subdomain.xml deleted file mode 100644 index 07156939b..000000000 --- a/install-dev/data/xml/subdomain.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/install-dev/upgrade/sql/1.5.0.9.sql b/install-dev/upgrade/sql/1.5.0.9.sql index b86ea6151..7a63ae27e 100644 --- a/install-dev/upgrade/sql/1.5.0.9.sql +++ b/install-dev/upgrade/sql/1.5.0.9.sql @@ -6,3 +6,5 @@ ALTER TABLE `PREFIX_employee` MODIFY COLUMN `id_last_customer` INT(10) UNSIGNED NOT NULL DEFAULT 0; ALTER TABLE `PREFIX_employee` ADD `default_tab` int(10) unsigned NOT NULL default 0 AFTER `bo_theme`; + +DROP TABLE `PREFIX_subdomain`; \ No newline at end of file