'.print_r(debug_backtrace(), true).''); if (!is_array($_ERRORS)) return str_replace('"', '"', $string); $key = md5(str_replace('\'', '\\\'', $string)); - $str = (isset($_ERRORS) AND is_array($_ERRORS) AND key_exists($key, $_ERRORS)) ? ($htmlentities ? htmlentities($_ERRORS[$key], ENT_COMPAT, 'UTF-8') : $_ERRORS[$key]) : $string; + $str = (isset($_ERRORS) && is_array($_ERRORS) && array_key_exists($key, $_ERRORS)) ? ($htmlentities ? htmlentities($_ERRORS[$key], ENT_COMPAT, 'UTF-8') : $_ERRORS[$key]) : $string; return str_replace('"', '"', stripslashes($str)); } @@ -735,8 +735,8 @@ class ToolsCore public static function isSubmit($submit) { return ( - isset($_POST[$submit]) OR isset($_POST[$submit.'_x']) OR isset($_POST[$submit.'_y']) - OR isset($_GET[$submit]) OR isset($_GET[$submit.'_x']) OR isset($_GET[$submit.'_y']) + isset($_POST[$submit]) || isset($_POST[$submit.'_x']) || isset($_POST[$submit.'_y']) + || isset($_GET[$submit]) || isset($_GET[$submit.'_x']) || isset($_GET[$submit.'_y']) ); } @@ -811,7 +811,7 @@ class ToolsCore { if (empty($row['meta_description'])) $row['meta_description'] = strip_tags($row['meta_description']); - $row['meta_title'] .= $row['name'] . (!empty($page_number) ? ' ('.$page_number.')' : ''); + $row['meta_title'] .= $row['name'].(!empty($page_number) ? ' ('.$page_number.')' : ''); $row['meta_title'] .= ' - '.Configuration::get('PS_SHOP_NAME'); return Tools::completeMetaTags($row, $row['meta_title']); } @@ -879,9 +879,9 @@ class ToolsCore { /* Metas-tags */ $metas = Meta::getMetaByPage($page_name, $id_lang); - $ret['meta_title'] = (isset($metas['title']) AND $metas['title']) ? $metas['title'].' - '.Configuration::get('PS_SHOP_NAME') : Configuration::get('PS_SHOP_NAME'); - $ret['meta_description'] = (isset($metas['description']) AND $metas['description']) ? $metas['description'] : ''; - $ret['meta_keywords'] = (isset($metas['keywords']) AND $metas['keywords']) ? $metas['keywords'] : ''; + $ret['meta_title'] = (isset($metas['title']) && $metas['title']) ? $metas['title'].' - '.Configuration::get('PS_SHOP_NAME') : Configuration::get('PS_SHOP_NAME'); + $ret['meta_description'] = (isset($metas['description']) && $metas['description']) ? $metas['description'] : ''; + $ret['meta_keywords'] = (isset($metas['keywords']) && $metas['keywords']) ? $metas['keywords'] : ''; return $ret; } @@ -991,8 +991,8 @@ class ToolsCore $categories = Db::getInstance()->executeS($sql); $n = 1; - $nCategories = (int)sizeof($categories); - foreach ($categories AS $category) + $nCategories = count($categories); + foreach ($categories as $category) { $fullPath .= (($n < $nCategories || $linkOntheLastItem) ? '' : ''). @@ -1076,10 +1076,10 @@ class ToolsCore $str = Tools::replaceAccentedChars($str); // Remove all non-whitelist chars. - $str = preg_replace('/[^a-zA-Z0-9\s\'\:\/\[\]-\pL]/u','', $str); - $str = preg_replace('/[\s\'\:\/\[\]-]+/',' ', $str); - $str = preg_replace('/[ ]/','-', $str); - $str = preg_replace('/[\/]/','-', $str); + $str = preg_replace('/[^a-zA-Z0-9\s\'\:\/\[\]-\pL]/u', '', $str); + $str = preg_replace('/[\s\'\:\/\[\]-]+/', ' ', $str); + $str = preg_replace('/[ ]/', '-', $str); + $str = preg_replace('/[\/]/', '-', $str); // If it was not possible to lowercase the string with mb_strtolower, we do it after the transformations. // This way we lose fewer special chars. @@ -1096,23 +1096,23 @@ class ToolsCore */ public static function replaceAccentedChars($str) { - $str = preg_replace('/[\x{0105}\x{0104}\x{00E0}\x{00E1}\x{00E2}\x{00E3}\x{00E4}\x{00E5}]/u','a', $str); - $str = preg_replace('/[\x{00E7}\x{010D}\x{0107}\x{0106}]/u','c', $str); - $str = preg_replace('/[\x{010F}]/u','d', $str); - $str = preg_replace('/[\x{00E8}\x{00E9}\x{00EA}\x{00EB}\x{011B}\x{0119}\x{0118}]/u','e', $str); - $str = preg_replace('/[\x{00EC}\x{00ED}\x{00EE}\x{00EF}]/u','i', $str); - $str = preg_replace('/[\x{0142}\x{0141}\x{013E}\x{013A}]/u','l', $str); - $str = preg_replace('/[\x{00F1}\x{0148}]/u','n', $str); - $str = preg_replace('/[\x{00F2}\x{00F3}\x{00F4}\x{00F5}\x{00F6}\x{00F8}\x{00D3}]/u','o', $str); - $str = preg_replace('/[\x{0159}\x{0155}]/u','r', $str); - $str = preg_replace('/[\x{015B}\x{015A}\x{0161}]/u','s', $str); - $str = preg_replace('/[\x{00DF}]/u','ss', $str); - $str = preg_replace('/[\x{0165}]/u','t', $str); - $str = preg_replace('/[\x{00F9}\x{00FA}\x{00FB}\x{00FC}\x{016F}]/u','u', $str); - $str = preg_replace('/[\x{00FD}\x{00FF}]/u','y', $str); - $str = preg_replace('/[\x{017C}\x{017A}\x{017B}\x{0179}\x{017E}]/u','z', $str); - $str = preg_replace('/[\x{00E6}]/u','ae', $str); - $str = preg_replace('/[\x{0153}]/u','oe', $str); + $str = preg_replace('/[\x{0105}\x{0104}\x{00E0}\x{00E1}\x{00E2}\x{00E3}\x{00E4}\x{00E5}]/u', 'a', $str); + $str = preg_replace('/[\x{00E7}\x{010D}\x{0107}\x{0106}]/u', 'c', $str); + $str = preg_replace('/[\x{010F}]/u', 'd', $str); + $str = preg_replace('/[\x{00E8}\x{00E9}\x{00EA}\x{00EB}\x{011B}\x{0119}\x{0118}]/u', 'e', $str); + $str = preg_replace('/[\x{00EC}\x{00ED}\x{00EE}\x{00EF}]/u', 'i', $str); + $str = preg_replace('/[\x{0142}\x{0141}\x{013E}\x{013A}]/u', 'l', $str); + $str = preg_replace('/[\x{00F1}\x{0148}]/u', 'n', $str); + $str = preg_replace('/[\x{00F2}\x{00F3}\x{00F4}\x{00F5}\x{00F6}\x{00F8}\x{00D3}]/u', 'o', $str); + $str = preg_replace('/[\x{0159}\x{0155}]/u', 'r', $str); + $str = preg_replace('/[\x{015B}\x{015A}\x{0161}]/u', 's', $str); + $str = preg_replace('/[\x{00DF}]/u', 'ss', $str); + $str = preg_replace('/[\x{0165}]/u', 't', $str); + $str = preg_replace('/[\x{00F9}\x{00FA}\x{00FB}\x{00FC}\x{016F}]/u', 'u', $str); + $str = preg_replace('/[\x{00FD}\x{00FF}]/u', 'y', $str); + $str = preg_replace('/[\x{017C}\x{017A}\x{017B}\x{0179}\x{017E}]/u', 'z', $str); + $str = preg_replace('/[\x{00E6}]/u', 'ae', $str); + $str = preg_replace('/[\x{0153}]/u', 'oe', $str); return $str; } @@ -1185,7 +1185,7 @@ class ToolsCore return $date; } - static function strtolower($str) + public static function strtolower($str) { if (is_array($str)) return false; @@ -1194,7 +1194,7 @@ class ToolsCore return strtolower($str); } - static function strlen($str, $encoding = 'UTF-8') + public static function strlen($str, $encoding = 'UTF-8') { if (is_array($str)) return false; @@ -1204,14 +1204,14 @@ class ToolsCore return strlen($str); } - static function stripslashes($string) + public static function stripslashes($string) { if (_PS_MAGIC_QUOTES_GPC_) $string = stripslashes($string); return $string; } - static function strtoupper($str) + public static function strtoupper($str) { if (is_array($str)) return false; @@ -1220,7 +1220,7 @@ class ToolsCore return strtoupper($str); } - static function substr($str, $start, $length = false, $encoding = 'utf-8') + public static function substr($str, $start, $length = false, $encoding = 'utf-8') { if (is_array($str)) return false; @@ -1229,20 +1229,20 @@ class ToolsCore return substr($str, $start, ($length === false ? Tools::strlen($str) : (int)($length))); } - static function ucfirst($str) + public static function ucfirst($str) { return Tools::strtoupper(Tools::substr($str, 0, 1)).Tools::substr($str, 1); } public static function orderbyPrice(&$array, $orderWay) { - foreach($array as &$row) - $row['price_tmp'] = Product::getPriceStatic($row['id_product'], true, ((isset($row['id_product_attribute']) AND !empty($row['id_product_attribute'])) ? (int)($row['id_product_attribute']) : NULL), 2); - if(strtolower($orderWay) == 'desc') + foreach ($array as &$row) + $row['price_tmp'] = Product::getPriceStatic($row['id_product'], true, ((isset($row['id_product_attribute']) && !empty($row['id_product_attribute'])) ? (int)($row['id_product_attribute']) : null), 2); + if (strtolower($orderWay) == 'desc') uasort($array, 'cmpPriceDesc'); else uasort($array, 'cmpPriceAsc'); - foreach($array as &$row) + foreach ($array as &$row) unset($row['price_tmp']); } @@ -1255,7 +1255,7 @@ class ToolsCore public static function isEmpty($field) { - return ($field === '' OR $field === NULL); + return ($field === '' || $field === null); } /** @@ -1330,9 +1330,9 @@ class ToolsCore return self::$file_exists_cache[$filename]; } - public static function file_get_contents($url, $useIncludePath = false, $streamContext = NULL, $curlTimeOut = 5) - { - if ($streamContext == NULL) + public static function file_get_contents($url, $useIncludePath = false, $streamContext = null, $curlTimeOut = 5) + { + if ($streamContext == null) $streamContext = @stream_context_create(array('http' => array('timeout' => 5))); if (in_array(ini_get('allow_url_fopen'), array('On', 'on', '1'))) @@ -1379,7 +1379,7 @@ class ToolsCore public static function toCamelCase($str, $capitaliseFirstChar = false) { $str = strtolower($str); - if($capitaliseFirstChar) + if ($capitaliseFirstChar) $str = ucfirst($str); return preg_replace_callback('/_([a-z])/', create_function('$c', 'return strtoupper($c[1]);'), $str); } @@ -1460,7 +1460,7 @@ class ToolsCore public static function minifyCSS($css_content, $fileuri = false) { Tools::displayAsDeprecated(); - return Media::minifyCSS($css_content, $fileuri); + return Media::minifyCSS($css_content, $fileuri); } public static function replaceByAbsoluteURL($matches) @@ -1541,7 +1541,7 @@ class ToolsCore self::$_cache_nb_media_servers = 3; } - if (self::$_cache_nb_media_servers AND ($id_media_server = (abs(crc32($filename)) % self::$_cache_nb_media_servers + 1))) + if (self::$_cache_nb_media_servers && ($id_media_server = (abs(crc32($filename)) % self::$_cache_nb_media_servers + 1))) return constant('_MEDIA_SERVER_'.$id_media_server.'_'); return Tools::getHttpHost(); } @@ -1647,7 +1647,7 @@ class ToolsCore $img_name .= '$'.$j; } $img_name .= '$'.$j; - fwrite($write_fd, 'RewriteRule ^'.str_repeat('([0-9])', $i).'(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/[_a-zA-Z0-9-\pL]*\.jpg$ '._PS_PROD_IMG_.$img_path.$img_name.'$'.($j+1).".jpg [L]\n"); + fwrite($write_fd, 'RewriteRule ^'.str_repeat('([0-9])', $i).'(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/[_a-zA-Z0-9-\pL]*\.jpg$ '._PS_PROD_IMG_.$img_path.$img_name.'$'.($j + 1).".jpg [L]\n"); } fwrite($write_fd, 'RewriteRule ^c/([0-9]+)(\-[_a-zA-Z0-9-\pL]*)(-[0-9]+)?/[_a-zA-Z0-9-]*\.jpg$ img/c/$1$2$3.jpg [L]'."\n"); fwrite($write_fd, 'RewriteRule ^c/([a-zA-Z-]+)(-[0-9]+)?/[a-zA-Z0-9-\pL]+\.jpg$ img/c/$1$2.jpg [L]'."\n"); @@ -1693,8 +1693,8 @@ FileETag INode MTime Size } // In case the user hasn't rewrite mod enabled - fwrite($write_fd, "#If rewrite mod isn't enabled\n"); - fwrite($write_fd, "ErrorDocument 404 " . $uri['physical'] . "index.php?controller=404\n\n"); + fwrite($write_fd, '#If rewrite mod isn\'t enabled\n'); + fwrite($write_fd, 'ErrorDocument 404 '.$uri['physical']."index.php?controller=404\n\n"); fwrite($write_fd, "# ~~end~~ Do not remove this comment, Prestashop will keep automatically the code outside this comment when .htaccess will be generated again\n"); fwrite($write_fd, "\n\n".trim($specific_after)); @@ -1805,8 +1805,8 @@ FileETag INode MTime Size $smarty = $context->smarty; if (!Configuration::get('PS_SMARTY_CACHE')) return; - if ($smarty->force_compile == 0 AND $smarty->caching == $level) - return ; + if ($smarty->force_compile == 0 && $smarty->caching == $level) + return; self::$_forceCompile = (int)($smarty->force_compile); self::$_caching = (int)($smarty->caching); $smarty->force_compile = 0; @@ -1827,7 +1827,7 @@ FileETag INode MTime Size public static function isCallable($function) { $disabled = explode(',', ini_get('disable_functions')); - return (!in_array($function, $disabled) AND is_callable($function)); + return (!in_array($function, $disabled) && is_callable($function)); } public static function pRegexp($s, $delim) @@ -1838,7 +1838,7 @@ FileETag INode MTime Size return $s; } - public static function str_replace_once($needle , $replace, $haystack) + public static function str_replace_once($needle, $replace, $haystack) { $pos = strpos($haystack, $needle); if ($pos === false) @@ -1878,13 +1878,13 @@ FileETag INode MTime Size { $version = null; - if(defined('PHP_VERSION')) + if (defined('PHP_VERSION')) $version = PHP_VERSION; else $version = phpversion(''); //Case management system of ubuntu, php version return 5.2.4-2ubuntu5.2 - if(strpos($version, '-') !== false ) + if (strpos($version, '-') !== false) $version = substr($version, 0, strpos($version, '-')); return $version; @@ -1920,7 +1920,7 @@ FileETag INode MTime Size if (class_exists('ZipArchive', false)) { $zip = new ZipArchive(); - if ($zip->open($fromFile) === true AND $zip->extractTo($toDir) AND $zip->close()) + if ($zip->open($fromFile) === true && $zip->extractTo($toDir) && $zip->close()) return true; return false; } @@ -1988,9 +1988,7 @@ FileETag INode MTime Size public static function convertBytes($value) { if (is_numeric($value)) - { return $value; - } else { $value_length = strlen($value); @@ -2147,7 +2145,7 @@ FileETag INode MTime Size // we need strpos (example, evasive can be evasive20) foreach ($apacheModuleList as $module) { - if (strpos($module, $name)!==false) + if (strpos($module, $name) !== false) return true; } } @@ -2185,15 +2183,15 @@ FileETag INode MTime Size $filtered_files = array(); - $real_ext = ''; + $real_ext = ''; if (!empty($ext)) - $real_ext = '.' . $ext; + $real_ext = '.'.$ext; $real_ext_length = strlen($real_ext); foreach ($files as $file) if (strpos($file, $real_ext) && strpos($file, $real_ext) == (strlen($file) - $real_ext_length)) - $filtered_files[] = $dir . '/' . $file; + $filtered_files[] = $dir.'/'.$file; return $filtered_files; } } @@ -2206,7 +2204,7 @@ FileETag INode MTime Size * @return integer */ /* Externalized because of a bug in PHP 5.1.6 when inside an object */ -function cmpPriceAsc($a,$b) +function cmpPriceAsc($a, $b) { if ((float)($a['price_tmp']) < (float)($b['price_tmp'])) return (-1); @@ -2215,7 +2213,7 @@ function cmpPriceAsc($a,$b) return (0); } -function cmpPriceDesc($a,$b) +function cmpPriceDesc($a, $b) { if ((float)($a['price_tmp']) < (float)($b['price_tmp'])) return (1); diff --git a/classes/AdminController.php b/classes/controller/AdminController.php similarity index 98% rename from classes/AdminController.php rename to classes/controller/AdminController.php index 88e289cc3..6c3d34df4 100644 --- a/classes/AdminController.php +++ b/classes/controller/AdminController.php @@ -172,9 +172,6 @@ class AdminControllerCore extends Controller /** @var array required_fields to display in the Required Fields form */ public $required_fields = array(); - /** @var module contain the controller */ - public $module; - /** * @var array actions to execute on multiple selections * Usage: @@ -1956,23 +1953,9 @@ class AdminControllerCore extends Controller throw new PrestaShopException(sprintf('Table name %s is invalid:', $this->table)); if (empty($order_by)) - { - if ($this->context->cookie->{$this->table.'Orderby'}) - $order_by = $this->context->cookie->{$this->table.'Orderby'}; - elseif ($this->_orderBy) - $order_by = $this->_orderBy; - else - $order_by = $this->_defaultOrderBy; - } + $order_by = $this->context->cookie->__get($this->table.'Orderby') ? $this->context->cookie->__get($this->table.'Orderby') : $this->_defaultOrderBy; if (empty($order_way)) - { - if ($this->context->cookie->{$this->table.'Orderway'}) - $order_way = $this->context->cookie->{$this->table.'Orderway'}; - elseif ($this->_orderWay) - $order_way = $this->_orderWay; - else - $order_way = $this->_defaultOrderWay; - } + $order_way = $this->context->cookie->__get($this->table.'Orderway') ? $this->context->cookie->__get($this->table.'Orderway') : $this->_defaultOrderWay; $limit = (int)Tools::getValue('pagination', $limit); $this->context->cookie->{$this->table.'_pagination'} = $limit; @@ -1993,7 +1976,7 @@ class AdminControllerCore extends Controller /* Cache */ $this->_lang = (int)$id_lang; - $this->_orderBy = substr($order_by, strpos($order_by, '.') + 1); + $this->_orderBy = $order_by; $this->_orderWay = Tools::strtoupper($order_way); /* SQL table : orders, but class name is Order */ @@ -2061,11 +2044,7 @@ class AdminControllerCore extends Controller if (isset($this->_having)) $having_clause .= $this->_having.' '; } - if (strpos($order_by, '.') > 0) - { - $order_by = explode('.', $order_by); - $order_by = pSQL($order_by[0]).'.`'.pSQL($order_by[1]).'`'; - } + $sql = 'SELECT SQL_CALC_FOUND_ROWS '.($this->_tmpTableFilter ? ' * FROM (SELECT ' : '').' '.($this->lang ? 'b.*, ' : '').'a.*'.(isset($this->_select) ? ', '.$this->_select.' ' : '').$select_shop.' @@ -2078,7 +2057,7 @@ class AdminControllerCore extends Controller (isset($this->_filter) ? $this->_filter : '').$where_shop.' '.(isset($this->_group) ? $this->_group.' ' : '').' '.$having_clause.' - ORDER BY '.(($order_by == $this->identifier) ? 'a.' : '').pSQL($order_by).' '.pSQL($order_way). + ORDER BY '.(($order_by == $this->identifier) ? 'a.' : '').'`'.pSQL($order_by).'` '.pSQL($order_way). ($this->_tmpTableFilter ? ') tmpTable WHERE 1'.$this->_tmpTableFilter : ''). (($use_limit === true) ? ' LIMIT '.(int)$start.','.(int)$limit : ''); @@ -2454,25 +2433,23 @@ class AdminControllerCore extends Controller $max_size = isset($this->max_image_size) ? $this->max_image_size : 0; if ($error = ImageManager::validateUpload($_FILES[$name], Tools::getMaxUploadSize($max_size))) $this->errors[] = $error; - - $tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS'); - if (!$tmp_name) + else if (!($tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS')) || !move_uploaded_file($_FILES[$name]['tmp_name'], $tmp_name)) return false; - - if (!move_uploaded_file($_FILES[$name]['tmp_name'], $tmp_name)) - return false; - - // Copy new image - if (!ImageManager::resize($tmp_name, _PS_IMG_DIR_.$dir.$id.'.'.$this->imageType, (int)$width, (int)$height, ($ext ? $ext : $this->imageType))) - $this->errors[] = Tools::displayError('An error occurred while uploading image.'); - if (count($this->errors)) - return false; - if ($this->afterImageUpload()) + else { - unlink($tmp_name); - return true; + $tmp_name = $_FILES[$name]['tmp_name']; + // Copy new image + if (!ImageManager::resize($tmp_name, _PS_IMG_DIR_.$dir.$id.'.'.$this->imageType, (int)$width, (int)$height, ($ext ? $ext : $this->imageType))) + $this->errors[] = Tools::displayError('An error occurred while uploading image.'); + if (count($this->errors)) + return false; + if ($this->afterImageUpload()) + { + unlink($tmp_name); + return true; + } + return false; } - return false; } return true; } @@ -2613,15 +2590,6 @@ class AdminControllerCore extends Controller */ public function createTemplate($tpl_name) { - // Use for module - if (!is_null($this->module)) - { - $moduleTemplate = _PS_MODULE_DIR_.$this->module.'/templates/admin/'.$this->override_folder.$tpl_name; - - if ($this->viewAccess() && file_exists($moduleTemplate)) - return $this->context->smarty->createTemplate($moduleTemplate, $this->context->smarty); - } - // Use override tpl if it exists // If view access is denied, we want to use the default template that will be used to display an error if ($this->viewAccess() diff --git a/classes/Controller.php b/classes/controller/Controller.php similarity index 100% rename from classes/Controller.php rename to classes/controller/Controller.php diff --git a/classes/FrontController.php b/classes/controller/FrontController.php similarity index 99% rename from classes/FrontController.php rename to classes/controller/FrontController.php index ce5a91481..3e34424f0 100755 --- a/classes/FrontController.php +++ b/classes/controller/FrontController.php @@ -255,9 +255,9 @@ class FrontControllerCore extends Controller $page_name = $this->page_name; else if (!empty($this->php_self)) $page_name = $this->php_self; - else if (Tools::getValue('controller') == 'module' && $module_name != '' && new $module_name() instanceof PaymentModule) + else if (0&&Tools::getValue('fc') == 'module' && $module_name != '' && new $module_name() instanceof PaymentModule) $page_name = 'module-payment-submit'; - // Are we in a module + // @retrocompatibility Are we in a module ? else if (preg_match('#^'.preg_quote($this->context->shop->getPhysicalURI(), '#').'modules/([a-zA-Z0-9_-]+?)/(.*)$#', $_SERVER['REQUEST_URI'], $m)) $page_name = 'module-'.$m[1].'-'.str_replace(array('.php', '/'), array('', '-'), $m[2]); else @@ -562,7 +562,7 @@ class FrontControllerCore extends Controller if (!preg_match('/^'.Tools::pRegexp($canonicalURL, '/').'([&?].*)?$/', $matchUrl)) { $params = array(); - $excludedKey = array('isolang', 'id_lang', 'controller'); + $excludedKey = array('isolang', 'id_lang', 'controller', 'fc'); foreach ($_GET as $key => $value) if (!in_array($key, $excludedKey)) $params[] = $key.'='.$value; diff --git a/classes/controller/ModuleAdminController.php b/classes/controller/ModuleAdminController.php new file mode 100644 index 000000000..ba47a29bc --- /dev/null +++ b/classes/controller/ModuleAdminController.php @@ -0,0 +1,68 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +/** + * @since 1.5.0 + */ +abstract class ModuleAdminControllerCore extends AdminController +{ + /** + * @var Module + */ + public $module; + + public function __construct() + { + parent::__construct(); + + $tab = new Tab($this->id); + if (!$tab->module) + throw new PrestaShopException('Admin tab '.get_class($this).' is not a module tab'); + + $this->module = Module::getInstanceByName($tab->module); + if (!$this->module->id) + throw new PrestaShopException("Module {$tab->module} not found"); + } + + public function createTemplate($tpl_name) + { + if (file_exists($this->getTemplatePath().$this->override_folder.$tpl_name) && $this->viewAccess()) + return $this->context->smarty->createTemplate($this->getTemplatePath().$this->override_folder.$tpl_name, $this->context->smarty); + + return parent::createTemplate($tpl_name); + } + + /** + * Get path to back office templates for the module + * + * @return string + */ + public function getTemplatePath() + { + return _PS_MODULE_DIR_.$this->module->name.'/views/templates/admin/'; + } +} diff --git a/controllers/front/ModuleController.php b/classes/controller/ModuleFrontController.php similarity index 65% rename from controllers/front/ModuleController.php rename to classes/controller/ModuleFrontController.php index eeb2079ab..2ee24292f 100644 --- a/controllers/front/ModuleController.php +++ b/classes/controller/ModuleFrontController.php @@ -28,7 +28,7 @@ /** * @since 1.5.0 */ -class ModuleControllerCore extends FrontController +class ModuleFrontControllerCore extends FrontController { /** * @var Module @@ -40,7 +40,7 @@ class ModuleControllerCore extends FrontController $this->module = Module::getInstanceByName(Tools::getValue('module')); if (!$this->module->active) Tools::redirect('index'); - $this->process = Tools::getValue('process'); + $this->page_name = 'module-'.$this->module->name.'-'.Dispatcher::getInstance()->getController(); parent::__construct(); } @@ -52,6 +52,21 @@ class ModuleControllerCore extends FrontController */ public function setTemplate($template) { - $this->template = $this->module->getTemplatePath($template); + if (Tools::file_exists_cache(_PS_THEME_DIR_.'modules/'.$this->module->name.'/'.$template)) + $this->template = _PS_THEME_DIR_.'modules/'.$this->module->name.'/'.$template; + elseif (Tools::file_exists_cache($this->getTemplatePath().$template)) + $this->template = $this->getTemplatePath().$template; + else + throw new PrestaShopException("Template '$template'' not found"); + } + + /** + * Get path to front office templates for the module + * + * @return string + */ + public function getTemplatePath() + { + return _PS_MODULE_DIR_.$this->module->name.'/views/templates/front/'; } } diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php index bd37253f6..575418e6a 100755 --- a/classes/helper/Helper.php +++ b/classes/helper/Helper.php @@ -79,8 +79,12 @@ class HelperCore */ public function createTemplate($tpl_name) { - // Overrides exists? - if ($this->override_folder && file_exists($this->context->smarty->getTemplateDir(0).'controllers/'.$this->override_folder.$tpl_name)) + if ($this->context->controller instanceof ModuleAdminController) + { + if ($this->override_folder && file_exists($this->context->controller->getTemplatePath().$this->override_folder.$tpl_name)) + return $this->context->smarty->createTemplate($this->context->controller->getTemplatePath().$this->override_folder.$tpl_name); + } + else if ($this->override_folder && file_exists($this->context->smarty->getTemplateDir(0).'controllers/'.$this->override_folder.$tpl_name)) return $this->context->smarty->createTemplate('controllers/'.$this->override_folder.$tpl_name); return $this->context->smarty->createTemplate($this->base_folder.$tpl_name); diff --git a/config/smartyfront.config.inc.php b/config/smartyfront.config.inc.php index f2e8a1666..ebf7b4969 100644 --- a/config/smartyfront.config.inc.php +++ b/config/smartyfront.config.inc.php @@ -35,7 +35,7 @@ function smartyTranslate($params, &$smarty) if (!isset($params['mod'])) $params['mod'] = false; $string = str_replace('\'', '\\\'', $params['s']); - $filename = ((!isset($smarty->compiler_object) OR !is_object($smarty->compiler_object->template)) ? $smarty->template_resource : $smarty->compiler_object->template->getTemplateFilepath()); + $filename = ((!isset($smarty->compiler_object) || !is_object($smarty->compiler_object->template)) ? $smarty->template_resource : $smarty->compiler_object->template->getTemplateFilepath()); $key = Tools::substr(basename($filename), 0, -4).'_'.md5($string); $lang_array = $_LANG; if ($params['mod']) @@ -49,11 +49,15 @@ function smartyTranslate($params, &$smarty) } else { - $translationsFile = _PS_MODULE_DIR_.$params['mod'].'/'.$iso.'.php'; + // @retrocompatibility with translations files in module root + if (Tools::file_exists_cache(_PS_MODULE_DIR_.$params['mod'].'/translations')) + $translationsFile = _PS_MODULE_DIR_.$params['mod'].'/translations/'.$iso.'.php'; + else + $translationsFile = _PS_MODULE_DIR_.$params['mod'].'/'.$iso.'.php'; $key = '<{'.$params['mod'].'}prestashop>'.$key; } - if(!is_array($_MODULES)) + if (!is_array($_MODULES)) $_MODULES = array(); if (@include_once($translationsFile)) if(is_array($_MODULE)) @@ -72,9 +76,9 @@ function smartyTranslate($params, &$smarty) $lang_array = $_LANGPDF; } - if (is_array($lang_array) AND key_exists($key, $lang_array)) + if (is_array($lang_array) && key_exists($key, $lang_array)) $msg = $lang_array[$key]; - elseif (is_array($lang_array) AND key_exists(Tools::strtolower($key), $lang_array)) + elseif (is_array($lang_array) && key_exists(Tools::strtolower($key), $lang_array)) $msg = $lang_array[Tools::strtolower($key)]; else $msg = $params['s']; diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index c32084fb7..7cb37ad31 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -448,7 +448,7 @@ class AdminTranslationsControllerCore extends AdminController $is_default = $theme_name === self::DEFAULT_THEME_NAME ? true : false; if (!$dir) - $dir = ($theme_name === self::DEFAULT_THEME_NAME ? _PS_MODULE_DIR_.$module_name.'/' : _PS_ALL_THEMES_DIR_.$theme_name.'/modules/'.$module_name.'/'); + $dir = ($is_default ? _PS_MODULE_DIR_.$module_name.'/' : _PS_ALL_THEMES_DIR_.$theme_name.'/modules/'.$module_name.'/'); // Thank to this var similar keys are not duplicate // in AndminTranslation::modules_translations array @@ -1665,9 +1665,13 @@ class AdminTranslationsControllerCore extends AdminController { if ($module{0} != '.' && is_dir($root_dir.$module)) { - @include($root_dir.$module.'/'.$lang.'.php'); + if (file_exists($root_dir.$module.'/translations/'.$lang.'.php')) + $lang_file = $root_dir.$module.'/translations/'.$lang.'.php'; + else + $lang_file = $root_dir.$module.'/'.$lang.'.php'; + @include($lang_file); AdminTranslationsController::getModuleTranslations($is_default); - $this->recursiveGetModuleFiles($root_dir.$module.'/', $array_files, $module, $root_dir.$module.'/'.$lang.'.php', $is_default); + $this->recursiveGetModuleFiles($root_dir.$module.'/', $array_files, $module, $lang_file, $is_default); } } return $array_files; diff --git a/modules/bankwire/bankwire.php b/modules/bankwire/bankwire.php index 5a0a87d45..e377a329d 100644 --- a/modules/bankwire/bankwire.php +++ b/modules/bankwire/bankwire.php @@ -162,36 +162,6 @@ class BankWire extends PaymentModule return $this->_html; } - public function execPayment($cart) - { - return $this->actionPayment(true); - } - - public function actionPayment($direct_call = false) - { - $cart = Context::getContext()->cart; - - if (!$this->active) - return; - if (!$this->_checkCurrency($cart)) - Tools::redirect('index.php?controller=order'); - - $this->context->smarty->assign(array( - 'nbProducts' => $cart->nbProducts(), - 'cust_currency' => $cart->id_currency, - 'currencies' => $this->getCurrency((int)$cart->id_currency), - 'total' => $cart->getOrderTotal(true, Cart::BOTH), - 'this_path' => $this->_path, - 'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->name.'/' - )); - - if (!$direct_call) - return $this->getTemplatePath('payment_execution.tpl'); - else - // For retrocompatibility - return $this->display(__FILE__, 'payment_execution.tpl'); - } - public function hookPayment($params) { if (!$this->active) diff --git a/modules/bankwire/controllers/front/payment.php b/modules/bankwire/controllers/front/payment.php new file mode 100644 index 000000000..0eaa466e1 --- /dev/null +++ b/modules/bankwire/controllers/front/payment.php @@ -0,0 +1,57 @@ + +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +/** + * @since 1.5.0 + */ +class BankwirePaymentModuleFrontController extends ModuleFrontController +{ + public $display_column_left = false; + + /** + * @see FrontController::initContent() + */ + public function initContent() + { + parent::initContent(); + + $cart = $this->context->cart; + if (!$this->module->checkCurrency($cart)) + Tools::redirect('index.php?controller=order'); + + $this->context->smarty->assign(array( + 'nbProducts' => $cart->nbProducts(), + 'cust_currency' => $cart->id_currency, + 'currencies' => $this->module->getCurrency((int)$cart->id_currency), + 'total' => $cart->getOrderTotal(true, Cart::BOTH), + 'this_path' => $this->module->getPathUri(), + 'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->module->name.'/' + )); + + $this->setTemplate('payment_execution.tpl'); + } +} diff --git a/modules/bankwire/bankwireController.php b/modules/bankwire/controllers/front/validation.php similarity index 70% rename from modules/bankwire/bankwireController.php rename to modules/bankwire/controllers/front/validation.php index 44b534c34..ff4cd97da 100644 --- a/modules/bankwire/bankwireController.php +++ b/modules/bankwire/controllers/front/validation.php @@ -28,22 +28,12 @@ /** * @since 1.5.0 */ -class ModuleBankwireController extends ModuleController +class BankwireValidationModuleFrontController extends ModuleFrontController { /** * @see FrontController::postProcess() */ public function postProcess() - { - $this->display_column_left = false; - if ($this->process == 'validation') - $this->processValidation(); - } - - /** - * Validate bankwire payment - */ - public function processValidation() { $cart = $this->context->cart; if ($cart->id_customer == 0 || $cart->id_address_delivery == 0 || $cart->id_address_invoice == 0 || !$this->module->active) @@ -75,36 +65,4 @@ class ModuleBankwireController extends ModuleController $this->module->validateOrder($cart->id, Configuration::get('PS_OS_BANKWIRE'), $total, $this->module->displayName, NULL, $mailVars, (int)$currency->id, false, $customer->secure_key); Tools::redirect('index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$this->module->id.'&id_order='.$this->module->currentOrder.'&key='.$customer->secure_key); } - - /** - * @see FrontController::initContent() - */ - public function initContent() - { - parent::initContent(); - - if ($this->process == 'payment') - $this->assignPaymentExecution(); - } - - /** - * Assign bankwire payment template - */ - public function assignPaymentExecution() - { - $cart = $this->context->cart; - if (!$this->module->checkCurrency($cart)) - Tools::redirect('index.php?controller=order'); - - $this->context->smarty->assign(array( - 'nbProducts' => $cart->nbProducts(), - 'cust_currency' => $cart->id_currency, - 'currencies' => $this->module->getCurrency((int)$cart->id_currency), - 'total' => $cart->getOrderTotal(true, Cart::BOTH), - 'this_path' => $this->module->getPathUri(), - 'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->module->name.'/' - )); - - $this->setTemplate('payment_execution.tpl'); - } } diff --git a/modules/bankwire/fr.php b/modules/bankwire/fr.php index cd46105b4..1da5328d0 100644 --- a/modules/bankwire/fr.php +++ b/modules/bankwire/fr.php @@ -21,8 +21,6 @@ $_MODULE['<{bankwire}prestashop>bankwire_3ec365dd533ddb7ef3d1c111186ce872'] = 'D $_MODULE['<{bankwire}prestashop>bankwire_6b154cafbab54ba3a1e76a78c290c02a'] = 'Comme le code banque, l\'IBAN ou encore le BIC'; $_MODULE['<{bankwire}prestashop>bankwire_f9a1a1bb716cbae0503d351ea2af4b34'] = 'Adresse de la banque'; $_MODULE['<{bankwire}prestashop>bankwire_b17f3f4dcf653a5776792498a9b44d6a'] = 'Mettre à jour'; -$_MODULE['<{bankwire}prestashop>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Payer par virement bancaire'; -$_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Payer par virement bancaire (traitement plus long)'; $_MODULE['<{bankwire}prestashop>payment_execution_c5e8668ba5e211603955f0b5e913d83d'] = 'Paiement par virement bancaire'; $_MODULE['<{bankwire}prestashop>payment_execution_f1d3b424cd68795ecaa552883759aceb'] = 'Récapitulatif de commande'; $_MODULE['<{bankwire}prestashop>payment_execution_879f6b8877752685a966564d072f498f'] = 'Votre panier est vide.'; @@ -38,6 +36,8 @@ $_MODULE['<{bankwire}prestashop>payment_execution_3dd021316505c0204989f984246c6f $_MODULE['<{bankwire}prestashop>payment_execution_0881a11f7af33bc1b43e437391129d66'] = 'Merci de confirmer votre commande en cliquant sur \"Je confirme ma commande\"'; $_MODULE['<{bankwire}prestashop>payment_execution_46b9e3665f187c739c55983f757ccda0'] = 'Je confirme ma commande'; $_MODULE['<{bankwire}prestashop>payment_execution_569fd05bdafa1712c4f6be5b153b8418'] = 'Autres moyens de paiement'; +$_MODULE['<{bankwire}prestashop>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Payer par virement bancaire'; +$_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Payer par virement bancaire (traitement plus long)'; $_MODULE['<{bankwire}prestashop>payment_return_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Votre commande sur'; $_MODULE['<{bankwire}prestashop>payment_return_75fbf512d744977d62599cc3f0ae2bb4'] = 'a bien été enregistrée.'; $_MODULE['<{bankwire}prestashop>payment_return_1552c5916ccfe019f35d91fd8955755e'] = 'Merci de nous envoyer un virement bancaire avec :'; diff --git a/modules/bankwire/payment.php b/modules/bankwire/payment.php index ce28825c4..bf9c23f2d 100644 --- a/modules/bankwire/payment.php +++ b/modules/bankwire/payment.php @@ -26,7 +26,7 @@ */ /** - * @deprecated 1.5.0 This file is deprecated, use moduleController instead + * @deprecated 1.5.0 This file is deprecated, use moduleFrontController instead */ /* SSL Management */ @@ -39,4 +39,4 @@ Tools::displayFileAsDeprecated(); $controller = new FrontController(); $controller->init(); -Tools::redirect('index.php?controller=module&module=bankwire&process=payment'); \ No newline at end of file +Tools::redirect(Context::getContext()->link->getModuleLink('bankwire', 'payment')); \ No newline at end of file diff --git a/modules/bankwire/validation.php b/modules/bankwire/validation.php index ebef6c2fc..812bc8944 100644 --- a/modules/bankwire/validation.php +++ b/modules/bankwire/validation.php @@ -26,7 +26,7 @@ */ /** - * @deprecated 1.5.0 This file is deprecated, use moduleController instead + * @deprecated 1.5.0 This file is deprecated, use moduleFrontController instead */ include(dirname(__FILE__).'/../../config/config.inc.php'); diff --git a/modules/bankwire/payment_execution.tpl b/modules/bankwire/views/templates/front/payment_execution.tpl similarity index 100% rename from modules/bankwire/payment_execution.tpl rename to modules/bankwire/views/templates/front/payment_execution.tpl diff --git a/modules/bankwire/payment.tpl b/modules/bankwire/views/templates/hook/payment.tpl similarity index 100% rename from modules/bankwire/payment.tpl rename to modules/bankwire/views/templates/hook/payment.tpl diff --git a/modules/bankwire/payment_return.tpl b/modules/bankwire/views/templates/hook/payment_return.tpl similarity index 100% rename from modules/bankwire/payment_return.tpl rename to modules/bankwire/views/templates/hook/payment_return.tpl diff --git a/modules/blockcontact/fr.php b/modules/blockcontact/fr.php index ba6a3131d..a6e93e4f2 100644 --- a/modules/blockcontact/fr.php +++ b/modules/blockcontact/fr.php @@ -10,7 +10,6 @@ $_MODULE['<{blockcontact}prestashop>blockcontact_44a87f7752c32d2d4dba5b25cb2a966 $_MODULE['<{blockcontact}prestashop>blockcontact_b17f3f4dcf653a5776792498a9b44d6a'] = 'Mettre à jour'; $_MODULE['<{blockcontact}prestashop>blockcontact_02d4482d332e1aef3437cd61c9bcc624'] = 'Contactez-nous'; $_MODULE['<{blockcontact}prestashop>blockcontact_6e6a51212bd633f9901a22cea27194d8'] = 'Une conseillère'; -$_MODULE['<{blockcontact}prestashop>blockcontact_689681c4a40a1e95c35a83771253e8fd'] = 'à votre disposition 24/ 24h'; $_MODULE['<{blockcontact}prestashop>blockcontact_6e6c05a143d676b33ca265b0306813fb'] = 'Tél :'; $_MODULE['<{blockcontact}prestashop>blockcontact_bbaff12800505b22a853e8b7f4eb6a22'] = 'Contacter'; $_MODULE['<{blockcontact}prestashop>blockcontact_e9376117c97ae76d0eefdc3e1f4486e7'] = 'notre conseillère'; diff --git a/modules/blocknewsletter/blocknewsletter.php b/modules/blocknewsletter/blocknewsletter.php index 1de947918..b1fd860d0 100644 --- a/modules/blocknewsletter/blocknewsletter.php +++ b/modules/blocknewsletter/blocknewsletter.php @@ -218,7 +218,7 @@ class Blocknewsletter extends Module // return $this->error = $this->l('E-mail address already registered'); $email = pSQL($_POST['email']); - if (true || !$this->isRegistered($register_status)) + if (!$this->isRegistered($register_status)) { if (Configuration::get('NW_VERIFICATION_EMAIL')) { @@ -451,7 +451,9 @@ class Blocknewsletter extends Module */ protected function sendVerificationEmail($email, $token) { - $verif_url = Context::getContext()->link->getModuleLink('blocknewsletter', 'verification').'&token='.$token; + $verif_url = Context::getContext()->link->getModuleLink('blocknewsletter', 'verification', array( + 'token' => $token, + )); return Mail::Send($this->context->language->id, 'newsletter_verif', Mail::l('Email verification', $this->context->language->id), array('{verif_url}' => $verif_url), $email, null, null, null, null, null, dirname(__FILE__).'/mails/'); } diff --git a/modules/blocknewsletter/blocknewsletterController.php b/modules/blocknewsletter/controllers/front/verification.php similarity index 71% rename from modules/blocknewsletter/blocknewsletterController.php rename to modules/blocknewsletter/controllers/front/verification.php index a0eeb8d02..77cb5cad6 100644 --- a/modules/blocknewsletter/blocknewsletterController.php +++ b/modules/blocknewsletter/controllers/front/verification.php @@ -28,7 +28,7 @@ /** * @since 1.5.0 */ -class ModuleBlocknewsletterController extends ModuleController +class BlocknewsletterVerificationModuleFrontController extends ModuleFrontController { private $message = ''; @@ -37,18 +37,7 @@ class ModuleBlocknewsletterController extends ModuleController */ public function postProcess() { - $this->display_column_left = true; - if ($this->process == 'verification') - $this->processVerification(); - } - - /** - * Process email confirmation - */ - public function processVerification() - { - $module = new Blocknewsletter(); - $this->message = $module->confirmEmail(Tools::getValue('token')); + $this->message = $this->module->confirmEmail(Tools::getValue('token')); } /** @@ -58,17 +47,7 @@ class ModuleBlocknewsletterController extends ModuleController { parent::initContent(); - if ($this->process == 'verification') - $this->assignVerificationExecution(); - } - - /** - * Assign verification return message - */ - public function assignVerificationExecution() - { $this->context->smarty->assign('message', $this->message); - $this->setTemplate('verification_execution.tpl'); } } diff --git a/modules/blocknewsletter/verification_execution.tpl b/modules/blocknewsletter/views/templates/front/verification_execution.tpl similarity index 100% rename from modules/blocknewsletter/verification_execution.tpl rename to modules/blocknewsletter/views/templates/front/verification_execution.tpl diff --git a/modules/blocknewsletter/blocknewsletter.tpl b/modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl similarity index 100% rename from modules/blocknewsletter/blocknewsletter.tpl rename to modules/blocknewsletter/views/templates/hook/blocknewsletter.tpl diff --git a/modules/carriercompare/fr.php b/modules/carriercompare/fr.php index 843d21163..79a04c00b 100644 --- a/modules/carriercompare/fr.php +++ b/modules/carriercompare/fr.php @@ -10,7 +10,6 @@ $_MODULE['<{carriercompare}prestashop>carriercompare_fb9e838d470b2c27c2c128d1271 $_MODULE['<{carriercompare}prestashop>carriercompare_b72dd62d03697b37417288c63e78c8c6'] = 'Veuillez utiliser un code postal valide en fonction du pays choisi'; $_MODULE['<{carriercompare}prestashop>carriercompare_3f63451bbacbb1c3303d99d0309fdfe9'] = 'Choississez un transporteur'; $_MODULE['<{carriercompare}prestashop>carriercompare_efaf5c3827ef576b05de32ad458f196c'] = 'Cet identifiant de transporteur n\'est pas disponible pour cette sélection'; -$_MODULE['<{carriercompare}prestashop>carriercompare_edc5cf1b3bab64b1d45ef51c63b53887'] = 'Impossibilité de mettre a jour le panier'; $_MODULE['<{carriercompare}prestashop>carriercompare_e7a6ca4e744870d455a57b644f696457'] = 'Offert !'; $_MODULE['<{carriercompare}prestashop>carriercompare_fbc1bef527a3a092053a244fd8d87abf'] = 'Estimez vos frais de livraison & taxes'; $_MODULE['<{carriercompare}prestashop>carriercompare_59716c97497eb9694541f7c3d37b1a4d'] = 'Pays'; diff --git a/modules/cheque/cheque.php b/modules/cheque/cheque.php index 52b175312..ec9ddf3b0 100644 --- a/modules/cheque/cheque.php +++ b/modules/cheque/cheque.php @@ -33,8 +33,8 @@ class Cheque extends PaymentModule private $_html = ''; private $_postErrors = array(); - public $chequeName; - public $address; + public $chequeName; + public $address; public function __construct() { @@ -58,22 +58,22 @@ class Cheque extends PaymentModule $this->description = $this->l('Module for accepting payments by check.'); $this->confirmUninstall = $this->l('Are you sure you want to delete your details ?'); - if (!isset($this->chequeName) OR !isset($this->address) OR empty($this->chequeName) OR empty($this->address)) + if (!isset($this->chequeName) || !isset($this->address) || empty($this->chequeName) || empty($this->address)) $this->warning = $this->l('\'To the order of\' and address must be configured in order to use this module correctly.'); - if (!sizeof(Currency::checkPaymentCurrencies($this->id))) + if (!count(Currency::checkPaymentCurrencies($this->id))) $this->warning = $this->l('No currency set for this module'); } public function install() { - if (!parent::install() OR !$this->registerHook('payment') OR !$this->registerHook('paymentReturn')) + if (!parent::install() || !$this->registerHook('payment') || !$this->registerHook('paymentReturn')) return false; return true; } public function uninstall() { - if (!Configuration::deleteByName('CHEQUE_NAME') OR !Configuration::deleteByName('CHEQUE_ADDRESS') OR !parent::uninstall()) + if (!Configuration::deleteByName('CHEQUE_NAME') || !Configuration::deleteByName('CHEQUE_ADDRESS') || !parent::uninstall()) return false; return true; } @@ -132,11 +132,11 @@ class Cheque extends PaymentModule if (Tools::isSubmit('btnSubmit')) { $this->_postValidation(); - if (!sizeof($this->_postErrors)) + if (!count($this->_postErrors)) $this->_postProcess(); else - foreach ($this->_postErrors AS $err) - $this->_html .= '