[geeklog-cvs] geeklog-1.3/system lib-plugins.php,1.43,1.44 lib-sessions.php,1.32,1.33

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/system
In directory www:/tmp/cvs-serv1781

Modified Files:
	lib-plugins.php lib-sessions.php 
Log Message:
$_USER['auto_login'] is set to "true" when users are re-authenticated by their long-term cookie (for plugins, since we can't call PLG_loginUser() in that case).


Index: lib-plugins.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/lib-plugins.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** lib-plugins.php	25 Sep 2004 03:03:12 -0000	1.43
--- lib-plugins.php	29 Sep 2004 08:04:43 -0000	1.44
***************
*** 699,702 ****
--- 699,706 ----
  * This function will inform all plugins when a user logs in
  *
+ * Note: This function is NOT called when users are re-authenticated by their
+ * long-term cookie. The global variable $_USER['auto_login'] will be set to
+ * 'true' in that case, however.
+ *
  * @param     int     $uid     user id
  *

Index: lib-sessions.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/lib-sessions.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** lib-sessions.php	6 Sep 2004 19:51:55 -0000	1.32
--- lib-sessions.php	29 Sep 2004 08:04:43 -0000	1.33
***************
*** 35,39 ****
  /**
  * This is the session management library for Geeklog.  Some of this code was
! * borrowed by phpBB 1.4.x which is also GPL'd
  *
  */
--- 35,39 ----
  /**
  * This is the session management library for Geeklog.  Some of this code was
! * borrowed from phpBB 1.4.x which is also GPL'd
  *
  */
***************
*** 64,68 ****
  
  // LOAD USER DATA. NOTE: I'm not sure why I have to set $_USER like this because
! // it's suppose to be a global variable.  I tried setting $_USER from within
  // SESS_sessionCheck() and it doesn't work.
  $_USER = SESS_sessionCheck();
--- 64,68 ----
  
  // LOAD USER DATA. NOTE: I'm not sure why I have to set $_USER like this because
! // it's supposed to be a global variable.  I tried setting $_USER from within
  // SESS_sessionCheck() and it doesn't work.
  $_USER = SESS_sessionCheck();
***************
*** 117,120 ****
--- 117,121 ----
              }
              $_USER = $userdata;
+             $_USER['auto_login'] = false;
          } else {
              // Session probably expired, now check permanent cookie
***************
*** 135,138 ****
--- 136,140 ----
                              $userdata = SESS_getUserDataFromId($userid);
                              $_USER = $userdata;
+                             $_USER['auto_login'] = true;
                          }
                      }
***************
*** 171,174 ****
--- 173,177 ----
                          $userdata = SESS_getUserDataFromId($userid);
                          $_USER = $userdata;
+                         $_USER['auto_login'] = true;
                      }
                  }