lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Procdure de test connexion base webcalendar plus binde.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-07-09 23:31:10 +00:00
parent 84ea640481
commit 6071ad5264
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
htdocs/admin/webcalendar.php
View File

@ -52,13 +52,13 @@ $phpwebcalendar_user=trim($_POST["phpwebcalendar_user"]);
$phpwebcalendar_pass=trim($_POST["phpwebcalendar_pass"]); $phpwebcalendar_pass=trim($_POST["phpwebcalendar_pass"]);
$phpwebcalendar_pass2=trim($_POST["phpwebcalendar_pass2"]); $phpwebcalendar_pass2=trim($_POST["phpwebcalendar_pass2"]);
$phpwebcalendar_syncro=trim($_POST["phpwebcalendar_syncro"]); $phpwebcalendar_syncro=trim($_POST["phpwebcalendar_syncro"]);
$actionsave=$_POST["save"];
$actiontest=$_POST["test"]; $actiontest=$_POST["test"];
$actionsave=$_POST["save"];
// Test saisie mot de passe // Test saisie mot de passe
if ($phpwebcalendar_pass != $phpwebcalendar_pass2) if ($phpwebcalendar_pass != $phpwebcalendar_pass2)
{ {
$ok="<font class=\"error\">".$langs->trans("ErrorPasswordDiffers")."</font>"; $ok="<div class=\"error\">".$langs->trans("ErrorPasswordDiffers")."</div>";
} }
// Positionne la variable pour le test d'affichage de l'icone // Positionne la variable pour le test d'affichage de l'icone
elseif ($actionsave) elseif ($actionsave)
@ -105,13 +105,16 @@ elseif ($actionsave)
} }
} }
if (! $phpwebcalendar_url) { $phpwebcalendar_url=PHPWEBCALENDAR_URL; } if (! $actiontest && ! $actionsave)
if (! $phpwebcalendar_host) { $phpwebcalendar_host=PHPWEBCALENDAR_HOST; } {
if (! $phpwebcalendar_dbname) { $phpwebcalendar_dbname=PHPWEBCALENDAR_DBNAME; } if (! $phpwebcalendar_url) { $phpwebcalendar_url=PHPWEBCALENDAR_URL; }
if (! $phpwebcalendar_user) { $phpwebcalendar_user=PHPWEBCALENDAR_USER; } if (! $phpwebcalendar_host) { $phpwebcalendar_host=PHPWEBCALENDAR_HOST; }
if (! $phpwebcalendar_pass) { $phpwebcalendar_pass=PHPWEBCALENDAR_PASS; } if (! $phpwebcalendar_dbname) { $phpwebcalendar_dbname=PHPWEBCALENDAR_DBNAME; }
if (! $phpwebcalendar_pass2) { $phpwebcalendar_pass2=PHPWEBCALENDAR_PASS; } if (! $phpwebcalendar_user) { $phpwebcalendar_user=PHPWEBCALENDAR_USER; }
if (! $phpwebcalendar_syncro) { $phpwebcalendar_syncro=PHPWEBCALENDAR_SYNCRO; } if (! $phpwebcalendar_pass) { $phpwebcalendar_pass=PHPWEBCALENDAR_PASS; }
if (! $phpwebcalendar_pass2) { $phpwebcalendar_pass2=PHPWEBCALENDAR_PASS; }
if (! $phpwebcalendar_syncro) { $phpwebcalendar_syncro=PHPWEBCALENDAR_SYNCRO; }
}
/** /**
@ -167,27 +170,46 @@ print "</form>\n";
clearstatcache(); clearstatcache();
if ($ok) print "<br>$ok<br>"; if ($ok) print "<br>$ok<br>";
print "<br>";
// Test de la connection a la database webcalendar // Test de la connection a la database webcalendar
if ($actiontest && ($phpwebcalendar_pass == $phpwebcalendar_pass2)) if ($actiontest && ($phpwebcalendar_pass == $phpwebcalendar_pass2))
{ {
// Test connexion
$webcal = new DoliDb('',$phpwebcalendar_host,$phpwebcalendar_user,$phpwebcalendar_pass,$phpwebcalendar_dbname); $webcal = new DoliDb('',$phpwebcalendar_host,$phpwebcalendar_user,$phpwebcalendar_pass,$phpwebcalendar_dbname);
if ($webcal->connected == 1 && $webcal->database_selected == 1) if ($webcal->connected == 1 && $webcal->database_selected == 1)
{ {
print "<br><font class=\"ok\">".$langs->trans("WebCalTestOk",$phpwebcalendar_host,$phpwebcalendar_dbname,$phpwebcalendar_user)."</font><br>"; // Vérifie si bonne base
$sql="SELECT cal_value FROM webcal_config WHERE cal_setting='application_name'";
$resql=$webcal->query($sql);
if ($resql) {
$mesg ="<div class=\"ok\">".$langs->trans("WebCalTestOk",$phpwebcalendar_host,$phpwebcalendar_dbname,$phpwebcalendar_user);
$mesg.="</div>";
}
else {
$mesg ="<div class=\"error\">".$langs->trans("ErrorConnectOkButWrongDatabase");
$mesg.=$webcal->error;
$mesg.="</div>";
}
$webcal->close(); $webcal->close();
} }
elseif ($webcal->connected == 1) elseif ($webcal->connected == 1 && $webcal->database_selected != 1)
{ {
print "<br><font class=\"error\">".$langs->trans("WebCalTestKo1",$phpwebcalendar_host,$phpwebcalendar_dbname)."</font><br>"; $mesg ="<div class=\"error\">".$langs->trans("WebCalTestKo1",$phpwebcalendar_host,$phpwebcalendar_dbname);
$mesg.="<br>".$webcal->error;
$mesg.="</div>";
$webcal->close(); $webcal->close();
} }
else else
{ {
print "<br><font class=\"error\">".$langs->trans("WebCalTestKo2",$phpwebcalendar_host,$phpwebcalendar_user)."</font><br>"; $mesg ="<div class=\"error\">".$langs->trans("WebCalTestKo2",$phpwebcalendar_host,$phpwebcalendar_user);
$mesg.="<br>".$webcal->error;
$mesg.="</div>";
} }
print $mesg;
} }