diff --git a/modules/autoupgrade/AdminSelfTab.php b/modules/autoupgrade/AdminSelfTab.php
index ef80165c5..2df06e7f7 100644
--- a/modules/autoupgrade/AdminSelfTab.php
+++ b/modules/autoupgrade/AdminSelfTab.php
@@ -390,7 +390,7 @@ abstract class AdminSelfTab
if (get_class($this) == 'Adminemails')
echo '
';
- if (!is_writable(PS_ADMIN_DIR.'/../config/settings.inc.php') AND $name == 'themes')
+ if (!is_writable(_PS_ADMIN_DIR_.'/../config/settings.inc.php') AND $name == 'themes')
echo '
@@ -550,7 +550,7 @@ abstract class AdminSelfTab
$classname = 'Admin'.$subtab;
if ($module = Db::getInstance()->getValue('SELECT `module` FROM `'._DB_PREFIX_.'tab` WHERE `class_name` = \''.pSQL($classname).'\'') AND file_exists(_PS_MODULE_DIR_.'/'.$module.'/'.$classname.'.php'))
include_once(_PS_MODULE_DIR_.'/'.$module.'/'.$classname.'.php');
- elseif (file_exists(PS_ADMIN_DIR.'/tabs/'.$classname.'.php'))
+ elseif (file_exists(_PS_ADMIN_DIR_.'/tabs/'.$classname.'.php'))
include_once('tabs/'.$classname.'.php');
if (!isset($this->_includeObj[$key]))
$this->_includeObj[$key] = new $classname;
diff --git a/modules/autoupgrade/AdminSelfUpgrade.php b/modules/autoupgrade/AdminSelfUpgrade.php
index 105e2ff83..6c318bce0 100644
--- a/modules/autoupgrade/AdminSelfUpgrade.php
+++ b/modules/autoupgrade/AdminSelfUpgrade.php
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA
*/
if(!defined('_PS_ADMIN_DIR_'))
- define('_PS_ADMIN_DIR_',PS_ADMIN_DIR);
+ define('_PS_ADMIN_DIR_', _PS_ADMIN_DIR_);
if(!defined('_PS_USE_SQL_SLAVE_'))
define('_PS_USE_SQL_SLAVE_',false);
@@ -44,7 +44,7 @@ if(empty($_POST['action']) OR !in_array($_POST['action'],array('upgradeDb')))
require_once(dirname(__FILE__).'/AdminSelfTab.php');
require_once(dirname(__FILE__).'/SelfModule.php');
-// Add Upgrader class
+// Add Upgrader class
if(!version_compare(_PS_VERSION_,'1.4.5.0','<') AND file_exists(_PS_ROOT_DIR_.'/classes/Upgrader.php'))
require_once(_PS_ROOT_DIR_.'/classes/Upgrader.php');
else
@@ -70,10 +70,10 @@ class AdminSelfUpgrade extends AdminSelfTab
public $ajax = false;
public $nextResponseType = 'json'; // json, xml
public $next = 'N/A';
-
+
public $upgrader = null;
public $standalone = true;
-
+
/**
* set to false if the current step is a loop
*
@@ -102,12 +102,12 @@ class AdminSelfUpgrade extends AdminSelfTab
'backupDbFilename',
'backupFilesFilename',
-
+
);
public $autoupgradePath = null;
/**
- * autoupgradeDir
- *
+ * autoupgradeDir
+ *
* @var string directory relative to admin dir
*/
public $autoupgradeDir = 'autoupgrade';
@@ -127,7 +127,7 @@ class AdminSelfUpgrade extends AdminSelfTab
private $backupFilesFilename = '';
private $backupDbFilename = '';
-
+
/**
* int loopBackupFiles : if your server has a low memory size, lower this value
* @TODO remove the static, add a const, and use it like this : min(AdminUpgrade::DEFAULT_LOOP_ADD_FILE_TO_ZIP,Configuration::get('LOOP_ADD_FILE_TO_ZIP');
@@ -170,7 +170,7 @@ class AdminSelfUpgrade extends AdminSelfTab
public function createCustomToken()
{
// ajax-mode for autoupgrade, we can't use the classic authentication
- // so, we'll create a cookie in admin dir, based on cookie key
+ // so, we'll create a cookie in admin dir, based on cookie key
global $cookie;
$id_employee = $cookie->id_employee;
@@ -224,7 +224,7 @@ class AdminSelfUpgrade extends AdminSelfTab
/**
* _setFields function to set fields (only when we need it).
- *
+ *
* @return void
*/
private function _setFields()
@@ -263,7 +263,7 @@ class AdminSelfUpgrade extends AdminSelfTab
);
}
}
-
+
public function configOk()
{
$allowed = (ConfigurationTest::test_fopen() && $this->rootWritable);
@@ -274,7 +274,7 @@ class AdminSelfUpgrade extends AdminSelfTab
}
/**
* isUpgradeAllowed checks if all server configuration is valid for upgrade
- *
+ *
* @return void
*/
public function isUpgradeAllowed()
@@ -314,7 +314,7 @@ class AdminSelfUpgrade extends AdminSelfTab
if (!in_array($this->action,array('upgradeFile', 'upgradeDb', 'upgradeComplete','rollback','restoreFiles','restoreDb')))
{
- // checkPSVersion will be not
+ // checkPSVersion will be not
$this->upgrader = new Upgrader();
$this->upgrader->checkPSVersion();
$this->nextParams['install_version'] = $this->upgrader->version_num;
@@ -333,7 +333,7 @@ $this->standalone = true;
}
else
$this->useSvn = false;
-
+
// If not exists in this sessions, "create"
// session handling : from current to next params
@@ -361,7 +361,7 @@ $this->standalone = true;
$this->backupDbFilename = Configuration::get('UPGRADER_BACKUPDB_FILENAME');
if(!file_exists($this->backupDbFilename))
{
- // If not exists, the filename is generated by Backup.php
+ // If not exists, the filename is generated by Backup.php
$this->backupDbFilename = '';
Configuration::updateValue('UPGRADER_BACKUPDB_FILENAME', $this->backupDbFilename);
}
@@ -402,7 +402,7 @@ $this->standalone = true;
$this->manualMode = $this->currentParams['manualMode'];
$this->desactivateCustomModule = $this->currentParams['desactivateCustomModule'];
}
- // We can add any file or directory in the exclude dir : theses files will be not removed or overwritten
+ // We can add any file or directory in the exclude dir : theses files will be not removed or overwritten
// @TODO cache should be ignored recursively, but we have to reconstruct it after upgrade
// - compiled from smarty
// - .svn
@@ -425,18 +425,18 @@ $this->standalone = true;
if ($this->dontBackupImages)
$this->backupIgnoreAbsoluteFiles[] = "/img";
-
-
+
+
if ($this->keepDefaultTheme)
$this->excludeAbsoluteFilesFromUpgrade[] = "/themes/prestashop";
-
+
if ($this->keepTrad)
$this->excludeFilesFromUpgrade[] = "translations";
}
/**
* getFilePath return the path to the zipfile containing prestashop.
- *
+ *
* @return void
*/
private function getFilePath()
@@ -594,13 +594,13 @@ $this->standalone = true;
if ($file[0] != '.')
{
$fullPath = $dir.DIRECTORY_SEPARATOR.$file;
-
+
if (!$this->_skipFile($file, $fullPath,'backup'))
{
if (is_dir($fullPath))
$this->_listBackupFiles($fullPath);
else
- $list[] = $fullPath;
+ $list[] = $fullPath;
}
else
$list[] = $fullPath;
@@ -616,7 +616,7 @@ $this->standalone = true;
foreach ($allFiles as $file)
{
$fullPath = $dir.DIRECTORY_SEPARATOR.$file;
-
+
if (!$this->_skipFile($file, $fullPath, "upgrade"))
{
$list[] = $fullPath;
@@ -698,7 +698,7 @@ $this->standalone = true;
@ini_set('memory_limit','128M');
}
require_once($this->prodRootDir.'/config/autoload.php');
-
+
/* Redefine REQUEST_URI if empty (on some webservers...) */
if (!isset($_SERVER['REQUEST_URI']) || $_SERVER['REQUEST_URI'] == '')
$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'];
@@ -753,7 +753,7 @@ $this->standalone = true;
case 'doUpgrade' :
require_once(INSTALL_PATH.DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'doUpgrade.php');
break;
-
+
case 'getVersionFromDb' :
require_once(INSTALL_PATH.DIRECTORY_SEPARATOR.'xml'.DIRECTORY_SEPARATOR.'getVersionFromDb.php');
break;
@@ -913,7 +913,7 @@ $this->standalone = true;
/**
* ajaxProcessRestoreFiles restore the previously saved files.
- *
+ *
* @return boolean true if succeed
*/
public function ajaxProcessRestoreFiles()
@@ -1015,7 +1015,7 @@ $this->standalone = true;
// @TODO need to check if a ";" in description could block that (I suppose it can at the end of a line)
preg_match_all('/(.*;)[\n\r]+/Usm', $content, $requests);
/* @TODO maybe improve regex pattern ... */
- $db = Db::getInstance();
+ $db = Db::getInstance();
if (count($requests[0])>0)
{
foreach ($requests[1] as $request)
@@ -1062,7 +1062,7 @@ $this->standalone = true;
if(!class_exists('MySQL',false))
eval('Class MySQL extends MySQLCore{}');
}
-
+
if(!class_exists('Validate',false))
{
require_once(_PS_ROOT_DIR_.'/classes/Validate.php');
@@ -1104,7 +1104,7 @@ $this->standalone = true;
if ($res)
{
$this->nextParams['backupDbFilename'] = $backup->id;
- // We need to load configuration to use it ...
+ // We need to load configuration to use it ...
Configuration::loadConfiguration();
Configuration::updateValue('UPGRADER_BACKUPDB_FILENAME', $backup->id);
@@ -1147,12 +1147,12 @@ $this->standalone = true;
//$current = crc32(file_get_contents($file));
//$file = $this->nextParams['filesForBackup'][0];
//$latestFile = str_replace(_PS_ROOT_DIR_,$this->latestRootDir,$file);
-
+
// if (file_exists($latestFile))
// $latest = crc32($latestFile);
// else
// $latest = '';
-
+
$zip = new ZipArchive();
if ($zip->open($this->backupFilesFilename, ZIPARCHIVE::CREATE))
{
@@ -1269,13 +1269,13 @@ $this->standalone = true;
return $resRemove;
}
-
+
public function ajaxProcessSvnCheckout()
{
$this->nextParams = $this->currentParams;
if ($this->useSvn){
$dest = $this->autoupgradePath . DIRECTORY_SEPARATOR . $this->svnDir;
-
+
$svnStatus = svn_status($dest);
if (is_array($svnStatus))
{
@@ -1363,7 +1363,7 @@ $this->standalone = true;
$this->nextParams[$v] = $this->$v;
$return['nextParams'] = $this->nextParams;
-
+
$return['nextParams']['typeResult'] = $this->nextResponseType;
$return['nextQuickInfo'] = $this->nextQuickInfo;
@@ -1383,14 +1383,14 @@ $this->standalone = true;
$this->_errors[] = Tools::displayError('This class depends of several files modified in 1.4.5.0 version and should not be used in an older version');
}
parent::displayConf();
-
+
}
public function ajaxPreProcess()
{
if (!empty($_POST['responseType']) AND $_POST['responseType'] == 'json')
header('Content-Type: application/json');
-
+
if(!empty($_POST['action']))
{
$action = $_POST['action'];
@@ -1424,10 +1424,10 @@ $this->standalone = true;
if(function_exists('apache_get_modules'))
{
static $apacheModuleList = null;
-
+
if (!is_array($apacheModuleList))
$apacheModuleList = apache_get_modules();
-
+
// we need strpos (example can be evasive20
foreach($apacheModuleList as $module)
{
@@ -1437,7 +1437,7 @@ $this->standalone = true;
}
else{
// If apache_get_modules does not exists,
- // one solution should be parsing httpd.conf,
+ // one solution should be parsing httpd.conf,
// but we could simple parse phpinfo(INFO_MODULES) return string
ob_start();
phpinfo(INFO_MODULES);
@@ -1547,7 +1547,7 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
else
$srcRootWritable = '../img/admin/disabled.gif';
echo '
'.$this->l('Root directory status').' : '.'
'.($this->rootWritable?$this->l('fully writable'):$this->l('not writable recursively')).'
';
-
+
if ($this->upgrader->needUpgrade)
{
if ($this->upgrader->autoupgrade)
@@ -1621,19 +1621,19 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
{
echo '
'.$this->l('Your shop is already up to date.').' ';
}
- echo '
'.sprintf($this->l('last datetime check : %s '),date('Y-m-d H:i:s',Configuration::get('PS_LAST_VERSION_CHECK'))).'
+ echo '
'.sprintf($this->l('last datetime check : %s '),date('Y-m-d H:i:s',Configuration::get('PS_LAST_VERSION_CHECK'))).'
'.$this->l('Please click to refresh').'
';
-
+
echo''.$this->l('Your current configuration indicate you want to upgrade your system from the unstable development branch, with no version number. If you upgrade, you will not be able to follow the official release process anymore').'.
';
$this->_displayUpgraderForm();
-
+
echo '