Changeset 1065 in ExiteCMS for branches/PLi-Fusion/setuser.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/setuser.php (modified) (4 diffs)

branches/PLi-Fusion/setuser.php

@@ -19 +19 @@
 $variables = array();
 
+// set the redirect url (set in theme_cleanup)
+if (isset($_COOKIE['last_url'])) {
+    $variables['url'] = $_COOKIE['last_url'];
+} elseif (empty($_SERVER['HTTP_REFERER'])) {
+    $variables['url'] = BASEDIR."index.php";
+} else {
+    $variables['url'] = substr(strstr($_SERVER['HTTP_REFERER'], ":"), strlen($_SERVER['HTTP_HOST'])+3);
+}
+
+// array to store the lines of the setuser message
+$message = array();
+
+// make sure the error parameter has a value
+if (!isset($error) || !isNum($error)) $error = 0;
+
 if (isset($_REQUEST['logout']) && $_REQUEST['logout'] == "yes") {
     header("P3P: CP='NOI ADM DEV PSAi COM NAV OUR OTRo STP IND DEM'");
@@ -25 +40 @@
     setcookie("lastvisit", "", time() - 7200, "/", "", "0");
     $result = dbquery("DELETE FROM ".$db_prefix."online WHERE online_ip='".USER_IP."'");
-    if (isset($userdata['user_name'])) $message = "<b>".$locale['192'].$userdata['user_name']."</b><br /><br />\n";
-    $error = "";
+    if (isset($userdata['user_name'])) {
+        $message['line2'] =  "<b>".$locale['192'].$userdata['user_name']."</b>";
+    }
 } else {
-    if (!isset($error)) $error = "";
     if ($error == 1) {
-        $error = "<b>".$locale['194']."</b><br /><br />\n";
+        $message['line1'] = "<b>".$locale['194']."</b>";
         $data = dbarray(dbquery("SELECT user_ban_reason, user_ban_expire FROM ".$db_prefix."users WHERE user_id='$user_id'"));
         if (is_array($data)) {
-            if ($data['user_ban_reason'] != "") $error .= "<b>".$locale['180']." : ".$data['user_ban_reason']."</b><br />\n";
-            if ($data['user_ban_expire'] > 0) $error .= "<b>".$locale['181']." ".showdate('forumdate', $data['user_ban_expire'])."</b><br />\n";
-            $error .= "<br / >";
+            if ($data['user_ban_reason'] != "") $message['line2'] = "<b>".$locale['180']." : ".$data['user_ban_reason']."</b>";
+            if ($data['user_ban_expire'] > 0) $message['line4']  = "<b>".$locale['181']." ".showdate('forumdate', $data['user_ban_expire'])."</b>";
         }
     } elseif ($error == 2) {
-        $error = "<b>".$locale['195']."</b><br /><br />\n";
+        $message['line2'] =  "<b>".$locale['195']."</b>";
     } elseif ($error == 3) {
-        $error = "<b>".$locale['196']."</b><br /><br />\n";
+        $message['line2'] =  "<b>".$locale['196']."</b>";
     } else {
         if (isset($_COOKIE['userinfo'])) {
@@ -46 +60 @@
             $user_pass = (preg_match("/^[0-9a-z]{32}$/", $cookie_vars['1']) ? $cookie_vars['1'] : "");
             $user_name = preg_replace(array("/\=/","/\#/","/\sOR\s/"), "", stripinput($user));
-            if (!dbcount("(user_id)", "users", "user_name='$user_name' AND user_password='".$user_pass."'")) {
-                $message = "<b>".$locale['196']."</b><br /><br />\n";
+            $result = dbquery("SELECT * FROM ".$db_prefix."users WHERE user_name='".$user_name."' AND user_password='".$user_pass."'");
+            if ($data = dbarray($result)) {
+                if ($data['user_bad_email'] != 0) {
+                    $variables['url'] = BASEDIR."edit_profile.php?check=email&value=".(90 - intval((time() - $data['user_bad_email']) / 86400));
+                }
+                $result = dbquery("DELETE FROM ".$db_prefix."online WHERE online_user='0' AND online_ip='".USER_IP."'");
+                $message['line2'] =  "<b>".$locale['193'].$user."</b>";
             } else {
-                $result = dbquery("DELETE FROM ".$db_prefix."online WHERE online_user='0' AND online_ip='".USER_IP."'");
-                $message = "<b>".$locale['193'].$user."</b><br /><br />\n";
+                $message['line2'] =  "<b>".$locale['196']."</b>";
             }
         }
@@ -56 +74 @@
 }
 
-$variables['message'] = isset($message)?$message:"";
+// store the message for use in the template
+$variables['message'] = $message;
+
+// auto-redirect counter (in seconds)
 $variables['error'] = $error;
-$variables['refresh'] = $error==""?1:10;
+$variables['refresh'] = $error==0 ? 1 : 10;
 
 // define the first body panel variables