Skip to content
Snippets Groups Projects
Commit f7acd0f5 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: Bad path for instal.lock

parent b315bf3e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/admin/tools/update.php
+ 7
− 8
View file @ f7acd0f5
<?php <?php
/* Copyright (C) 2007-2010 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2007-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -39,7 +39,7 @@ $urldolibarrmodules='http://www.dolistore.com/'; ...@@ -39,7 +39,7 @@ $urldolibarrmodules='http://www.dolistore.com/';
$urldolibarrthemes='http://www.dolistore.com/'; $urldolibarrthemes='http://www.dolistore.com/';
$dolibarrroot=preg_replace('/([\\/]+)$/i','',DOL_DOCUMENT_ROOT); $dolibarrroot=preg_replace('/([\\/]+)$/i','',DOL_DOCUMENT_ROOT);
$dolibarrroot=preg_replace('/([^\\/]+)$/i','',$dolibarrroot); $dolibarrroot=preg_replace('/([^\\/]+)$/i','',$dolibarrroot);
$dolibarrdataroot=preg_replace('/([\\/]+)$/i','',DOL_DATA_ROOT);
/* /*
* Actions * Actions
...@@ -93,10 +93,7 @@ print $langs->trans("CurrentVersion").' : <b>'.DOL_VERSION.'</b><br>'; ...@@ -93,10 +93,7 @@ print $langs->trans("CurrentVersion").' : <b>'.DOL_VERSION.'</b><br>';
print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("FeatureNotYetAvailable").'</b><br>'; print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("FeatureNotYetAvailable").'</b><br>';
print '<br>'; print '<br>';
if ($mesg) dol_htmloutput_errors($mesg);
{
print '<div class="error">'.$mesg.'</div><br>';
}
print $langs->trans("Upgrade").'<br>'; print $langs->trans("Upgrade").'<br>';
print '<hr>'; print '<hr>';
...@@ -107,12 +104,12 @@ print $langs->trans("DownloadPackageFromWebSite",$fullurl).'<br>'; ...@@ -107,12 +104,12 @@ print $langs->trans("DownloadPackageFromWebSite",$fullurl).'<br>';
print '<b>'.$langs->trans("StepNb",2).'</b>: '; print '<b>'.$langs->trans("StepNb",2).'</b>: ';
print $langs->trans("UnpackPackageInDolibarrRoot",$dolibarrroot).'<br>'; print $langs->trans("UnpackPackageInDolibarrRoot",$dolibarrroot).'<br>';
print '<b>'.$langs->trans("StepNb",3).'</b>: '; print '<b>'.$langs->trans("StepNb",3).'</b>: ';
print $langs->trans("RemoveLock",$dolibarrroot.'install.lock').'<br>'; print $langs->trans("RemoveLock",$dolibarrdataroot.'/install.lock').'<br>';
print '<b>'.$langs->trans("StepNb",4).'</b>: '; print '<b>'.$langs->trans("StepNb",4).'</b>: ';
$fullurl='<a href="'.DOL_URL_ROOT.'/install/" target="_blank">'.DOL_URL_ROOT.'/install/</a>'; $fullurl='<a href="'.DOL_URL_ROOT.'/install/" target="_blank">'.DOL_URL_ROOT.'/install/</a>';
print $langs->trans("CallUpdatePage",$fullurl).'<br>'; print $langs->trans("CallUpdatePage",$fullurl).'<br>';
print '<b>'.$langs->trans("StepNb",5).'</b>: '; print '<b>'.$langs->trans("StepNb",5).'</b>: ';
print $langs->trans("RestoreLock",$dolibarrroot.'install.lock').'<br>'; print $langs->trans("RestoreLock",$dolibarrdataroot.'/install.lock').'<br>';
print '<br>'; print '<br>';
print '<br>'; print '<br>';
...@@ -141,4 +138,6 @@ print $langs->trans("SetupIsReadyForUse").'<br>'; ...@@ -141,4 +138,6 @@ print $langs->trans("SetupIsReadyForUse").'<br>';
print '</form>'; print '</form>';
llxFooter(); llxFooter();
$db->close();
?> ?>
\ No newline at end of file
htdocs/langs/en_US/admin.lang
+ 1
− 1
View file @ f7acd0f5
...@@ -38,7 +38,7 @@ SetupArea=Setup area ...@@ -38,7 +38,7 @@ SetupArea=Setup area
FormToTestFileUploadForm=Form to test file upload (according to setup) FormToTestFileUploadForm=Form to test file upload (according to setup)
IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool. RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
RestoreLock=Replace file <b>%s</b>, with read permission only, to disable any usage of update tool. RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
SecuritySetup=Security setup SecuritySetup=Security setup
ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment