dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Deletion of subdomains

Browse Source
This commit is contained in:
rGaillard
2012-03-12 16:04:22 +00:00
parent 9566879f60
commit 88dcbf56df
6 changed files with 3 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cookie.php
+1 -9
View File
@@ -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;
}
classes/SubDomain.php
-53
View File
@@ -1,53 +0,0 @@
<?php
/*
* 2007-2012 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @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;
}
}
controllers/admin/AdminSubDomainsController.php
-89
View File
@@ -1,89 +0,0 @@
<?php
/*
* 2007-2012 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @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();
}
}
install-dev/data/db_structure.sql
-5
View File
@@ -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,
install-dev/data/xml/subdomain.xml
-9
View File
@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity_subdomain>
<fields id="name" class="SubDomain">
<field name="name"/>
</fields>
<entities>
<subdomain id="www" name="www"/>
</entities>
</entity_subdomain>
install-dev/upgrade/sql/1.5.0.9.sql
+2
View File
@@ -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`;