WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

style changes

This commit is contained in:
Roland Gruber 2007-12-31 13:25:09 +00:00
parent 043e381582
commit 2500bf4341
2 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lam/templates/tests/index.php
View File

@ -55,10 +55,10 @@ echo "<h1 align=\"center\">" . _("LAM tests") . "</h1>\n";
echo "<table class=\"userlist\" rules=\"none\">\n"; echo "<table class=\"userlist\" rules=\"none\">\n";
echo "<tr class=\"userlist\"><td style=\"padding:10px;\"><a href=\"lamdaemonTest.php\">" . _("Lamdaemon test") . "&nbsp;&nbsp;</a></td>"; echo "<tr class=\"userlist\"><td style=\"padding:10px;\"><a href=\"lamdaemonTest.php\"><b>" . _("Lamdaemon test") . "</b>&nbsp;&nbsp;</a></td>";
echo "<td style=\"padding:10px;\">" . _("Check if quotas and homedirectories can be managed.") . "</td></tr>"; echo "<td style=\"padding:10px;\">" . _("Check if quotas and homedirectories can be managed.") . "</td></tr>";
echo "<tr class=\"userlist\"><td style=\"padding:10px;\"><a href=\"schemaTest.php\">" . _("Schema test") . "&nbsp;&nbsp;</a></td>"; echo "<tr class=\"userlist\"><td style=\"padding:10px;\"><a href=\"schemaTest.php\"><b>" . _("Schema test") . "</b>&nbsp;&nbsp;</a></td>";
echo "<td style=\"padding:10px;\">" . _("Check if the LDAP schema fits the requirements of the selected account modules.") . "</td></tr>"; echo "<td style=\"padding:10px;\">" . _("Check if the LDAP schema fits the requirements of the selected account modules.") . "</td></tr>";
echo "</table>\n"; echo "</table>\n";

63
lam/templates/tests/lamdaemonTest.php
View File

