Merge branch 'develop' into gli-407
This commit is contained in:
@@ -1179,9 +1179,10 @@ abstract class AdminTabCore
|
||||
if ($key == 'passwd' && Tools::getValue('id_'.$table) && empty($value)) {
|
||||
continue;
|
||||
}
|
||||
/* Automatically encrypt password in MD5 */
|
||||
/* Automatically hash password */
|
||||
if ($key == 'passwd' && !empty($value)) {
|
||||
$value = Tools::encrypt($value);
|
||||
$objHash = new PasswordHashing();
|
||||
$value = $objHash->passwordHash($value);
|
||||
}
|
||||
$object->{$key} = $value;
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@ class CustomerCore extends ObjectModel
|
||||
'lastname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'required' => true, 'size' => 32),
|
||||
'firstname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'required' => true, 'size' => 32),
|
||||
'email' => array('type' => self::TYPE_STRING, 'validate' => 'isEmail', 'required' => true, 'size' => 128),
|
||||
'passwd' => array('type' => self::TYPE_STRING, 'validate' => 'isPasswd', 'required' => true, 'size' => 32),
|
||||
'passwd' => array('type' => self::TYPE_STRING, 'validate' => 'isPasswd', 'required' => true, 'size' => 60),
|
||||
'last_passwd_gen' => array('type' => self::TYPE_STRING, 'copy_post' => false),
|
||||
'id_gender' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
|
||||
'birthday' => array('type' => self::TYPE_DATE, 'validate' => 'isBirthDate'),
|
||||
@@ -383,19 +383,28 @@ class CustomerCore extends ObjectModel
|
||||
FROM `'._DB_PREFIX_.'customer`
|
||||
WHERE `email` = \''.pSQL($email).'\'
|
||||
'.Shop::addSqlRestriction(Shop::SHARE_CUSTOMER).'
|
||||
'.(isset($passwd) ? 'AND `passwd` = \''.pSQL(Tools::encrypt($passwd)).'\'' : '').'
|
||||
AND `deleted` = 0
|
||||
'.($ignore_guest ? ' AND `is_guest` = 0' : ''));
|
||||
|
||||
if (!$result) {
|
||||
return false;
|
||||
}
|
||||
if (isset($passwd)) {
|
||||
$objHash = new PasswordHashing();
|
||||
if (!$objHash->validateHash($passwd, $result['passwd'])) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
$this->id = $result['id_customer'];
|
||||
foreach ($result as $key => $value) {
|
||||
if (property_exists($this, $key)) {
|
||||
$this->{$key} = $value;
|
||||
}
|
||||
}
|
||||
if (isset($passwd) && !$objHash->isPrimaryHash($passwd, $result['passwd'])) {
|
||||
$this->passwd = $objHash->passwordHash($passwd);
|
||||
$this->update();
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
@@ -560,7 +569,7 @@ class CustomerCore extends ObjectModel
|
||||
*/
|
||||
public static function checkPassword($id_customer, $passwd)
|
||||
{
|
||||
if (!Validate::isUnsignedId($id_customer) || !Validate::isMd5($passwd)) {
|
||||
if (!Validate::isUnsignedId($id_customer)) {
|
||||
die(Tools::displayError());
|
||||
}
|
||||
$cache_id = 'Customer::checkPassword'.(int)$id_customer.'-'.$passwd;
|
||||
@@ -852,7 +861,8 @@ class CustomerCore extends ObjectModel
|
||||
}
|
||||
|
||||
$this->is_guest = 0;
|
||||
$this->passwd = Tools::encrypt($password);
|
||||
$objHash = new PasswordHashing();
|
||||
$this->passwd = $objHash->passwordHash($password);
|
||||
$this->cleanGroups();
|
||||
$this->addGroups(array(Configuration::get('PS_CUSTOMER_GROUP'))); // add default customer group
|
||||
$this->id_default_group = (int) Configuration::get('PS_CUSTOMER_GROUP');
|
||||
@@ -887,7 +897,8 @@ class CustomerCore extends ObjectModel
|
||||
public function setWsPasswd($passwd)
|
||||
{
|
||||
if ($this->id == 0 || $this->passwd != $passwd) {
|
||||
$this->passwd = Tools::encrypt($passwd);
|
||||
$objHash = new PasswordHashing();
|
||||
$this->passwd = $objHash->passwordHash($passwd);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ class EmployeeCore extends ObjectModel
|
||||
'firstname' => array('type' => self::TYPE_STRING, 'validate' => 'isName', 'required' => true, 'size' => 32),
|
||||
'email' => array('type' => self::TYPE_STRING, 'validate' => 'isEmail', 'required' => true, 'size' => 128),
|
||||
'id_lang' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'required' => true),
|
||||
'passwd' => array('type' => self::TYPE_STRING, 'validate' => 'isPasswdAdmin', 'required' => true, 'size' => 32),
|
||||
'passwd' => array('type' => self::TYPE_STRING, 'validate' => 'isPasswdAdmin', 'required' => true, 'size' => 60),
|
||||
'last_passwd_gen' => array('type' => self::TYPE_STRING),
|
||||
'active' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
|
||||
'optin' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
|
||||
@@ -281,11 +281,17 @@ class EmployeeCore extends ObjectModel
|
||||
SELECT *
|
||||
FROM `'._DB_PREFIX_.'employee`
|
||||
WHERE `email` = \''.pSQL($email).'\'
|
||||
'.($active_only ? ' AND `active` = 1' : '')
|
||||
.($passwd !== null ? ' AND `passwd` = \''.Tools::encrypt($passwd).'\'' : ''));
|
||||
'.($active_only ? ' AND `active` = 1' : ''));
|
||||
if (!$result) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($passwd !== null) {
|
||||
$objHash = new PasswordHashing();
|
||||
if (!$objHash->validateHash($passwd, $result['passwd'])) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
$this->id = $result['id_employee'];
|
||||
$this->id_profile = $result['id_profile'];
|
||||
foreach ($result as $key => $value) {
|
||||
@@ -293,6 +299,11 @@ class EmployeeCore extends ObjectModel
|
||||
$this->{$key} = $value;
|
||||
}
|
||||
}
|
||||
|
||||
if ($passwd !== null && !$objHash->isPrimaryHash($passwd, $result['passwd'])) {
|
||||
$this->passwd = $objHash->passwordHash($passwd);
|
||||
$this->update();
|
||||
}
|
||||
return $this;
|
||||
}
|
||||
|
||||
@@ -316,7 +327,7 @@ class EmployeeCore extends ObjectModel
|
||||
*/
|
||||
public static function checkPassword($id_employee, $passwd)
|
||||
{
|
||||
if (!Validate::isUnsignedId($id_employee) || !Validate::isPasswd($passwd, 8)) {
|
||||
if (!Validate::isUnsignedId($id_employee)) {
|
||||
die(Tools::displayError());
|
||||
}
|
||||
|
||||
@@ -364,19 +375,20 @@ class EmployeeCore extends ObjectModel
|
||||
// validate and set password for the employee
|
||||
public function setWsPasswd($passwd)
|
||||
{
|
||||
$objHash = new PasswordHashing();
|
||||
if ($this->id != 0) {
|
||||
if ($this->passwd != $passwd) {
|
||||
if (!Validate::isPasswd($passwd, Validate::ADMIN_PASSWORD_LENGTH)) {
|
||||
WebserviceRequest::getInstance()->setError(400, 'The password must be at least '.Validate::ADMIN_PASSWORD_LENGTH.' characters long.', 134);
|
||||
} else {
|
||||
$this->passwd = Tools::encrypt($passwd);
|
||||
$this->passwd = $objHash->passwordHash($passwd);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (!Validate::isPasswd($passwd, Validate::ADMIN_PASSWORD_LENGTH)) {
|
||||
WebserviceRequest::getInstance()->setError(400, 'The password must be at least '.Validate::ADMIN_PASSWORD_LENGTH.' characters long.', 134);
|
||||
} else {
|
||||
$this->passwd = Tools::encrypt($passwd);
|
||||
$this->passwd = $objHash->passwordHash($passwd);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1188,7 +1188,8 @@ abstract class ObjectModelCore implements Core_Foundation_Database_EntityInterfa
|
||||
}
|
||||
if ($field == 'passwd') {
|
||||
if ($value = Tools::getValue($field)) {
|
||||
$this->{$field} = Tools::encrypt($value);
|
||||
$objHash = new PasswordHashing();
|
||||
$this->{$field} = $objHash->passwordHash($value);
|
||||
}
|
||||
} else {
|
||||
$this->{$field} = $value;
|
||||
|
||||
122
classes/PasswordHashing.php
Normal file
122
classes/PasswordHashing.php
Normal file
@@ -0,0 +1,122 @@
|
||||
<?php
|
||||
/**
|
||||
* NOTICE OF LICENSE
|
||||
*
|
||||
* This source file is subject to the Open Software License version 3.0
|
||||
* that is bundled with this package in the file LICENSE.md
|
||||
* It is also available through the world-wide-web at this URL:
|
||||
* https://opensource.org/license/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 support@qloapps.com so we can send you a copy immediately.
|
||||
*
|
||||
* DISCLAIMER
|
||||
*
|
||||
* Do not edit or add to this file if you wish to upgrade this module to a newer
|
||||
* versions in the future. If you wish to customize this module for your needs
|
||||
* please refer to https://store.webkul.com/customisation-guidelines for more information.
|
||||
*
|
||||
* @author Webkul IN
|
||||
* @copyright Since 2010 Webkul
|
||||
* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
|
||||
*/
|
||||
|
||||
|
||||
|
||||
class PasswordHashingCore
|
||||
{
|
||||
/** @var array Available password hashing methods. */
|
||||
private $passwordHashMethods = array();
|
||||
|
||||
/**
|
||||
* Check whether the stored hash matches the primary hashing method.
|
||||
*
|
||||
* @param string $passwd Plain-text password to validate.
|
||||
* @param string $hash Stored password hash.
|
||||
* @param string $staticSalt Static salt used by legacy hash methods.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isPrimaryHash($passwd, $hash, $staticSalt = _COOKIE_KEY_)
|
||||
{
|
||||
if (!count($this->passwordHashMethods)) {
|
||||
$this->initPasswordHashMethods();
|
||||
}
|
||||
|
||||
$closure = reset($this->passwordHashMethods);
|
||||
|
||||
return $closure['verify']($passwd, $hash, $staticSalt);
|
||||
}
|
||||
|
||||
/**
|
||||
* Validate a password against all supported hashing methods.
|
||||
*
|
||||
* @param string $passwd Plain-text password to validate.
|
||||
* @param string $hash Stored password hash.
|
||||
* @param string $staticSalt Static salt used by legacy hash methods.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function validateHash($passwd, $hash, $staticSalt = _COOKIE_KEY_)
|
||||
{
|
||||
if (!count($this->passwordHashMethods)) {
|
||||
$this->initPasswordHashMethods();
|
||||
}
|
||||
|
||||
foreach ($this->passwordHashMethods as $closure) {
|
||||
if ($closure['verify']($passwd, $hash, $staticSalt)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Hash a plain-text password with the primary hashing method.
|
||||
*
|
||||
* @param string $plaintextPassword Password to hash.
|
||||
* @param string $staticSalt Static salt reserved for legacy hash methods.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function passwordHash($plaintextPassword, $staticSalt = _COOKIE_KEY_)
|
||||
{
|
||||
if (!count($this->passwordHashMethods)) {
|
||||
$this->initPasswordHashMethods();
|
||||
}
|
||||
|
||||
$closure = reset($this->passwordHashMethods);
|
||||
|
||||
return $closure['hash']($plaintextPassword, $staticSalt, $closure['option']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialize the supported password hashing methods.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
private function initPasswordHashMethods()
|
||||
{
|
||||
$this->passwordHashMethods = array(
|
||||
'bcrypt' => array(
|
||||
'option' => array(),
|
||||
'hash' => function ($passwd, $staticSalt, $option) {
|
||||
return password_hash($passwd, PASSWORD_BCRYPT);
|
||||
},
|
||||
'verify' => function ($passwd, $hash, $staticSalt) {
|
||||
return password_verify($passwd, $hash);
|
||||
},
|
||||
),
|
||||
'md5' => array(
|
||||
'option' => array(),
|
||||
'hash' => function ($passwd, $staticSalt, $option) {
|
||||
return md5($staticSalt.$passwd);
|
||||
},
|
||||
'verify' => function ($passwd, $hash, $staticSalt) {
|
||||
return md5($staticSalt.$passwd) === $hash;
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -53,7 +53,7 @@ class ReferrerCore extends ObjectModel
|
||||
'primary' => 'id_referrer',
|
||||
'fields' => array(
|
||||
'name' => array('type' => self::TYPE_STRING, 'validate' => 'isGenericName', 'required' => true, 'size' => 64),
|
||||
'passwd' => array('type' => self::TYPE_STRING, 'validate' => 'isPasswd', 'size' => 32),
|
||||
'passwd' => array('type' => self::TYPE_STRING, 'validate' => 'isPasswd', 'size' => 60),
|
||||
'http_referer_regexp' => array('type' => self::TYPE_STRING, 'validate' => 'isCleanHtml', 'size' => 64),
|
||||
'request_uri_regexp' => array('type' => self::TYPE_STRING, 'validate' => 'isCleanHtml', 'size' => 64),
|
||||
'http_referer_like' => array('type' => self::TYPE_STRING, 'validate' => 'isCleanHtml', 'size' => 64),
|
||||
|
||||
@@ -1140,4 +1140,4 @@ class ValidateCore
|
||||
{
|
||||
return (preg_match('/^(?:'.Configuration::get('PS_INVOICE_PREFIX', Context::getContext()->language->id).')\s*([0-9]+)$/i', $id));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3842,9 +3842,10 @@ class AdminControllerCore extends Controller
|
||||
if ($key == 'passwd' && Tools::getValue('id_'.$table) && empty($value)) {
|
||||
continue;
|
||||
}
|
||||
/* Automatically encrypt password in MD5 */
|
||||
/* Automatically hash password */
|
||||
if ($key == 'passwd' && !empty($value)) {
|
||||
$value = Tools::encrypt($value);
|
||||
$objHash = new PasswordHashing();
|
||||
$value = $objHash->passwordHash($value);
|
||||
}
|
||||
$object->{$key} = $value;
|
||||
}
|
||||
@@ -4821,4 +4822,4 @@ class AdminControllerCore extends Controller
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -689,6 +689,7 @@ abstract class ModuleCore
|
||||
*/
|
||||
public function uninstall()
|
||||
{
|
||||
Hook::exec('actionModuleUninstallBefore', array('object' => $this));
|
||||
// Check module installation id validation
|
||||
if (!Validate::isUnsignedId($this->id)) {
|
||||
$this->_errors[] = Tools::displayError('The module is not installed.');
|
||||
|
||||
@@ -1392,7 +1392,8 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
|
||||
$objCustomer->firstname = $customerDetails['firstname'];
|
||||
$objCustomer->lastname = $customerDetails['lastname'];
|
||||
$objCustomer->email = $customerDetails['email'];
|
||||
$objCustomer->passwd = md5(time()._COOKIE_KEY_);
|
||||
$objHash = new PasswordHashing();
|
||||
$objCustomer->passwd = $objHash->passwordHash(Tools::passwdGen(32, 'RANDOM'));
|
||||
$objCustomer->phone = (isset($customerDetails['phone']) ? $customerDetails['phone'] : '');
|
||||
$objCustomer->cleanGroups();
|
||||
$objCustomer->add();
|
||||
|
||||
@@ -45,6 +45,8 @@ ini_set('magic_quotes_sybase', 0);
|
||||
/* correct Apache charset (except if it's too late */
|
||||
if (!headers_sent()) {
|
||||
header('Content-Type: text/html; charset=utf-8');
|
||||
header('X-Powered-By: QloApps');
|
||||
header('X-Built-With: QloApps');
|
||||
}
|
||||
|
||||
/* No settings file? goto installer... */
|
||||
|
||||
@@ -2835,7 +2835,8 @@ class AdminImportControllerCore extends AdminController
|
||||
|
||||
AdminImportController::arrayWalk($info, array('AdminImportController', 'fillInfo'), $customer);
|
||||
if ($customer->passwd) {
|
||||
$customer->passwd = Tools::encrypt($customer->passwd);
|
||||
$objHash = new PasswordHashing();
|
||||
$customer->passwd = $objHash->passwordHash($customer->passwd);
|
||||
}
|
||||
|
||||
$customers_shop = array();
|
||||
|
||||
@@ -263,7 +263,8 @@ class AdminLoginControllerCore extends AdminController
|
||||
|
||||
if (!count($this->errors)) {
|
||||
$pwd = Tools::passwdGen(10, 'RANDOM');
|
||||
$employee->passwd = Tools::encrypt($pwd);
|
||||
$objHash = new PasswordHashing();
|
||||
$employee->passwd = $objHash->passwordHash($pwd);
|
||||
$employee->last_passwd_gen = date('Y-m-d H:i:s', time());
|
||||
|
||||
$params = array(
|
||||
|
||||
@@ -71,7 +71,7 @@ class IdentityControllerCore extends FrontController
|
||||
$this->errors[] = Tools::displayError('This email address is not valid');
|
||||
} elseif ($this->customer->email != $email && Customer::customerExists($email, true)) {
|
||||
$this->errors[] = Tools::displayError('An account using this email address has already been registered.');
|
||||
} elseif (!Tools::getIsset('old_passwd') || (Tools::encrypt($old_passwd) != $this->context->cookie->passwd)) {
|
||||
} elseif (!Tools::getIsset('old_passwd') || !(new PasswordHashing())->validateHash($old_passwd, $this->context->cookie->passwd)) {
|
||||
$this->errors[] = Tools::displayError('The password you entered is incorrect.');
|
||||
} elseif (Tools::getValue('passwd') != Tools::getValue('confirmation')) {
|
||||
$this->errors[] = Tools::displayError('The password and confirmation do not match.');
|
||||
|
||||
@@ -73,7 +73,8 @@ class PasswordControllerCore extends FrontController
|
||||
} elseif ((strtotime($customer->last_passwd_gen.'+'.(int)Configuration::get('PS_PASSWD_TIME_FRONT').' minutes') - time()) > 0) {
|
||||
Tools::redirect('index.php?controller=authentication&error_regen_pwd');
|
||||
} else {
|
||||
$customer->passwd = Tools::encrypt($password = Tools::passwdGen(MIN_PASSWD_LENGTH, 'RANDOM'));
|
||||
$objHash = new PasswordHashing();
|
||||
$customer->passwd = $objHash->passwordHash($password = Tools::passwdGen(MIN_PASSWD_LENGTH, 'RANDOM'));
|
||||
$customer->last_passwd_gen = date('Y-m-d H:i:s', time());
|
||||
if ($customer->update()) {
|
||||
Hook::exec('actionPasswordRenew', array('customer' => $customer, 'password' => $password));
|
||||
|
||||
@@ -675,6 +675,7 @@ class ProductControllerCore extends FrontController
|
||||
'id_room_type' => $idProduct,
|
||||
'id_cart' => $idCart,
|
||||
'id_guest' => $idGuest,
|
||||
'search_unavai' => 1,
|
||||
);
|
||||
if (Configuration::get('PS_FRONT_ROOM_UNIT_SELECTION_TYPE') == HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY) {
|
||||
$bookingParams['occupancy'] = $occupancy;
|
||||
@@ -693,9 +694,39 @@ class ProductControllerCore extends FrontController
|
||||
}
|
||||
|
||||
$totalAvailableRooms = 0;
|
||||
$losRestrictionFailed = false;
|
||||
$losMinFailed = false;
|
||||
$losMaxFailed = false;
|
||||
// Initialize LOS values for the selected room type/date
|
||||
$objRoomTypeRestrictionDateRange = new HotelRoomTypeRestrictionDateRange();
|
||||
$losRestriction = $objRoomTypeRestrictionDateRange->getRoomTypeLengthOfStay($idProduct, $dateFrom);
|
||||
$losMinDays = (int) ($losRestriction ? $losRestriction['min_los'] : 1);
|
||||
$losMaxDays = (int) ($losRestriction ? $losRestriction['max_los'] : 0);
|
||||
if ($hotelRoomData = $objBookingDetail->dataForFrontSearch($bookingParams)) {
|
||||
$totalAvailableRooms = $hotelRoomData['stats']['num_avail'];
|
||||
$quantity = ($quantity > $totalAvailableRooms) ? $totalAvailableRooms : $quantity;
|
||||
// Check if rooms are unavailable due to LOS restriction
|
||||
if ($totalAvailableRooms <= 0 && !empty($hotelRoomData['rm_data'][$idProduct]['data']['unavailable'])) {
|
||||
foreach ($hotelRoomData['rm_data'][$idProduct]['data']['unavailable'] as $unavailableRoom) {
|
||||
if (empty($unavailableRoom['detail'])) {
|
||||
continue;
|
||||
}
|
||||
foreach ($unavailableRoom['detail'] as $detail) {
|
||||
if (!empty($detail['id_status']) && $detail['id_status'] == HotelRoomInformation::STATUS_SEARCH_LOS_UNSATISFIED) {
|
||||
$losRestrictionFailed = true;
|
||||
break 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($losRestrictionFailed) {
|
||||
// Determine which restriction failed
|
||||
if ($numDays < $losMinDays) {
|
||||
$losMinFailed = true;
|
||||
} elseif ($losMaxDays > 0 && $numDays > $losMaxDays) {
|
||||
$losMaxFailed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// calculate room type price first
|
||||
@@ -863,6 +894,11 @@ class ProductControllerCore extends FrontController
|
||||
$smartyVars['num_days'] = $numDays;
|
||||
$smartyVars['warning_count'] = $warningCount;
|
||||
$smartyVars['total_available_rooms'] = $totalAvailableRooms;
|
||||
$smartyVars['los_restriction_failed'] = $losRestrictionFailed;
|
||||
$smartyVars['los_min_days'] = $losMinDays;
|
||||
$smartyVars['los_max_days'] = $losMaxDays;
|
||||
$smartyVars['los_min_failed'] = $losMinFailed;
|
||||
$smartyVars['los_max_failed'] = $losMaxFailed;
|
||||
$smartyVars['has_room_type_demands'] = $roomTypeDemands ? true : false; // whether to show price breakup
|
||||
$smartyVars['rooms_price'] = $totalRoomPrice;
|
||||
$smartyVars['demands_price_per_room'] = $demandsPricePerRoom;
|
||||
|
||||
@@ -593,7 +593,7 @@ CREATE TABLE `PREFIX_customer` (
|
||||
`firstname` varchar(32) NOT NULL,
|
||||
`lastname` varchar(32) NOT NULL,
|
||||
`email` varchar(128) NOT NULL,
|
||||
`passwd` varchar(32) NOT NULL,
|
||||
`passwd` varchar(60) NOT NULL,
|
||||
`last_passwd_gen` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
`birthday` date DEFAULT NULL,
|
||||
`newsletter` tinyint(1) unsigned NOT NULL DEFAULT '0',
|
||||
@@ -779,7 +779,7 @@ CREATE TABLE `PREFIX_employee` (
|
||||
`lastname` varchar(32) NOT NULL,
|
||||
`firstname` varchar(32) NOT NULL,
|
||||
`email` varchar(128) NOT NULL,
|
||||
`passwd` varchar(32) NOT NULL,
|
||||
`passwd` varchar(60) NOT NULL,
|
||||
`last_passwd_gen` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
`stats_date_from` date DEFAULT NULL,
|
||||
`stats_date_to` date DEFAULT NULL,
|
||||
@@ -1781,7 +1781,7 @@ CREATE TABLE `PREFIX_range_weight` (
|
||||
CREATE TABLE `PREFIX_referrer` (
|
||||
`id_referrer` int(10) unsigned NOT NULL auto_increment,
|
||||
`name` varchar(64) NOT NULL,
|
||||
`passwd` varchar(32) DEFAULT NULL,
|
||||
`passwd` varchar(60) DEFAULT NULL,
|
||||
`http_referer_regexp` varchar(64) DEFAULT NULL,
|
||||
`http_referer_like` varchar(64) DEFAULT NULL,
|
||||
`request_uri_regexp` varchar(64) DEFAULT NULL,
|
||||
|
||||
@@ -35,7 +35,8 @@ class InstallFixturesFashion extends InstallXmlLoader
|
||||
public function createEntityCustomer($identifier, array $data, array $data_lang)
|
||||
{
|
||||
if ($identifier == 'John') {
|
||||
$data['passwd'] = Tools::encrypt('123456789');
|
||||
$objHash = new PasswordHashing();
|
||||
$data['passwd'] = $objHash->passwordHash('123456789');
|
||||
$data['last_passwd_gen'] = date('Y-m-d H:i:s');
|
||||
$data['birthday'] = date('Y-m-d', strtotime('-30 years'));
|
||||
$data['newsletter_date_add'] = date('Y-m-d H:i:s');
|
||||
|
||||
@@ -566,7 +566,8 @@ class InstallModelInstall extends InstallAbstractModel
|
||||
$employee->firstname = Tools::ucfirst($data['admin_firstname']);
|
||||
$employee->lastname = Tools::ucfirst($data['admin_lastname']);
|
||||
$employee->email = $data['admin_email'];
|
||||
$employee->passwd = md5(_COOKIE_KEY_.$data['admin_password']);
|
||||
$objHash = new PasswordHashing();
|
||||
$employee->passwd = $objHash->passwordHash($data['admin_password']);
|
||||
$employee->last_passwd_gen = date('Y-m-d h:i:s', strtotime('-360 minutes'));
|
||||
$employee->bo_theme = 'default';
|
||||
$employee->default_tab = 1;
|
||||
|
||||
@@ -212,7 +212,17 @@
|
||||
{/block}
|
||||
{else}
|
||||
<div class="sold_out_alert">
|
||||
<span>{l s='All rooms sold out!'}</span>
|
||||
{if isset($los_restriction_failed) && $los_restriction_failed}
|
||||
<span>
|
||||
{if isset($los_min_failed) && $los_min_failed}
|
||||
{l s='Minimum stay allowed is %d nights.' sprintf=[$los_min_days]}
|
||||
{elseif isset($los_max_failed) && $los_max_failed}
|
||||
{l s='Maximum stay allowed is %d nights.' sprintf=[$los_max_days]}
|
||||
{/if}
|
||||
</span>
|
||||
{else}
|
||||
<span>{l s='All rooms sold out!'}</span>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
{if isset($meta_keywords) AND $meta_keywords}
|
||||
<meta name="keywords" content="{$meta_keywords|escape:'html':'UTF-8'}" />
|
||||
{/if}
|
||||
<meta name="generator" content="QloApps" />
|
||||
<meta name="generator" content="QloApps {{ _QLO_VERSION_ }}" />
|
||||
<meta name="robots" content="{if isset($nobots)}no{/if}index,{if isset($nofollow) && $nofollow}no{/if}follow" />
|
||||
<meta name="viewport" content="width=device-width, minimum-scale=0.25, maximum-scale=1.6, initial-scale=1.0" />
|
||||
<meta name="mobile-web-app-capable" content="yes" />
|
||||
@@ -77,7 +77,8 @@
|
||||
<!-- <link href='https://fonts.googleapis.com/css?family=PT+Serif:400,400italic,700,700italic' rel='stylesheet' type='text/css'> -->
|
||||
<link href='//fonts.googleapis.com/css?family=Oxygen:400,300,700' rel='stylesheet' type='text/css'>
|
||||
</head>
|
||||
<body{if isset($page_name)} id="{$page_name|escape:'html':'UTF-8'}"{/if} class="{if isset($page_name)}{$page_name|escape:'html':'UTF-8'}{/if}{if isset($body_classes) && $body_classes|@count} {' '|implode:$body_classes}{/if}{if $hide_left_column} hide-left-column{else} show-left-column{/if}{if $hide_right_column} hide-right-column{else} hide-right-column{/if}{if isset($content_only) && $content_only} content_only{/if} lang_{$lang_iso}" style="{if $page_name == 'index'}height: 100%;{/if}">
|
||||
<!-- Built with QloApps -->
|
||||
<body{if isset($page_name)} id="{$page_name|escape:'html':'UTF-8'}"{/if} class="qloapps {if isset($page_name)}{$page_name|escape:'html':'UTF-8'}{/if}{if isset($body_classes) && $body_classes|@count} {' '|implode:$body_classes}{/if}{if $hide_left_column} hide-left-column{else} show-left-column{/if}{if $hide_right_column} hide-right-column{else} hide-right-column{/if}{if isset($content_only) && $content_only} content_only{/if} lang_{$lang_iso}" style="{if $page_name == 'index'}height: 100%;{/if}">
|
||||
{if !isset($content_only) || !$content_only}
|
||||
{if isset($restricted_country_mode) && $restricted_country_mode}
|
||||
<div id="restricted-country">
|
||||
|
||||
Reference in New Issue
Block a user