diff --git a/.gitignore b/.gitignore index 33d7ca758..c72b887a2 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,7 @@ tools/smarty*/compile/*.php !tools/smarty*/compile/index.php override/classes/*.php themes/default/cache/*.js -themes/default/cache/*.css \ No newline at end of file +themes/default/cache/*.css +modules/*/translations/*.php +!modules/*/translations/index.php + diff --git a/404.php b/404.php index 856c99e72..9fd4270f4 100644 --- a/404.php +++ b/404.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ -/* Send the proper status code in HTTP headers */ -header('HTTP/1.1 404 Not Found'); -header('Status: 404 Not Found'); - -if (in_array(substr($_SERVER['REQUEST_URI'], -3), array('png', 'jpg', 'gif'))) -{ - require_once(dirname(__FILE__).'/config/settings.inc.php'); - header('Location: '.__PS_BASE_URI__.'img/404.gif'); - exit; -} -elseif (in_array(substr($_SERVER['REQUEST_URI'], -3), array('.js', 'css'))) - die(''); - require_once(dirname(__FILE__).'/config/config.inc.php'); +Tools::displayFileAsDeprecated(); Controller::getController('PageNotFoundController')->run(); diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 322ab0155..06dcfe350 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1,53 +1,75 @@ - (d)oekia + - Alexander Otchenashev + - Benjamin PONGY + - Burhan - Caleydon Media - Damien Metzger - DamienMetzger - Damon Skelhorn + - Daniel - David Gasperoni + - DrySs + - DrÿSs' - François Gaillard - Gabriel Schwardy + - Gregory Roussac - Ha!*!*y - Jonathan Danse - Krystian Podemski + - Marco Cervellin + - Michel Courtade - Milow + - Patanock + - Pierre - PrestaEdit + - Raphaël Malié - Rémi Gaillard + - Samy Rabih - Sarah Lorenzini + - Shagshag - Vincent Augagneur - Xavier POITAU - aFolletete - aKorczak - aNiassy - adonis karavokyros + - anat - bLeveque - bMancone - bumbu - cmouleyre - dMetzger - dSevere + - djfm - fBrignoli - fSerny + - fram - gBrunier - gCharmes - gPoulain + - gRoussac - hAitmansour - ivancasasempere - jBreux - jObregon - jessylenne - jmCollin + - kpodemski - lBrieu - lCherifi - lLefevre - mBertholino - mDeflotte - mMarinetti + - marcinsz101 - montes - nPellicari + - nezenmoins - oleacorner - rGaillard - rMalie - rMontagne + - root - sLorenzini - sThiebaut - tDidierjean diff --git a/address.php b/address.php index 8d2a7ee75..fcfac54af 100644 --- a/address.php +++ b/address.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/addresses.php b/addresses.php index 71a0007c2..75e3a1dfe 100644 --- a/addresses.php +++ b/addresses.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajax-tab.php b/admin-dev/ajax-tab.php index d3b865930..24c751f9d 100755 --- a/admin-dev/ajax-tab.php +++ b/admin-dev/ajax-tab.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ define('_PS_ADMIN_DIR_', getcwd()); -require(dirname(__FILE__).'/../config/config.inc.php'); -require(dirname(__FILE__).'/functions.php'); +require(_PS_ADMIN_DIR_.'/../config/config.inc.php'); +require(_PS_ADMIN_DIR_.'/functions.php'); // For retrocompatibility with "tab" parameter if (!isset($_GET['controller']) && isset($_GET['tab'])) diff --git a/admin-dev/ajax.php b/admin-dev/ajax.php index 01c35c7db..8f41e44cb 100644 --- a/admin-dev/ajax.php +++ b/admin-dev/ajax.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -27,7 +27,7 @@ define('_PS_ADMIN_DIR_', getcwd()); include(_PS_ADMIN_DIR_.'/../config/config.inc.php'); /* Getting cookie or logout */ -require_once(dirname(__FILE__).'/init.php'); +require_once(_PS_ADMIN_DIR_.'/init.php'); $context = Context::getContext(); @@ -171,110 +171,6 @@ if (Tools::isSubmit('updateElementEmployee') && Tools::getValue('updateElementEm die($notification->updateEmployeeLastElement(Tools::getValue('updateElementEmployeeType'))); } -if (Tools::isSubmit('syncImapMail')) -{ - if (!($url = Configuration::get('PS_SAV_IMAP_URL')) - || !($port = Configuration::get('PS_SAV_IMAP_PORT')) - || !($user = Configuration::get('PS_SAV_IMAP_USER')) - || !($password = Configuration::get('PS_SAV_IMAP_PWD'))) - die('{"hasError" : true, "errors" : ["Configuration is not correct"]}'); - - $conf = Configuration::getMultiple(array( - 'PS_SAV_IMAP_OPT_NORSH', 'PS_SAV_IMAP_OPT_SSL', - 'PS_SAV_IMAP_OPT_VALIDATE-CERT', 'PS_SAV_IMAP_OPT_NOVALIDATE-CERT', - 'PS_SAV_IMAP_OPT_TLS', 'PS_SAV_IMAP_OPT_NOTLS')); - - $conf_str = ''; - if ($conf['PS_SAV_IMAP_OPT_NORSH']) - $conf_str .= '/norsh'; - if ($conf['PS_SAV_IMAP_OPT_SSL']) - $conf_str .= '/ssl'; - if ($conf['PS_SAV_IMAP_OPT_VALIDATE-CERT']) - $conf_str .= '/validate-cert'; - if ($conf['PS_SAV_IMAP_OPT_NOVALIDATE-CERT']) - $conf_str .= '/novalidate-cert'; - if ($conf['PS_SAV_IMAP_OPT_TLS']) - $conf_str .= '/tls'; - if ($conf['PS_SAV_IMAP_OPT_NOTLS']) - $conf_str .= '/notls'; - - if (!function_exists('imap_open')) - die('{"hasError" : true, "errors" : ["imap is not installed on this server"]}'); - - $mbox = @imap_open('{'.$url.':'.$port.$conf_str.'}', $user, $password); - - //checks if there is no error when connecting imap server - $errors = imap_errors(); - $str_errors = ''; - $str_error_delete = ''; - if (sizeof($errors) && is_array($errors)) - { - var_dump($errors); - $str_errors = ''; - foreach($errors as $error) - $str_errors .= '"'.$error.'",'; - $str_errors = rtrim($str_errors, ',').''; - } - //checks if imap connexion is active - if (!$mbox) - die('{"hasError" : true, "errors" : ["Cannot connect to the mailbox"]}'); - - //Returns information about the current mailbox. Returns FALSE on failure. - $check = imap_check($mbox); - if (!$check) - die('{"hasError" : true, "errors" : ["Fail to get information about the current mailbox"]}'); - - if ($check->Nmsgs == 0) - die('{"hasError" : true, "errors" : ["NO message to sync"]}'); - - $result = imap_fetch_overview($mbox,"1:{$check->Nmsgs}",0); - foreach ($result as $overview) - { - //check if message exist in database - if (isset($overview->subject)) - $subject = $overview->subject; - else - $subject = ''; - - //Creating an md5 to check if message has been allready processed - $md5 = md5($overview->date.$overview->from.$subject.$overview->msgno); - $exist = Db::getInstance()->getValue( - 'SELECT `md5_header` - FROM `'._DB_PREFIX_.'customer_message_sync_imap` - WHERE `md5_header` = \''.pSQL($md5).'\''); - if ($exist) - { - if (Configuration::get('PS_SAV_IMAP_DELETE_MSG')) - if (!imap_delete($mbox, $overview->msgno)) - $str_error_delete = ', "Fail to delete message"'; - } - else - { - //check if subject has id_order - preg_match('/\#ct([0-9]*)/', $subject, $matches1); - preg_match('/\#tc([0-9-a-z-A-Z]*)/', $subject, $matches2); - - if (isset($matches1[1]) && isset($matches2[1])) - { - //check if order exist in database - $ct = new CustomerThread((int)$matches1[1]); - - if (Validate::isLoadedObject($ct) && $ct->token == $matches2[1]) - { - $cm = new CustomerMessage(); - $cm->id_customer_thread = $ct->id; - $cm->message = imap_fetchbody($mbox, $overview->msgno, 1); - $cm->add(); - } - } - Db::getInstance()->execute('INSERT INTO `'._DB_PREFIX_.'customer_message_sync_imap` (`md5_header`) VALUES (\''.pSQL($md5).'\')'); - } - } - imap_expunge($mbox); - imap_close($mbox); - die('{"hasError" : false, "errors" : ["'.$str_errors.$str_error_delete.'"]}'); -} - if (Tools::isSubmit('searchCategory')) { $q = Tools::getValue('q'); diff --git a/admin-dev/ajax_products_list.php b/admin-dev/ajax_products_list.php index f3c747e18..f14a9a8c8 100644 --- a/admin-dev/ajax_products_list.php +++ b/admin-dev/ajax_products_list.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -27,7 +27,7 @@ define('_PS_ADMIN_DIR_', getcwd()); include(_PS_ADMIN_DIR_.'/../config/config.inc.php'); /* Getting cookie or logout */ -require_once(dirname(__FILE__).'/init.php'); +require_once(_PS_ADMIN_DIR_.'/init.php'); $query = Tools::getValue('q', false); if (!$query OR $query == '' OR strlen($query) < 1) @@ -51,13 +51,16 @@ else // Excluding downloadable products from packs because download from pack is not supported $excludeVirtuals = (bool)Tools::getValue('excludeVirtuals', false); +$exclude_packs = (bool)Tools::getValue('exclude_packs', false); $sql = 'SELECT p.`id_product`, `reference`, pl.name FROM `'._DB_PREFIX_.'product` p LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (pl.id_product = p.id_product AND pl.id_lang = '.(int)Context::getContext()->language->id.Shop::addSqlRestrictionOnLang('pl').') WHERE (pl.name LIKE \'%'.pSQL($query).'%\' OR p.reference LIKE \'%'.pSQL($query).'%\')'. (!empty($excludeIds) ? ' AND p.id_product NOT IN ('.$excludeIds.') ' : ' '). - ($excludeVirtuals ? 'AND p.id_product NOT IN (SELECT pd.id_product FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))' : ''); + ($excludeVirtuals ? 'AND p.id_product NOT IN (SELECT pd.id_product FROM `'._DB_PREFIX_.'product_download` pd WHERE (pd.id_product = p.id_product))' : ''). + ($exclude_packs ? 'AND (p.cache_is_pack IS NULL OR p.cache_is_pack = 0)' : ''); + $items = Db::getInstance()->executeS($sql); if ($items) diff --git a/admin-dev/ajaxfilemanager/inc/index.php b/admin-dev/ajaxfilemanager/inc/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/inc/index.php +++ b/admin-dev/ajaxfilemanager/inc/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/index.php b/admin-dev/ajaxfilemanager/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/index.php +++ b/admin-dev/ajaxfilemanager/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php b/admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/edit_area/images/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/jscripts/edit_area/index.php b/admin-dev/ajaxfilemanager/jscripts/edit_area/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/jscripts/edit_area/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/edit_area/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php b/admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/edit_area/langs/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php b/admin-dev/ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/edit_area/reg_syntax/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/jscripts/index.php b/admin-dev/ajaxfilemanager/jscripts/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/jscripts/index.php +++ b/admin-dev/ajaxfilemanager/jscripts/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/langs/index.php b/admin-dev/ajaxfilemanager/langs/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/langs/index.php +++ b/admin-dev/ajaxfilemanager/langs/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/session/index.php b/admin-dev/ajaxfilemanager/session/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/session/index.php +++ b/admin-dev/ajaxfilemanager/session/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/theme/default/css/index.php b/admin-dev/ajaxfilemanager/theme/default/css/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/theme/default/css/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/css/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/theme/default/images/action/index.php b/admin-dev/ajaxfilemanager/theme/default/images/action/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/action/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/action/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/theme/default/images/big_icon/index.php b/admin-dev/ajaxfilemanager/theme/default/images/big_icon/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/big_icon/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/big_icon/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/theme/default/images/file_type/index.php b/admin-dev/ajaxfilemanager/theme/default/images/file_type/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/file_type/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/file_type/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/theme/default/images/index.php b/admin-dev/ajaxfilemanager/theme/default/images/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php b/admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/pagination/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/theme/default/images/standard/index.php b/admin-dev/ajaxfilemanager/theme/default/images/standard/index.php index ec45b2dfe..f42f03e4d 100644 --- a/admin-dev/ajaxfilemanager/theme/default/images/standard/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/images/standard/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/theme/default/index.php b/admin-dev/ajaxfilemanager/theme/default/index.php index 7a626751d..319128b59 100644 --- a/admin-dev/ajaxfilemanager/theme/default/index.php +++ b/admin-dev/ajaxfilemanager/theme/default/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/ajaxfilemanager/theme/index.php b/admin-dev/ajaxfilemanager/theme/index.php index 7a626751d..319128b59 100644 --- a/admin-dev/ajaxfilemanager/theme/index.php +++ b/admin-dev/ajaxfilemanager/theme/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/autoupgrade/index.php b/admin-dev/autoupgrade/index.php index 4c1db9e4c..5ca842ada 100644 --- a/admin-dev/autoupgrade/index.php +++ b/admin-dev/autoupgrade/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/backup.php b/admin-dev/backup.php index bf13d08ad..8a4f66fef 100644 --- a/admin-dev/backup.php +++ b/admin-dev/backup.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ define('_PS_ADMIN_DIR_', getcwd()); - include(_PS_ADMIN_DIR_.'/../config/config.inc.php'); if (!Context::getContext()->employee->isLoggedBack()) @@ -34,15 +33,15 @@ if (!Context::getContext()->employee->isLoggedBack()) $tabAccess = Profile::getProfileAccess(Context::getContext()->employee->id_profile, Tab::getIdFromClassName('AdminBackup')); if ($tabAccess['view'] !== '1') - die (Tools::displayError('You do not have permission to view here')); + die (Tools::displayError('You do not have permission to view this.')); $backupdir = realpath(_PS_ADMIN_DIR_ . '/backups/'); if ($backupdir === false) - die (Tools::displayError('Backups directory does not exist.')); + die (Tools::displayError('A "Backup" directory does not exist.')); if (!$backupfile = Tools::getValue('filename')) - die (Tools::displayError('No file specified')); + die (Tools::displayError('No file has been specified.')); // Check the realpath so we can validate the backup file is under the backup directory $backupfile = realpath($backupdir.'/'.$backupfile); @@ -59,7 +58,7 @@ else $fp = @fopen($backupfile, 'r'); if ($fp === false) - die (Tools::displayError('Unable to open backup file').' "'.addslashes($backupfile).'"'); + die (Tools::displayError('Unable to open backup file(s).').' "'.addslashes($backupfile).'"'); // Add the correct headers, this forces the file is saved header('Content-Type: '.$contentType); @@ -71,4 +70,4 @@ $ret = @fpassthru($fp); fclose($fp); if ($ret === false) - die (Tools::displayError('Unable to display backup file').' "'.addslashes($backupfile).'"'); \ No newline at end of file + die (Tools::displayError('Unable to display backup file(s).').' "'.addslashes($backupfile).'"'); \ No newline at end of file diff --git a/admin-dev/backups/index.php b/admin-dev/backups/index.php index 88e934d59..195fab225 100644 --- a/admin-dev/backups/index.php +++ b/admin-dev/backups/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/cron_currency_rates.php b/admin-dev/cron_currency_rates.php index 36015d7e5..2bf94de21 100644 --- a/admin-dev/cron_currency_rates.php +++ b/admin-dev/cron_currency_rates.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/displayImage.php b/admin-dev/displayImage.php index 17ac32918..f873fdb22 100644 --- a/admin-dev/displayImage.php +++ b/admin-dev/displayImage.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ -require_once(dirname(__FILE__).'/../config/config.inc.php'); -require_once(dirname(__FILE__).'/init.php'); +define('_PS_ADMIN_DIR_', getcwd()); +require_once(_PS_ADMIN_DIR_.'/../config/config.inc.php'); +require_once(_PS_ADMIN_DIR_.'/init.php'); if (isset($_GET['img']) AND Validate::isMd5($_GET['img']) AND isset($_GET['name']) AND Validate::isGenericName($_GET['name']) AND file_exists(_PS_UPLOAD_DIR_.$_GET['img'])) { diff --git a/admin-dev/drawer.php b/admin-dev/drawer.php index 6d6c78384..c52ea4547 100644 --- a/admin-dev/drawer.php +++ b/admin-dev/drawer.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ define('_PS_ADMIN_DIR_', getcwd()); -include_once(dirname(__FILE__).'/../config/config.inc.php'); +include_once(_PS_ADMIN_DIR_.'/../config/config.inc.php'); $module = Tools::getValue('module'); $render = Tools::getValue('render'); diff --git a/admin-dev/export/index.php b/admin-dev/export/index.php index 88e934d59..195fab225 100644 --- a/admin-dev/export/index.php +++ b/admin-dev/export/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/footer.inc.php b/admin-dev/footer.inc.php index e41c93db3..5f91c44fa 100644 --- a/admin-dev/footer.inc.php +++ b/admin-dev/footer.inc.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/functions.php b/admin-dev/functions.php index a79749b62..d24502367 100644 --- a/admin-dev/functions.php +++ b/admin-dev/functions.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ -require_once(dirname(__FILE__).'/../images.inc.php'); - function bindDatepicker($id, $time) { if ($time) @@ -96,6 +94,8 @@ function rewriteSettingsFile($baseUrls = NULL, $theme = NULL, $arrayDB = NULL) $defines['_DB_PASSWD_'] = (($arrayDB AND isset($arrayDB['_DB_PASSWD_'])) ? $arrayDB['_DB_PASSWD_'] : _DB_PASSWD_); $defines['_COOKIE_KEY_'] = addslashes(_COOKIE_KEY_); $defines['_COOKIE_IV_'] = addslashes(_COOKIE_IV_); + $defines['_PS_CREATION_DATE_'] = addslashes(_PS_CREATION_DATE_); + if (defined('_RIJNDAEL_KEY_')) $defines['_RIJNDAEL_KEY_'] = addslashes(_RIJNDAEL_KEY_); if (defined('_RIJNDAEL_IV_')) @@ -252,7 +252,7 @@ function checkingTab($tab) { if (isset(AdminTab::$tabParenting[$tab])) Tools::redirectAdmin('?tab='.AdminTab::$tabParenting[$tab].'&token='.Tools::getAdminTokenLite(AdminTab::$tabParenting[$tab])); - echo sprintf(Tools::displayError('Page %s cannot be found.'),$tab); + echo sprintf(Tools::displayError('Page %s cannot be found..'),$tab); return false; } @@ -265,7 +265,7 @@ function checkingTab($tab) $adminObj = new $tab; if (!$adminObj->viewAccess() AND ($adminObj->table != 'employee' OR Context::getContext()->employee->id != Tools::getValue('id_employee') OR !Tools::isSubmit('updateemployee'))) { - $adminObj->_errors = array(Tools::displayError('Access denied')); + $adminObj->_errors = array(Tools::displayError('Access denied.')); echo $adminObj->displayErrors(); return false; } @@ -431,7 +431,7 @@ function runAdminTab($tab, $ajaxMode = false) $bread = ''; foreach ($tabs AS $key => $item) { - $bread .= ' >'; + $bread .= ' >'; if (count($tabs) - 1 > $key) $bread .= ''; diff --git a/admin-dev/get-file-admin.php b/admin-dev/get-file-admin.php index bc9e28e82..b37f691e5 100644 --- a/admin-dev/get-file-admin.php +++ b/admin-dev/get-file-admin.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ define('_PS_ADMIN_DIR_', getcwd()); -require(dirname(dirname(__FILE__)).'/config/config.inc.php'); +require(_PS_ADMIN_DIR_.'/config/config.inc.php'); Controller::getController('GetFileController')->run(); \ No newline at end of file diff --git a/admin-dev/grider.php b/admin-dev/grider.php index 4fffad24a..6e97baf68 100644 --- a/admin-dev/grider.php +++ b/admin-dev/grider.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ define('_PS_ADMIN_DIR_', getcwd()); -include_once(dirname(__FILE__).'/../config/config.inc.php'); +include_once(_PS_ADMIN_DIR_.'/../config/config.inc.php'); $module = Tools::getValue('module'); $render = Tools::getValue('render'); diff --git a/admin-dev/header.inc.php b/admin-dev/header.inc.php index 0f92567d4..077fde82f 100644 --- a/admin-dev/header.inc.php +++ b/admin-dev/header.inc.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ @@ -36,9 +36,9 @@ echo ' - + - + PrestaShop™ - '.translate('Administration panel').' @@ -231,28 +231,37 @@ echo ' var html = ""; '; } - echo ' - '.translate('My preferences').' - - - '.Tools::substr(Context::getContext()->employee->firstname, 0, 1).'. '.htmlentities(Context::getContext()->employee->lastname, ENT_COMPAT, 'UTF-8').' - '.translate('logout').''; - if (Context::getContext()->shop->getBaseURL()) - echo ''.translate('View my shop').''; - echo ' + echo ' + +
+
+
'.translate('Welcome,').' '.Context::getContext()->employee->firstname.' '.Context::getContext()->employee->lastname.'
+
+ '; + if (defined(_PS_BASE_URL_)) + echo ''.translate('View my shop').''; + echo '
+
+
- +
+ {l s='Language:'} {if isset($customerLanguage)}{$customerLanguage->name}{else}{l s='undefined'}{/if}
{l s='Newsletter:'} {if $customer->newsletter}{else}{/if}
- {l s='Opt-in:'} {if $customer->optin}{else}{/if}
- {l s='Age:'} {$customer_stats['age']} {if isset($customer->birthday['age'])}({$customer_birthday}){else}{l s='unknown'}{/if}

+ {l s='Opt in:'} {if $customer->optin}{else}{/if}
+ {l s='Age:'} {$customer_stats['age']} {if isset($customer->birthday['age'])}({$customer_birthday}){else}{l s='Unknown'}{/if}

{l s='Last update:'} {$last_update}
{l s='Status:'} {if $customer->active}{else}{/if} {if $customer->isGuest()}
- {l s='This customer is registered as'} {l s='guest'} + {l s='This customer is registered as.'} {l s='Guest'} {if !$customer_exists}
-

- {l s='This feature generates a random password and sends an e-mail to the customer'} +

+ {l s='This feature generates a random password before sending an email to your customer.'}
{else} -
{l s='A registered customer account already exists with this e-mail address'} +
{l s='A registered customer account using the defined email address already exists. '} {/if}
{/if} @@ -110,83 +111,86 @@

{l s='Add a private note'}

-

{l s='This note will be displayed to all employees but not to the customer.'}

+

{l s='This note will be displayed to all employees but not to customers.'}


- +
- -

{l s='Messages'} ({count($messages)})

- {if count($messages)} - - - - - - - {foreach $messages AS $message} +
+

{l s='Messages'} ({count($messages)})

+ {if count($messages)} +
{l s='Status'}{l s='Message'}{l s='Sent on'}
- - - + + + - {/foreach} -
{$message['status']} - - {$message['message']}... - - {$message['date_add']}{l s='Status'}{l s='Message'}{l s='Sent on'}
-
 
- {else} - {l s='%1$s %2$s has never contacted you' sprintf=[$customer->firstname, $customer->lastname]} - {/if} + {foreach $messages AS $message} + + {$message['status']} + + + {$message['message']}... + + + {$message['date_add']} + + {/foreach} + +
 
+ {else} + {l s='%1$s %2$s has never contacted you' sprintf=[$customer->firstname, $customer->lastname]} + {/if} + + +
+
{l s='Vouchers'} ({count($discounts)}) + {if count($discounts)} + + + + + + + + + {foreach $discounts AS $key => $discount} + + + + + + + + {/foreach} +
{l s='ID'}{l s='Code'}{l s='Name'}{l s='Status'}{l s='Actions'}
{$discount['id_cart_rule']}{$discount['code']}{$discount['name']}{l s='Status'} + + +
+ {else} + {l s='%1$s %2$s has no discount vouchers' sprintf=[$customer->firstname, $customer->lastname]}. + {/if} +
+
{* display hook specified to this page : AdminCustomers *}
{hook h="displayAdminCustomers" id_customer=$customer->id}
 
-

- {l s='Groups'} ({count($groups)}) - - - -

- {if $groups AND count($groups)} - - - - - - - - - - - - {foreach $groups AS $key => $group} - - - - - - {/foreach} -
{l s='ID'}{l s='Name'}{l s='Actions'}
{$group['id_group']}{$group['name']}
- {/if} -
 
- - +

{l s='Orders'} ({count($orders)})

{if $orders AND count($orders)} {assign var=count_ok value=count($orders_ok)} {if $count_ok}
-

+

{l s='Valid orders:'} {$count_ok} {l s='for'} {$total_ok}

@@ -202,18 +206,18 @@ - + - - + + {foreach $orders_ok AS $key => $order} - - - - + + + + @@ -225,7 +229,6 @@ {assign var=count_ko value=count($orders_ko)} {if $count_ko}
-

{l s='Invalid orders:'} {$count_ko}

{l s='ID'} {l s='Date'}{l s='Payment'}{l s='Payment: '} {l s='State'}{l s='Products'}{l s='Total spent'}{l s='Products'}{l s='Total spent'} {l s='Actions'}
{$order['id_order']}{$order['date_add']}{$order['payment']}{$order['order_state']}{$order['id_order']}{$order['date_add']}{$order['payment']}{$order['order_state']} {$order['nb_products']} {$order['total_paid_real']}
@@ -237,36 +240,73 @@ - - - - - - + + + + + + {foreach $orders_ko AS $key => $order} - - - - - + + + + + {/foreach}
{l s='ID'}{l s='Date'}{l s='Payment'}{l s='State'}{l s='Products'}{l s='Total spent'}{l s='ID'}{l s='Date'}{l s='Payment: '}{l s='State'}{l s='Products'}{l s='Total spent'} {l s='Actions'}
{$order['id_order']}{$order['date_add']}{$order['payment']}{$order['order_state']}{$order['nb_products']}{$order['id_order']}{$order['date_add']}{$order['payment']}{$order['order_state']}{$order['nb_products']} {$order['total_paid_real']}
+

{l s='Invalid orders:'} {$count_ko}

-
 
{/if} {else} {l s='%1$s %2$s has not placed any orders yet' sprintf=[$customer->firstname, $customer->lastname]} {/if} +
+
+
+

{l s='Carts'} ({count($carts)})

+ {if $carts AND count($carts)} + + + + + + + + + + + + + + + + {foreach $carts AS $key => $cart} + + + + + + + + {/foreach} +
{l s='ID'}{l s='Date'}{l s='Carrier'}{l s='Total'}{l s='Actions'}
{$cart['id_cart']}{$cart['date_add']}{$cart['name']}{$cart['total_price']}
+ {else} + {l s='No cart is available'}. + {/if} +
+
+ +
 
{if $products AND count($products)}
 
-

{l s='Products'} ({count($products)})

+

{l s='Products:'} ({count($products)})

@@ -291,116 +331,90 @@
{/if}
 
- -

{l s='Addresses'} ({count($addresses)})

- {if count($addresses)} - - - - - - - - - - - - - - - - - - {foreach $addresses AS $key => $address} - - - - - - - - - {/foreach} -
{l s='Company'}{l s='Name'}{l s='Address'}{l s='Country'}{l s='Phone number(s)'}{l s='Actions'}
{if $address['company']}{$address['company']}{else}--{/if}{$address['firstname']} {$address['lastname']}{$address['address1']} {if $address['address2']}{$address['address2']}{/if} {$address['postcode']} {$address['city']}{$address['country']} - {if $address['phone']} - {$address['phone']} - {if $address['phone_mobile']}
{$address['phone_mobile']}{/if} - {else} - {if $address['phone_mobile']}
{$address['phone_mobile']}{else}--{/if} - {/if} - 		- - -
- {else} - {l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]} - {/if} - -
 
