[Tikiwiki-cvs] tiki/lib commentslib.php,1.28,1.29 userslib.php,1.31,1.32 tikilib.php,1.175,1.176 searchlib.php,1.5,1.6

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

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

Modified Files:
	commentslib.php userslib.php tikilib.php searchlib.php 
Log Message:
Bugfixing


Index: commentslib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/commentslib.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- commentslib.php	27 May 2003 20:33:59 -0000	1.28
+++ commentslib.php	2 Jun 2003 19:49:52 -0000	1.29
@@ -433,7 +433,7 @@
                         $pruneMaxAge, $topicsPerPage,
                         '$topicOrdering','$threadOrdering','$section',
                         '$topics_list_reads','$topics_list_replies','$topics_list_pts','$topics_list_lastpost','$topics_list_author','$vote_threads','$show_description',
-                        '$inbound_pop_server',$inbound_pop_port,'$inbound_pop_user','$inbound_pop_password',$outbound_address',
+                        '$inbound_pop_server',$inbound_pop_port,'$inbound_pop_user','$inbound_pop_password','$outbound_address',
                         '$topic_smileys','$topic_summary',
                         '$ui_avatar','$ui_flag','$ui_posts','$ui_level','$ui_email','$ui_online','$approval_type','$moderator_group','$forum_password','$forum_use_password','$att','$att_store','$att_store_dir',$att_max_size) ";
      $result = $this->query($query);

Index: userslib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/userslib.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- userslib.php	27 May 2003 20:34:01 -0000	1.31
+++ userslib.php	2 Jun 2003 19:49:52 -0000	1.32
@@ -828,7 +828,7 @@
     if($feature_clear_passwords == 'n') {
       $provpass='';
     }
-    $query = "update users_users set password='$provpass',hash='$hash' where login='$user'";
+    $query = "update users_users set password='$provpass',hash='$hash',provpass='' where login='$user'"; 
     $result = $this->query($query);
   }
   

Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -d -r1.175 -r1.176
--- tikilib.php	30 May 2003 17:44:45 -0000	1.175
+++ tikilib.php	2 Jun 2003 19:49:52 -0000	1.176
@@ -752,6 +752,7 @@
     $result = $this->query($query);
   }
 
+
   function get_pv_chart_data($days)
   {
     $now = mktime(0,0,0,date("m"),date("d"),date("Y"));

Index: searchlib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/searchlib.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- searchlib.php	21 Mar 2003 22:46:37 -0000	1.5
+++ searchlib.php	2 Jun 2003 19:49:52 -0000	1.6
@@ -324,6 +324,14 @@
       array_push($data, $a);
     }
     $cant += $rv['cant'];
+    
+    $rv = $this->find_directory($words,     $offset, $maxRecords, $fulltext);
+    foreach($rv['data'] as $a) {
+      $a['type'] = tra('Directory');
+      array_push($data, $a);
+    }
+    $cant += $rv['cant'];
+    
     if ($fulltext) {
       function find_pages_cmp ($a, $b) {
         return ($a['relevance'] > $b['relevance']) ? -1 : (($a['relevance'] < $b['relevance']) ? 1 : 0);