Roberto González fix for BT#7413

main/admin/add_sessions_to_usergroup.php

@@ -1,8 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 /**
-*   @package chamilo.admin
-*/
+ *   @package chamilo.admin
+ */
 
 // name of the language file that needs to be included
 $language_file=array('admin','registration');
@@ -120,7 +120,7 @@ function search_sessions($needle,$type) {
     global $tbl_user,$elements_in;
     $xajax_response = new XajaxResponse();
     $return = '';
-    if (!empty($needle) && !empty($type)) {
+    if (isset($needle) && !empty($type)) {
 
         // xajax send utf8 datas... datas in db can be non-utf8 datas
         $charset = api_get_system_encoding();
@@ -135,7 +135,10 @@ function search_sessions($needle,$type) {
                   OR lastname LIKE "'.$needle.'%") AND user.user_id<>"'.$user_anonymous.'"   AND user.status<>'.DRH.''.
                   $order_clause.
                   ' LIMIT 11';*/
-        } else {
+        } else if ($type == 'searchbox') {
+            $session_list = SessionManager::get_sessions_list(array('s.name LIKE' => "%$needle%"));
+        }
+        else {
             $session_list = SessionManager::get_sessions_list(array('s.name LIKE' => "$needle%"));
         }
         $i=0;
@@ -182,11 +185,11 @@ echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'
 echo '</div>';
 
 ?>
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
-<?php
-echo '<legend>'.$data['name'].': '.$tool_name.'</legend>';
+    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+        <?php
+        echo '<legend>'.$data['name'].': '.$tool_name.'</legend>';
 
-if ($add_type=='multiple') {
+        if ($add_type=='multiple') {
             if (is_array($extra_field_list)) {
                 if (is_array($new_field_list) && count($new_field_list)>0 ) {
                     echo '<h3>'.get_lang('FilterUsers').'</h3>';
@@ -211,38 +214,41 @@ if ($add_type=='multiple') {
                     echo '<br /><br />';
                 }
             }
-}
-echo Display::input('hidden','id',$id);
-echo Display::input('hidden','form_sent','1');
-echo Display::input('hidden','add_type',null);
-if(!empty($errorMsg)) {
+        }
+        echo Display::input('hidden','id',$id);
+        echo Display::input('hidden','form_sent','1');
+        echo Display::input('hidden','add_type',null);
+        if(!empty($errorMsg)) {
             Display::display_normal_message($errorMsg); //main API
-}
-?>
+        }
+        ?>
 
-<table border="0" cellpadding="5" cellspacing="0" width="100%">
-<tr>
+        <table border="0" cellpadding="5" cellspacing="0" width="100%">
+            <tr>
                 <td align="center"><b><?php echo get_lang('SessionsInPlatform') ?> :</b>
                 </td>
                 <td></td>
                 <td align="center"><b><?php echo get_lang('SessionsInGroup') ?> :</b></td>
-</tr>
+            </tr>
 
-<?php if ($add_type=='multiple') { ?>
-<tr>
-<td align="center">
-<?php echo get_lang('FirstLetterSessions'); ?> :
+            <?php if ($add_type=='multiple') { ?>
+                <tr>
+                    <td align="center">
+                        <?php echo get_lang('FirstLetterSessions'); ?> :
                         <select name="firstLetterUser" onchange = "xajax_search_sessions(this.value,'multiple')" >
                             <option value = "%">--</option>
                             <?php
                             echo Display :: get_alphabet_options();
                             ?>
                         </select>
-</td>
-<td align="center">&nbsp;</td>
-</tr>
-<?php } ?>
-<tr>
+                        <?php echo '<br />'; ?>
+                        <?php echo get_lang('SearchSessions'); ?> :
+                        <input name="SearchUser" class="span3" onchange = "xajax_search_sessions(this.value,'searchbox')" onkeyup="this.onchange()">
+                    </td>
+                    <td align="center">&nbsp;</td>
+                </tr>
+            <?php } ?>
+            <tr>
                 <td align="center">
                     <div id="content_source">
                         <?php
@@ -278,26 +284,26 @@ if(!empty($errorMsg)) {
                     <br /><br /><br /><br /><br /><br />
                 </td>
                 <td align="center">
-<?php
+                    <?php
                     echo Display::select('elements_in_name[]', $elements_in, '', array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_in','size'=>'15px'),false );
                     unset($sessionUsersList);
-?>
+                    ?>
                 </td>
-</tr>
-<tr>
+            </tr>
+            <tr>
                 <td colspan="3" align="center">
                     <br />
                     <?php
                     echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeClassToSessions').'</button>';
                     ?>
                 </td>
-</tr>
-</table>
-</form>
+            </tr>
+        </table>
+    </form>
 
-<script type="text/javascript">
-<!--
-function moveItem(origin , destination){
+    <script type="text/javascript">
+        <!--
+        function moveItem(origin , destination){
 
             for(var i = 0 ; i<origin.options.length ; i++) {
                 if(origin.options[i].selected) {
@@ -309,9 +315,9 @@ function moveItem(origin , destination){
             destination.selectedIndex = -1;
             sortOptions(destination.options);
 
-}
+        }
 
-function sortOptions(options) {
+        function sortOptions(options) {
 
             newOptions = new Array();
             for (i = 0 ; i<options.length ; i++)
@@ -322,9 +328,9 @@ function sortOptions(options) {
             for(i = 0 ; i < newOptions.length ; i++)
                 options[i] = newOptions[i];
 
-}
+        }
 
-function mysort(a, b){
+        function mysort(a, b){
             if(a.text.toLowerCase() > b.text.toLowerCase()){
                 return 1;
             }
@@ -332,17 +338,17 @@ function mysort(a, b){
                 return -1;
             }
             return 0;
-}
+        }
 
-function valide(){
+        function valide(){
             var options = document.getElementById('elements_in').options;
             for (i = 0 ; i<options.length ; i++)
                 options[i].selected = true;
             document.forms.formulaire.submit();
-}
+        }
 
 
-function loadUsersInSelect(select){
+        function loadUsersInSelect(select){
 
             var xhr_object = null;
 
@@ -371,17 +377,17 @@ function loadUsersInSelect(select){
                     //alert(xhr_object.responseText);
                 }
             }
-}
+        }
 
-function makepost(select){
+        function makepost(select){
             var options = select.options;
             var ret = "";
             for (i = 0 ; i<options.length ; i++)
                 ret = ret + options[i].value +'::'+options[i].text+";;";
 
             return ret;
-}
--->
-</script>
+        }
+        -->
+    </script>
 <?php
 Display::display_footer();