[php-blog-cvs] serendipity serendipity_functions.inc.php,1.175,1.176

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv5393

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixing up auto-login real good... Moving around some auth stuff, this makes more sense...


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- serendipity_functions.inc.php	7 Jan 2004 17:45:52 -0000	1.175
+++ serendipity_functions.inc.php	13 Jan 2004 17:47:57 -0000	1.176
@@ -14,23 +14,29 @@
 function serendipity_login() {
     global $serendipity;
 
-    if (serendipity_authenticate_author((isset($serendipity['POST']['user']) ? $serendipity['POST']['user'] : ''), (isset($serendipity['POST']['pass']) ? $serendipity['POST']['pass'] : ''))) {
-        $_SESSION['serendipityAuthedUser'] = true;
+    if ( $_SESSION['serendipityAuthedUser'] === true ) {
+        return true;
+    }
+
+    if (serendipity_authenticate_author($serendipity['POST']['user'], $serendipity['POST']['pass'])) {
 
         if ( empty($serendipity['POST']['auto']) ) {
             serendipity_deleteCookie('author_information');
+            return false;
         } else {
-            $passwd = serialize(array('username' => $serendipity['POST']['user'],
-                                      'password' => $serendipity['POST']['pass']));
-            serendipity_setCookie('author_information', base64_encode($passwd));
+            $package = serialize(array('username' => $serendipity['POST']['user'],
+                                       'password' => $serendipity['POST']['pass']));
+            serendipity_setCookie('author_information', base64_encode($package));
+            return true;
         }
-        return true;
+    
     } elseif ( isset($serendipity['COOKIE']['author_information']) ) {
         $cookie = unserialize(base64_decode($serendipity['COOKIE']['author_information']));
         if ( serendipity_authenticate_author($cookie['username'], $cookie['password']) ) {
-            $_SESSION['serendipityAuthedUser'] = true;
+            return true;
         } else {
             serendipity_deleteCookie('author_information');
+            return false;
         }
 
     }
@@ -2181,14 +2187,11 @@
               AND password = '$password'";
     $row = serendipity_db_query($query, true, 'assoc');
 
-    if (is_string($row)) {
-        print $row;
-    }
-
-    if ($row) {
-        $_SESSION['serendipityUser']     = $serendipity['serendipityUser']  = $username;
-        $_SESSION['serendipityEmail']    = $serendipity['serendipityEmail'] = $row['email'];
-        $_SESSION['serendipityAuthorid'] = $serendipity['authorid']         = $row['authorid'];
+    if (is_array($row)) {
+        $_SESSION['serendipityUser']        = $serendipity['serendipityUser']       = $username;
+        $_SESSION['serendipityEmail']       = $serendipity['serendipityEmail']      = $row['email'];
+        $_SESSION['serendipityAuthorid']    = $serendipity['authorid']              = $row['authorid'];
+        $_SESSION['serendipityAuthedUser']  = $serendipity['serendipityAuthedUser'] = true;
         return true;
     }