A merger avec stable 3.0 pour les fichiers 1.0.1.php et 3.0.1.php

Quand on upgrade directement en 3.1, le panel change de répertoire, il faut pouvoir gérer les deux.
This commit is contained in:
Alan Garcia 2013-03-03 11:51:23 +00:00
parent 22ed77527c
commit a981feac88
3 changed files with 24 additions and 13 deletions

View File

@ -7,10 +7,14 @@ if(!function_exists('mysql_connect')) {
exit(1);
}
// we don't check our AlternC session
if(!chdir("/var/alternc/bureau"))
exit(1);
require("/var/alternc/bureau/class/config_nochk.php");
// If we upgrade directly to 3.1 the panel directory change
$panel='';
if(chdir("/usr/share/alternc/panel")) $panel='/usr/share/alternc/panel';
elseif (chdir("/var/alternc/bureau")) $panel='/var/alternc/bureau';
if (empty($panel)) { echo "Problem to load panel library"; exit(1); }
require("$panel/class/config_nochk.php");
// we go super-admin
$admin->enabled=1;
@ -33,4 +37,4 @@ foreach($domains as $v) {
$dom->unlock();
?>
?>

View File

@ -8,11 +8,14 @@ if(!function_exists('mysql_connect')) {
exit(1);
}
// If we upgrade directly to 3.1 the panel directory change
$panel='';
if(chdir("/usr/share/alternc/panel")) $panel='/usr/share/alternc/panel';
elseif (chdir("/var/alternc/bureau")) $panel='/var/alternc/bureau';
// we don't check our AlternC session
if(!chdir("/var/alternc/bureau"))
exit(1);
require("/var/alternc/bureau/class/config_nochk.php");
if (empty($panel)) { echo "Problem to load panel library"; exit(1); }
require("$panel/class/config_nochk.php");
$db2=new DB_System();
// we go super-admin

View File

@ -7,10 +7,14 @@ if(!function_exists('mysql_connect')) {
exit(1);
}
// we don't check our AlternC session
if(!chdir("/usr/share/alternc/panel"))
exit(1);
require("/usr/share/alternc/panel/class/config_nochk.php");
// If we upgrade directly to 3.1 the panel directory change
$panel='';
if(chdir("/usr/share/alternc/panel")) $panel='/usr/share/alternc/panel';
elseif (chdir("/var/alternc/bureau")) $panel='/var/alternc/bureau';
if (empty($panel)) { echo "Problem to load panel library"; exit(1); }
require("$panel/class/config_nochk.php");
$db2=new DB_System();
// we go super-admin