global sync to HEAD for passing fixes

blocks/search/block_search.php

@@ -1,14 +1,17 @@
 <?php
   
   /* This is the global search shortcut block - a single query can be entered, and
-     the user will be redirected to the query page where they can enter more
-     advanced queries, and view the results of their search. When searching from
-     this block, the broadest possible selection of documents is searched.
-     
-     Author:  Michael Champanis (mchampan)
-     Date:    2006 06 25
-  
-     Todo: make strings -> get_string()  
+  * the user will be redirected to the query page where they can enter more
+  *  advanced queries, and view the results of their search. When searching from
+  *  this block, the broadest possible selection of documents is searched.
+  *  
+  *
+  *  Todo: make strings -> get_string()  
+  * 
+  * @package search
+  * @subpackage search block
+  * @author: Michael Champanis (mchampan), reengineered by Valery Fremaux 
+  * @date: 2006 06 25
   */
      
   class block_search extends block_base {
@@ -16,7 +19,7 @@
     function init() {
       $this->title = get_string('blockname', 'block_search');
       $this->cron = 1;
-      $this->version = 2007112700;
+      $this->version = 2008031500;
     } //init  
     
     // only one instance of this block is required

blocks/search/config_global.html

@@ -55,6 +55,20 @@
             } ?>"/><br/><br/>
         </td>
     </tr>
+    <tr>
+        <td valign="top" align="right">
+            <b><?php print_string('usemoodleroot', 'block_search') ?>:</b>
+        </td>
+        <td valign="top" align="left">
+        <?php 
+            $usemoodleroot = (isset($CFG->block_search_usemoodleroot)) ? 'checked="checked"' : '' ; 
+            $notusemoodleroot = (!isset($CFG->block_search_usemoodleroot)) ? 'checked="checked"' : '' ; 
+        ?>
+          <input id="block_search_usemoodleroot" type="radio" name="block_search_usemoodleroot" <?php echo $usemoodleroot ?> value="1"/> <?php print_string('yes') ?> - 
+          <input id="block_search_usemoodleroot" type="radio" name="block_search_usemoodleroot" <?php echo $notusemoodleroot ?> value="0"/> <?php print_string('no') ?> 
+          <br/><br/>
+        </td>
+    </tr>
     <tr>
         <td valign="top" align="right">
             <b><?php print_string('configpdftotextcmd', 'block_search') ?>:</b>

blocks/search/lang/en_utf8/block_search.php

@@ -11,4 +11,5 @@ $string['configsearchtext'] = 'Search text';
 $string['go'] = 'Go!';
 $string['bytes'] = ' bytes (0 stands for no limits)';
 $string['searchmoodle'] = 'Search Moodle';
+$string['usemoodleroot'] = 'Use moodle root for external converters';
 ?>

blocks/search/lang/fr_utf8/block_search.php

@@ -11,4 +11,5 @@ $string['configsearchtext'] = 'Rechercher dans le texte';
 $string['go'] = 'Lancer la recherche';
 $string['bytes'] = ' octets (0 pour \"pas de limite\")';
 $string['searchmoodle'] = 'Rechercher dans le site';
+$string['usemoodleroot'] = 'Utiliser la racine de Moodle pour les convertisseurs externes';
 ?>

blocks/search/lang/nl_utf8/block_search.php

@@ -11,4 +11,6 @@ $string['configsearchtext'] = 'Zoektekst';
 $string['go'] = 'Zoek!';
 $string['bytes'] = ' bytes (0 staat voor ongelimiteerd)';
 $string['searchmoodle'] = 'Zoek in Moodle';
+$string['usemoodleroot'] = 'Use moodle root for external converters';
+
 ?>