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

fixed several PHP notices

This commit is contained in:
Roland Gruber 2005-02-22 20:20:47 +00:00
parent dbb175de50
commit 1e53b1bb16
9 changed files with 87 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lam/lib/account.inc
View File

@ -356,16 +356,16 @@ function pwd_is_enabled($hash) {
if ($sr) { if ($sr) {
$units = ldap_get_entries($_SESSION['ldap']->server, $sr); $units = ldap_get_entries($_SESSION['ldap']->server, $sr);
// delete count entry // delete count entry
array_shift($units); unset($units['count']);
// extract attributes // extract attributes
for ($i = 0; $i < sizeof($units); $i++) { for ($i = 0; $i < sizeof($units); $i++) {
$ret[$i] = new samba3domain(); $ret[$i] = new samba3domain();
$ret[$i]->dn = $units[$i]['dn']; $ret[$i]->dn = $units[$i]['dn'];
$ret[$i]->name = $units[$i]['sambadomainname'][0]; $ret[$i]->name = $units[$i]['sambadomainname'][0];
$ret[$i]->SID = $units[$i]['sambasid'][0]; $ret[$i]->SID = $units[$i]['sambasid'][0];
$ret[$i]->nextRID = $units[$i]['sambanextrid'][0]; if (isset($units[$i]['sambanextrid'][0])) $ret[$i]->nextRID = $units[$i]['sambanextrid'][0];
$ret[$i]->nextGroupRID = $units[$i]['sambanextgrouprid'][0]; if (isset($units[$i]['sambanextgrouprid'][0])) $ret[$i]->nextGroupRID = $units[$i]['sambanextgrouprid'][0];
$ret[$i]->nextUserRID = $units[$i]['sambanextuserrid'][0]; if (isset($units[$i]['sambanextuserrid'][0])) $ret[$i]->nextUserRID = $units[$i]['sambanextuserrid'][0];
if (isset($units[$i]['sambaalgorithmicridbase'][0])) $ret[$i]->RIDbase = $units[$i]['sambaalgorithmicridbase'][0]; if (isset($units[$i]['sambaalgorithmicridbase'][0])) $ret[$i]->RIDbase = $units[$i]['sambaalgorithmicridbase'][0];
} }
// sort array by domain name // sort array by domain name

1
lam/lib/ldap.inc
View File

@ -159,6 +159,7 @@ class Ldap{
$sr = @ldap_search($this->server(), $suffix, "objectClass=organizationalunit", array("DN")); $sr = @ldap_search($this->server(), $suffix, "objectClass=organizationalunit", array("DN"));
if ($sr) { if ($sr) {
$units = ldap_get_entries($this->server, $sr); $units = ldap_get_entries($this->server, $sr);
unset($units['count']);
// extract Dns // extract Dns
for ($i = 0; $i < sizeof($units); $i++) { for ($i = 0; $i < sizeof($units); $i++) {
if ($units[$i]['dn']) $ret[] = $units[$i]['dn']; if ($units[$i]['dn']) $ret[] = $units[$i]['dn'];

22
lam/lib/lists.inc
View File

@ -40,7 +40,7 @@ $Id$
function listBuildFilter($post, $attributes) { function listBuildFilter($post, $attributes) {
$filter = array(); $filter = array();
for ($i = 0; $i < sizeof($attributes); $i++) { for ($i = 0; $i < sizeof($attributes); $i++) {
if (eregi('^([0-9a-z_\\*\\$])+$', $_POST["filter" . strtolower($attributes[$i])])) { if (isset($_POST["filter" . strtolower($attributes[$i])]) && eregi('^([0-9a-z_\\*\\$])+$', $_POST["filter" . strtolower($attributes[$i])])) {
$filter[$attributes[$i]]['original'] = $_POST["filter" . strtolower($attributes[$i])]; $filter[$attributes[$i]]['original'] = $_POST["filter" . strtolower($attributes[$i])];
$filter[$attributes[$i]]['regex'] = $_POST["filter" . strtolower($attributes[$i])]; $filter[$attributes[$i]]['regex'] = $_POST["filter" . strtolower($attributes[$i])];
// replace special characters // replace special characters
@ -212,11 +212,13 @@ function listPrintTableHeader($scope, $searchFilter, $desc_array, $attr_array, $
echo "</td>\n"; echo "</td>\n";
// print input boxes for filters // print input boxes for filters
for ($k = 0; $k < sizeof ($desc_array); $k++) { for ($k = 0; $k < sizeof ($desc_array); $k++) {
$value = "";
if (isset($_POST["filter" . strtolower($attr_array[$k])])) {
$value = " value=\"" . $_POST["filter" . strtolower($attr_array[$k])] . "\"";
}
echo "<td>"; echo "<td>";
echo ("<input type=\"text\" size=15 name=\"filter" . strtolower ($attr_array[$k]) . echo ("<input type=\"text\" size=15 name=\"filter" . strtolower ($attr_array[$k]) ."\"" .
"\" value=\"" . $_POST["filter" . strtolower($attr_array[$k])] . "\"" . $value . "title=\"" . _("Here you can input small filters (e.g. 'value' or 'v*').") . "\">");
"title=\"" . _("Here you can input small filters (e.g. 'value' or 'v*').") . "\"" .
">");
echo "</td>\n"; echo "</td>\n";
} }
echo "</tr>\n"; echo "</tr>\n";
@ -229,14 +231,14 @@ function listPrintTableHeader($scope, $searchFilter, $desc_array, $attr_array, $
*/ */
function listDoPost($scope) { function listDoPost($scope) {
// check if button was pressed and if we have to add/delete an account // check if button was pressed and if we have to add/delete an account
if ($_POST['new'] || $_POST['del'] || $_POST['pdf'] || $_POST['pdf_all']){ if (isset($_POST['new']) || isset($_POST['del']) || isset($_POST['pdf']) || isset($_POST['pdf_all'])){
// add new account // add new account
if ($_POST['new']){ if (isset($_POST['new'])){
metaRefresh("../account/edit.php?type=" . $scope); metaRefresh("../account/edit.php?type=" . $scope);
exit; exit;
} }
// delete account(s) // delete account(s)
elseif ($_POST['del']){ elseif (isset($_POST['del'])){
// search for checkboxes // search for checkboxes
$accounts = array_keys($_POST, "on"); $accounts = array_keys($_POST, "on");
$_SESSION['delete_dn'] = array(); $_SESSION['delete_dn'] = array();
@ -249,7 +251,7 @@ function listDoPost($scope) {
} }
} }
// PDF for selected accounts // PDF for selected accounts
elseif ($_POST['pdf']){ elseif (isset($_POST['pdf'])){
$pdf_structure = $_POST['pdf_structure']; $pdf_structure = $_POST['pdf_structure'];
// search for checkboxes // search for checkboxes
$accounts = array_keys($_POST, "on"); $accounts = array_keys($_POST, "on");
@ -266,7 +268,7 @@ function listDoPost($scope) {
} }
} }
// PDF for all accounts // PDF for all accounts
elseif ($_POST['pdf_all']){ elseif (isset($_POST['pdf_all'])){
$list = array(); $list = array();
for ($i = 0; $i < sizeof($_SESSION[$scope . 'info']); $i++) { for ($i = 0; $i < sizeof($_SESSION[$scope . 'info']); $i++) {
$_SESSION["accountPDF-$i"] = new accountContainer($scope, "accountPDF-$i"); $_SESSION["accountPDF-$i"] = new accountContainer($scope, "accountPDF-$i");

2
lam/lib/modules/posixAccount.inc
View File

@ -317,7 +317,7 @@ class posixAccount extends baseModule {
), ),
'homeDirectory' => array( 'homeDirectory' => array(
"Headline" => _("Home directory"), "Headline" => _("Home directory"),
"Text" => _("$user and $group are replaced with username or primary groupname.") "Text" => _('$user and $group are replaced with username or primary groupname.')
), ),
/*'userPassword' =>*/ /*'userPassword' =>*/
'userPassword_no' => array( 'userPassword_no' => array(

29
lam/templates/lists/listdomains.php
View File

@ -47,9 +47,6 @@ setlanguage();
$scope = 'domain'; $scope = 'domain';
// get sorting column when register_globals is off
$sort = $_GET['sort'];
// copy HTTP-GET variables to HTTP-POST // copy HTTP-GET variables to HTTP-POST
$_POST = $_POST + $_GET; $_POST = $_POST + $_GET;
@ -57,14 +54,14 @@ $info = $_SESSION[$scope . 'info'];
$dom_units = $_SESSION['dom_units']; $dom_units = $_SESSION['dom_units'];
// check if button was pressed and if we have to add/delete a domain // check if button was pressed and if we have to add/delete a domain
if ($_POST['new_domain'] || $_POST['del_domain']){ if (isset($_POST['new_domain']) || isset($_POST['del_domain'])){
// add new domain // add new domain
if ($_POST['new_domain']){ if (isset($_POST['new_domain'])){
metaRefresh("../domain.php?action=new"); metaRefresh("../domain.php?action=new");
exit; exit;
} }
// delete domain(s) // delete domain(s)
if ($_POST['del_domain']){ if (isset($_POST['del_domain'])){
// search for checkboxes // search for checkboxes
$domains = array_keys($_POST, "on"); $domains = array_keys($_POST, "on");
$domainstr = implode(";", $domains); $domainstr = implode(";", $domains);
@ -82,8 +79,9 @@ echo "</head><body>\n";
echo "<script src=\"../../lib/functions.js\" type=\"text/javascript\" language=\"javascript\"></script>\n"; echo "<script src=\"../../lib/functions.js\" type=\"text/javascript\" language=\"javascript\"></script>\n";
// get current page // get current page
$page = $_GET["page"]; if (isset($_GET["page"])) $page = $_GET["page"];
if (!$page) $page = 1; else $page = 1;
// take maximum count of domain entries shown on one page out of session // take maximum count of domain entries shown on one page out of session
if ($_SESSION["config"]->get_MaxListEntries() <= 0) if ($_SESSION["config"]->get_MaxListEntries() <= 0)
$max_page_entries = 10; // default setting, if not yet set $max_page_entries = 10; // default setting, if not yet set
@ -101,14 +99,17 @@ $desc_array[] = strtoupper(_("Domain name"));
$desc_array[] = strtoupper(_("Domain SID")); $desc_array[] = strtoupper(_("Domain SID"));
$desc_array[] = "DN"; $desc_array[] = "DN";
if (isset($_GET["sort"])) $sort = $_GET["sort"];
else $sort = strtolower($attr_array[0]);
// check search suffix // check search suffix
if ($_POST['dom_suffix']) $dom_suffix = $_POST['dom_suffix']; // new suffix selected via combobox if (isset($_POST['dom_suffix'])) $dom_suffix = $_POST['dom_suffix']; // new suffix selected via combobox
elseif ($_SESSION['dom_suffix']) $dom_suffix = $_SESSION['dom_suffix']; // old suffix from session elseif (isset($_SESSION['dom_suffix'])) $dom_suffix = $_SESSION['dom_suffix']; // old suffix from session
else $dom_suffix = $_SESSION["config"]->get_DomainSuffix(); // default suffix else $dom_suffix = $_SESSION["config"]->get_DomainSuffix(); // default suffix
$refresh = true; $refresh = true;
if ($_GET['norefresh']) $refresh = false; if (isset($_GET['norefresh'])) $refresh = false;
if ($_POST['refresh']) $refresh = true; if (isset($_POST['refresh'])) $refresh = true;
if ($refresh) { if ($refresh) {
// configure search filter // configure search filter
@ -194,9 +195,9 @@ listDrawNavigationBar(sizeof($info), $max_page_entries, $page, $sort, '', "domai
echo ("<br>\n"); echo ("<br>\n");
} }
if (! $_GET['norefresh']) { if ($refresh) {
// generate list of possible suffixes // generate list of possible suffixes
$dom_units = $_SESSION['ldap']->search_units($_SESSION["config"]->get_DomainSuffix()); $dom_units = $_SESSION['ldap']->search_units($_SESSION["config"]->get_DomainSuffix());
} }
// print combobox with possible sub-DNs // print combobox with possible sub-DNs

20
lam/templates/lists/listgroups.php
View File

@ -51,9 +51,6 @@ setlanguage();
$scope = 'group'; $scope = 'group';
// get sorting column when register_globals is off
$sort = $_GET['sort'];
// copy HTTP-GET variables to HTTP-POST // copy HTTP-GET variables to HTTP-POST
$_POST = $_POST + $_GET; $_POST = $_POST + $_GET;
@ -76,8 +73,9 @@ $temp_array = explode(";", $attr_string);
$hash_table = listGetAttributeGroupArray(); $hash_table = listGetAttributeGroupArray();
// get current page // get current page
$page = $_GET["page"]; if (isset($_GET["page"])) $page = $_GET["page"];
if (!$page) $page = 1; else $page = 1;
// take maximum count of group entries shown on one page out of session // take maximum count of group entries shown on one page out of session
if ($_SESSION["config"]->get_MaxListEntries() <= 0) if ($_SESSION["config"]->get_MaxListEntries() <= 0)
$max_page_entries = 10; // default setting, if not yet set $max_page_entries = 10; // default setting, if not yet set
@ -102,14 +100,18 @@ for ($i = 0; $i < sizeof($temp_array); $i++) {
} }
} }
// get sorting column
if (isset($_GET["sort"])) $sort = $_GET["sort"];
else $sort = strtolower($attr_array[0]);
// check search suffix // check search suffix
if ($_POST['grp_suffix']) $grp_suffix = $_POST['grp_suffix']; // new suffix selected via combobox if ($_POST['grp_suffix']) $grp_suffix = $_POST['grp_suffix']; // new suffix selected via combobox
elseif ($_SESSION['grp_suffix']) $grp_suffix = $_SESSION['grp_suffix']; // old suffix from session elseif ($_SESSION['grp_suffix']) $grp_suffix = $_SESSION['grp_suffix']; // old suffix from session
else $grp_suffix = $_SESSION["config"]->get_GroupSuffix(); // default suffix else $grp_suffix = $_SESSION["config"]->get_GroupSuffix(); // default suffix
$refresh = true; $refresh = true;
if ($_GET['norefresh']) $refresh = false; if (isset($_GET['norefresh'])) $refresh = false;
if ($_POST['refresh']) $refresh = true; if (isset($_POST['refresh'])) $refresh = true;
if ($refresh) { if ($refresh) {
// configure search filter // configure search filter
@ -180,7 +182,7 @@ if (sizeof($info) > 0) {
" onMouseOut=\"group_out(this, '" . $i . "')\"" . " onMouseOut=\"group_out(this, '" . $i . "')\"" .
" onClick=\"group_click(this, '" . $i . "')\"" . " onClick=\"group_click(this, '" . $i . "')\"" .
" onDblClick=\"parent.frames[1].location.href='../account/edit.php?type=group&amp;DN=" . $info[$i]['dn'] . "'\">"); " onDblClick=\"parent.frames[1].location.href='../account/edit.php?type=group&amp;DN=" . $info[$i]['dn'] . "'\">");
if ($_GET['selectall'] == "yes") { if (isset($_GET['selectall'])) {
echo " <td height=22 align=\"center\"><input onClick=\"group_click(this, '" . $i . "')\" type=\"checkbox\"" . echo " <td height=22 align=\"center\"><input onClick=\"group_click(this, '" . $i . "')\" type=\"checkbox\"" .
" name=\"" . $i . "\" checked></td>"; " name=\"" . $i . "\" checked></td>";
} }
@ -241,7 +243,7 @@ listDrawNavigationBar(sizeof($info), $max_page_entries, $page, $sort, $searchFil
echo ("<br>\n"); echo ("<br>\n");
} }
if (! $_GET['norefresh']) { if ($refresh) {
// generate list of possible suffixes // generate list of possible suffixes
$grp_units = $_SESSION['ldap']->search_units($_SESSION["config"]->get_GroupSuffix()); $grp_units = $_SESSION['ldap']->search_units($_SESSION["config"]->get_GroupSuffix());
} }

50
lam/templates/lists/listhosts.php
View File

@ -51,9 +51,6 @@ setlanguage();
$scope = 'host'; $scope = 'host';
// get sorting column when register_globals is off
$sort = $_GET['sort'];
// copy HTTP-GET variables to HTTP-POST // copy HTTP-GET variables to HTTP-POST
$_POST = $_POST + $_GET; $_POST = $_POST + $_GET;
@ -76,8 +73,9 @@ $temp_array = explode(";", $attr_string);
$hash_table = listGetAttributeHostArray(); $hash_table = listGetAttributeHostArray();
// get current page // get current page
$page = $_GET["page"]; if (isset($_GET["page"])) $page = $_GET["page"];
if (!$page) $page = 1; else $page = 1;
// take maximum count of host entries shown on one page out of session // take maximum count of host entries shown on one page out of session
if ($_SESSION["config"]->get_MaxListEntries() <= 0) if ($_SESSION["config"]->get_MaxListEntries() <= 0)
$max_page_entries = 10; // default setting, if not yet set $max_page_entries = 10; // default setting, if not yet set
@ -86,30 +84,34 @@ else
// generate column attributes and descriptions // generate column attributes and descriptions
for ($i = 0; $i < sizeof($temp_array); $i++) { for ($i = 0; $i < sizeof($temp_array); $i++) {
// if value is predifined, look up description in hash_table // if value is predifined, look up description in hash_table
if (substr($temp_array[$i],0,1) == "#") { if (substr($temp_array[$i],0,1) == "#") {
$attr = strtolower(substr($temp_array[$i],1)); $attr = strtolower(substr($temp_array[$i],1));
$attr_array[$i] = $attr; $attr_array[$i] = $attr;
if ($hash_table[$attr]) $desc_array[] = strtoupper($hash_table[$attr]); if ($hash_table[$attr]) $desc_array[] = strtoupper($hash_table[$attr]);
else $desc_array[] = strtoupper($attr); else $desc_array[] = strtoupper($attr);
} }
// if not predefined, the attribute is seperated by a ":" from description // if not predefined, the attribute is seperated by a ":" from description
else { else {
$attr = explode(":", $temp_array[$i]); $attr = explode(":", $temp_array[$i]);
$attr_array[$i] = $attr[0]; $attr_array[$i] = $attr[0];
if ($attr[1]) $desc_array[$i] = strtoupper($attr[1]); if ($attr[1]) $desc_array[$i] = strtoupper($attr[1]);
else $desc_array[$i] = strtoupper($attr[0]); else $desc_array[$i] = strtoupper($attr[0]);
} }
} }
// get sorting column
if (isset($_GET["sort"])) $sort = $_GET["sort"];
else $sort = strtolower($attr_array[0]);
// check search suffix // check search suffix
if ($_POST['hst_suffix']) $hst_suffix = $_POST['hst_suffix']; // new suffix selected via combobox if ($_POST['hst_suffix']) $hst_suffix = $_POST['hst_suffix']; // new suffix selected via combobox
elseif ($_SESSION['hst_suffix']) $hst_suffix = $_SESSION['hst_suffix']; // old suffix from session elseif ($_SESSION['hst_suffix']) $hst_suffix = $_SESSION['hst_suffix']; // old suffix from session
else $hst_suffix = $_SESSION["config"]->get_HostSuffix(); // default suffix else $hst_suffix = $_SESSION["config"]->get_HostSuffix(); // default suffix
$refresh = true; $refresh = true;
if ($_GET['norefresh']) $refresh = false; if (isset($_GET['norefresh'])) $refresh = false;
if ($_POST['refresh']) $refresh = true; if (isset($_POST['refresh'])) $refresh = true;
if ($refresh) { if ($refresh) {
// configure search filter // configure search filter
@ -180,7 +182,7 @@ if (sizeof($info) > 0) {
" onMouseOut=\"host_out(this, '" . $i . "')\"" . " onMouseOut=\"host_out(this, '" . $i . "')\"" .
" onClick=\"host_click(this, '" . $i . "')\"" . " onClick=\"host_click(this, '" . $i . "')\"" .
" onDblClick=\"parent.frames[1].location.href='../account/edit.php?type=host&amp;DN=" . $info[$i]['dn'] . "'\">"); " onDblClick=\"parent.frames[1].location.href='../account/edit.php?type=host&amp;DN=" . $info[$i]['dn'] . "'\">");
if ($_GET['selectall'] == "yes") { if (isset($_GET['selectall'])) {
echo " <td height=22 align=\"center\"><input onClick=\"host_click(this, '" . $i . "')\"" . echo " <td height=22 align=\"center\"><input onClick=\"host_click(this, '" . $i . "')\"" .
" type=\"checkbox\" checked name=\"" . $i . "\"></td>"; " type=\"checkbox\" checked name=\"" . $i . "\"></td>";
} }
@ -225,9 +227,9 @@ listDrawNavigationBar(sizeof($info), $max_page_entries, $page, $sort, $searchFil
echo ("<br>\n"); echo ("<br>\n");
} }
if (! $_GET['norefresh']) { if ($refresh) {
// generate list of possible suffixes // generate list of possible suffixes
$hst_units = $_SESSION['ldap']->search_units($_SESSION["config"]->get_HostSuffix()); $hst_units = $_SESSION['ldap']->search_units($_SESSION["config"]->get_HostSuffix());
} }
// print combobox with possible sub-DNs // print combobox with possible sub-DNs

31
lam/templates/lists/listusers.php
View File

@ -56,12 +56,17 @@ $scope = 'user';
// copy HTTP-GET variables to HTTP-POST // copy HTTP-GET variables to HTTP-POST
$_POST = $_POST + $_GET; $_POST = $_POST + $_GET;
$refresh = true;
if (isset($_GET['norefresh'])) $refresh = false;
if (isset($_POST['refresh'])) $refresh = true;
// check if primary group should be translated // check if primary group should be translated
if ($_POST['trans_primary'] == "on") $trans_primary = "on"; if (isset($_POST['trans_primary'])) $trans_primary = "on";
else $trans_primary = "off"; else $trans_primary = "off";
$trans_primary_hash = $_SESSION['trans_primary_hash']; if (isset($_SESSION['trans_primary_hash'])) $trans_primary_hash = $_SESSION['trans_primary_hash'];
else $trans_primary_hash = array();
// generate hash table for group translation // generate hash table for group translation
if ($trans_primary == "on" && !$_GET["norefresh"]) { if ($trans_primary == "on" && ($refresh || (sizeof($trans_primary_hash) == 0))) {
$trans_primary_hash = array(); $trans_primary_hash = array();
$suffix = $_SESSION['config']->get_groupSuffix(); $suffix = $_SESSION['config']->get_groupSuffix();
$filter = "objectClass=posixGroup"; $filter = "objectClass=posixGroup";
@ -90,8 +95,9 @@ echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../../style/layout.css\"
echo "</head><body>\n"; echo "</head><body>\n";
echo "<script src=\"../../lib/functions.js\" type=\"text/javascript\" language=\"javascript\"></script>\n"; echo "<script src=\"../../lib/functions.js\" type=\"text/javascript\" language=\"javascript\"></script>\n";
$page = $_GET["page"]; // get current page
if (!$page) $page = 1; if (isset($_GET["page"])) $page = $_GET["page"];
else $page = 1;
// take maximum count of user entries shown on one page out of session // take maximum count of user entries shown on one page out of session
if ($_SESSION["config"]->get_MaxListEntries() <= 0) { if ($_SESSION["config"]->get_MaxListEntries() <= 0) {
@ -124,9 +130,8 @@ for ($i = 0; $i < sizeof($temp_array); $i++) {
} }
} }
$sort = $_GET["sort"]; if (isset($_GET["sort"])) $sort = $_GET["sort"];
if (!$sort) else $sort = strtolower($attr_array[0]);
$sort = strtolower($attr_array[0]);
// check search suffix // check search suffix
if ($_POST['usr_suffix']) $usr_suffix = $_POST['usr_suffix']; // new suffix selected via combobox if ($_POST['usr_suffix']) $usr_suffix = $_POST['usr_suffix']; // new suffix selected via combobox
@ -138,10 +143,6 @@ else $usr_suffix = $_SESSION["config"]->get_UserSuffix(); // default suffix
$module_filter = get_ldap_filter("user"); // basic filter is provided by modules $module_filter = get_ldap_filter("user"); // basic filter is provided by modules
$filter = "(&" . $module_filter . ")"; $filter = "(&" . $module_filter . ")";
$refresh = true;
if ($_GET['norefresh']) $refresh = false;
if ($_POST['refresh']) $refresh = true;
if ($refresh) { if ($refresh) {
$attrs = $attr_array; $attrs = $attr_array;
$sr = @ldap_search($_SESSION["ldap"]->server(), $usr_suffix, $filter, $attrs); $sr = @ldap_search($_SESSION["ldap"]->server(), $usr_suffix, $filter, $attrs);
@ -212,7 +213,7 @@ if ($user_count != 0) {
if ($trans_primary == "on") { if ($trans_primary == "on") {
// translate GIDs // translate GIDs
for ($i = 0; $i < sizeof($info); $i++) { for ($i = 0; $i < sizeof($info); $i++) {
if ($trans_primary_hash[$info[$i]['gidnumber'][0]]) { if (isset($trans_primary_hash[$info[$i]['gidnumber'][0]])) {
$info[$i]['gidnumber'][0] = $trans_primary_hash[$info[$i]['gidnumber'][0]]; $info[$i]['gidnumber'][0] = $trans_primary_hash[$info[$i]['gidnumber'][0]];
} }
} }
@ -229,7 +230,7 @@ if ($user_count != 0) {
"onClick=\"user_click(this, '" . $i . "')\"\n" . "onClick=\"user_click(this, '" . $i . "')\"\n" .
"onDblClick=\"parent.frames[1].location.href='../account/edit.php?type=user&amp;DN=" . $info[$i]['dn'] . "'\">\n"); "onDblClick=\"parent.frames[1].location.href='../account/edit.php?type=user&amp;DN=" . $info[$i]['dn'] . "'\">\n");
// checkboxes if selectall = "yes" // checkboxes if selectall = "yes"
if ($_GET['selectall'] == "yes") { if (isset($_GET['selectall'])) {
echo "<td height=22 align=\"center\">\n<input onClick=\"user_click(this, '" . $i . "')\" type=\"checkbox\" name=\"" . echo "<td height=22 align=\"center\">\n<input onClick=\"user_click(this, '" . $i . "')\" type=\"checkbox\" name=\"" .
$i . "\" checked>\n</td>\n"; $i . "\" checked>\n</td>\n";
} }
@ -275,7 +276,7 @@ if ($user_count != 0) {
echo ("<br>"); echo ("<br>");
} }
if (! $_GET['norefresh']) { if ($refresh) {
// generate list of possible suffixes // generate list of possible suffixes
$usr_units = $_SESSION['ldap']->search_units($_SESSION["config"]->get_UserSuffix()); $usr_units = $_SESSION['ldap']->search_units($_SESSION["config"]->get_UserSuffix());
} }

2
lam/templates/login.php
View File

@ -33,7 +33,7 @@ function display_LoginPage($config_object,$profile)
global $error_message; global $error_message;
// generate 256 bit key and initialization vector for user/passwd-encryption // generate 256 bit key and initialization vector for user/passwd-encryption
// check if we can use /dev/random otherwise use /dev/urandom or rand() // check if we can use /dev/random otherwise use /dev/urandom or rand()
if(function_exists(mcrypt_create_iv)) { if(function_exists('mcrypt_create_iv')) {
$key = @mcrypt_create_iv(32, MCRYPT_DEV_RANDOM); $key = @mcrypt_create_iv(32, MCRYPT_DEV_RANDOM);
if (! $key) $key = @mcrypt_create_iv(32, MCRYPT_DEV_URANDOM); if (! $key) $key = @mcrypt_create_iv(32, MCRYPT_DEV_URANDOM);
if (! $key) { if (! $key) {