-

{l s='Vouchers'} ({count($discounts)})

- {if count($discounts)} - - - - - - - - - {foreach $discounts AS $key => $discount} - - - - - - - - {/foreach} -
{l s='ID'}{l s='Code'}{l s='Name'}{l s='Status'}{l s='Actions'}
{$discount['id_cart_rule']}{$discount['code']}{$discount['name']}{l s='Status'} - - -
- {else} - {l s='%1$s %2$s has no discount vouchers' sprintf=[$customer->firstname, $customer->lastname]}. - {/if} -
 
- -
-

{l s='Carts'} ({count($carts)})

- {if $carts AND count($carts)} - - - - - - - - + +
+

{l s='Addresses'} ({count($addresses)})

+ {if count($addresses)} +
+ + + + + + + + - - - - + + + + + - {foreach $carts AS $key => $cart} - - - - - - + {foreach $addresses AS $key => $address} + + + + + + + {/foreach}
{l s='ID'}{l s='Date'}{l s='Carrier'}{l s='Total'}{l s='Company'}{l s='Name'}{l s='Address'}{l s='Country'}{l s='Phone number(s)'} {l s='Actions'}
{$cart['id_cart']}{$cart['date_add']}{$cart['name']}{$cart['total_price']}
{if $address['company']}{$address['company']}{else}--{/if}{$address['firstname']} {$address['lastname']}{$address['address1']} {if $address['address2']}{$address['address2']}{/if} {$address['postcode']} {$address['city']}{$address['country']} + {if $address['phone']} + {$address['phone']} + {if $address['phone_mobile']}
{$address['phone_mobile']}{/if} + {else} + {if $address['phone_mobile']}
{$address['phone_mobile']}{else}--{/if} + {/if} + 		+ + +
{else} - {l s='No cart available'}. + {l s='%1$s %2$s has not registered any addresses yet' sprintf=[$customer->firstname, $customer->lastname]} {/if}
- + +
+
+

