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

Timestamp:

05/15/08 22:25:54 (4 years ago)

Author:

hverton

Message:

Merged trunk revisions 1342:1407 into the PLi-Fusion branch

File:

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

branches/PLi-Fusion/includes/user_functions.php

@@ -42 +42 @@
 
 // Login code 
-if (isset($_POST['login'])) {
-    $user_pass = md5($_POST['user_pass']);
+if (isset($_POST['login']) && isset($_POST['user_name']) && isset($_POST['user_pass'])) {
+    $user_pass = md5(md5($_POST['user_pass']));
     $user_name = preg_replace(array("/\=/","/\#/","/\sOR\s/"), "", stripinput($_POST['user_name']));
-    // double hashed passwords as of revision 954
-    if ($settings['revision'] >= 954) {
-        $user_pass = md5($user_pass);
-    }
     $result = dbquery("SELECT * FROM ".$db_prefix."users WHERE user_name='$user_name' AND user_password='".$user_pass."'");
     if (dbrows($result) != 0) {
@@ -85 +81 @@
         }
     } else {
-        redirect(BASEDIR."setuser.php?error=3");
+        redirect(BASEDIR."setuser.php?error=3", "script");
         exit;
     }
@@ -365 +361 @@
 
     if (iSUPERADMIN) { 
-        $res .= ($hidden == false?" AND ":"")."($field != '100'";
+        $res .= ($res != ""?" AND ":"")."$field != '100'";
+        return $res;
     } elseif ($userdata['user_level'] >= 102) { 
         $res .= ($hidden == false?" AND ":"")."($field='0' OR $field='101' OR $field='102'";