From 1f471d75888f6c73c572c4669a953793b45e5985 Mon Sep 17 00:00:00 2001 From: seek3r Date: Wed, 6 Sep 2000 15:55:58 +0000 Subject: [PATCH] cleaned up code --- admin/editaccount.php | 249 ++++++++++++++++++++---------------------- login.php | 3 +- 2 files changed, 121 insertions(+), 131 deletions(-) diff --git a/admin/editaccount.php b/admin/editaccount.php index 764fff0295..48a27f05b0 100755 --- a/admin/editaccount.php +++ b/admin/editaccount.php @@ -28,88 +28,86 @@ } if ($submit) { - $phpgw->db->query("select loginid from accounts where con='$con'"); - $phpgw->db->next_record(); - $lid = $phpgw->db->f("loginid"); + $phpgw->db->query("select loginid from accounts where con='$con'"); + $phpgw->db->next_record(); + $lid = $phpgw->db->f("loginid"); - if ($n_passwd || $n_passwd_2) { - if ($n_passwd != $n_passwd_2) - $error .= lang_admin("The two passwords are not the same"); + if ($n_passwd || $n_passwd_2) { + if ($n_passwd != $n_passwd_2){ + $error .= lang_admin("The two passwords are not the same"); + } + if (! $n_passwd){ + $error .= lang_admin("You must enter a password"); + } + } - if (! $n_passwd) - $error .= lang_admin("You must enter a password"); - } + if ($lid != $n_loginid) { + $phpgw->db->query("select loginid from accounts where loginid='$n_loginid'"); + if ($phpgw->db->num_rows() != 0) { + $error .= "
" . lang_admin("That loginid has already been taken"); + } + } - if ($lid != $n_loginid) { - $phpgw->db->query("select loginid from accounts where loginid='$n_loginid'"); - if ($phpgw->db->num_rows() != 0) { - $error .= "
" . lang_admin("That loginid has already been taken"); + if (count($new_permissions) == 0){ + $error .= "
" . lang_admin("You must add at least 1 permission to this account"); + } + if (! $error) { + $phpgw->db->lock(array('accounts','preferences','sessions')); + if ($n_passwd) { + $phpgw->db->query("update accounts set passwd='" . md5($n_passwd) . "', " + . "lastpasswd_change='" . time() . "' where loginid='" . "$lid'"); + $phpgw->db->query("update sessions set passwd='" . addslashes($n_passwd) + . "' where loginid='$lid'"); + } + while ($permission = each($new_permissions)) { + if ($phpgw_info["apps"][$permission[0]]["enabled"]) { + $phpgw->accounts->add_app($permission[0]); } - } + } + //$phpgw->permissions->add("hr"); - if (count($new_permissions) == 0) - $error .= "
" . lang_admin("You must add at least 1 permission to this account"); + if ($new_permissions["anonymous"] && ! $new_permissions["admin"]){ + $phpgw->accounts->add_app("anonymous"); + } + if (! $n_account_status){ + $n_account_status = "L"; + } + $cd = 27; - if (! $error) { - $phpgw->db->lock(array('accounts','preferences','sessions')); - if ($n_passwd) { - $phpgw->db->query("update accounts set passwd='" . md5($n_passwd) . "', " - . "lastpasswd_change='" . time() . "' where loginid='" - . "$lid'"); + // If they changed there loginid, we need to change the owner in ALL + // tables to reflect on the new one + if ($lid != $n_loginid) { + change_owner("","preferences","owner",$n_loginid,$lid); + change_owner("addressbook","addressbook","owner",$n_loginid,$lid); + change_owner("todo","todo","owner",$n_loginid,$lid); + change_owner("","accounts","loginid",$n_loginid,$lid); + change_owner("","sessions","loginid",$n_loginid,$lid); + change_owner("calendar","webcal_entry","cal_create_by",$n_loginid,$lid); + change_owner("calendar","webcal_entry_user","cal_login",$n_loginid,$lid); - $phpgw->db->query("update sessions set passwd='" . addslashes($n_passwd) - . "' where loginid='$lid'"); - } - - while ($permission = each($new_permissions)) { - if ($phpgw_info["apps"][$permission[0]]["enabled"]) { - $phpgw->accounts->add_app($permission[0]); - } - } - //$phpgw->permissions->add("hr"); - - if ($new_permissions["anonymous"] && ! $new_permissions["admin"]) - $phpgw->accounts->add_app("anonymous"); - - if (! $n_account_status) - $n_account_status = "L"; - - $cd = 27; - - // If they changed there loginid, we need to change the owner in ALL - // tables to reflect on the new one - if ($lid != $n_loginid) { - change_owner("","preferences","owner",$n_loginid,$lid); - change_owner("addressbook","addressbook","owner",$n_loginid,$lid); - change_owner("todo","todo","owner",$n_loginid,$lid); - change_owner("","accounts","loginid",$n_loginid,$lid); - change_owner("","sessions","loginid",$n_loginid,$lid); - change_owner("calendar","webcal_entry","cal_create_by",$n_loginid,$lid); - change_owner("calendar","webcal_entry_user","cal_login",$n_loginid,$lid); - - if ($lid <> $n_loginid) { - $sep = $phpgw->common->filesystem_separator(); + if ($lid <> $n_loginid) { + $sep = $phpgw->common->filesystem_separator(); $basedir = $phpgw_info["server"]["server_root"] . $sep . "filemanager" . $sep - . "users" . $sep; + . "users" . $sep; if (! @rename($basedir . $lid, $basedir . $n_loginid)) { - $cd = 35; - } - } + $cd = 35; + } } + } - $phpgw->db->query("update accounts set firstname='" . addslashes($n_firstname) . "'," - . " lastname='" . addslashes($n_lastname) . "', permissions='" - . $phpgw->accounts->add_app("",True) . "', status='" - . "$n_account_status', groups='" - . $phpgw->accounts->array_to_string("none",$n_groups) - . "' where loginid='$n_loginid'"); + $phpgw->db->query("update accounts set firstname='" . addslashes($n_firstname) . "'," + . " lastname='" . addslashes($n_lastname) . "', permissions='" + . $phpgw->accounts->add_app("",True) . "', status='" + . "$n_account_status', groups='" + . $phpgw->accounts->array_to_string("none",$n_groups) + . "' where loginid='$n_loginid'"); $phpgw->db->unlock(); Header("Location: " . $phpgw->link("accounts.php", "cd=$cd")); exit; - } // if ! $error + } // if ! $error } // if $submit $phpgw->common->header(); @@ -120,15 +118,14 @@ $phpgw->db->query("select * from accounts where con='$con'"); $phpgw->db->next_record(); $account_status = $phpgw->db->f("status"); - ?> - -
"> +?> + "> - " . lang_common("Error") . ":$error"; - } - ?> +" . lang_common("Error") . ":$error"; + } +?>
@@ -146,78 +143,71 @@ - ' - . '"; - + } + echo ">" . $phpgw->db->f("group_name") . "\n"; + } +?> + + +' . lang_common($perm_display[$i][1]) . '' - . '"; - - $i++; - } + for ($i=0;$i<200;) { // The $i<200 is only used for a brake + if (! $perm_display[$i][1]) break; + echo '' + . '"; + $i++; + if (! $perm_display[$i][1]) break; + echo '' + . '"; + $i++; + } /* echo ""; + echo " checked"; + echo ">"; echo ""; */ - - ?> - +?> - + @@ -233,5 +223,4 @@
-
' . lang_common($perm_display[$i][1]) . 'db->query("select * from groups"); + while ($phpgw->db->next_record()) { + echo "
' . lang_common($perm_display[$i][1]) . '' . lang_common($perm_display[$i][1]) . '
" . lang_admin("Anonymous user") . "" . lang_admin("Manager") . "
>> +
- \ No newline at end of file diff --git a/login.php b/login.php index 3a1108b794..b7db5aea71 100755 --- a/login.php +++ b/login.php @@ -22,11 +22,12 @@ include($phpgw_info["server"]["include_root"] . "/lang/" . "en" . "_login.inc.php"); include($phpgw_info["server"]["api_dir"] . "/phpgw_template.inc.php"); +/* if ($code != 10 && $phpgw_info["server"]["usecookies"] == False) { Setcookie("sessionid"); Setcookie("kp3"); } - +*/ $deny_login = False; $tmpl = new Template($phpgw_info["server"]["template_dir"]);