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

[-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376

Browse Source
This commit is contained in:
rMalie
2012-01-19 10:14:10 +00:00
parent 60d466b2f7
commit eee9b353c1
82 changed files with 432 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Language.php
+18 -17
View File
@@ -106,7 +106,7 @@ class LanguageCore extends ObjectModel
* Generate traslations files
*
*/
private function _generateFiles($newIso = null)
protected function _generateFiles($newIso = null)
{
$iso_code = $newIso?$newIso:$this->iso_code;
@@ -165,7 +165,7 @@ class LanguageCore extends ObjectModel
* @return array([theme dir] => array('name' => [theme name]))
* @deprecated will be removed in 1.6
*/
private function _getThemesList()
protected function _getThemesList()
{
Tools::displayAsDeprecated();
static $themes = array();
@@ -204,7 +204,7 @@ class LanguageCore extends ObjectModel
public function checkFiles()
{
return self::checkFilesWithIsoCode($this->iso_code);
return Language::checkFilesWithIsoCode($this->iso_code);
}
@@ -218,9 +218,10 @@ class LanguageCore extends ObjectModel
*/
public static function checkFilesWithIsoCode($iso_code)
{
if (isset(self::$_checkedLangs[$iso_code]) AND self::$_checkedLangs[$iso_code])
if (isset(self::$_checkedLangs[$iso_code]) && self::$_checkedLangs[$iso_code])
return true;
foreach (array_keys(self::getFilesList($iso_code, _THEME_NAME_, false, false, false, true)) as $key)
foreach (array_keys(Language::getFilesList($iso_code, _THEME_NAME_, false, false, false, true)) as $key)
if (!file_exists($key))
return false;
self::$_checkedLangs[$iso_code] = true;
@@ -390,7 +391,7 @@ class LanguageCore extends ObjectModel
if ($file != '.' && $file != '..')
{
if (is_dir($dir.'/'.$file))
self::recurseDeleteDir($dir.'/'.$file);
Language::recurseDeleteDir($dir.'/'.$file);
elseif (file_exists($dir.'/'.$file))
@unlink($dir.'/'.$file);
}
@@ -402,7 +403,7 @@ class LanguageCore extends ObjectModel
public function delete()
{
if (empty($this->iso_code))
$this->iso_code = self::getIsoById($this->id);
$this->iso_code = Language::getIsoById($this->id);
// Database translations deletion
$result = Db::getInstance()->executeS('SHOW TABLES FROM `'._DB_NAME_.'`');
@@ -418,30 +419,30 @@ class LanguageCore extends ObjectModel
Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'search_word WHERE id_lang = '.(int)($this->id));
// Files deletion
foreach (self::getFilesList($this->iso_code, _THEME_NAME_, false, false, false, true, true) as $key => $file)
foreach (Language::getFilesList($this->iso_code, _THEME_NAME_, false, false, false, true, true) as $key => $file)
if (file_exists($key))
unlink($key);
$modList = scandir(_PS_MODULE_DIR_);
foreach ($modList as $mod)
{
self::recurseDeleteDir(_PS_MODULE_DIR_.$mod.'/mails/'.$this->iso_code);
Language::recurseDeleteDir(_PS_MODULE_DIR_.$mod.'/mails/'.$this->iso_code);
$files = @scandir(_PS_MODULE_DIR_.$mod.'/mails/');
if (count($files) <= 2)
self::recurseDeleteDir(_PS_MODULE_DIR_.$mod.'/mails/');
Language::recurseDeleteDir(_PS_MODULE_DIR_.$mod.'/mails/');
if(file_exists(_PS_MODULE_DIR_.$mod.'/'.$this->iso_code.'.php'))
{
unlink(_PS_MODULE_DIR_.$mod.'/'.$this->iso_code.'.php');
$files = @scandir(_PS_MODULE_DIR_.$mod);
if (count($files) <= 2)
self::recurseDeleteDir(_PS_MODULE_DIR_.$mod);
Language::recurseDeleteDir(_PS_MODULE_DIR_.$mod);
}
}
if (file_exists(_PS_MAIL_DIR_.$this->iso_code))
self::recurseDeleteDir(_PS_MAIL_DIR_.$this->iso_code);
Language::recurseDeleteDir(_PS_MAIL_DIR_.$this->iso_code);
if (file_exists(_PS_TRANSLATIONS_DIR_.$this->iso_code))
self::recurseDeleteDir(_PS_TRANSLATIONS_DIR_.$this->iso_code);
Language::recurseDeleteDir(_PS_TRANSLATIONS_DIR_.$this->iso_code);
if (!parent::delete())
return false;
@@ -488,7 +489,7 @@ class LanguageCore extends ObjectModel
public static function getLanguages($active = true, $id_shop = false)
{
if (!self::$_LANGUAGES)
self::loadLanguages();
Language::loadLanguages();
$languages = array();
foreach (self::$_LANGUAGES AS $language)
@@ -641,13 +642,13 @@ class LanguageCore extends ObjectModel
fclose($file);
}
else
self::_copyNoneFlag($insert_id);
Language::_copyNoneFlag($insert_id);
}
else
self::_copyNoneFlag($insert_id);
Language::_copyNoneFlag($insert_id);
}
else
self::_copyNoneFlag($insert_id);
Language::_copyNoneFlag($insert_id);
$files_copy = array('/en.jpg', '/en-default-thickbox.jpg', '/en-default-home.jpg', '/en-default-large.jpg', '/en-default-medium.jpg', '/en-default-small.jpg', '/en-default-large_scene.jpg');
$tos = array(_PS_CAT_IMG_DIR_, _PS_MANU_IMG_DIR_, _PS_PROD_IMG_DIR_, _PS_SUPP_IMG_DIR_);