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

// Fix pub@prestashop.com default account password

Browse Source
This commit is contained in:
rMalie
2011-12-28 10:49:34 +00:00
parent 8a3fe4a45a
commit f99bb7cffa
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Customer.php
+1 -1
View File
@@ -269,7 +269,7 @@ class CustomerCore extends ObjectModel
WHERE `active` = 1
AND `email` = \''.pSQL($email).'\'
'.$shop->addSqlRestriction(Shop::SHARE_CUSTOMER).'
'.(isset($passwd) ? 'AND `passwd` = \''.md5(_COOKIE_KEY_.$passwd).'\'' : '').'
'.(isset($passwd) ? 'AND `passwd` = \''.Tools::encrypt($passwd).'\'' : '').'
AND `deleted` = 0
AND `is_guest` = 0';
$result = Db::getInstance()->getRow($sql);
classes/Tools.php
+1 -1
View File
@@ -879,7 +879,7 @@ class ToolsCore
*/
public static function encrypt($passwd)
{
return md5(pSQL(_COOKIE_KEY_.$passwd));
return md5(_COOKIE_KEY_.$passwd);
}
/**
install-new/classes/xmlLoader.php
+11 -9
View File
@@ -285,7 +285,15 @@ class InstallXmlLoader
}
$data = $this->rewriteRelationedData($entity, $data);
$this->createEntity($entity, $identifier, (string)$xml->fields['class'], $data, $data_lang);
if (method_exists($this, 'createEntity'.Tools::toCamelCase($entity)))
{
// Create entity with custom method in current class
$method = 'createEntity'.Tools::toCamelCase($entity);
$this->$method($identifier, $data, $data_lang);
}
else
$this->createEntity($entity, $identifier, (string)$xml->fields['class'], $data, $data_lang);
if ($xml->fields['image'])
{
if (method_exists($this, 'copyImages'.Tools::toCamelCase($entity)))
@@ -406,13 +414,7 @@ class InstallXmlLoader
public function createEntity($entity, $identifier, $classname, array $data, array $data_lang = array())
{
$xml = $this->loadEntity($entity);
if (method_exists($this, 'createEntity'.Tools::toCamelCase($entity)))
{
// Create entity with custom method in current class
$method = 'createEntity'.Tools::toCamelCase($entity);
$entity_id = $this->$method($identifier, $data, $data_lang);
}
else if ($classname)
if ($classname)
{
// Create entity with ObjectModel class
$object = new $classname();
@@ -501,7 +503,7 @@ class InstallXmlLoader
}
}
return $entity_id;
$this->storeId($entity, $identifier, $entity_id);
}
public function generatePrimary($entity, $primary)
install-new/fixtures/apple/install.php
+6
View File
@@ -33,5 +33,11 @@
*/
class InstallFixturesApple extends InstallXmlLoader
{
public function createEntityCustomer($identifier, array $data, array $data_lang)
{
if ($identifier == 'John')
$data['passwd'] = Tools::encrypt('123456789');
return $this->createEntity('customer', $identifier, 'Customer', $data, $data_lang);
}
}