[Tikiwiki-cvs] tiki/lib tikilib.php,1.64,1.65 userslib.php,1.13,1.14

[<lra...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv1718/lib

Modified Files:
	tikilib.php userslib.php 
Log Message:
Some bugfixes (closed several SF bugs)


Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- tikilib.php	13 Jan 2003 15:03:59 -0000	1.64
+++ tikilib.php	13 Jan 2003 15:32:34 -0000	1.65
@@ -5540,10 +5540,11 @@
   function get_links($data)
   {
     $links = Array();
-    if(preg_match_all("/\[([^\|\]]+)/",$data,$r1)) {
+    if(preg_match_all("/\[([^\[\|\]]+)\]/",$data,$r1)) {
       $res = $r1[1];
       $links = array_unique($res);
     }
+    print_r($links);
     return $links;
   }
 

Index: userslib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/userslib.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- userslib.php	10 Jan 2003 17:18:50 -0000	1.13
+++ userslib.php	13 Jan 2003 15:32:38 -0000	1.14
@@ -103,9 +103,10 @@
   function user_logout($user)
   {
     $t = date("U");
-    $query = "update users_users set lastLogin=$t where login='$user'";
-    $result = $this->db->query($query);
-    if(DB::isError($result)) $this->sql_error($query,$result);
+    // No need to change lastLogin since it is handled at the validateUser method
+    //$query = "update users_users set lastLogin=$t where login='$user'";
+    //$result = $this->db->query($query);
+    //if(DB::isError($result)) $this->sql_error($query,$result);
   }
   
   function genPass()
@@ -133,16 +134,28 @@
   {
     global $feature_challenge;
     $hash=md5($pass);
-    if($feature_challenge=='n' || empty($response)) {
+    // If the user is loggin in the the lastLogin should be the last currentLogin?
+    // 
+    
     
+    if($feature_challenge=='n' || empty($response)) {
       $query = "select login from users_users where login='$user' and hash='$hash'"; 
       $result = $this->db->query($query);
       if(DB::isError($result)) $this->sql_error($query,$result);
       if($result->numRows()) {
         $t = date("U");
+        // Check
+        $current = $this->db->getOne("select currentLogin from users_users where login='$user'");
+        $query = "update users_users set lastLogin=$current where login='$user'";
+        $result = $this->db->query($query);
+        if(DB::isError($result)) $this->sql_error($query,$result);
+        // check
+        
         $query = "update users_users set currentLogin=$t where login='$user'";
         $result = $this->db->query($query);
         if(DB::isError($result)) $this->sql_error($query,$result);
+        
+        
         return true; 
       }
     } else {
@@ -156,6 +169,12 @@
       //print("response : $response<br/>");
       if($response == md5($user.$hash.$_SESSION["challenge"])) {
         $t = date("U");
+        // Check
+        $current = $this->db->getOne("select currentLogin from users_users where login='$user'");
+        $query = "update users_users set lastLogin=$current where login='$user'";
+        $result = $this->db->query($query);
+        if(DB::isError($result)) $this->sql_error($query,$result);
+        // check
         $query = "update users_users set currentLogin=$t where login='$user'";
         $result = $this->db->query($query);
         if(DB::isError($result)) $this->sql_error($query,$result);