diff --git a/lam/templates/lists/listusers.php b/lam/templates/lists/listusers.php
index d4b735dd..af856863 100644
--- a/lam/templates/lists/listusers.php
+++ b/lam/templates/lists/listusers.php
@@ -24,6 +24,9 @@ $Id$
include_once ("../../lib/config.inc");
include_once("../../lib/ldap.inc");
+// used to display status messages
+include_once ("../../lib/status.inc");
+
// start session
session_save_path("../../sess");
@session_start();
@@ -95,7 +98,7 @@ for ($k = 0; $k < sizeof($desc_array); $k++) {
$filter = $filter . "(" . strtolower($attr_array[$k]) . "=" .
$_POST["filter" . strtolower($attr_array[$k])] . ")";
else
- $_POST["filter" . strtolower($attr_array[$k])] = "*";
+ $_POST["filter" . strtolower($attr_array[$k])] = "";
}
$filter = $filter . ")";
@@ -114,16 +117,16 @@ if ($_SESSION["userlist"] && !$_POST['refresh'] && !$_POST["apply_filter"]) {
if ($sr) {
$userinfo = ldap_get_entries ($_SESSION["ldap"]->server, $sr);
ldap_free_result ($sr);
- if ($userinfo["count"] == 0) echo ("
" .
- _("No Users found!") .
- "
");
- // delete first array entry which is "count"
+ if ($userinfo["count"] == 0)
+ StatusMessage("WARN", "", _("No Users found!"));
+
array_shift($userinfo);
$_SESSION["userlist"] = $userinfo;
}
- else echo ("
" .
- _("LDAP Search failed! Please check your preferences.
No Users found!") .
- "
");
+else
+ StatusMessage("ERROR",
+ _("LDAP Search failed! Please check your preferences."),
+ _("No Groups found!"));
}
$user_count = sizeof ($_SESSION["userlist"]);
@@ -136,21 +139,21 @@ echo ("
");
// print user table header
echo "
"; +echo " | ||||||
---|---|---|---|---|---|---|
\n"; // table header for ($k = 0; $k < sizeof ($desc_array); $k++) { if ($sortattrib == strtolower($attr_array[$k])) - echo " | "; + echo " | \n"; else - echo " | "; + echo " | \n"; echo "" . - $desc_array[$k] . " | "; + $desc_array[$k] . "\n"; } echo "||
"; +echo " | ||||||
\n"; echo ""; -echo " | "; +echo "\n"; // print input boxes for filters for ($k = 0; $k < sizeof ($desc_array); $k++) { @@ -170,38 +173,21 @@ for ($i = 0; $i < sizeof ($userinfo); $i++) { // ignore last entry in array whic " onClick=\"user_click(this, '" . $userinfo[$i]["dn"] . "')\"" . " onDblClick=parent.frames[1].location.href=\"../account.php?type=user&DN='" . $userinfo[$i]["dn"] . "'\">" . "" . - " | " . _("Edit") . " | "); + "" . _("Edit") . " | \n"); for ($k = 0; $k < sizeof($attr_array); $k++) { - echo (""); + echo (" | \n"); // print all attribute entries seperated by "; " if (sizeof($userinfo[$i][strtolower($attr_array[$k])]) > 0) { // delete first array entry which is "count" array_shift($userinfo[$i][strtolower($attr_array[$k])]); - // generate links for user members - if (strtolower($attr_array[$k]) == "memberuid") { - $linklist = array(); - for ($d = 0; $d < sizeof($userinfo[$i][strtolower($attr_array[$k])]); - $d++) { - $user = $userinfo[$i][strtolower($attr_array[$k])][$d]; // user name - $dn = $_SESSION["ldap"]->search_username($user); // DN entry - // if user was found in LDAP make link, otherwise just print name - if ($dn) { - $linklist[$d] = "" . - $userinfo[$i][strtolower($attr_array[$k])][$d] . ""; - } - else $linklist[$d] = $user; - } - echo implode("; ", $linklist); - } // print all other attributes - else { - echo implode("; ", $userinfo[$i][strtolower($attr_array[$k])]); - } + echo implode("; ", $userinfo[$i][strtolower($attr_array[$k])]); } - echo (" | "); } - echo("
"); if ($page != 1) - echo ("<="); + echo ("<="); else - echo ("<="); + echo ("<="); echo (" "); if ($page < ($user_count / $max_pageentrys)) - echo ("=>"); + echo ("=>"); else - echo ("=> | "); + echo ("=>"); echo (""); for ($i = 0; $i < ($user_count / $max_pageentrys); $i++) { if ($i == $page - 1) echo (" " . ($i + 1)); else - echo (" " . ($i + 1) . ""); } echo (" |