+ {l s='Groups'} ({count($groups)}) + + + +

+ {if $groups AND count($groups)} + + + + + + + + + + + + {foreach $groups AS $key => $group} + + + + + + {/foreach} +
{l s='ID'}{l s='Name'}{l s='Actions'}
{$group['id_group']}{$group['name']}
+ {/if} +
+
+ +
 
+ {if count($interested)}
-

{l s='Products'} ({count($interested)})

+

{l s='Products:'} ({count($interested)})

@@ -417,9 +431,9 @@
{/if} - +
 
- +
{* Last connections *} {if count($connections)}

{l s='Last connections'}

@@ -432,42 +446,46 @@ - {l s='Date'} - {l s='Pages viewed'} - {l s='Total time'} - {l s='Origin'} - {l s='IP Address'} + {l s='Date'} + {l s='Pages viewed'} + {l s='Total time'} + {l s='Origin'} + {l s='IP Address'} {foreach $connections as $connection} - {$connection['date_add']} - {$connection['pages']} - {$connection['time']} - {$connection['http_referer']} - {$connection['ipaddress']} + {$connection['date_add']} + {$connection['pages']} + {$connection['time']} + {$connection['http_referer']} + {$connection['ipaddress']} {/foreach}
 
{/if} - - {if count($referrers)} -