@ -64,9 +64,11 @@ echo "<h1 align=\"center\">" . _("Lamdaemon test") . "</h1>\n";
* @return boolean true, if errors occured * @return boolean true, if errors occured
*/ */
function lamTestLamdaemon($command, $stopTest, $handle, $testText) { function lamTestLamdaemon($command, $stopTest, $handle, $testText) {
$okImage = "<img src=\"../../graphics/pass.png\" alt=\"\">\n";
$failImage = "<img src=\"../../graphics/fail.png\" alt=\"\">\n";
// run lamdaemon and get user quotas // run lamdaemon and get user quotas
if (!$stopTest) { if (!$stopTest) {
echo "<tr class=\"userlist\">\n<td>" . $testText . "&nbsp;&nbsp;</td>\n"; echo "<tr class=\"userlist\">\n<td nowrap>" . $testText . "&nbsp;&nbsp;</td>\n";
flush(); flush();
$lamdaemonOk = false; $lamdaemonOk = false;
$errorMessage = ""; $errorMessage = "";
@ -99,12 +101,12 @@ function lamTestLamdaemon($command, $stopTest, $handle, $testText) {
$lamdaemonOk = true; $lamdaemonOk = true;
} }
if ($lamdaemonOk) { if ($lamdaemonOk) {
echo "<td bgcolor=\"green\">" . _("Ok") . "</td>"; echo "<td>" . $okImage . "</td>";
echo "<td bgcolor=\"green\">" . _("Lamdaemon successfully run.") . "</td>"; echo "<td>" . _("Lamdaemon successfully run.") . "</td>";
} }
else { else {
echo "<td bgcolor=\"red\">" . _("Error") . "&nbsp;&nbsp;</td>\n"; echo "<td>" . $failImage . "&nbsp;&nbsp;</td>\n";
echo "<td bgcolor=\"red\">\n"; echo "<td>\n";
for ($i = 0; $i < sizeof($return); $i++) { for ($i = 0; $i < sizeof($return); $i++) {
call_user_func_array('StatusMessage', split(",", $return[$i])); call_user_func_array('StatusMessage', split(",", $return[$i]));
} }
@ -117,6 +119,9 @@ function lamTestLamdaemon($command, $stopTest, $handle, $testText) {
return $stopTest; return $stopTest;
} }
$okImage = "<img src=\"../../graphics/pass.png\" alt=\"\">\n";
$failImage = "<img src=\"../../graphics/fail.png\" alt=\"\">\n";
$servers = explode(";", $_SESSION['config']->get_scriptServers()); $servers = explode(";", $_SESSION['config']->get_scriptServers());
for ($i = 0; $i < sizeof($servers); $i++) { for ($i = 0; $i < sizeof($servers); $i++) {
$servers[$i] = explode(":", $servers[$i]); $servers[$i] = explode(":", $servers[$i]);
@ -136,19 +141,19 @@ for ($i = 0; $i < sizeof($servers); $i++) {
echo "<tr class=\"userlist\">\n<td colspan=\"3\" align=\"center\"><b>$title</b>\n</td>\n</tr>"; echo "<tr class=\"userlist\">\n<td colspan=\"3\" align=\"center\"><b>$title</b>\n</td>\n</tr>";
// check script server and path // check script server and path
echo "<tr class=\"userlist\">\n<td>" . _("Lamdaemon server and path") . "&nbsp;&nbsp;</td>\n"; echo "<tr class=\"userlist\">\n<td nowrap>" . _("Lamdaemon server and path") . "&nbsp;&nbsp;</td>\n";
if (!isset($serverName) || (strlen($serverName) < 3)) { if (!isset($serverName) || (strlen($serverName) < 3)) {
echo "<td>" . _("Error") . "</td>\n"; echo "<td>" . $failImage . "</td>\n";
echo "<td bgcolor=\"red\">" . _("No lamdaemon server set, please update your LAM configuration settings.") . "</td>"; echo "<td>" . _("No lamdaemon server set, please update your LAM configuration settings.") . "</td>";
} }
elseif (($_SESSION['config']->get_scriptPath() == null) || (strlen($_SESSION['config']->get_scriptPath()) < 10)) { elseif (($_SESSION['config']->get_scriptPath() == null) || (strlen($_SESSION['config']->get_scriptPath()) < 10)) {
echo "<td bgcolor=\"red\">" . _("Error") . "&nbsp;&nbsp;</td>\n"; echo "<td>" . $failImage . "&nbsp;&nbsp;</td>\n";
echo "<td bgcolor=\"red\">" . _("No lamdaemon path set, please update your LAM configuration settings.") . "</td>"; echo "<td>" . _("No lamdaemon path set, please update your LAM configuration settings.") . "</td>";
$stopTest = true; $stopTest = true;
} }
else { else {
echo "<td bgcolor=\"green\">" . _("Ok") . "&nbsp;&nbsp;</td>\n"; echo "<td>" . $okImage . "&nbsp;&nbsp;</td>\n";
echo "<td bgcolor=\"green\">" . sprintf(_("Using %s as lamdaemon remote server."), $serverName) . "</td>"; echo "<td>" . sprintf(_("Using %s as lamdaemon remote server."), $serverName) . "</td>";
} }
echo "</tr>\n"; echo "</tr>\n";
@ -156,7 +161,7 @@ for ($i = 0; $i < sizeof($servers); $i++) {
// check Unix account of LAM admin // check Unix account of LAM admin
if (!$stopTest) { if (!$stopTest) {
echo "<tr class=\"userlist\">\n<td>" . _("Unix account") . "&nbsp;&nbsp;</td>\n"; echo "<tr class=\"userlist\">\n<td nowrap>" . _("Unix account") . "&nbsp;&nbsp;</td>\n";
$credentials = $_SESSION['ldap']->decrypt_login(); $credentials = $_SESSION['ldap']->decrypt_login();
$unixOk = false; $unixOk = false;
$sr = @ldap_read($_SESSION['ldap']->server(), $credentials[0], "objectClass=posixAccount", array('uid')); $sr = @ldap_read($_SESSION['ldap']->server(), $credentials[0], "objectClass=posixAccount", array('uid'));
@ -168,12 +173,12 @@ for ($i = 0; $i < sizeof($servers); $i++) {
} }
} }
if ($unixOk) { if ($unixOk) {
echo "<td bgcolor=\"green\">" . _("Ok") . "</td>\n"; echo "<td>" . $okImage . "</td>\n";
echo "<td bgcolor=\"green\">" . sprintf(_("Using %s to connect to remote server."), $userName) . "</td>"; echo "<td>" . sprintf(_("Using %s to connect to remote server."), $userName) . "</td>";
} }
else { else {
echo "<td bgcolor=\"red\">" . _("Error") . "&nbsp;&nbsp;</td>\n"; echo "<td>" . $failImage . "&nbsp;&nbsp;</td>\n";
echo "<td bgcolor=\"red\">" . sprintf(_("Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"), $credentials[0]) . "</td>"; echo "<td>" . sprintf(_("Your LAM admin user (%s) must be a valid Unix account to work with lamdaemon!"), $credentials[0]) . "</td>";
$stopTest = true; $stopTest = true;
} }
echo "</tr>\n"; echo "</tr>\n";
@ -183,14 +188,14 @@ for ($i = 0; $i < sizeof($servers); $i++) {
// check SSH2 function // check SSH2 function
if (!$stopTest) { if (!$stopTest) {
echo "<tr class=\"userlist\">\n<td>" . _("SSH2 module") . "&nbsp;&nbsp;</td>\n"; echo "<tr class=\"userlist\">\n<td nowrap>" . _("SSH2 module") . "&nbsp;&nbsp;</td>\n";
if (function_exists("ssh2_connect")) { if (function_exists("ssh2_connect")) {
echo "<td bgcolor=\"green\">" . _("Ok") . "</td>"; echo "<td>" . $okImage . "</td>";
echo "<td bgcolor=\"green\">" . _("SSH2 module is installed.") . "</td>"; echo "<td>" . _("SSH2 module is installed.") . "</td>";
} }
else { else {
echo "<td bgcolor=\"red\">" . _("Error") . "&nbsp;&nbsp;</td>\n"; echo "<td>" . $failImage . "&nbsp;&nbsp;</td>\n";
echo "<td bgcolor=\"red\">" . _("Please install the SSH2 module for PHP and activate it in your php.ini!") . "</td>"; echo "<td>" . _("Please install the SSH2 module for PHP and activate it in your php.ini!") . "</td>";
$stopTest = true; $stopTest = true;
} }
echo "</tr>\n"; echo "</tr>\n";
@ -200,7 +205,7 @@ for ($i = 0; $i < sizeof($servers); $i++) {
// check SSH login // check SSH login
if (!$stopTest) { if (!$stopTest) {
echo "<tr class=\"userlist\">\n<td>" . _("SSH connection") . "&nbsp;&nbsp;</td>\n"; echo "<tr class=\"userlist\">\n<td nowrap>" . _("SSH connection") . "&nbsp;&nbsp;</td>\n";
flush(); flush();
$sshOk = false; $sshOk = false;
$handle = @ssh2_connect($serverName); $handle = @ssh2_connect($serverName);
@ -210,12 +215,12 @@ for ($i = 0; $i < sizeof($servers); $i++) {
} }
} }
if ($sshOk) { if ($sshOk) {
echo "<td bgcolor=\"green\">" . _("Ok") . "</td>"; echo "<td>" . $okImage . "</td>";
echo "<td bgcolor=\"green\">" . _("SSH connection could be established.") . "</td>"; echo "<td>" . _("SSH connection could be established.") . "</td>";
} }
else { else {
echo "<td bgcolor=\"red\">" . _("Error") . "&nbsp;&nbsp;</td>\n"; echo "<td>" . $failImage . "&nbsp;&nbsp;</td>\n";
echo "<td bgcolor=\"red\">" . _("Unable to connect to remote server!") . "</td>"; echo "<td>" . _("Unable to connect to remote server!") . "</td>";
$stopTest = true; $stopTest = true;
} }
echo "</tr>\n"; echo "</tr>\n";
@ -227,9 +232,7 @@ for ($i = 0; $i < sizeof($servers); $i++) {
$stopTest = lamTestLamdaemon("+ test quota\n", $stopTest, $handle, _("Lamdaemon: Quota module installed")); $stopTest = lamTestLamdaemon("+ test quota\n", $stopTest, $handle, _("Lamdaemon: Quota module installed"));
$stopTest = lamTestLamdaemon("+ quota get user\n", $stopTest, $handle, _("Lamdaemon: read quotas")); $stopTest = lamTestLamdaemon("+ quota get user\n", $stopTest, $handle, _("Lamdaemon: read quotas"));
echo "<br />"; echo "</table><br>\n";
echo "</table>\n";
} }
echo "<h2>" . _("Lamdaemon test finished.") . "</h2>\n"; echo "<h2>" . _("Lamdaemon test finished.") . "</h2>\n";