Browse Source

Merge pull request #225 from robertglez/1.9.x

Second fix for BT#7413
Julio Montoya 11 years ago
parent
commit
c179ed0ed9

+ 209 - 197
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');
@@ -69,6 +69,16 @@ function remove_item(origin) {
     }
 }
 
+function display_advanced_search () {
+        if ($("#advancedSearch").css("display") == "none") {
+                $("#advancedSearch").css("display","block");
+                $("#img_plus_and_minus").html(\'&nbsp;'.Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedSearch').'\');
+        } else {
+                $("#advancedSearch").css("display","none");
+                $("#img_plus_and_minus").html(\'&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedSearch').'\');
+        }
+}
+
 function validate_filter() {
         document.formulaire.add_type.value = \''.$add_type.'\';
         document.formulaire.form_sent.value=0;
@@ -83,16 +93,16 @@ $sessions=array();
 $usergroup = new UserGroup();
 $id = intval($_GET['id']);
 if($_POST['form_sent']) {
-    $form_sent          = $_POST['form_sent'];
-    $elements_posted    = $_POST['elements_in_name'];
+    $form_sent          = $_POST['form_sent'];    
+    $elements_posted    = $_POST['elements_in_name'];     
     if (!is_array($elements_posted)) {
         $elements_posted = array();
     }
     if ($form_sent == 1) {
-        //added a parameter to send emails when registering a user
+        //added a parameter to send emails when registering a user        
         $usergroup->subscribe_sessions_to_usergroup($id, $elements_posted);
         header('Location: usergroups.php');
-        exit;
+        exit;        
     }
 }
 $data               = $usergroup->get($id);
@@ -103,9 +113,9 @@ $session_list       = SessionManager::get_sessions_list(array(), array('name'));
 $elements_not_in = $elements_in= array();
 
 if (!empty($session_list)) {
-    foreach($session_list as $session) {
-        if (in_array($session['id'], $session_list_in)) {
-            $elements_in[$session['id']] = $session['name'];
+    foreach($session_list as $session) {        
+        if (in_array($session['id'], $session_list_in)) {            
+            $elements_in[$session['id']] = $session['name'];             
         } else {
             $elements_not_in[$session['id']] = $session['name'];
         }
@@ -129,19 +139,19 @@ function search_sessions($needle,$type) {
 
         if ($type == 'single') {
             // search users where username or firstname or lastname begins likes $needle
-            /*  $sql = 'SELECT user.user_id, username, lastname, firstname FROM '.$tbl_user.' user
-                      WHERE (username LIKE "'.$needle.'%"
-                      OR firstname LIKE "'.$needle.'%"
-                  OR lastname LIKE "'.$needle.'%") AND user.user_id<>"'.$user_anonymous.'"   AND user.status<>'.DRH.''.
-                  $order_clause.
-                  ' LIMIT 11';*/
+          /*  $sql = 'SELECT user.user_id, username, lastname, firstname FROM '.$tbl_user.' user
+                    WHERE (username LIKE "'.$needle.'%"
+                    OR firstname LIKE "'.$needle.'%"
+                OR lastname LIKE "'.$needle.'%") AND user.user_id<>"'.$user_anonymous.'"   AND user.status<>'.DRH.''.
+                $order_clause.
+                ' LIMIT 11';*/
         } 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;
+        $i=0;        
         if ($type=='single') {
             /*
             while ($user = Database :: fetch_array($rs)) {
@@ -156,9 +166,9 @@ function search_sessions($needle,$type) {
             $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));*/
         } else {
             $return .= '<select id="elements_not_in" name="elements_not_in_name[]" multiple="multiple" size="15" style="width:360px;">';
-
-            foreach ($session_list as $row ) {
-                if (!in_array($row['id'], array_keys($elements_in))) {
+            
+            foreach ($session_list as $row ) {         
+                if (!in_array($row['id'], array_keys($elements_in))) {       
                     $return .= '<option value="'.$row['id'].'">'.$row['name'].'</option>';
                 }
             }
@@ -181,213 +191,215 @@ if ($add_type == 'multiple') {
 }
 
 echo '<div class="actions">';
-echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
+echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>'; 
+echo '<a href="javascript://" class="advanced_parameters" style="margin-top: 8px" onclick="display_advanced_search();"><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'</span></a>';
 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>';
-
-        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>';
-                    foreach ($new_field_list as $new_field) {
-                        echo $new_field['name'];
-                        $varname = 'field_'.$new_field['variable'];
-                        echo '&nbsp;<select name="'.$varname.'">';
-                        echo '<option value="0">--'.get_lang('Select').'--</option>';
-                        foreach ($new_field['data'] as $option) {
-                            $checked='';
-                            if (isset($_POST[$varname])) {
-                                if ($_POST[$varname]==$option[1]) {
-                                    $checked = 'selected="true"';
-                                }
-                            }
-                            echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
+<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 (is_array($extra_field_list)) {
+        if (is_array($new_field_list) && count($new_field_list)>0 ) {
+            echo '<h3>'.get_lang('FilterUsers').'</h3>';
+            foreach ($new_field_list as $new_field) {
+                echo $new_field['name'];
+                $varname = 'field_'.$new_field['variable'];
+                echo '&nbsp;<select name="'.$varname.'">';
+                echo '<option value="0">--'.get_lang('Select').'--</option>';
+                foreach ($new_field['data'] as $option) {
+                    $checked='';
+                    if (isset($_POST[$varname])) {
+                        if ($_POST[$varname]==$option[1]) {
+                            $checked = 'selected="true"';
                         }
-                        echo '</select>';
-                        echo '&nbsp;&nbsp;';
                     }
-                    echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
-                    echo '<br /><br />';
+                    echo '<option value="'.$option[1].'" '.$checked.'>'.$option[1].'</option>';
                 }
+                echo '</select>';
+                echo '&nbsp;&nbsp;';
             }
+            echo '<input type="button" value="'.get_lang('Filter').'" onclick="validate_filter()" />';
+            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)) {
-            Display::display_normal_message($errorMsg); //main API
-        }
+    }
+}
+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>
+  <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>
+
+<?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>
+<?php echo '<br />'; ?>
+<?php echo '<div id="advancedSearch" style="display: none">'. get_lang('SearchSessions'); ?> :
+     <input name="SearchSession" onchange = "xajax_search_sessions(this.value,'searchbox')" onkeyup="this.onchange()">
+     </div>
+</td>
+<td align="center">&nbsp;</td>
+</tr>
+<?php } ?>
+<tr>
+  <td align="center">
+  <div id="content_source">
+      <?php           
+      if (!($add_type=='multiple')) {        
+        ?>
+        <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
+        <div id="ajax_list_users_single"></div>
+        <?php
+      } else {               
+      ?>
+      <div id="ajax_list_multiple">
+        <?php echo Display::select('elements_not_in_name',$elements_not_in, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?> 
+      </div>
+    <?php
+      }
+     ?>
+  </div>
+  </td>
+  <td width="10%" valign="middle" align="center">
+  <?php
+  if ($ajax_search) {
+  ?>
+    <button class="arrowl" type="button" onclick="remove_item(document.getElementById('elements_in'))" ></button>
+  <?php
+  } else {
+  ?>
+    <button class="arrowr" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))"></button>
+    <br /><br />
+    <button class="arrowl" type="button" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))"></button>
+    <?php
+  }
+  ?>
+    <br /><br /><br /><br /><br /><br />
+  </td>
+  <td align="center">
+<?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>
+    <td colspan="3" align="center">
+        <br />
+        <?php
+        echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeClassToSessions').'</button>';
         ?>
+    </td>
+</tr>
+</table>
+</form>
 
-        <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>
-
-            <?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>
-                        <?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
-                        if (!($add_type=='multiple')) {
-                            ?>
-                            <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
-                            <div id="ajax_list_users_single"></div>
-                        <?php
-                        } else {
-                            ?>
-                            <div id="ajax_list_multiple">
-                                <?php echo Display::select('elements_not_in_name',$elements_not_in, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'elements_not_in','size'=>'15px'),false); ?>
-                            </div>
-                        <?php
-                        }
-                        ?>
-                    </div>
-                </td>
-                <td width="10%" valign="middle" align="center">
-                    <?php
-                    if ($ajax_search) {
-                        ?>
-                        <button class="arrowl" type="button" onclick="remove_item(document.getElementById('elements_in'))" ></button>
-                    <?php
-                    } else {
-                        ?>
-                        <button class="arrowr" type="button" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))" onclick="moveItem(document.getElementById('elements_not_in'), document.getElementById('elements_in'))"></button>
-                        <br /><br />
-                        <button class="arrowl" type="button" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))" onclick="moveItem(document.getElementById('elements_in'), document.getElementById('elements_not_in'))"></button>
-                    <?php
-                    }
-                    ?>
-                    <br /><br /><br /><br /><br /><br />
-                </td>
-                <td align="center">
-                    <?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>
-                <td colspan="3" align="center">
-                    <br />
-                    <?php
-                    echo '<button class="save" type="button" value="" onclick="valide()" >'.get_lang('SubscribeClassToSessions').'</button>';
-                    ?>
-                </td>
-            </tr>
-        </table>
-    </form>
-
-    <script type="text/javascript">
-        <!--
-        function moveItem(origin , destination){
-
-            for(var i = 0 ; i<origin.options.length ; i++) {
-                if(origin.options[i].selected) {
-                    destination.options[destination.length] = new Option(origin.options[i].text,origin.options[i].value);
-                    origin.options[i]=null;
-                    i = i-1;
-                }
-            }
-            destination.selectedIndex = -1;
-            sortOptions(destination.options);
+<script type="text/javascript">
+<!--
+function moveItem(origin , destination){
 
+    for(var i = 0 ; i<origin.options.length ; i++) {
+        if(origin.options[i].selected) {
+            destination.options[destination.length] = new Option(origin.options[i].text,origin.options[i].value);
+            origin.options[i]=null;
+            i = i-1;
         }
+    }
+    destination.selectedIndex = -1;
+    sortOptions(destination.options);
 
-        function sortOptions(options) {
+}
 
-            newOptions = new Array();
-            for (i = 0 ; i<options.length ; i++)
-                newOptions[i] = options[i];
+function sortOptions(options) {
 
-            newOptions = newOptions.sort(mysort);
-            options.length = 0;
-            for(i = 0 ; i < newOptions.length ; i++)
-                options[i] = newOptions[i];
+    newOptions = new Array();
+    for (i = 0 ; i<options.length ; i++)
+        newOptions[i] = options[i];
 
-        }
+    newOptions = newOptions.sort(mysort);
+    options.length = 0;
+    for(i = 0 ; i < newOptions.length ; i++)
+        options[i] = newOptions[i];
 
-        function mysort(a, b){
-            if(a.text.toLowerCase() > b.text.toLowerCase()){
-                return 1;
-            }
-            if(a.text.toLowerCase() < b.text.toLowerCase()){
-                return -1;
-            }
-            return 0;
-        }
+}
 
-        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 mysort(a, b){
+    if(a.text.toLowerCase() > b.text.toLowerCase()){
+        return 1;
+    }
+    if(a.text.toLowerCase() < b.text.toLowerCase()){
+        return -1;
+    }
+    return 0;
+}
 
+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){
 
-            var xhr_object = null;
+function loadUsersInSelect(select){
 
-            if(window.XMLHttpRequest) // Firefox
-                xhr_object = new XMLHttpRequest();
-            else if(window.ActiveXObject) // Internet Explorer
-                xhr_object = new ActiveXObject("Microsoft.XMLHTTP");
-            else  // XMLHttpRequest non supporté par le navigateur
-                alert("Votre navigateur ne supporte pas les objets XMLHTTPRequest...");
+    var xhr_object = null;
 
-            //xhr_object.open("GET", "loadUsersInSelect.ajax.php?id_session=<?php echo $id_session ?>&letter="+select.options[select.selectedIndex].text, false);
-            xhr_object.open("POST", "loadUsersInSelect.ajax.php");
+    if(window.XMLHttpRequest) // Firefox
+        xhr_object = new XMLHttpRequest();
+    else if(window.ActiveXObject) // Internet Explorer
+        xhr_object = new ActiveXObject("Microsoft.XMLHTTP");
+    else  // XMLHttpRequest non supporté par le navigateur
+    alert("Votre navigateur ne supporte pas les objets XMLHTTPRequest...");
 
-            xhr_object.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+    //xhr_object.open("GET", "loadUsersInSelect.ajax.php?id_session=<?php echo $id_session ?>&letter="+select.options[select.selectedIndex].text, false);
+    xhr_object.open("POST", "loadUsersInSelect.ajax.php");
 
+    xhr_object.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
 
-            nosessionUsers = makepost(document.getElementById('elements_not_in'));
-            sessionUsers = makepost(document.getElementById('elements_in'));
-            nosessionClasses = makepost(document.getElementById('origin_classes'));
-            sessionClasses = makepost(document.getElementById('destination_classes'));
-            xhr_object.send("nosessionusers="+nosessionUsers+"&sessionusers="+sessionUsers+"&nosessionclasses="+nosessionClasses+"&sessionclasses="+sessionClasses);
 
-            xhr_object.onreadystatechange = function() {
-                if(xhr_object.readyState == 4) {
-                    document.getElementById('content_source').innerHTML = result = xhr_object.responseText;
-                    //alert(xhr_object.responseText);
-                }
-            }
+    nosessionUsers = makepost(document.getElementById('elements_not_in'));
+    sessionUsers = makepost(document.getElementById('elements_in'));
+    nosessionClasses = makepost(document.getElementById('origin_classes'));
+    sessionClasses = makepost(document.getElementById('destination_classes'));
+    xhr_object.send("nosessionusers="+nosessionUsers+"&sessionusers="+sessionUsers+"&nosessionclasses="+nosessionClasses+"&sessionclasses="+sessionClasses);
+
+    xhr_object.onreadystatechange = function() {
+        if(xhr_object.readyState == 4) {
+            document.getElementById('content_source').innerHTML = result = xhr_object.responseText;
+            //alert(xhr_object.responseText);
         }
+    }
+}
 
-        function makepost(select){
-            var options = select.options;
-            var ret = "";
-            for (i = 0 ; i<options.length ; i++)
-                ret = ret + options[i].value +'::'+options[i].text+";;";
+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>
+    return ret;
+}
+-->
+</script>
 <?php
 Display::display_footer();

+ 1 - 0
main/lang/english/admin.inc.php

@@ -1688,4 +1688,5 @@ $SpaceUsedOnSystemCannotBeMeasuredOnWindows = "The space used on disk cannot be
 $XOldTablesDeleted = "%d old tables deleted";
 $XOldDatabasesDeleted = "%d old databases deleted";
 $ExtensionShouldBeLoaded = "This extension should be loaded.";
+$SearchSessions = "Session search";
 ?>

+ 1 - 0
main/lang/spanish/admin.inc.php

@@ -1715,4 +1715,5 @@ $SpaceUsedOnSystemCannotBeMeasuredOnWindows = "El espacio usado en el disco no p
 $XOldTablesDeleted = "%d tablas antiguas eliminadas";
 $XOldDatabasesDeleted = "%d bases de datos antiguas eliminadas";
 $ExtensionShouldBeLoaded = "Esta extensión debería ser cargada.";
+$SearchSessions = "Búsqueda de sesiones";
 ?>