From c74b5f542fd4b1acc11b01726088d19f77d46f7f Mon Sep 17 00:00:00 2001 From: jengo Date: Mon, 2 Jul 2001 20:32:02 +0000 Subject: [PATCH] No longer needed --- admin/inc/accounts_ldap.inc.php | 342 -------------------------------- admin/inc/accounts_sql.inc.php | 208 ------------------- 2 files changed, 550 deletions(-) delete mode 100644 admin/inc/accounts_ldap.inc.php delete mode 100755 admin/inc/accounts_sql.inc.php diff --git a/admin/inc/accounts_ldap.inc.php b/admin/inc/accounts_ldap.inc.php deleted file mode 100644 index df70a2aaf3..0000000000 --- a/admin/inc/accounts_ldap.inc.php +++ /dev/null @@ -1,342 +0,0 @@ - - - // This is a local config option, I didn't make it global. Becuase most people will leave it on - // and its something that doesn't need to be in the config table. - $allow_long_loginids = False; - - - $ldap = ldap_connect($phpgw_info["server"]["ldap_host"]); - - if (! @ldap_bind($ldap, $phpgw_info["server"]["ldap_root_dn"], $phpgw_info["server"]["ldap_root_pw"])) { - echo "

Error binding to LDAP server. Check your config"; - $phpgw->common->phpgw_exit(); - } - - function getSearchLine($searchstring) - { - if (($searchstring=="*") || ($searchstring=="")) { - $searchline = "cn=*"; - } else { - $searchline = sprintf("cn=*%s*",$searchstring); - } - return $searchline; - } - - // Not the best method, but it works for now. - function account_total() - { - global $phpgw_info, $ldap; - - $filter = "(|(uid=*))"; - $sr = ldap_search($ldap,$phpgw_info["server"]["ldap_context"],$filter,array("uid")); - $info = ldap_get_entries($ldap, $sr); - - $total = -1; - for ($i=0;$iaccounts->read_userData(); - function account_view($loginid) - { - global $phpgw_info, $ldap; - - $filter = "(|(uid=$loginid))"; - $sr = ldap_search($ldap,$phpgw_info["server"]["ldap_context"],$filter,array("sn","givenname","uid","uidnumber")); - $aci = ldap_get_entries($ldap, $sr); - - $account_info["account_id"] = $aci[0]["uid"][0]; - $account_info["account_lid"] = $aci[0]["uidnumber"][0]; - $account_info["account_lastname"] = $aci[0]["sn"][0]; - $account_info["account_firstname"] = $aci[0]["givenname"][0]; - - return $account_info; - } - - function account_read($method,$start = 0,$sort,$order) - { - global $phpgw_info, $ldap; - -/* echo "sort: $sort"; - if ($sort == "account_lastname") { - $sort = 3; - } else if ($sort == "account_firstname") { - $sort = 2; - } else { - $sort = 1; - } - echo " - sort: $sort"; -*/ - - $filter = "(|(uid=*))"; - $sr = ldap_search($ldap,$phpgw_info["server"]["ldap_context"],$filter,array("sn","givenname","uid","uidnumber")); - $info = ldap_get_entries($ldap, $sr); - - $nummsg = $start; - - if ($nummsg < $phpgw_info["user"]["preferences"]["common"]["maxmatchs"]) { - $totaltodisplay = $nummsg; - } else if (($nummsg - $start) > $phpgw_info["user"]["preferences"]["common"]["maxmatchs"]) { - $totaltodisplay = $start + $phpgw_info["user"]["preferences"]["common"]["maxmatchs"]; - } else { - $totaltodisplay = $nummsg; - } - - for ($i=0, $j=0; $i<$info["count"]; $i++,$j++) { - if (! $phpgw_info["server"]["global_denied_users"][$info[$i]["uid"][0]]) { -# $account_info[$i]["account_id"] = rawurlencode($info[$i]["dn"]); - $account_info[$i]["account_id"] = $info[$i]["uidnumber"][0]; - $account_info[$i]["account_lid"] = $info[$i]["uid"][0]; - $account_info[$i]["account_lastname"] = $info[$i]["sn"][0]; - $account_info[$i]["account_firstname"] = $info[$i]["givenname"][0]; - } - } - - -// echo " - order: $order"; -/* if ($order == "ASC") { - sort($account_info[$sort]); - } else { - rsort($account_info[$sort]); - } */ - - return $account_info; - } - - function account_add($account_info) - { - global $phpgw_info, $phpgw, $ldap; - - $account_info["passwd"] = $phpgw->common->encrypt_password($account_info["passwd"]); - - // This method is only temp. We need to figure out the best way to assign uidnumbers and - // guidnumbers. - - $phpgw->db->query("select (max(account_id)+1) from accounts"); - $phpgw->db->next_record(); - - $account_info["account_id"] = $phpgw->db->f(0); - - // Much of this is going to be guess work for now, until we get things planned out. - $entry["uid"] = $account_info["loginid"]; - $entry["uidNumber"] = $account_info["account_id"]; - $entry["gidNumber"] = $account_info["account_id"]; - $entry["userpassword"] = $account_info["passwd"]; - $entry["loginShell"] = "/bin/bash"; - $entry["homeDirectory"] = "/home/" . $account_info["loginid"]; - $entry["cn"] = sprintf("%s %s", $account_info["firstname"], $account_info["lastname"]); - $entry["sn"] = $account_info["lastname"]; - $entry["givenname"] = $account_info["firstname"]; - //$entry["company"] = $company; - //$entry["title"] = $title; - $entry["mail"] = $account_info["loginid"] . "@" . $phpgw_info["server"]["mail_suffix"]; - //$entry["telephonenumber"] = $telephonenumber; - //$entry["homephone"] = $homephone; - //$entry["pagerphone"] = $pagerphone; - //$entry["cellphone"] = $cellphone; - //$entry["streetaddress"] = $streetaddress; - //$entry["locality"] = $locality; - //$entry["st"] = $st; - //$entry["postalcode"] = $postalcode; - //$entry["countryname"] = $countryname; - //$entry["homeurl"] = $homeurl; - //$entry["description"] = $description; - $entry["objectclass"][0] = "account"; - $entry["objectclass"][1] = "posixAccount"; - $entry["objectclass"][2] = "shadowAccount"; - $entry["objectclass"][3] = "inetOrgperson"; - $entry["objectclass"][4] = "person"; - $entry["objectclass"][5] = "top"; - /* $dn=sprintf("cn=%s %s, %s", $givenname, $sn, $BASEDN);*/ - $dn=sprintf("uid=%s, %s", $account_info["loginid"], $phpgw_info["server"]["ldap_context"]); - - // add the entries - if (ldap_add($ldap, $dn, $entry)) { - $cd = 28; - } else { - $cd = 99; // Come out with a code for this - } - - @ldap_close($ldap); - - $sql = "insert into accounts (account_id,account_lid,account_pwd,account_firstname," - . "account_lastname,account_status,account_lastpwd_change) " - . "values ('" . $account_info["account_id"] . "','" . $account_info["loginid"] - . "','x','". addslashes($account_info["firstname"]) . "','" - . addslashes($account_info["lastname"]) . "','A',0)"; - - $phpgw->db->query($sql,__LINE__,__FILE__); - - $sep = $phpgw->common->filesystem_separator(); - - $basedir = $phpgw_info["server"]["files_dir"] . $sep . "users" . $sep; - - if (! @mkdir($basedir . $account_info["loginid"], 0707)) { - $cd = 36; - } else { - $cd = 28; - } - - return $cd; - } - - function account_edit($account_info) - { - global $phpgw, $phpgw_info, $ldap, $new_loginid; - - - // This is just until the API fully handles reading the LDAP account info. - $lid = $account_info["loginid"]; - - if ($account_info["old_loginid"] != $account_info["loginid"]) { -// $account_info["loginid"] = $account_info["c_loginid"]; - - $entry["uid"] = $account_info["loginid"]; - $entry["homeDirectory"] = "/home/" . $account_info["loginid"]; - $entry["mail"] = $account_info["loginid"] . "@" . $phpgw_info["server"]["mail_suffix"]; - - $phpgw->db->query("update accounts set account_lid='" . $account_info["loginid"] . "' " - . "where account_lid='" . $account_info["old_loginid"] . "'",__LINE__,__FILE__); - } - - if ($account_info["passwd"]) { -// $entry["userpassword"] = $phpgw->common->encrypt_password($n_passwd); - $entry["userpassword"] = $phpgw->common->encrypt_password($account_info["passwd"]); - - if ($account_info["account_id"] == $phpgw_info["user"]["account_id"]) { - $phpgw_info["user"]["passwd"] = $phpgw->common->encrypt($account_info["passwd"]); - } - - // Update the sessions table. (The user might be logged in) -// $phpgw->db->query("update phpgw_sessions set session_pwd='" . $phpgw->common->encrypt($n_passwd) . "' " -// . "where session_lid='$lid'",__LINE__,__FILE__); - } - - if (! $account_info["account_status"]) { - $account_info["account_status"] = "L"; - } - - $entry["cn"] = sprintf("%s %s", $account_info["firstname"], $account_info["lastname"]); - $entry["sn"] = $account_info["lastname"]; - $entry["givenname"] = $account_info["firstname"]; - $dn = $account_info["account_id"]; - @ldap_modify($ldap, $dn, $entry); - - $phpgw->db->query("update accounts set account_firstname='". $account_info["firstname"] ."'," - . "account_lastname='". $account_info["lastname"] ."'," - . "account_status='". $account_info["account_status"] . "' " - . "where account_lid='" . $account_info["loginid"]. "'",__LINE__,__FILE__); - - - $cd = 27; - $new_loginid = $account_info["loginid"]; - if ($account_info["old_loginid"] != $account_info["loginid"]) { - $sep = $phpgw->common->filesystem_separator(); - - $basedir = $phpgw_info["server"]["files_dir"] . $sep . "users" . $sep; - - if (! @rename($basedir . $account_info["old_loginid"], $basedir . $account_info["loginid"])) { - $cd = 35; - } - } - return $cd; - } - - function account_delete($account_id) - { - global $phpgw_info, $phpgw, $ldap; - - //delete sub dn's - $sri = ldap_search($ldap, $phpgw_info["server"]["ldap_context"], "objectclass=phpgw_*"); - $allValues = ldap_get_entries($ldap, $sri); - - for ($i=0; $i < $allValues["count"]; $i++) - { - #print "
delete".$allValues[$i]["dn"]; - ldap_delete($ldap,$allValues[$i]["dn"]); - #print ldap_error($ldap); - } - - //before we delete the data in ldaptree, we need to fetch the uid, - //to be able to delete the sql stuff - $sri = ldap_read($ldap,$account_id,"objectclass=*"); - $allValues = ldap_get_entries($ldap, $sri); - - ldap_delete($ldap,$account_id); - - // set $account_id to uidnumber for sql - $account_id = $allValues[0]["uidnumber"][0]; - - $lid = $phpgw->accounts->id2name($account_id); - - $table_locks = array('preferences','todo','addressbook','accounts'); - - $cal = CreateObject('calendar.calendar'); - $cal->delete(string($lid)); - - $phpgw->db->lock($table_locks); - - $phpgw->db->query("delete from todo where todo_owner='".$account_id."'",__LINE__,__FILE__); - $phpgw->db->query("delete from addressbook where ab_owner='".$account_id."'",__LINE__,__FILE__); - $phpgw->db->query("delete from accounts where account_id='".$account_id."'",__LINE__,__FILE__); - $phpgw->db->query("delete from preferences where preference_owner='".$account_id."'",__LINE__,__FILE__); - - $phpgw->db->unlock(); - - $sep = $phpgw->common->filesystem_separator(); - - $basedir = $phpgw_info["server"]["files_dir"] . $sep . "users" . $sep; - - if (! @rmdir($basedir . $lid)) { - $cd = 34; - } else { - $cd = 29; - } - return $cd; - } - - function account_exsists($loginid) - { - global $phpgw_info, $ldap; - - $filter = "(|(uid=$loginid))"; - - $sr = ldap_search($ldap,$phpgw_info["server"]["ldap_context"],$filter,array("uid")); - $total = ldap_get_entries($ldap, $sr); - - // Odd, but it works - if (count($total) == 2) { - return True; - } else { - return False; - } - } - - function account_close() - { - @ldap_close($ldap); - } diff --git a/admin/inc/accounts_sql.inc.php b/admin/inc/accounts_sql.inc.php deleted file mode 100755 index c72150eaa8..0000000000 --- a/admin/inc/accounts_sql.inc.php +++ /dev/null @@ -1,208 +0,0 @@ -db->query("select account_id,account_firstname,account_lastname,account_lid " - . "from phpgw_accounts $querymethod $ordermethod " . $phpgw->db->limit($start)); - - $i = 0; - while ($phpgw->db->next_record()) { - $account_info[$i]["account_id"] = $phpgw->db->f("account_id"); - $account_info[$i]["account_lid"] = $phpgw->db->f("account_lid"); - $account_info[$i]["account_lastname"] = $phpgw->db->f("account_lastname"); - $account_info[$i]["account_firstname"] = $phpgw->db->f("account_firstname"); - $i++; - } - - return $account_info; - } - - function account_view($loginid) - { - global $phpgw_info, $phpgw; - - $phpgw->db->query("select account_id,account_firstname,account_lastname from phpgw_accounts where " - . "account_lid='$loginid'"); - $phpgw->db->next_record(); - - $account_info["account_id"] = $phpgw->db->f("account_id"); - $account_info["account_lid"] = $loginid; - $account_info["account_lastname"] = $phpgw->db->f("account_lastname"); - $account_info["account_firstname"] = $phpgw->db->f("account_firstname"); - - return $account_info; - } - - function account_add($account_info) - { - global $phpgw, $phpgw_info; - - $sql = "insert into accounts (account_lid,account_pwd,account_firstname,account_lastname," - . "account_status,account_lastpwd_change) values ('" - . $account_info["loginid"] . "','" . md5($account_info["passwd"]) . "','" - . addslashes($account_info["firstname"]) . "','". addslashes($account_info["lastname"]) - . "','A',0)"; - - $phpgw->db->query($sql,__LINE__,__FILE__); - - $sep = $phpgw->common->filesystem_separator(); - - $basedir = $phpgw_info["server"]["files_dir"] . $sep . "users" . $sep; - //echo "TEST: " . $basedir . $account_info["loginid"]; - if (! @mkdir($basedir . $account_info["loginid"], 0707)) { - $cd = 36; - } else { - $cd = 28; - } - return $cd; - } - - function account_edit($account_info) - { - global $phpgw_info, $phpgw; - -// $lid = $account_info["loginid"]; - - if ($account_info["old_loginid"] != $account_info["loginid"]) { - $phpgw->db->query("update accounts set account_lid='" . $account_info["loginid"] - . "' where account_lid='" . $account_info["old_loginid"] . "'"); - $phpgw->db->query("update phpgw_sessions set session_lid='" . $account_info["loginid"] - . "' where session_lid='" . $account_info["old_loginid"] . "'"); - -// $account_info["loginid"] = $account_info["n_loginid"]; - } - - if ($account_info["passwd"]) { - $phpgw->db->query("update accounts set account_pwd='" . md5($account_info["passwd"]) . "', " - . "account_lastpwd_change='" . time() . "' where account_lid='" - . $account_info["loginid"] . "'"); - if ($account_info["account_id"] == $phpgw_info["user"]["account_id"]) { - $phpgw_info["user"]["passwd"] = $phpgw->common->encrypt($account_info["passwd"]); - } -// $phpgw->db->query("update phpgw_sessions set session_pwd='" . addslashes($account_info["passwd"]) -// . "' where session_lid='" . $account_info["loginid"] . "'"); - } - - if (! $account_info["account_status"]) { - $account_info["account_status"] = "L"; - } - $cd = 27; - - if ($account_info["old_loginid"] != $account_info["loginid"]) { - $sep = $phpgw->common->filesystem_separator(); - - $basedir = $phpgw_info["server"]["files_dir"] . $sep . "users" . $sep; - - if (! @rename($basedir . $account_info["old_loginid"], $basedir . $account_info["loginid"])) { - $cd = 35; - } - } - - $phpgw->db->query("update accounts set account_firstname='" - . addslashes($account_info["firstname"]) . "', account_lastname='" - . addslashes($account_info["lastname"]) . "', account_status='" - . $account_info["account_status"] . "' where account_lid='" . $account_info["loginid"] - . "'"); - - return $cd; - } - - function account_delete($account_id) - { - global $phpgw; - global $phpgw_info; - - - $lid = $phpgw->accounts->id2name($account_id); - - $table_locks = array('preferences','todo','addressbook','accounts'); - - $cal = CreateObject('calendar.calendar'); - $cal->delete((string)$lid); - - $phpgw->db->lock($table_locks); - - $phpgw->db->query("delete from todo where todo_owner='".$account_id."'"); - $phpgw->db->query("delete from addressbook where ab_owner='".$account_id."'"); - $phpgw->db->query("delete from accounts where account_id='".$account_id."'"); - $phpgw->db->query("delete from preferences where preference_owner='".$account_id."'"); - - $phpgw->db->unlock(); - - $sep = $phpgw->common->filesystem_separator(); - - $basedir = $phpgw_info["server"]["files_dir"] . $sep . "users" . $sep; - - if (! @rmdir($basedir . $lid)) { - $cd = 34; - } else { - $cd = 29; - } - return $cd; - } - - function account_exsists($loginid) - { - global $phpgw; - - $phpgw->db->query("select count(*) from phpgw_accounts where account_lid='$loginid'"); - $phpgw->db->next_record(); - if ($phpgw->db->f(0) != 0) { - return True; - } else { - return False; - } - } - - function account_total() - { - global $phpgw, $query; - - if ($query) { - $querymethod = " where account_firstname like '%$query%' OR account_lastname like " - . "'%$query%' OR account_lid like '%$query%' "; - } - - $phpgw->db->query("select count(*) from phpgw_accounts $querymethod"); - $phpgw->db->next_record(); - - return $phpgw->db->f(0); - } - - // This is need for LDAP, so this is a dummy function. - function account_close() - { - return True; - }