{l s='Referrers'}

- - - - - {if $shop_is_feature_active}{/if} - - {foreach $referrers as $referrer} - - - - {if $shop_is_feature_active}{/if} - - {/foreach} -
{l s='Date'}{l s='Name'}{l s='Shop'}
{$referrer['date_add']}{$referrer['name']}{$referrer['shop_name']}
- {/if} +
+
+
+ {if count($referrers)} +

{l s='Referrers'}

+ + + + + {if $shop_is_feature_active}{/if} + + {foreach $referrers as $referrer} + + + + {if $shop_is_feature_active}{/if} + + {/foreach} +
{l s='Date'}{l s='Name'}{l s='Shop'}
{$referrer['date_add']}{$referrer['name']}{$referrer['shop_name']}
+ {/if} +
+
{/block} -
 
+
 
\ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/customers/index.php b/admin-dev/themes/default/template/controllers/customers/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/customers/index.php +++ b/admin-dev/themes/default/template/controllers/customers/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/emails/content.tpl b/admin-dev/themes/default/template/controllers/emails/content.tpl index 9e8ae6652..7ae001ff5 100644 --- a/admin-dev/themes/default/template/controllers/emails/content.tpl +++ b/admin-dev/themes/default/template/controllers/emails/content.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,18 +18,18 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *}
- {l s='Configuration Information'} + {l s='Configuration information'}

