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

// Release branch merged

Browse Source
This commit is contained in:
François Gaillard
2013-04-25 17:00:56 +02:00
parent f0da3fa2ae 056709f2dd
commit 6106066ef1
53 changed files with 1086 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImagesController.php
+17 -11
View File
@@ -28,6 +28,7 @@ class AdminImagesControllerCore extends AdminController
{
protected $start_time = 0;
protected $max_execution_time = 7200;
protected $display_move;
public function __construct()
{
@@ -50,6 +51,9 @@ class AdminImagesControllerCore extends AdminController
'scenes' => array('title' => $this->l('Scenes'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
'stores' => array('title' => $this->l('Stores'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false)
);
// No need to display the old image system if the install has been made later than 2013-03-26
$this->display_move = (defined('_PS_CREATION_DATE_') && strtotime(_PS_CREATION_DATE_) > strtotime('2013-03-26')) ? false : true;
$this->fields_options = array(
'images' => array(
@@ -141,20 +145,22 @@ class AdminImagesControllerCore extends AdminController
'type' => 'text',
'height' => 'px',
'visibility' => Shop::CONTEXT_ALL
),
'PS_LEGACY_IMAGES' => array(
'title' => $this->l('Use the legacy image filesystem'),
'desc' => $this->l('This should be set to yes unless you successfully moved images in "Images" page under the "Preferences" menu.'),
'validation' => 'isBool',
'cast' => 'intval',
'required' => false,
'type' => 'bool',
'visibility' => Shop::CONTEXT_ALL
),
)
),
'submit' => array('title' => $this->l('Save '), 'class' => 'button'),
),
);
if ($this->display_move)
$this->fields_options['product_images']['fields']['PS_LEGACY_IMAGES'] = array(
'title' => $this->l('Use the legacy image filesystem'),
'desc' => $this->l('This should be set to yes unless you successfully moved images in "Images" page under the "Preferences" menu.'),
'validation' => 'isBool',
'cast' => 'intval',
'required' => false,
'type' => 'bool',
'visibility' => Shop::CONTEXT_ALL
);
$this->fields_form = array(
'legend' => array(
@@ -670,7 +676,7 @@ class AdminImagesControllerCore extends AdminController
$this->context->smarty->assign(array(
'display_regenerate' => true,
'display_move' => true
'display_move' => $this->display_move
));
}
controllers/admin/AdminTranslationsController.php
+80 -69
View File
@@ -52,9 +52,6 @@ class AdminTranslationsControllerCore extends AdminController
/** @var array : List of theme by translation type : FRONT, BACK, ERRORS... */
protected $translations_informations = array();
/** @var array : List of theme by translation type : FRONT, BACK, ERRORS... */
protected $translations_type_for_theme = array('front', 'modules', 'pdf', 'mails');
/** @var array : List of all languages */
protected $languages;
@@ -199,7 +196,6 @@ class AdminTranslationsControllerCore extends AdminController
'token' => $this->token,
'languages' => $this->languages,
'translations_type' => $this->translations_informations,
'translations_type_for_theme' => $this->translations_type_for_theme,
'packs_to_install' => $packs_to_install,
'packs_to_update' => $packs_to_update,
'url_submit' => self::$currentIndex.'&token='.$this->token,
@@ -761,7 +757,7 @@ class AdminTranslationsControllerCore extends AdminController
$this->errors[] = sprintf(Tools::displayError('Cannot delete the archive %s.'), $file);
}
else
$this->errors[] = Tools::displayError('The server does not have permissions for writing.'. ' '.sprintf(Tools::displayError('Please check rights for %s'), dirname($file)));
$this->errors[] = Tools::displayError('The server does not have permissions for writing.').' '.sprintf(Tools::displayError('Please check rights for %s'), dirname($file));
}
else
$this->errors[] = Tools::displayError('Language not found.');
@@ -788,14 +784,13 @@ class AdminTranslationsControllerCore extends AdminController
static $str_write = '';
static $array_check_duplicate = array();
// Default translations and Prestashop overriding themes are distinguish
$is_default = $theme_name === self::DEFAULT_THEME_NAME ? true : false;
// Set file_name in static var, this allow to open and wright the file just one time
if (!isset($cache_file[$theme_name.'-'.$file_name]))
{
$str_write = '';
$cache_file[$theme_name.'-'.$file_name] = true;
if (!Tools::file_exists_cache(dirname($file_name)))
mkdir(dirname($file_name), 0777, true);
if (!Tools::file_exists_cache($file_name))
file_put_contents($file_name, '');
if (!is_writable($file_name))
@@ -811,10 +806,10 @@ class AdminTranslationsControllerCore extends AdminController
foreach ($files as $file)
{
if (preg_match('/^(.*).(tpl|php)$/', $file) && Tools::file_exists_cache($file_path = $dir.$file) && !in_array($file, self::$ignore_folder))
if (preg_match('/^(.*).(tpl|php)$/', $file) && Tools::file_exists_cache($dir.$file) && !in_array($file, self::$ignore_folder))
{
// Get content for this file
$content = file_get_contents($file_path);
$content = file_get_contents($dir.$file);
// Get file type
$type_file = substr($file, -4) == '.tpl' ? 'tpl' : 'php';
@@ -827,16 +822,16 @@ class AdminTranslationsControllerCore extends AdminController
foreach ($matches as $key)
{
if ($is_default)
{
$post_key = md5(strtolower($module_name).'_'.self::DEFAULT_THEME_NAME.'_'.strtolower($template_name).'_'.md5($key));
$pattern = '\'<{'.strtolower($module_name).'}prestashop>'.strtolower($template_name).'_'.md5($key).'\'';
}
else
if ($theme_name)
{
$post_key = md5(strtolower($module_name).'_'.strtolower($theme_name).'_'.strtolower($template_name).'_'.md5($key));
$pattern = '\'<{'.strtolower($module_name).'}'.strtolower($theme_name).'>'.strtolower($template_name).'_'.md5($key).'\'';
}
else
{
$post_key = md5(strtolower($module_name).'_'.strtolower($template_name).'_'.md5($key));
$pattern = '\'<{'.strtolower($module_name).'}prestashop>'.strtolower($template_name).'_'.md5($key).'\'';
}
if (array_key_exists($post_key, $_POST) && !empty($_POST[$post_key]) && !in_array($pattern, $array_check_duplicate))
{
@@ -900,9 +895,6 @@ class AdminTranslationsControllerCore extends AdminController
// added for compatibility
$GLOBALS[$name_var] = array_change_key_case($GLOBALS[$name_var]);
// Default translations and Prestashop overriding themes are distinguish
$is_default = $theme_name === self::DEFAULT_THEME_NAME ? true : false;
// Thank to this var similar keys are not duplicate
// in AndminTranslation::modules_translations array
// see below
@@ -929,19 +921,22 @@ class AdminTranslationsControllerCore extends AdminController
foreach ($matches as $key)
{
$module_key = '<{'.Tools::strtolower($module_name).'}'.
strtolower($is_default ? 'prestashop' : $theme_name).'>'.Tools::strtolower($template_name).'_'.md5($key);
$md5_key = md5($key);
$module_key = '<{'.Tools::strtolower($module_name).'}'.strtolower($theme_name).'>'.Tools::strtolower($template_name).'_'.$md5_key;
$default_key = '<{'.Tools::strtolower($module_name).'}prestashop>'.Tools::strtolower($template_name).'_'.$md5_key;
// to avoid duplicate entry
if (!in_array($module_key, $array_check_duplicate))
{
$array_check_duplicate[] = $module_key;
if (!isset($this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad']))
$this->total_expression++;
if (array_key_exists($module_key, $GLOBALS[$name_var]))
if ($theme_name && array_key_exists($module_key, $GLOBALS[$name_var]))
$this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'] = html_entity_decode($GLOBALS[$name_var][$module_key], ENT_COMPAT, 'UTF-8');
elseif (array_key_exists($default_key, $GLOBALS[$name_var]))
$this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'] = html_entity_decode($GLOBALS[$name_var][$default_key], ENT_COMPAT, 'UTF-8');
else
{
//d(array($module_key, $default_key, $key, $GLOBALS[$name_var]));
$this->modules_translations[$theme_name][$module_name][$template_name][$key]['trad'] = '';
$this->missing_translations++;
}
@@ -1128,7 +1123,7 @@ class AdminTranslationsControllerCore extends AdminController
'front' => array(
'name' => $this->l('Front Office translations'),
'var' => '_LANG',
'dir' => _PS_THEME_SELECTED_DIR_.'lang/',
'dir' => defined('_PS_THEME_SELECTED_DIR_') ? _PS_THEME_SELECTED_DIR_.'lang/' : '',
'file' => $this->lang_selected->iso_code.'.php'
),
'back' => array(
@@ -1153,33 +1148,28 @@ class AdminTranslationsControllerCore extends AdminController
'name' => $this->l('Installed modules translations'),
'var' => '_MODULES',
'dir' => _PS_MODULE_DIR_,
'file' => '',
'override' => array(
'dir' => _PS_THEME_SELECTED_DIR_.'modules/',
'file' => ''
)
'file' => ''
),
'pdf' => array(
'name' => $this->l('PDF translations'),
'var' => '_LANGPDF',
'dir' => _PS_TRANSLATIONS_DIR_.$this->lang_selected->iso_code.'/',
'file' => 'pdf.php',
'override' => array(
'dir' => _PS_THEME_SELECTED_DIR_.'pdf/lang/',
'file' => $this->lang_selected->iso_code.'.php'
)
'file' => 'pdf.php'
),
'mails' => array(
'name' => $this->l('Email templates translations'),
'var' => '_LANGMAIL',
'dir' => _PS_MAIL_DIR_.$this->lang_selected->iso_code.'/',
'file' => 'lang.php',
'override' => array(
'dir' => _PS_THEME_SELECTED_DIR_.'mails/'.$this->lang_selected->iso_code.'/',
'file' => 'lang.php'
)
'file' => 'lang.php'
)
);
if (defined('_PS_THEME_SELECTED_DIR_'))
{
$this->translations_informations['modules']['override'] = array('dir' => _PS_THEME_SELECTED_DIR_.'modules/', 'file' => '');
$this->translations_informations['pdf']['override'] = array('dir' => _PS_THEME_SELECTED_DIR_.'pdf/lang/', 'file' => $this->lang_selected->iso_code.'.php');
$this->translations_informations['mails']['override'] = array('dir' => _PS_THEME_SELECTED_DIR_.'mails/'.$this->lang_selected->iso_code.'/', 'file' => 'lang.php');
}
}
/**
@@ -1200,20 +1190,15 @@ class AdminTranslationsControllerCore extends AdminController
// Get folder name of theme
if (($theme = Tools::getValue('theme')) && !is_array($theme))
{
$theme_exists = false;
foreach ($this->themes as $existing_theme)
if ($existing_theme->directory == $theme)
$theme_exists = true;
if ($theme_exists)
$this->theme_selected = Tools::safeOutput($theme);
else
$theme_exists = $this->theme_exists($theme);
if (!$theme_exists)
throw new PrestaShopException(sprintf(Tools::displayError('Invalid theme "%s"'), $theme));
$this->theme_selected = Tools::safeOutput($theme);
}
else
$this->theme_selected = self::DEFAULT_THEME_NAME;
// Set the path of selected theme
define('_PS_THEME_SELECTED_DIR_', _PS_ROOT_DIR_.'/themes/'.$this->theme_selected.'/');
if ($this->theme_selected)
define('_PS_THEME_SELECTED_DIR_', _PS_ROOT_DIR_.'/themes/'.$this->theme_selected.'/');
// Get type of translation
if (($type = Tools::getValue('type')) && !is_array($type))
@@ -1294,7 +1279,7 @@ class AdminTranslationsControllerCore extends AdminController
{
if ($this->tabAccess['edit'] === '1')
// Only the PrestaShop team should write the translations into the _PS_TRANSLATIONS_DIR_
if (($this->theme_selected == self::DEFAULT_THEME_NAME) && _PS_MODE_DEV_)
if (!$this->theme_selected)
$this->writeTranslationFile();
else
$this->writeTranslationFile(true);
@@ -1339,7 +1324,7 @@ class AdminTranslationsControllerCore extends AdminController
{
// Get files of all modules
$arr_files = $this->getAllModuleFiles($modules, null, $this->lang_selected->iso_code, true);
// Find and write all translation modules files
foreach ($arr_files as $value)
$this->findAndWriteTranslationsIntoFile($value['file_name'], $value['files'], $value['theme'], $value['module'], $value['dir']);
@@ -1409,7 +1394,7 @@ class AdminTranslationsControllerCore extends AdminController
$arr_mail_content['core_mail'] = Tools::getValue('core_mail');
// Get path of directory for find a good path of translation file
if ($this->theme_selected == self::DEFAULT_THEME_NAME && _PS_MODE_DEV_)
if (!$this->theme_selected)
$arr_mail_path['core_mail'] = $this->translations_informations[$this->type_selected]['dir'];
else
$arr_mail_path['core_mail'] = $this->translations_informations[$this->type_selected]['override']['dir'];
@@ -1420,7 +1405,7 @@ class AdminTranslationsControllerCore extends AdminController
$arr_mail_content['module_mail'] = Tools::getValue('module_mail');
// Get path of directory for find a good path of translation file
if ($this->theme_selected == self::DEFAULT_THEME_NAME && _PS_MODE_DEV_)
if (!$this->theme_selected)
$arr_mail_path['module_mail'] = $this->translations_informations['modules']['dir'].'{module}/mails/'.$this->lang_selected->iso_code.'/';
else
$arr_mail_path['module_mail'] = $this->translations_informations['modules']['override']['dir'].'{module}/mails/'.$this->lang_selected->iso_code.'/';
@@ -1601,6 +1586,12 @@ class AdminTranslationsControllerCore extends AdminController
*/
public function initFormFront()
{
if (!$this->theme_exists(Tools::getValue('theme')))
{
$this->errors[] = sprintf(Tools::displayError('Invalid theme "%s"'), Tools::getValue('theme'));
return;
}
$missing_translations_front = array();
$name_var = $this->translations_informations[$this->type_selected]['var'];
$GLOBALS[$name_var] = $this->fileExists();
@@ -2300,7 +2291,7 @@ class AdminTranslationsControllerCore extends AdminController
if (!in_array($module_dir, self::$ignore_folder))
{
$dir = false;
if (($this->theme_selected != self::DEFAULT_THEME_NAME || !_PS_MODE_DEV_) && Tools::file_exists_cache($this->translations_informations['modules']['override']['dir'].$module_dir.'/mails/'))
if ($this->theme_selected && Tools::file_exists_cache($this->translations_informations['modules']['override']['dir'].$module_dir.'/mails/'))
$dir = $this->translations_informations['modules']['override']['dir'].$module_dir.'/';
elseif (Tools::file_exists_cache($this->translations_informations['modules']['dir'].$module_dir.'/mails/'))
$dir = $this->translations_informations['modules']['dir'].$module_dir.'/';
@@ -2359,7 +2350,7 @@ class AdminTranslationsControllerCore extends AdminController
$subject_mail = $this->getSubjectMail($dir, $file, $subject_mail);
// Get path of directory for find a good path of translation file
if (($this->theme_selected != self::DEFAULT_THEME_NAME || !_PS_MODE_DEV_) && @filemtime($this->translations_informations[$this->type_selected]['override']['dir']))
if ($this->theme_selected && @filemtime($this->translations_informations[$this->type_selected]['override']['dir']))
$i18n_dir = $this->translations_informations[$this->type_selected]['override']['dir'];
else
$i18n_dir = $this->translations_informations[$this->type_selected]['dir'];
@@ -2534,28 +2525,37 @@ class AdminTranslationsControllerCore extends AdminController
$root_dir = $initial_root_dir;
if ($module{0} == '.')
continue;
// Get path of directory for find a good path of translation file
if ($root_dir == null)
{
$i18n_dir = $this->translations_informations[$this->type_selected]['override']['dir'];
if (is_dir($i18n_dir.$module))
$root_dir = $i18n_dir;
}
// First we load the default translation file
if ($root_dir == null)
{
$i18n_dir = $this->translations_informations[$this->type_selected]['dir'];
if (is_dir($i18n_dir.$module))
$root_dir = $i18n_dir;
}
if (is_dir($root_dir.$module))
{
if (Tools::file_exists_cache($root_dir.$module.'/translations/'.$lang.'.php'))
$lang_file = $root_dir.$module.'/translations/'.$lang.'.php';
else
$lang_file = $root_dir.$module.'/translations/'.$lang.'.php';
if (!Tools::file_exists_cache($root_dir.$module.'/translations/'.$lang.'.php') && Tools::file_exists_cache($root_dir.$module.'/'.$lang.'.php'))
$lang_file = $root_dir.$module.'/'.$lang.'.php';
@include($lang_file);
$this->getModuleTranslations();
// If a theme is selected, then the destination translation file must be in the theme
if ($this->theme_selected)
$lang_file = $this->translations_informations[$this->type_selected]['override']['dir'].$module.'/translations/'.$lang.'.php';
$this->recursiveGetModuleFiles($root_dir.$module.'/', $array_files, $module, $lang_file, $is_default);
}
$root_dir = $initial_root_dir;
// Then we load the overriden translation file
if ($this->theme_selected && isset($this->translations_informations[$this->type_selected]['override']))
{
$i18n_dir = $this->translations_informations[$this->type_selected]['override']['dir'];
if (is_dir($i18n_dir.$module))
$root_dir = $i18n_dir;
if (Tools::file_exists_cache($root_dir.$module.'/translations/'.$lang.'.php'))
$lang_file = $root_dir.$module.'/translations/'.$lang.'.php';
elseif (Tools::file_exists_cache($root_dir.$module.'/'.$lang.'.php'))
$lang_file = $root_dir.$module.'/'.$lang.'.php';
@include($lang_file);
$this->getModuleTranslations();
$this->recursiveGetModuleFiles($root_dir.$module.'/', $array_files, $module, $lang_file, $is_default);
}
@@ -2641,7 +2641,7 @@ class AdminTranslationsControllerCore extends AdminController
$i18n_dir = $this->translations_informations[$this->type_selected]['dir'];
$default_i18n_file = $i18n_dir.$this->translations_informations[$this->type_selected]['file'];
if (($this->theme_selected == self::DEFAULT_THEME_NAME) && _PS_MODE_DEV_)
if (!$this->theme_selected)
$i18n_file = $default_i18n_file;
else
{
@@ -2736,5 +2736,16 @@ class AdminTranslationsControllerCore extends AdminController
}
return $list;
}
protected function theme_exists($theme)
{
if (!is_array($this->themes))
$this->themes = Theme::getThemes();
$theme_exists = false;
foreach ($this->themes as $existing_theme)
if ($existing_theme->directory == $theme)
return true;
return false;
}
}