Moving search options to the settings.php?category=Search page

main/admin/index.php

@@ -35,7 +35,6 @@ $tool_name = get_lang('PlatformAdmin');
 // Displaying the header
 Display::display_header($nameTools);
 
-
 if (api_is_platform_admin()) {
     if (is_dir(api_get_path(SYS_CODE_PATH).'install/') && is_readable(api_get_path(SYS_CODE_PATH).'install/index.php')) {
         Display::display_normal_message(get_lang('InstallDirAccessibleSecurityThreat'));
@@ -115,9 +114,7 @@ if (api_is_platform_admin()) { ?>
         <li><a href="course_category.php"><?php echo get_lang('AdminCategories'); ?></a></li>
         <li><a href="subscribe_user2course.php"><?php echo get_lang('AddUsersToACourse'); ?></a></li>
         <li><a href="course_user_import.php"><?php echo get_lang('ImportUsersToACourse'); ?></a></li>
-    <?php if (api_get_setting('search_enabled') == 'true') { ?>
+    <?php 
-        <li><a href="specific_fields.php"><?php echo get_lang('SpecificSearchFields'); ?></a></li>
-    <?php }
     if (isset($extAuthSource) && isset($extAuthSource['ldap']) && count($extAuthSource['ldap']) > 0) { ?>
         <li><a href="ldap_import_students.php"><?php echo get_lang('ImportLDAPUsersIntoCourse'); ?></a></li>
     <?php } ?>

main/admin/settings.lib.php

@@ -563,9 +563,14 @@ function handle_search() {
            $sf_values[$sf['code']] = $sf['name'];
         }
         $group = array();
-        $form->addElement('select', 'search_prefilter_prefix', get_lang('SearchPrefilterPrefix'), $sf_values, '');
+        if (empty($sf_values)) {
-        $default_values['search_prefilter_prefix'] = api_get_setting('search_prefilter_prefix');
+            $url =  Display::div(Display::url(get_lang('AddSpecificSearchField'), 'specific_fields.php'), array('class'=>'sectioncomment'));
-        
+            $form->addElement('html', get_lang('SearchPrefilterPrefix'));         
+            $form->addElement('html', $url);    
+        } else {
+            $form->addElement('select', 'search_prefilter_prefix', get_lang('SearchPrefilterPrefix'), $sf_values, '');
+            $default_values['search_prefilter_prefix'] = api_get_setting('search_prefilter_prefix');
+        }
         //$form->addElement('html', Display::url(get_lang('AddSpecificSearchField'), 'specific_fields.php' ));
         //admin/specific_fields.php        
     }
@@ -608,14 +613,13 @@ function handle_search() {
         }
         */
         
-        $xapian_loaded      = Display::return_icon('bullet_green.gif', get_lang('Ok'));
+        $xapian_loaded          = Display::return_icon('bullet_green.gif', get_lang('Ok'));
-        $dir_exists         = Display::return_icon('bullet_green.gif', get_lang('Ok'));
+        $dir_exists             = Display::return_icon('bullet_green.gif', get_lang('Ok'));
-        $dir_is_writable    = Display::return_icon('bullet_green.gif', get_lang('Ok'));
+        $dir_is_writable        = Display::return_icon('bullet_green.gif', get_lang('Ok'));        
-        
         $specific_fields_exists = Display::return_icon('bullet_green.gif', get_lang('Ok'));
         
         if (empty($specific_fields)) {
-            $specific_fields_exists = Display::return_icon('bullet_red.gif', get_lang('Error'));
+            $specific_fields_exists = Display::return_icon('bullet_red.gif', get_lang('AddSpecificSearchField'));
         }
         
         if (!extension_loaded('xapian')) {

main/admin/specific_fields.php

@@ -17,6 +17,7 @@ api_protect_admin_script();
 
 // Breadcrumb
 $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array ('url' => 'settings.php?category=Search', 'name' => get_lang('DokeosConfigSettings'));
 $interbreadcrumb[] = array ('url' => 'specific_fields.php', 'name' => get_lang('SpecificSearchFields'));
 
 $libpath = api_get_path(LIBRARY_PATH);

main/admin/specific_fields_add.php

@@ -13,8 +13,8 @@ $cidReset = true;
 // including necessary libraries
 require_once '../inc/global.inc.php';
 $libpath = api_get_path(LIBRARY_PATH);
-include_once ($libpath.'specific_fields_manager.lib.php');
+include_once $libpath.'specific_fields_manager.lib.php';
-require_once ($libpath.'formvalidator/FormValidator.class.php');
+require_once $libpath.'formvalidator/FormValidator.class.php';
 
 // section for the tabs
 $this_section=SECTION_PLATFORM_ADMIN;
@@ -30,6 +30,7 @@ $table_uf_opt = Database :: get_main_table(TABLE_MAIN_USER_FIELD_OPTIONS);
 $table_uf_val = Database :: get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
 
 $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array ('url' => 'settings.php?category=Search', 'name' => get_lang('DokeosConfigSettings'));
 $interbreadcrumb[] = array ('url' => 'specific_fields.php', 'name' => get_lang('SpecificSearchFields'));
 if ($_GET['action']<>'edit') {
   $tool_name = get_lang('AddSpecificSearchField');