{l s='This information must be provided when you report an issue on our bug tracker or forum.'}


- {l s='Information about your configuration'} + {l s='Information about your configuration.'}

{l s='Server information'}

{if count($uname)}

@@ -113,7 +113,7 @@

{l s='Store information'}

- {l s='Prestashop version'}: {$shop.ps|escape:'htmlall':'UTF-8'} + {l s='PrestaShop version'}: {$shop.ps|escape:'htmlall':'UTF-8'}

{l s='Shop URL'}: {$shop.url|escape:'htmlall':'UTF-8'} @@ -127,7 +127,7 @@ {l s='Mail method'}: {if $mail} - {l s='You are using the PHP mail() function.'}

+ {l s='You are using the PHP mail function.'}

{else} {l s='You are using your own SMTP parameters.'}

diff --git a/admin-dev/themes/default/template/controllers/information/index.php b/admin-dev/themes/default/template/controllers/information/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/information/index.php +++ b/admin-dev/themes/default/template/controllers/information/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl index 873130cd4..e1ba3492b 100644 --- a/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/invoices/helpers/form/index.php b/admin-dev/themes/default/template/controllers/invoices/helpers/form/index.php index 8e4de11e4..30839633c 100644 --- a/admin-dev/themes/default/template/controllers/invoices/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/invoices/helpers/form/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/invoices/helpers/index.php b/admin-dev/themes/default/template/controllers/invoices/helpers/index.php index b4a66917e..063209789 100644 --- a/admin-dev/themes/default/template/controllers/invoices/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/invoices/helpers/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/invoices/index.php b/admin-dev/themes/default/template/controllers/invoices/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/invoices/index.php +++ b/admin-dev/themes/default/template/controllers/invoices/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl index e29a421e8..d8b551b02 100644 --- a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -36,10 +36,10 @@ {/block} {block name=script} - var langPackOk = "\"\" {l s='A language pack is available for this ISO (name is'}"; - var langPackVersion = "{l s='The compatible Prestashop version for this language and your system is:'}"; - var langPackInfo = "{l s='After creating the language, you can import the content of the language pack, which you can download above under "Localization - Translations"'}"; - var noLangPack = "\"\" {l s='No language pack available on prestashop.com for this ISO code'}"; + var langPackOk = "\"\" {l s='A language pack is available for this ISO.'}"; + var langPackVersion = "{l s='The Prestashop version compatible with this language and your system is:'}"; + var langPackInfo = "{l s='After creating the language, you can import the content of the language pack, which you can download under "Localization -- Translations."'}"; + var noLangPack = "\"\" {l s='No language pack is available on prestashop.com for this ISO code'}"; var download = "{l s='Download'}"; $(document).ready(function() { @@ -62,7 +62,7 @@ {if isset($field.image)}{$field.title}{/if} {$field.title} -

{l s='This language is NOT complete and cannot be used in the Front or Back Office because some files are missing.'}

+

{l s='This language pack is NOT complete and cannot be used in the Front or Back Office because some files are missing.'}


{elseif $key == 'list_files'} {foreach $field as $list} diff --git a/admin-dev/themes/default/template/controllers/languages/helpers/form/index.php b/admin-dev/themes/default/template/controllers/languages/helpers/form/index.php index 8e4de11e4..30839633c 100644 --- a/admin-dev/themes/default/template/controllers/languages/helpers/form/index.php +++ b/admin-dev/themes/default/template/controllers/languages/helpers/form/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/languages/helpers/index.php b/admin-dev/themes/default/template/controllers/languages/helpers/index.php index b4a66917e..063209789 100644 --- a/admin-dev/themes/default/template/controllers/languages/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/languages/helpers/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/languages/index.php b/admin-dev/themes/default/template/controllers/languages/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/languages/index.php +++ b/admin-dev/themes/default/template/controllers/languages/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/localization/content.tpl b/admin-dev/themes/default/template/controllers/localization/content.tpl index f8abc659f..3fefc850d 100644 --- a/admin-dev/themes/default/template/controllers/localization/content.tpl +++ b/admin-dev/themes/default/template/controllers/localization/content.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,11 +18,15 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -{$localization_form} +
+ {$localization_form} +

-{$localization_options} \ No newline at end of file +
+ {$localization_options} +
\ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/localization/index.php b/admin-dev/themes/default/template/controllers/localization/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/localization/index.php +++ b/admin-dev/themes/default/template/controllers/localization/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl index c945e3981..b1cfff216 100755 --- a/admin-dev/themes/default/template/controllers/login/content.tpl +++ b/admin-dev/themes/default/template/controllers/login/content.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -48,10 +48,10 @@ {/if}

{$shop_name}

- {if !isset($wrong_folder_name)} + {if !isset($wrong_folder_name) && !isset($wrong_install_name)}
- +
@@ -77,10 +77,10 @@

{l s='Forgot your password?'}

-

{l s='Please enter the e-mail address you provided during the registration process in order to receive your access code by e-mail'}

+

{l s='In order to receive your access code by email, please enter the address you provided during the registration process.'}

- +
@@ -101,10 +101,10 @@

{l s='For security reasons, you cannot connect to the Back Office until after you have:'}

    -
  • {l s='deleted the /install folder'}
    • -
  • {l s='renamed the /admin folder (e.g. /admin123%d)' sprintf=$randomNb}
    • + {if isset($wrong_install_name) && $wrong_install_name == true}
  • {l s='deleted the /install folder'}
    • {/if} + {if isset($wrong_folder_name) && $wrong_folder_name == true}
  • {l s='renamed the /admin folder (e.g. /admin%d)' sprintf=$randomNb}
    • {/if}
-

{l s='Please then access this page by the new URL (e.g. http://www.yoursite.com/admin123%d)' sprintf=$randomNb}

+ {if isset($wrong_folder_name) && $wrong_folder_name == true}

{l s='Please then access this page by the new URL (e.g. http://www.yoursite.com/admin%d)' sprintf=$randomNb}

{/if}
{/if}
diff --git a/admin-dev/themes/default/template/controllers/login/index.php b/admin-dev/themes/default/template/controllers/login/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/login/index.php +++ b/admin-dev/themes/default/template/controllers/login/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/logs/helpers/index.php b/admin-dev/themes/default/template/controllers/logs/helpers/index.php index b4a66917e..063209789 100644 --- a/admin-dev/themes/default/template/controllers/logs/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/logs/helpers/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/logs/helpers/list/index.php b/admin-dev/themes/default/template/controllers/logs/helpers/list/index.php index 8e4de11e4..30839633c 100644 --- a/admin-dev/themes/default/template/controllers/logs/helpers/list/index.php +++ b/admin-dev/themes/default/template/controllers/logs/helpers/list/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl index b380c5844..2886a900c 100644 --- a/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/controllers/logs/helpers/list/list_header.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -34,7 +34,7 @@
  • {l s='Informative only'}
  • {l s='Warning'}
  • {l s='Error'}
    • -
  • {l s='Major issue (crash)'}
    • +
  • {l s='Major issue (crash)!'}

    • diff --git a/admin-dev/themes/default/template/controllers/logs/index.php b/admin-dev/themes/default/template/controllers/logs/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/logs/index.php +++ b/admin-dev/themes/default/template/controllers/logs/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/maintenance/helpers/index.php b/admin-dev/themes/default/template/controllers/maintenance/helpers/index.php index b4a66917e..063209789 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/index.php b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/index.php index 8e4de11e4..30839633c 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl index 7ea689a25..2e1505738 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/maintenance/index.php b/admin-dev/themes/default/template/controllers/maintenance/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/maintenance/index.php +++ b/admin-dev/themes/default/template/controllers/maintenance/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/manufacturers/helpers/index.php b/admin-dev/themes/default/template/controllers/manufacturers/helpers/index.php index b4a66917e..063209789 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/index.php b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/index.php index 8e4de11e4..30839633c 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/index.php +++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl index 6fb27f342..7fe5e96b3 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/manufacturers/helpers/view/view.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -29,11 +29,11 @@

    {$manufacturer->name}

    -

    {l s='Total addresses:'} {count($addresses)}

    +

    {l s='Total addresses'} {count($addresses)}

    {if !count($addresses)} - {l s='No address for this manufacturer'} + {l s='No address has been found for this manufacturer.'} {else} {foreach $addresses AS $addresse} @@ -60,7 +60,7 @@ {/foreach} {/if} -

    {l s='Total products:'} {count($products)}

    +

    {l s='Total products'} {count($products)}

    {foreach $products AS $product}
    {if !$product->hasAttributes()} diff --git a/admin-dev/themes/default/template/controllers/manufacturers/index.php b/admin-dev/themes/default/template/controllers/manufacturers/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/manufacturers/index.php +++ b/admin-dev/themes/default/template/controllers/manufacturers/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl new file mode 100644 index 000000000..b84d55b1e --- /dev/null +++ b/admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl @@ -0,0 +1,5 @@ +{if $show_toolbar} + {include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title} +{/if} + +{$modules_list} \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/meta/helpers/index.php b/admin-dev/themes/default/template/controllers/meta/helpers/index.php index b4a66917e..063209789 100644 --- a/admin-dev/themes/default/template/controllers/meta/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/meta/helpers/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/meta/helpers/options/index.php b/admin-dev/themes/default/template/controllers/meta/helpers/options/index.php index 8e4de11e4..30839633c 100644 --- a/admin-dev/themes/default/template/controllers/meta/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/meta/helpers/options/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl index 07f87c6d1..1b5fa94e3 100644 --- a/admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/meta/helpers/options/options.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -33,7 +33,7 @@ {if !$field['mod_rewrite']} - {l s='URL rewriting (mod_rewrite) is not active on your server or it is not possible to check your server configuration. If you want to use Friendly URLs you must activate this mod.'} + {l s='URL rewriting (mod_rewrite) is not active on your server, or it is not possible to check your server configuration. If you want to use Friendly URLs, you must activate this mod.'}
    {/if} {else} diff --git a/admin-dev/themes/default/template/controllers/meta/index.php b/admin-dev/themes/default/template/controllers/meta/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/meta/index.php +++ b/admin-dev/themes/default/template/controllers/meta/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/modules/content.tpl b/admin-dev/themes/default/template/controllers/modules/content.tpl index a60f596ae..58546be45 100644 --- a/admin-dev/themes/default/template/controllers/modules/content.tpl +++ b/admin-dev/themes/default/template/controllers/modules/content.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,12 +18,11 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - {if isset($module_content)} {$module_content} {else} diff --git a/admin-dev/themes/default/template/controllers/modules/favorites.tpl b/admin-dev/themes/default/template/controllers/modules/favorites.tpl index ae9eec7b9..13efe0e73 100755 --- a/admin-dev/themes/default/template/controllers/modules/favorites.tpl +++ b/admin-dev/themes/default/template/controllers/modules/favorites.tpl @@ -1,12 +1,10 @@
    - {include file='controllers/modules/header.tpl'} -
    @@ -16,6 +14,7 @@
    + @@ -27,6 +26,7 @@ + @@ -40,6 +40,22 @@ + + + \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl b/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl new file mode 100644 index 000000000..a4945a592 --- /dev/null +++ b/admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl @@ -0,0 +1,86 @@ +{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 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/afl-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 +* @copyright 2007-2013 PrestaShop SA + +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{if isset($tab_modules_list) && !empty($tab_modules_list)} + + +
    + {if count($tab_modules_list.installed)} +
    {l s='Module Name'} {l s='Description'} {l s='Status'}{l s='Tab'} {l s='Categories'} {l s='Interest'} {l s='Favorite'}{$module->displayName} {$module->description|truncate:80:'...'} {if isset($module->id) && $module->id gt 0}{l s='Installed'}{else}{l s='Not Installed'}{/if} + {assign var="module_name" value=$module->name} + + {$module->categoryName} +
    - - {/if} - {/if} +
     
    {/if} - - -
    -
    - - -
    + + +
    +
    + + +
    +
    +
    + - - -
    - - - -   - -   - -   - - -
    - -
    - - -
    - - - -
    - + +   + +   + +   + +
    +
    + + +
    + +
    + diff --git a/admin-dev/themes/default/template/controllers/modules/header.tpl b/admin-dev/themes/default/template/controllers/modules/header.tpl index 971cdb035..9d290bf06 100644 --- a/admin-dev/themes/default/template/controllers/modules/header.tpl +++ b/admin-dev/themes/default/template/controllers/modules/header.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,38 +18,34 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -
    -
    - - - - -
    -

    Module : {l s='List of modules'}

    -
    - +
    +
    + +
    +

    Module : {l s='List of modules'}

    +
    {if $add_permission eq '1'}
    {l s='Add a new module'} {l s='Add a new module'} -

    {l s='The module must be either a zip file or a tarball.'}

    +

    {l s='The module must either be a zip file or a tarball.'}

    diff --git a/admin-dev/themes/default/template/controllers/modules/index.php b/admin-dev/themes/default/template/controllers/modules/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/modules/index.php +++ b/admin-dev/themes/default/template/controllers/modules/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/modules/js.tpl b/admin-dev/themes/default/template/controllers/modules/js.tpl index ac370fd49..b0bc45df2 100644 --- a/admin-dev/themes/default/template/controllers/modules/js.tpl +++ b/admin-dev/themes/default/template/controllers/modules/js.tpl @@ -1,340 +1,327 @@ -{* -* 2007-2012 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 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/afl-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 -* @copyright 2007-2012 PrestaShop SA - -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - - + \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/modules/list.tpl b/admin-dev/themes/default/template/controllers/modules/list.tpl index 63e60a2b4..ff01f4620 100644 --- a/admin-dev/themes/default/template/controllers/modules/list.tpl +++ b/admin-dev/themes/default/template/controllers/modules/list.tpl @@ -1,116 +1,115 @@ -{* -* 2007-2012 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 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/afl-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 -* @copyright 2007-2012 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - - {if count($modules)} - - - - - - - - - - - - - - - - {foreach from=$modules item=module} - - - - - - - {/foreach} - -
    -
    -     		{l s='Module name'}
    confirmUninstall) OR empty($module->confirmUninstall)}rel="false"{else}rel="{$module->confirmUninstall|addslashes}"{/if} class="noborder"> -
    -

    {$module->displayName} - {if isset($module->type) && $module->type == 'addonsMustHave'} - {l s='Must Have'} - {else} - {if isset($module->id) && $module->id gt 0} - {l s='Installed'} - {else} - {l s='Not installed'} - {/if} - {/if} -

    -
    - {if isset($module->author) && !empty($module->author)} -
    -
    {l s='Developed by'} :
    -
    {$module->author|truncate:20:'...'}
    | -
    - {/if} -
    -
    {l s='Version'} :
    -
    {$module->version} - {if isset($module->version_addons)}({l s='Update'} {$module->version_addons} {l s='available on PrestaShop Addons'}){/if} -
    | -
    -
    -
    {l s='Category'} :
    -
    {$module->categoryName}
    -
    -
    -

    {if isset($module->description) && $module->description ne ''}{l s='Description'} : {$module->description}{else} {/if}

    - {if isset($module->message)}
    {$module->message}
    {/if} -
    - {if !isset($module->not_on_disk)}{$module->optionsHtml}{else} {/if} -
    -
    -     		- -
    - -
    - - -
    - {else} -

    {l s='No modules available in this section.'}

    - {/if} - +{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 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/afl-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 +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{if count($modules)} + + + + + + + + + + {foreach from=$modules item=module} + + + + + + + {/foreach} + +
    +
    +     		{l s='Module name'}
    + {if (isset($module->id) && $module->id > 0) || !isset($module->type) || $module->type != 'addonsMustHave'} + confirmUninstall) OR empty($module->confirmUninstall)}rel="false"{else}rel="{$module->confirmUninstall|addslashes}"{/if} + class="noborder"> + {/if} + +
    +

    {$module->displayName} + {if isset($module->type) && $module->type == 'addonsMustHave'} + {l s='Must Have'} + {else} + {if isset($module->id) && $module->id gt 0} + {l s='Installed'} + {else} + {l s='Not installed'} + {/if} + {/if} +

    +
    + {if isset($module->author) && !empty($module->author)} +
    +
    {l s='Developed by'} :
    +
    {$module->author|truncate:20:'...'}
    | +
    + {/if} +
    +
    {l s='Version'} :
    +
    {$module->version} + {if isset($module->version_addons)}({l s='Update'} {$module->version_addons} {l s='Available on PrestaShop Addons'}){/if} +
    | +
    +
    +
    {l s='Category'} :
    +
    {$module->categoryName}
    +
    +
    +

    {if isset($module->description) && $module->description ne ''}{l s='Description'} : {$module->description}{else} {/if}

    + {if isset($module->message)}
    {$module->message}
    {/if} +
    + {if !isset($module->not_on_disk)}{$module->optionsHtml}{else} {/if} +
    +
    +     		+ +
    + +
    + + +
    +{else} +

    {l s='No modules available in this section.'}

    +{/if} diff --git a/admin-dev/themes/default/template/controllers/modules/page.tpl b/admin-dev/themes/default/template/controllers/modules/page.tpl index 888ef4c26..f1e49c1d9 100644 --- a/admin-dev/themes/default/template/controllers/modules/page.tpl +++ b/admin-dev/themes/default/template/controllers/modules/page.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,20 +18,18 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *}
    - {include file='controllers/modules/header.tpl'} {include file='controllers/modules/filters.tpl'}
    @@ -58,10 +56,8 @@
    -
    {include file='controllers/modules/list.tpl'}
    -
    diff --git a/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl new file mode 100644 index 000000000..a73256926 --- /dev/null +++ b/admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl @@ -0,0 +1,77 @@ +{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 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/afl-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 +* @copyright 2007-2013 PrestaShop SA + +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +
    + + + + + + +
    + + +
    +

    + {$module->displayName|truncate:40:'…'} {$module->version} + {if isset($module->id) && $module->id gt 0 } + {if $module->active} + {l s='Enabled'} + {else} + {l s='Disabled'} + {/if} + {else} + {if isset($module->type) && $module->type == 'addonsMustHave'} + {l s='Must Have'} + {else} + {l s='Not installed'} + {/if} + + {/if} +

    +

    + {if isset($module->description) && $module->description ne ''} + {$module->description|truncate:100:'…'} + {else} +   + {/if} +

    +
    +     		+ {if isset($module->type) && $module->type == 'addonsMustHave'} + +   {displayPrice price=$module->price currency=$module->id_currency} + {else if !isset($module->not_on_disk)} + {$module->optionsHtml} +
     
    + Valider + {else} + {l s='Install'} + {/if} +
    +
    + {foreach from=$tab_modules_list.installed item=module} + {include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}} + {/foreach} +
    + {/if} + {if count($tab_modules_list.not_installed)} + + {foreach from=$tab_modules_list.not_installed item=module} + {include file='controllers/modules/tab_module_line.tpl' class_row={cycle values=",rowalt"}} + {/foreach} + + {/if} + +{/if} +

    {l s='More options'}

    \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl index d5b356883..ebd8d9dbc 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl +++ b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -44,7 +44,7 @@
    *
    @@ -88,8 +88,8 @@ {$value} {/foreach} {/if} - {l s='Please specify the files for which you do not want the module to be displayed'}.
    - {l s='Please type each filename separated by a comma'}. + {l s='Please specify the files for which you do not want the module to be displayed.'}.
    + {l s='Please input each filename, separated by a comma.'}.

    diff --git a/admin-dev/themes/default/template/controllers/modules_positions/index.php b/admin-dev/themes/default/template/controllers/modules_positions/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/index.php +++ b/admin-dev/themes/default/template/controllers/modules_positions/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl index a23a751a8..623e83dde 100644 --- a/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl +++ b/admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -65,7 +65,7 @@ {if !$can_move} -
    {l s='If you want to order/move the following data, please select a shop from the shop list'}
    +
    {l s='If you want to order/move the following data, please select a shop from the shop list.'}
    {/if} {foreach $hooks as $hook} @@ -79,7 +79,7 @@ {if $hook['module_count'] && $can_move} - {/if}{$hook['title']} - {$hook['module_count']} {if $hook['module_count'] > 1}{l s='modules'}{else}{l s='module'}{/if} + {/if}{$hook['title']} - {$hook['module_count']} {if $hook['module_count'] > 1}{l s='Modules'}{else}{l s='Module'}{/if} {if !empty($hook['description'])}  [{$hook['description']}] @@ -121,7 +121,7 @@ {/if} {/foreach} {else} - {l s='No module for this hook'} + {l s='No module was found for this hook.'} {/if} {/foreach} diff --git a/admin-dev/themes/default/template/controllers/not_found/content.tpl b/admin-dev/themes/default/template/controllers/not_found/content.tpl index f2df6da4c..67933528c 100644 --- a/admin-dev/themes/default/template/controllers/not_found/content.tpl +++ b/admin-dev/themes/default/template/controllers/not_found/content.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,12 +18,12 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *}

    {l s='The controller %s is missing or invalid.' sprintf=$controller}

     diff --git a/admin-dev/themes/default/template/controllers/not_found/index.php b/admin-dev/themes/default/template/controllers/not_found/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/not_found/index.php +++ b/admin-dev/themes/default/template/controllers/not_found/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/order_preferences/helpers/index.php b/admin-dev/themes/default/template/controllers/order_preferences/helpers/index.php index b4a66917e..063209789 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/helpers/index.php +++ b/admin-dev/themes/default/template/controllers/order_preferences/helpers/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/index.php b/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/index.php index 8e4de11e4..30839633c 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/index.php +++ b/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/options.tpl b/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/options.tpl index 04b7f7c69..e990347fb 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/options.tpl +++ b/admin-dev/themes/default/template/controllers/order_preferences/helpers/options/options.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} diff --git a/admin-dev/themes/default/template/controllers/order_preferences/index.php b/admin-dev/themes/default/template/controllers/order_preferences/index.php index 3d0287ee8..fcb7f5c2b 100644 --- a/admin-dev/themes/default/template/controllers/order_preferences/index.php +++ b/admin-dev/themes/default/template/controllers/order_preferences/index.php @@ -1,6 +1,6 @@ -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) * International Registered Trademark & Property of PrestaShop SA */ diff --git a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl index a7bd55c58..d6ca1cf6f 100755 --- a/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_customized_data.tpl @@ -1,5 +1,5 @@ {* -* 2007-2012 PrestaShop +* 2007-2013 PrestaShop * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * needs please refer to http://www.prestashop.com for more information. * * @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA +* @copyright 2007-2013 PrestaShop SA * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} @@ -28,7 +28,7 @@ {if isset($product.image) && $product.image->id}{$product.image_tag}{else}--{/if} - {$product['product_name']} - {l s='customized'}
    + {$product['product_name']} - {l s='Customized'}
    {if ($product['product_reference'])}{l s='Ref:'} {$product['product_reference']}
    {/if} {if ($product['product_supplier_reference'])}{l s='Ref Supplier:'} {$product['product_supplier_reference']}{/if}     @@ -90,7 +90,7 @@ - - {$customization['quantity']} + {$customization['quantity']} {if $can_edit}