[Tikiwiki-cvs] tiki get_strings.php,1.11,1.12 tiki-admin_rssmodules.php,1.6,1.7 tiki-faq_questions.php,1.4,1.5 tiki-pagesetup.php,1.3,1.4 tiki-searchresults.php,1.11,1.12 tiki-view_forum_thread.php,1.7,1.8

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

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

Modified Files:
	get_strings.php tiki-admin_rssmodules.php 
	tiki-faq_questions.php tiki-pagesetup.php 
	tiki-searchresults.php tiki-view_forum_thread.php 
Log Message:
Bugfixes and Swedish language file added


Index: get_strings.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/get_strings.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- get_strings.php	30 Mar 2003 18:54:59 -0000	1.11
+++ get_strings.php	30 Mar 2003 20:50:39 -0000	1.12
@@ -8,8 +8,8 @@
 
 // Cambiar lo que busca segun sea .php o .tpl
 
-$languages = Array('tw','dk','ru','de','en','sp','fr','dk','ru');
-//$languages = Array('po');
+$languages = Array('tw','dk','ru','de','en','sp','fr','dk','ru','sw');
+//$languages = Array('sw');
 
 $files = Array();
   

Index: tiki-admin_rssmodules.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_rssmodules.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tiki-admin_rssmodules.php	22 Mar 2003 22:13:56 -0000	1.6
+++ tiki-admin_rssmodules.php	30 Mar 2003 20:50:39 -0000	1.7
@@ -24,7 +24,7 @@
 }
 
 if($_REQUEST["rssId"]) {
-  $info = $tikilib->get_rss_module($_REQUEST["rssId"]);
+  $info = $rsslib->get_rss_module($_REQUEST["rssId"]);
 } else {
   $info = Array();
   $info["name"]='';

Index: tiki-faq_questions.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-faq_questions.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tiki-faq_questions.php	21 Mar 2003 13:17:47 -0000	1.4
+++ tiki-faq_questions.php	30 Mar 2003 20:50:39 -0000	1.5
@@ -56,6 +56,11 @@
 
 if(isset($_REQUEST["save"])) {
    $faqlib->replace_faq_question($_REQUEST["faqId"], $_REQUEST["questionId"], $_REQUEST["question"], $_REQUEST["answer"]);
+   $info["question"]='';
+   $info["answer"]='';
+   $smarty->assign('question',$info["question"]);
+   $smarty->assign('answer',$info["answer"]);
+   $smarty->assign('questionId',0);
 }
 
 if(!isset($_REQUEST["sort_mode"])) {

Index: tiki-pagesetup.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-pagesetup.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tiki-pagesetup.php	4 Jan 2003 19:34:16 -0000	1.3
+++ tiki-pagesetup.php	30 Mar 2003 20:50:39 -0000	1.4
@@ -7,6 +7,9 @@
 'tiki_p_edit',
 'tiki_p_rollback',
 'tiki_p_remove',
+'tiki_p_rename',
+'tiki_p_lock',
+'tiki_p_view_attachments'
 );
 
 // If we are in a page then get individual permissions

Index: tiki-searchresults.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-searchresults.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- tiki-searchresults.php	21 Mar 2003 15:48:16 -0000	1.11
+++ tiki-searchresults.php	30 Mar 2003 20:50:39 -0000	1.12
@@ -8,11 +8,11 @@
 if($feature_search != 'y') {
   $smarty->assign('msg',tra("This feature is disabled"));
   $smarty->display("styles/$style_base/error.tpl");
-  die;  
+  die;
 }
 
 if($feature_search_stats == 'y') {
-  $searchlib->register_search(isset($_REQUEST["words"]) ? $_REQUEST["words"] : '');
+  $tikilib->register_search(isset($_REQUEST["words"]) ? $_REQUEST["words"] : '');
 }
 
 if(!isset($_REQUEST["where"])) {
@@ -27,38 +27,38 @@
 if($where=='pages' and $feature_wiki != 'y') {
   $smarty->assign('msg',tra("This feature is disabled"));
   $smarty->display("styles/$style_base/error.tpl");
-  die;  
+  die;
 }
 if($where=='faqs' and $feature_faqs != 'y') {
   $smarty->assign('msg',tra("This feature is disabled"));
   $smarty->display("styles/$style_base/error.tpl");
-  die;  
+  die;
 }
 
 if($where=='forums' and $feature_forums != 'y') {
   $smarty->assign('msg',tra("This feature is disabled"));
   $smarty->display("styles/$style_base/error.tpl");
-  die;  
+  die;
 }
 if($where=='files' and $feature_file_galleries !='y') {
   $smarty->assign('msg',tra("This feature is disabled"));
   $smarty->display("styles/$style_base/error.tpl");
-  die;  
+  die;
 }
 if($where=='articles' and $feature_articles != 'y') {
   $smarty->assign('msg',tra("This feature is disabled"));
   $smarty->display("styles/$style_base/error.tpl");
-  die;  
+  die;
 }
 if(($where=='galleries' || $where=='images') and $feature_galleries != 'y') {
   $smarty->assign('msg',tra("This feature is disabled"));
   $smarty->display("styles/$style_base/error.tpl");
-  die;  
+  die;
 }
 if(($where=='blogs' || $where=='posts') and $feature_blogs != 'y') {
   $smarty->assign('msg',tra("This feature is disabled"));
   $smarty->display("styles/$style_base/error.tpl");
-  die;  
+  die;
 }
 // Already assigned above! $smarty->assign('where',$where);
 
@@ -66,7 +66,7 @@
 if(!isset($_REQUEST["offset"])) {
   $offset = 0;
 } else {
-  $offset = $_REQUEST["offset"]; 
+  $offset = $_REQUEST["offset"];
 }
 $smarty->assign_by_ref('offset',$offset);
 
@@ -81,6 +81,20 @@
   $smarty->assign('words',$_REQUEST["words"]);
 }
 
+if ($fulltext == 'y') {
+  $CurrentIndex = -1;
+  $CurrentData = NULL;
+
+  foreach($results["data"] as $current) {
+    if($current["relevance"] > 0) {
+      $CurrentData[++$CurrentIndex] = $current;
+      }
+    }
+
+  $results['data'] = $CurrentData;
+  $results['cant'] = $CurrentIndex;
+  }
+
 $cant_pages = ceil($results["cant"] / $maxRecords);
 $smarty->assign_by_ref('cant_results',$results["cant"]);
 $smarty->assign_by_ref('cant_pages',$cant_pages);
@@ -88,13 +102,13 @@
 if($results["cant"] > ($offset+$maxRecords)) {
   $smarty->assign('next_offset',$offset + $maxRecords);
 } else {
-  $smarty->assign('next_offset',-1); 
+  $smarty->assign('next_offset',-1);
 }
 // If offset is > 0 then prev_offset
 if($offset>0) {
-  $smarty->assign('prev_offset',$offset - $maxRecords);  
+  $smarty->assign('prev_offset',$offset - $maxRecords);
 } else {
-  $smarty->assign('prev_offset',-1); 
+  $smarty->assign('prev_offset',-1);
 }
 
 

Index: tiki-view_forum_thread.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-view_forum_thread.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tiki-view_forum_thread.php	28 Mar 2003 20:56:43 -0000	1.7
+++ tiki-view_forum_thread.php	30 Mar 2003 20:50:39 -0000	1.8
@@ -183,6 +183,7 @@
   $qdata = implode("\n",$quoted_lines);
   $qdata = '> '.$quote_info["userName"].":\n".$qdata;
   $smarty->assign('comment_data',$qdata);
+  $smarty->assign('comment_title',tra('Re:').$quote_info["title"]);
   $smarty->assign('openpost','y');
 }