'.$this->l('You already have the last version.').''; - } + } - if (Configuration::get('PS_SHOP_ENABLE')) - { - $srcShopStatus = '../img/admin/disabled.gif'; - $label = $this->l('No'); - } - else - { - $srcShopStatus = '../img/admin/enabled.gif'; - $label = $this->l('Yes'); - } + if (Configuration::get('PS_SHOP_ENABLE')) + { + $srcShopStatus = '../img/admin/disabled.gif'; + $label = $this->l('No'); + } + else + { + $srcShopStatus = '../img/admin/enabled.gif'; + $label = $this->l('Yes'); + } if (method_exists('Tools','getAdminTokenLite')) $token_preferences = Tools::getAdminTokenLite('AdminPreferences'); else $token_preferences = Tools14::getAdminTokenLite('AdminPreferences'); - $content .= ''.$this->l('Shop desactivated').' : '.'
'; - $max_exec_time = ini_get('max_execution_time'); - if ($max_exec_time == 0) - $srcExecTime = '../img/admin/enabled.gif'; - else - $srcExecTime = '../img/admin/warning.gif'; + $content .= ''.$this->l('Shop deactivated').' : '.'
'; + $max_exec_time = ini_get('max_execution_time'); + if ($max_exec_time == 0) + $srcExecTime = '../img/admin/enabled.gif'; + else + $srcExecTime = '../img/admin/warning.gif'; $content .= ''.$this->l('PHP time limit').' : '.'
'; if ($testConfigDone = (Configuration::get('PS_AUTOUP_DONT_SAVE_IMAGES') !== false)) - $configurationDone = '../img/admin/enabled.gif'; - else - $configurationDone = '../img/admin/disabled.gif'; + $configurationDone = '../img/admin/enabled.gif'; + else + $configurationDone = '../img/admin/disabled.gif'; $content .= ''.$this->l('Options chosen').' : '.'
'; + $content .= '
'; - $content .= ''; if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_ AND $this->manualMode) @@ -1780,6 +1772,15 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where public function display() { + /* PrestaShop demo mode */ + if (_PS_MODE_DEMO_) + { + echo '
'.Tools::displayError('This functionnality has been disabled.').'
';
+ return;
+ }
+ /* PrestaShop demo mode*/
+
+
if(isset($_GET['refreshCurrentVersion']))
{
$upgrader = new Upgrader();
@@ -1823,10 +1824,10 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
// @todo manual upload with a form
// We need jquery 1.6 for json
- echo '
- ';
+ echo '
+ ';
echo '';
echo '';
@@ -1881,12 +1882,12 @@ function addQuickInfo(arrQuickInfo){
}
}';
- if ($this->manualMode)
- $js .= 'var manualMode = true;';
- else
- $js .= 'var manualMode = false;';
+ if ($this->manualMode)
+ $js .= 'var manualMode = true;';
+ else
+ $js .= 'var manualMode = false;';
- $js .= '
+ $js .= '
var firstTimeParams = '.$this->buildAjaxResult().';
firstTimeParams = firstTimeParams.nextParams;
firstTimeParams.firstTime = "1";
@@ -1967,15 +1968,15 @@ function handleXMLResult(xmlRet, previousParams)
if (result == "ok")
{
nextParams = previousParams;
- nextParams.upgradeDbStep = parseInt(previousParams.upgradeDbStep)+1;
- if(nextParams.upgradeDbStep >= 4)
- {
- resGlobal.next = "upgradeComplete";
- nextParams.typeResult = "json";
- }
- else
- resGlobal.next = "upgradeDb";
- resGlobal = {next:resGlobal.next,nextParams:nextParams,status:"ok"};
+ nextParams.upgradeDbStep = parseInt(previousParams.upgradeDbStep)+1;
+ if(nextParams.upgradeDbStep >= 4)
+ {
+ resGlobal.next = "upgradeComplete";
+ nextParams.typeResult = "json";
+ }
+ else
+ resGlobal.next = "upgradeDb";
+ resGlobal = {next:resGlobal.next,nextParams:nextParams,status:"ok"};
}
else
@@ -2049,7 +2050,7 @@ function doAjaxRequest(action, nextParams){
myNext = nextParams;
req = $.ajax({
type:"POST",
- url : "'.($this->standalone? __PS_BASE_URI__ . trim($this->adminDir,DIRECTORY_SEPARATOR).'/autoupgrade/ajax-upgradetab.php' : str_replace('index','ajax-tab',$currentIndex)).'",
+ url : "'. __PS_BASE_URI__ .trim($this->adminDir,DIRECTORY_SEPARATOR).'/autoupgrade/ajax-upgradetab.php'.'",
async: true,
data : {
dir:"'.trim($this->adminDir,DIRECTORY_SEPARATOR).'",
@@ -2148,7 +2149,7 @@ function prepareNextButton(button_selector, nextParams)
';
if (defined('_PS_MODE_DEV_') AND _PS_MODE_DEV_)
$js .= 'addQuickInfo(["[DEV] request : "+$(this).attr("id")]);';
- $js .= '
+ $js .= '
action = button_selector.substr(1);
res = doAjaxRequest(action, nextParams);
});
@@ -2195,7 +2196,7 @@ function handleError(res)
// display error message in the main process thing
updateInfoStep(res.nextDesc);
addQuickInfo(res.nextQuickInfo);
- // In case the rollback button has been desactivated, just re-enable it
+ // In case the rollback button has been deactivated, just re-enable it
prepareNextButton("#rollback",res.nextParams);
// ask if you want to rollback
// @TODO !!!
@@ -2225,7 +2226,7 @@ function handleError(res)
}';
-$js.= '$(document).ready(function(){
+ $js.= '$(document).ready(function(){
$.ajax({
type:"POST",
url : "'. __PS_BASE_URI__ . trim($this->adminDir,DIRECTORY_SEPARATOR).'/autoupgrade/ajax-upgradetab.php",
@@ -2241,13 +2242,13 @@ $js.= '$(document).ready(function(){
{
res = $.parseJSON(res);
answer = res.nextParams;
- $("#checkPrestaShopFilesVersion").html(""+answer.msg+" ");
+ $("#checkPrestaShopFilesVersion").html(" "+answer.msg+" ");
if (answer.status == "error")
$("#checkPrestaShopFilesVersion").prepend("![](\"../img/admin/warning.gif\")
");
else
{
$("#checkPrestaShopFilesVersion").prepend(" ");
- $("#checkPrestaShopFilesVersion").append("'.$this->l('See or hide the list').'"); + $("#checkPrestaShopFilesVersion").append("'.$this->l('See or hide the list').'
"); $("#checkPrestaShopFilesVersion").append("