Changeset 1065 in ExiteCMS for branches/PLi-Fusion/includes/user_functions.php

Timestamp:

11/05/07 22:23:47 (5 years ago)

Author:

hverton

Message:

Merged trunk revision 1056:1064 into the PLi-Fusion branch

File:

• branches/PLi-Fusion/includes/user_functions.php (modified) (3 diffs)

branches/PLi-Fusion/includes/user_functions.php

@@ -43 +43 @@
     if (dbrows($result) != 0) {
         $data = dbarray($result);
-        $cookie_value = $data['user_id'].".".$user_pass;
         // if the account is suspended, check for an expiry date
         if ($data['user_status'] == 1 && $data['user_ban_expire'] > 0 && $data['user_ban_expire'] < time() ) {
+            // if this user's email address is marked as bad, reset the countdown counter
+            $data['user_bad_email'] = $data['user_bad_email'] == 0 ? 0 : time();
             // reset the user status and the expiry date
-            $result = dbquery("UPDATE ".$db_prefix."users SET user_status='0', user_ban_expire='0' WHERE user_id='".$data['user_id']."'");
+            $result = dbquery("UPDATE ".$db_prefix."users SET user_status='0', user_ban_expire='0', user_bad_email = '".$data['user_bad_email']."' WHERE user_id='".$data['user_id']."'");
             $data['user_status'] = 0;
         }
@@ -61 +62 @@
             // HV - end of code change
             header("P3P: CP='NOI ADM DEV PSAi COM NAV OUR OTRo STP IND DEM'");
+            $cookie_value = $data['user_id'].".".$user_pass;
             setcookie("userinfo", $cookie_value, $cookie_exp, "/", "", "0");
             redirect(BASEDIR."setuser.php?user=".$data['user_name'], "script");
@@ -136 +138 @@
 
 if (isset($userdata) && is_array($userdata)) {
-    // get the users own group memberships into an array
-    $groups = explode(".", substr($userdata['user_groups'], 1));
-    foreach ($groups as $group) {
-        // check if this groups has subgroups. If so, add them to the array
-        getsubgroups($group);
-    }
-    // create a new user_group field with all inherited groups, and
-    // get the inherited group rights and add them to the user own rights
-    $userdata['user_groups'] = "";
-    foreach ($groups as $group) {
-        $userdata['user_groups'] .= ".".$group;
-        $result = dbarray(dbquery("SELECT group_rights FROM ".$db_prefix."user_groups WHERE group_id = '".$group."'"));
-        if (isset($result['group_rights']) && $result['group_rights'] != "") {
-            $userdata['user_rights'] .= ($userdata['user_rights']==""?"":".").$result['group_rights'];
+    // if group memberships are defined, get the users own group memberships into an array
+    if (!empty($userdata['user_groups'])) {
+        $groups = explode(".", substr($userdata['user_groups'], 1));
+        foreach ($groups as $group) {
+            // check if this groups has subgroups. If so, add them to the array
+            getsubgroups($group);
+        }
+        // create a new user_group field with all inherited groups, and
+        // get the inherited group rights and add them to the user own rights
+        $userdata['user_groups'] = "";
+        foreach ($groups as $group) {
+            $userdata['user_groups'] .= ".".$group;
+            $result = dbarray(dbquery("SELECT group_rights FROM ".$db_prefix."user_groups WHERE group_id = '".$group."'"));
+            if (isset($result['group_rights']) && $result['group_rights'] != "") {
+                $userdata['user_rights'] .= ($userdata['user_rights']==""?"":".").$result['group_rights'];
+            }
         }
     }