xhtml and accessibility cleanup in data mod MDL-7813

* preference form fixes

do not search for one character in data mod MDL-7911

diff --git a/mod/data/lib.php b/mod/data/lib.php
index 03e313c737f6162e064c8f0b888921a5f6a600c7..b2dfa494982d9cdb96d67041941a46848fdb6705 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -908,9 +908,9 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
     echo '<form name="options" action="view.php" method="get">';
     echo '<input type="hidden" name="d" value="'.$data->id.'" />';
     echo '<label for="pref_perpage">'.get_string('pagesize','data').'</label> ';
-    $pagesizes = array(1=>1,2=>2,3=>3,4=>4,5=>5,6=>6,7=>7,8=>8,9=>9,10=>10,15=>15,
+    $pagesizes = array(2=>2,3=>3,4=>4,5=>5,6=>6,7=>7,8=>8,9=>9,10=>10,15=>15,
                        20=>20,30=>30,40=>40,50=>50,100=>100,200=>200,300=>300,400=>400,500=>500,1000=>1000);
-    choose_from_menu($pagesizes, 'perpage', $perpage, 'choose', '', '0', false, false, 0, 'pref_perpage');
+    choose_from_menu($pagesizes, 'perpage', $perpage, '', '', '0', false, false, 0, 'pref_perpage');
     echo '&nbsp;&nbsp;&nbsp;<label for="pref_search">'.get_string('search').'</label> <input type="text" size="16" name="search" id= "pref_search" value="'.s($search).'" />';
     echo '&nbsp;&nbsp;&nbsp;<label for="pref_sortby">'.get_string('sortby').'</label> ';
     //foreach field, print the option

diff --git a/mod/data/view.php b/mod/data/view.php
index 755ba4d78768c6e75d84636b8ac67b5ec07b1623..9842208dd4230167c99ea7231a15f95091e82389 100755 (executable)
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -114,6 +114,10 @@
         $SESSION->dataprefs[$data->id]['order'] = ($data->defaultsortdir == 0) ? 'ASC' : 'DESC';
     }
     $search = optional_param('search', $SESSION->dataprefs[$data->id]['search'], PARAM_NOTAGS);
+    $textlib = new textlib();
+    if ($textlib->strlen($search) < 2) {
+        $search = '';
+    }
     $SESSION->dataprefs[$data->id]['search'] = $search;   // Make it sticky
 
     $sort = optional_param('sort', $SESSION->dataprefs[$data->id]['sort'], PARAM_INT);