Explorar el Código

Fixing PHP notices, moving common js in the footer.tpl

Julio Montoya hace 12 años
padre
commit
b6dbf5767b

+ 1 - 37
main/admin/access_url_edit_courses_to_url.php

@@ -279,41 +279,7 @@ unset($course_list);
 </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);
-}
-
-function sortOptions(options) {
-	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;
-}
+<script>
 
 function valide(){
 	var options = document.getElementById('destination_users').options;
@@ -344,7 +310,6 @@ function loadUsersInSelect(select){
 
 	xhr_object.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
 
-
 	nosessionUsers = makepost(document.getElementById('origin_users'));
 	sessionUsers = makepost(document.getElementById('destination_users'));
 	nosessionClasses = makepost(document.getElementById('origin_classes'));
@@ -368,7 +333,6 @@ function makepost(select){
 	return ret;
 
 }
--->
 </script>
 <?php
 Display::display_footer();

+ 8 - 49
main/admin/access_url_edit_users_to_url.php

@@ -95,7 +95,7 @@ $message = '';
 if ($_POST['form_sent']) {
 	$form_sent  = $_POST['form_sent'];
 	$UserList   = $_POST['sessionUsersList'];
-    
+
 	if (!is_array($UserList)) {
 		$UserList=array();
 	}
@@ -104,11 +104,11 @@ if ($_POST['form_sent']) {
 			header('Location: access_url_edit_users_to_url.php?action=show_message&message='.get_lang('SelectURL'));
 		} elseif (is_array($UserList)) {
 			$result     = UrlManager::update_urls_rel_user($UserList, $access_url_id);
-            $url_info   = UrlManager::get_url_data_from_id($access_url_id);            
+            $url_info   = UrlManager::get_url_data_from_id($access_url_id);
             if (!empty($result)) {
                 $message .= 'URL: '.$url_info['url'].'<br />';
             }
-                        
+
             if (!empty($result['users_added'])) {
                 $message .=  '<h4>'.get_lang('UsersAdded').':</h4>';
                 $i = 1;
@@ -122,9 +122,9 @@ if ($_POST['form_sent']) {
                 }
                 if (!empty($user_added_list)) {
                     $message .= implode(', ', $user_added_list);
-                }                
+                }
             }
-            
+
             if (!empty($result['users_deleted'])) {
                 $message .= '<br /><h4>'.get_lang('UsersDeleted').': </h4>';
                 $user_deleted_list = array();
@@ -240,8 +240,8 @@ if(!empty($errorMsg)) {
 <tr>
     <td>
     <h3>
-    <?php 
-            $total_users = count($nosessionUsersList) +  count($sessionUsersList); 
+    <?php
+            $total_users = count($nosessionUsersList) +  count($sessionUsersList);
             echo get_lang('TotalAvailableUsers').' '.$total_users;
     ?>
     </h3>
@@ -324,48 +324,9 @@ unset($sessionUsersList);
 		?>
 	</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);
-}
-
-function sortOptions(options) {
-	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;
-}
-
+<script>
 function valide(){
 	var options = document.getElementById('destination_users').options;
 	for (i = 0 ; i<options.length ; i++)
@@ -419,8 +380,6 @@ function makepost(select){
 	return ret;
 
 }
--->
-
 </script>
 <?php
 Display::display_footer();

+ 26 - 67
main/admin/add_courses_to_usergroup.php

@@ -25,8 +25,8 @@ $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script(true);
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => 'usergroups.php','name' => get_lang('Classes'));
+$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes'));
 
 // Database Table Definitions
 
@@ -39,8 +39,7 @@ if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
 }
 
 $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
-$htmlHeadXtra[] = '
-<script>
+$htmlHeadXtra[] = '<script>
 function add_user_to_session (code, content) {
 
     document.getElementById("user_to_add").value = "";
@@ -80,16 +79,16 @@ $errorMsg   = '';
 $sessions=array();
 $usergroup = new UserGroup();
 $id = intval($_GET['id']);
-if($_POST['form_sent']) {
-    $form_sent              = $_POST['form_sent'];    
-    $elements_posted        = $_POST['elements_in_name'];     
+if (isset($_POST['form_sent']) && $_POST['form_sent']) {
+    $form_sent              = $_POST['form_sent'];
+    $elements_posted        = $_POST['elements_in_name'];
     if (!is_array($elements_posted)) {
         $elements_posted=array();
     }
     if ($form_sent == 1) {
         $usergroup->subscribe_courses_to_usergroup($id, $elements_posted);
         header('Location: usergroups.php');
-        exit;        
+        exit;
     }
 }
 $data               = $usergroup->get($id);
@@ -100,8 +99,8 @@ $course_list        = CourseManager::get_courses_list(0,0,'title');
 $elements_not_in = $elements_in= array();
 
 if (!empty($course_list)) {
-    foreach($course_list as $item) {        
-        if (in_array($item['id'], $course_list_in)) {            
+    foreach($course_list as $item) {
+        if (in_array($item['id'], $course_list_in)) {
             $elements_in[$item['id']] = $item['title']." (".$item['visual_code'].")";
         } else {
             $elements_not_in[$item['id']] = $item['title']." (".$item['visual_code'].")";
@@ -133,8 +132,8 @@ function search($needle,$type) {
                 ' LIMIT 11';*/
         } else {
             $list = CourseManager::get_courses_list(0, 0, 2, 'ASC', -1, $needle);
-        }     
-        $i=0;        
+        }
+        $i=0;
         if ($type=='single') {
             /*
             while ($user = Database :: fetch_array($rs)) {
@@ -149,9 +148,9 @@ function search($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 ($list as $row ) {         
-                if (!in_array($row['id'], array_keys($elements_in))) {       
+
+            foreach ($list as $row ) {
+                if (!in_array($row['id'], array_keys($elements_in))) {
                     $return .= '<option value="'.$row['id'].'">'.$row['title'].' ('.$row['visual_code'].')</option>';
                 }
             }
@@ -166,22 +165,22 @@ $xajax -> processRequests();
 Display::display_header($tool_name);
 
 if ($add_type == 'multiple') {
-    $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
     $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
 } else {
     $link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
-    $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
 }
 
 echo '<div class="actions">';
-echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'), array(), ICON_SIZE_MEDIUM).'</a>';       
+echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'), array(), ICON_SIZE_MEDIUM).'</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>'; 
-
+<?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 ) {
@@ -207,7 +206,7 @@ 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);
@@ -241,16 +240,16 @@ if(!empty($errorMsg)) {
 <tr>
   <td align="center">
   <div id="content_source">
-      <?php           
-      if (!($add_type=='multiple')) {        
+      <?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 {               
+      } 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); ?> 
+        <?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
       }
@@ -291,45 +290,7 @@ if(!empty($errorMsg)) {
 </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);
-
-}
-
-function sortOptions(options) {
-
-    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;
-}
-
+<script>
 function valide(){
     var options = document.getElementById('elements_in').options;
     for (i = 0 ; i<options.length ; i++)
@@ -347,9 +308,8 @@ function loadUsersInSelect(select){
     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...");
+        alert("Votre navigateur ne supporte pas les objets XMLHTTPRequest...");
 
-    //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");
@@ -377,7 +337,6 @@ function makepost(select){
 
     return ret;
 }
--->
 </script>
 <?php
 Display::display_footer();

+ 7 - 48
main/admin/add_many_session_to_category.php

@@ -128,7 +128,7 @@ Display::display_header($tool_name);
 $where ='';
 $rows_category_session = array();
 if((isset($_POST['CategorySessionId']) && $_POST['formSent'] == 0) || isset($_GET['id_category']) ) {
-	
+
 	$where = 'WHERE session_category_id !='.$Categoryid;
 	$sql = 'SELECT id, name  FROM '.$tbl_session .' WHERE session_category_id ='.$Categoryid.' ORDER BY name';
 	$result=Database::query($sql);
@@ -158,10 +158,10 @@ if(!empty($OkMsg)) {
 	Display::display_confirmation_message($OkMsg); //main API
 }
 
-/* 
- * 
- * The a/b/c Filter is not a priority 
- *  
+/*
+ *
+ * The a/b/c Filter is not a priority
+ *
  * <td width="45%" align="center">
  <?php echo get_lang('FirstLetterCourse'); ?> :
      <select name="firstLetterCourse" onchange = "xajax_search_courses(this.value,'multiple')">
@@ -179,7 +179,7 @@ if(!empty($OkMsg)) {
 <tr>
 	<td align="left"></td>
 	<td align="left"></td>
-	<td  align="center"> 
+	<td  align="center">
 	<b><?php echo get_lang('SessionCategoryName') ?> :</b><br />
 	<select name="CategorySessionId" style="width: 320px;" onchange="javascript:send();" >
 		<option value="0" ></option>
@@ -248,54 +248,13 @@ if(!empty($OkMsg)) {
 </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);
-}
-
-function sortOptions(options) {
-	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;
-}
-
+<script>
 function valide(){
 	var options = document.getElementById('destination').options;
 	for (i = 0 ; i<options.length ; i++)
 		options[i].selected = true;
-
 	document.forms.formulaire.submit();
 }
--->
-
 </script>
 <?php
-/*		FOOTER	*/
 Display::display_footer();

+ 19 - 59
main/admin/add_sessions_to_promotion.php

@@ -39,8 +39,7 @@ if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
 }
 
 $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
-$htmlHeadXtra[] = '
-<script type="text/javascript">
+$htmlHeadXtra[] = '<script>
 function add_user_to_session (code, content) {
 
     document.getElementById("user_to_add").value = "";
@@ -81,16 +80,16 @@ $users      =$sessions=array();
 $promotion = new Promotion();
 $id = intval($_GET['id']);
 if($_POST['form_sent']) {
-    $form_sent          = $_POST['form_sent'];    
-    $session_in_promotion_posted       = $_POST['session_in_promotion_name'];     
+    $form_sent          = $_POST['form_sent'];
+    $session_in_promotion_posted       = $_POST['session_in_promotion_name'];
     if (!is_array($session_in_promotion_posted)) {
         $session_in_promotion_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
         SessionManager::suscribe_sessions_to_promotion($id, $session_in_promotion_posted);
         header('Location: promotions.php');
-        exit;        
+        exit;
     }
 }
 
@@ -102,13 +101,13 @@ $session_not_in_promotion = $session_in_promotion= array();
 
 if (!empty($session_list)) {
     foreach($session_list as $session) {
-        $promotion_id = $session['promotion_id'];    
+        $promotion_id = $session['promotion_id'];
         if (isset($promotion_id) && !empty($promotion_id)) {
-            if ($promotion_id == $id) {                
+            if ($promotion_id == $id) {
                 $session_in_promotion[$session['id']] = $session['name'];
             } else {
                 $session_not_in_promotion[$session['id']] = $session['name'];
-            } 
+            }
         } else {
             $session_not_in_promotion[$session['id']] = $session['name'];
         }
@@ -139,8 +138,8 @@ function search_sessions($needle,$type) {
                 ' LIMIT 11';*/
         } 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)) {
@@ -154,9 +153,9 @@ function search_sessions($needle,$type) {
             }
             $xajax_response -> addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));*/
         } else {
-            $return .= '<select id="session_not_in_promotion" name="session_not_in_promotion_name[]" multiple="multiple" size="15" style="width:360px;">';            
-            foreach ($session_list as $row ) {         
-                if (!in_array($row['id'], array_keys($session_in_promotion))) {       
+            $return .= '<select id="session_not_in_promotion" name="session_not_in_promotion_name[]" multiple="multiple" size="15" style="width:360px;">';
+            foreach ($session_list as $row ) {
+                if (!in_array($row['id'], array_keys($session_in_promotion))) {
                     $return .= '<option value="'.$row['id'].'">'.$row['name'].'</option>';
                 }
             }
@@ -179,7 +178,7 @@ if ($add_type == 'multiple') {
 }
 
 echo '<div class="actions">';
-echo '<a href="promotions.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';       
+echo '<a href="promotions.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 ?>
 
@@ -245,16 +244,16 @@ if(!empty($errorMsg)) {
 <tr>
   <td align="center">
   <div id="content_source">
-      <?php           
-      if (!($add_type=='multiple')) {        
+      <?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 {               
+      } else {
       ?>
       <div id="ajax_list_multiple">
-        <?php echo Display::select('session_not_in_promotion_name',$session_not_in_promotion, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_not_in_promotion','size'=>'15px'),false); ?> 
+        <?php echo Display::select('session_not_in_promotion_name',$session_not_in_promotion, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_not_in_promotion','size'=>'15px'),false); ?>
       </div>
     <?php
       }
@@ -295,45 +294,7 @@ if(!empty($errorMsg)) {
 </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);
-
-}
-
-function sortOptions(options) {
-
-    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;
-}
-
+<script>
 function valide(){
     var options = document.getElementById('session_in_promotion').options;
     for (i = 0 ; i<options.length ; i++)
@@ -383,7 +344,6 @@ function makepost(select){
     return ret;
 
 }
--->
 </script>
 <?php
 Display::display_footer();

+ 28 - 69
main/admin/add_sessions_to_usergroup.php

@@ -39,8 +39,7 @@ if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
 }
 
 $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
-$htmlHeadXtra[] = '
-<script type="text/javascript">
+$htmlHeadXtra[] = '<script>
 function add_user_to_session (code, content) {
 
     document.getElementById("user_to_add").value = "";
@@ -68,9 +67,9 @@ function remove_item(origin) {
 }
 
 function validate_filter() {
-        document.formulaire.add_type.value = \''.$add_type.'\';
-        document.formulaire.form_sent.value=0;
-        document.formulaire.submit();
+    document.formulaire.add_type.value = \''.$add_type.'\';
+    document.formulaire.form_sent.value=0;
+    document.formulaire.submit();
 }
 </script>';
 
@@ -80,17 +79,17 @@ $errorMsg   = '';
 $sessions=array();
 $usergroup = new UserGroup();
 $id = intval($_GET['id']);
-if($_POST['form_sent']) {
-    $form_sent          = $_POST['form_sent'];    
-    $elements_posted    = $_POST['elements_in_name'];     
+if (isset($_POST['form_sent']) && $_POST['form_sent']) {
+    $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);
@@ -101,9 +100,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'];
         }
@@ -135,8 +134,8 @@ function search_sessions($needle,$type) {
                 ' LIMIT 11';*/
         } 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)) {
@@ -151,9 +150,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>';
                 }
             }
@@ -168,15 +167,15 @@ $xajax -> processRequests();
 Display::display_header($tool_name);
 
 if ($add_type == 'multiple') {
-    $link_add_type_unique = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique">'.Display::return_icon('single.gif').get_lang('SessionAddTypeUnique').'</a>';
     $link_add_type_multiple = Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple');
 } else {
     $link_add_type_unique = Display::return_icon('single.gif').get_lang('SessionAddTypeUnique');
-    $link_add_type_multiple = '<a href="'.api_get_self().'?id_session='.$id_session.'&add='.Security::remove_XSS($_GET['add']).'&add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple">'.Display::return_icon('multiple.gif').get_lang('SessionAddTypeMultiple').'</a>';
 }
 
 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 '</div>';
 
 ?>
@@ -185,6 +184,7 @@ echo '</div>';
 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>';
@@ -208,7 +208,7 @@ if ($add_type=='multiple') {
             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');
@@ -243,16 +243,16 @@ if(!empty($errorMsg)) {
 <tr>
   <td align="center">
   <div id="content_source">
-      <?php           
-      if (!($add_type=='multiple')) {        
+      <?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 {               
+      } 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); ?> 
+        <?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
       }
@@ -293,45 +293,7 @@ if(!empty($errorMsg)) {
 </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);
-
-}
-
-function sortOptions(options) {
-
-    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;
-}
-
+<script>
 function valide(){
     var options = document.getElementById('elements_in').options;
     for (i = 0 ; i<options.length ; i++)
@@ -339,7 +301,6 @@ function valide(){
     document.forms.formulaire.submit();
 }
 
-
 function loadUsersInSelect(select){
 
     var xhr_object = null;
@@ -349,9 +310,8 @@ function loadUsersInSelect(select){
     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...");
+        alert("Votre navigateur ne supporte pas les objets XMLHTTPRequest...");
 
-    //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");
@@ -379,7 +339,6 @@ function makepost(select){
 
     return ret;
 }
--->
 </script>
 <?php
 Display::display_footer();

+ 7 - 48
main/admin/add_users_to_group.php

@@ -42,7 +42,7 @@ if(isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
 //checking for extra field with filter on
 $xajax = new xajax();
 $xajax->registerFunction('search_users');
-function search_users($needle,$type,$relation_type) {    
+function search_users($needle,$type,$relation_type) {
 	global $tbl_user,$tbl_user_rel_access_url, $tbl_group_rel_user,$group_id,$_configuration;
 	$xajax_response = new XajaxResponse();
 	$return = $return_origin = $return_destination = '';
@@ -87,7 +87,7 @@ function search_users($needle,$type,$relation_type) {
 		} else {
 			$return_destination .= '<select id="destination_users" name="sessionUsersList[]" multiple="multiple" size="15" style="width:360px;"></select>';
 		}
-		
+
 		$xajax_response -> addAssign('ajax_destination_list','innerHTML',api_utf8_encode($return_destination));
 
 	} else {
@@ -110,7 +110,7 @@ function search_users($needle,$type,$relation_type) {
 		$needle = Database::escape_string($needle);
 		$needle = api_convert_encoding($needle, $charset, 'utf-8');
 		$user_anonymous=api_get_anonymous_id();
-		
+
 
 		$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname, username' : ' ORDER BY lastname, firstname, username';
 		if ($type == 'single') {
@@ -148,7 +148,7 @@ function search_users($needle,$type,$relation_type) {
 		} else {
 			// multiple
 			if (!empty($group_id) && !empty($relation_type)) {
-				$sql = "SELECT user_id, username, lastname, firstname FROM $tbl_user user 
+				$sql = "SELECT user_id, username, lastname, firstname FROM $tbl_user user
 				        WHERE ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND user_id<>'$user_anonymous' $without_user_id $order_clause ";
 				if ($_configuration['multiple_access_urls']) {
 					$access_url_id = api_get_current_access_url_id();
@@ -160,7 +160,7 @@ function search_users($needle,$type,$relation_type) {
 								AND user.user_id<>'$user_anonymous' $without_user_id $order_clause ";
 					}
 				}
-				
+
 				$rs_multiple = Database::query($sql);
 				$return_origin .= '<select id="origin_users" name="nosessionUsersList[]" multiple="multiple" size="15" style="width:360px;">';
 				while ($user = Database :: fetch_array($rs_multiple)) {
@@ -307,7 +307,7 @@ if ($ajax_search) {
 	if (Database::num_rows($rs_count)) {
 	   $row_count = Database::fetch_row($rs_count);
 	   $row_count = $row_count[0];
-	}	
+	}
 	if ($row_count > 2) $many_users = true;
 
 	// data for origin list
@@ -386,7 +386,7 @@ if ($add_type == 'multiple') {
 </div>
 
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $group_id; ?><?php if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
-<?php echo '<legend>'.$tool_name.' ('.$group_info['name'].')</legend>'; ?>    
+<?php echo '<legend>'.$tool_name.' ('.$group_info['name'].')</legend>'; ?>
 <?php if ($add_type=='multiple') { ?>
 <select name="relation" id="relation" onchange="xajax_search_users(document.getElementById('firstLetterUser').value,'multiple',this.value)">
 <?php } else { ?>
@@ -537,44 +537,6 @@ if(!empty($errorMsg)) {
 </form>
 
 <script>
-<!--
-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];
-
-	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 relation_select = document.getElementById('relation');
@@ -631,9 +593,6 @@ function makepost(select){
 	return ret;
 
 }
--->
-
 </script>
 <?php
-/*  FOOTER */
 Display::display_footer();

+ 3 - 40
main/admin/add_users_to_usergroup.php

@@ -20,8 +20,8 @@ $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script(true);
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => 'usergroups.php','name' => get_lang('Classes'));
+$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'usergroups.php','name' => get_lang('Classes'));
 
 // Database Table Definitions
 
@@ -149,7 +149,7 @@ if ($use_extra_fields) {
 }
 $data       = $usergroup->get($id);
 $list_in    = $usergroup->get_users_by_usergroup($id);
-$list_all    = $usergroup->get_users_by_usergroup();
+$list_all   = $usergroup->get_users_by_usergroup();
 
 $order = array('lastname');
 if (api_is_western_name_order()) {
@@ -308,43 +308,6 @@ if(!empty($errorMsg)) {
 ?>
 </form>
 <script>
-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];
-
-    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++)

+ 0 - 37
main/admin/course_edit.php

@@ -222,43 +222,6 @@ if ($form->validate()) {
 Display::display_header($tool_name);
 
 echo "<script>
-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];
-    }
-	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('course_teachers').options;
 	for (i = 0 ; i<options.length ; i++) {

+ 2 - 12
main/admin/dashboard_add_courses_to_user.php

@@ -116,17 +116,7 @@ function moveItem(origin , destination) {
 	destination.selectedIndex = -1;
 	sortOptions(destination.options);
 }
-function sortOptions(options) {
-	var 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;
@@ -204,7 +194,7 @@ if ($_configuration['multiple_access_urls']) {
 
 } else {
 	$sql 	= " SELECT c.code, c.title FROM $tbl_course c
-                WHERE  c.code LIKE '$needle' $without_assigned_courses 
+                WHERE  c.code LIKE '$needle' $without_assigned_courses
                 ORDER BY c.title";
 }
 

+ 3 - 36
main/admin/dashboard_add_sessions_to_user.php

@@ -99,40 +99,7 @@ function search_sessions($needle,$type) {
 $xajax->processRequests();
 $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
 $htmlHeadXtra[] = '
-<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) {
-	var 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;
-}
-
+<script>
 function valide() {
 	var options = document.getElementById("destination").options;
 	for (i = 0 ; i<options.length ; i++) {
@@ -193,11 +160,11 @@ if (isset($_POST['firstLetterSession'])) {
 
 if ($_configuration['multiple_access_urls']) {
 	$sql 	= " SELECT s.id, s.name FROM $tbl_session s LEFT JOIN $tbl_session_rel_access_url a ON (s.id = a.session_id)
-				WHERE  s.name LIKE '$needle%' $without_assigned_sessions AND access_url_id = ".api_get_current_access_url_id()." 
+				WHERE  s.name LIKE '$needle%' $without_assigned_sessions AND access_url_id = ".api_get_current_access_url_id()."
                 ORDER BY s.name";
 } else {
 	$sql 	= " SELECT s.id, s.name FROM $tbl_session s
-				WHERE  s.name LIKE '$needle%' $without_assigned_sessions 
+				WHERE  s.name LIKE '$needle%' $without_assigned_sessions
                 ORDER BY s.name
                 ";
 }

+ 2 - 37
main/admin/dashboard_add_users_to_user.php

@@ -101,41 +101,7 @@ function search_users($needle,$type) {
 
 $xajax -> processRequests();
 $htmlHeadXtra[] = $xajax->getJavascript('../inc/lib/xajax/');
-$htmlHeadXtra[] = '
-<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) {
-	var 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;
-}
-
+$htmlHeadXtra[] = '<script>
 function valide() {
 	var options = document.getElementById("destination").options;
 	for (i = 0 ; i<options.length ; i++) {
@@ -151,7 +117,6 @@ function remove_item(origin) {
 		}
 	}
 }
--->
 </script>';
 
 $formSent=0;
@@ -199,7 +164,7 @@ if ($_configuration['multiple_access_urls']) {
             ORDER BY firstname";
 } else {
 	$sql = "SELECT user_id, username, lastname, firstname FROM $tbl_user user
-			WHERE $without_assigned_users user_id NOT IN ($user_anonymous, $current_user_id, $user_id) AND status NOT IN(".DRH.", ".SESSIONADMIN.") $search_user 
+			WHERE $without_assigned_users user_id NOT IN ($user_anonymous, $current_user_id, $user_id) AND status NOT IN(".DRH.", ".SESSIONADMIN.") $search_user
             ORDER BY firstname ";
 }
 

+ 1 - 0
main/admin/usergroups.php

@@ -2,6 +2,7 @@
 /* For licensing terms, see /license.txt */
 
 /**
+ * @todo use a controller
  *  @package chamilo.admin
  */
 

+ 0 - 39
main/session/add_courses_to_session.php

@@ -348,45 +348,6 @@ unset($sessionCourses);
 
 </form>
 <script>
-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];
-	}
-
-	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('destination').options;

+ 0 - 35
main/session/add_users_to_session.php

@@ -650,41 +650,6 @@ $link_add_group = '<a href="usergroups.php">'.Display::return_icon(
 </form>
 
 <script>
-    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];
-
-        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('destination_users').options;
         for (i = 0; i < options.length; i++)

+ 0 - 14
main/session/session_add.php

@@ -176,20 +176,6 @@ $(function() {
     $("#coach_access_end_date").datetimepicker({
         dateFormat: "yy-mm-dd"
     });
-
-    var value = 1;
-    $("#advanced_parameters").on("click", function() {
-        $("#options").toggle(function() {
-            if (value == 1) {
-                $("#advanced_parameters").addClass("btn-hide");
-                value = 0;
-            } else {
-                $("#advanced_parameters").removeClass("btn-hide");
-                value = 1;
-            }
-        });
-    });
-
 });
 </script>';
 

+ 1 - 43
main/session/session_course_user.php

@@ -202,49 +202,9 @@ unset($sessionCourses);
 </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>
 
-function sortOptions(options) {
 
-	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('destination').options;
@@ -253,8 +213,6 @@ function valide(){
 
 	document.forms.formulaire.submit();
 }
--->
-
 </script>
 <?php
 Display::display_footer();

+ 3 - 4
main/social/group_add.php

@@ -23,12 +23,11 @@ if (api_get_setting('allow_students_to_create_groups_in_social') == 'false' && !
 $table_message = Database::get_main_table(TABLE_MESSAGE);
 $usergroup = new UserGroup();
 $form = new FormValidator('add_group');
-
-$usergroup->setForm($form, 'add');
+$usergroup->setGroupType($usergroup::SOCIAL_CLASS);
+$usergroup->setForm($form, 'add', array());
 
 if ($form->validate()) {
 	$values = $form->exportValues();
-    $values['type'] = $usergroup::SOCIAL_CLASS;
     $groupId = $usergroup->save($values);
 	header('Location: groups.php?id='.$groupId.'&action=show_message&message='.urlencode(get_lang('GroupAdded')));
 	exit();
@@ -53,4 +52,4 @@ $tpl->assign('social_left_content', $social_left_content);
 $tpl->assign('social_right_content', $social_right_content);
 
 $social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);
+$tpl->display($social_layout);

+ 3 - 17
main/social/group_edit.php

@@ -41,7 +41,7 @@ if (!$usergroup->is_group_admin($group_id)) {
 // Create the form
 $form = new FormValidator('group_edit', 'post', '', '');
 $form->addElement('hidden', 'id', $group_id);
-
+$usergroup->setGroupType($usergroup::SOCIAL_CLASS);
 $usergroup->setForm($form, 'edit', $group_data);
 
 // Set default values
@@ -51,6 +51,7 @@ $form->setDefaults($group_data);
 if ($form->validate()) {
     $group = $form->exportValues();
     $group['id'] = $group_id;
+    $group['type'] = $usergroup::SOCIAL_CLASS;
     $usergroup->update($group);
     $tok = Security::get_token();
     header(
@@ -61,20 +62,6 @@ if ($form->validate()) {
     exit();
 }
 
-// Group picture
-$image_path = $usergroup->get_group_picture_path_by_id($group_id, 'web');
-$image_dir = $image_path['dir'];
-$image = $image_path['file'];
-$image_file = ($image != '' ? $image_dir.$image : api_get_path(WEB_CODE_PATH).'img/unknown_group.jpg');
-$image_size = api_getimagesize($image_file);
-
-// get the path,width and height from original picture
-$big_image = $image_dir.'big_'.$image;
-$big_image_size = api_getimagesize($big_image);
-$big_image_width = $big_image_size['width'];
-$big_image_height = $big_image_size['height'];
-$url_big_image = $big_image.'?rnd='.time();
-
 $social_left_content = SocialManager::show_social_menu('group_edit', $group_id);
 $social_right_content = '<div class="span9">';
 $social_right_content .= $form->return_form();
@@ -86,5 +73,4 @@ $tpl->assign('social_left_content', $social_left_content);
 $tpl->assign('social_right_content', $social_right_content);
 
 $social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);
-
+$tpl->display($social_layout);

+ 0 - 35
main/social/group_invitation.php

@@ -445,41 +445,6 @@ if (is_array($members) && count($members)>0) {
 }
 
 $htmlHeadXtra[] = '<script>
-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];
-
-	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(\'destination_users\').options;
 	for (i = 0 ; i<options.length ; i++)

+ 90 - 88
main/social/groups.php

@@ -218,107 +218,108 @@ if ($group_id != 0 ) {
 	// details about the current group
 	$social_right_content = '<div class="span9">';
 	$social_right_content .=  '<div id="social-group-details">';
-            //Group's title
-            $social_right_content .=  Display::tag('h3', Security::remove_XSS($group_info['name'], STUDENT, true));
-
-            //Privacy
-            if (!$is_group_member) {
-                $social_right_content .=  '<div class="social-group-details-info">';
-                    $social_right_content .=  '<span>'.get_lang('Privacy').' : </span>';
-                    if ($group_info['visibility']== GROUP_PERMISSION_OPEN) {
-                        $social_right_content .=  get_lang('ThisIsAnOpenGroup');
-                    } elseif ($group_info['visibility']== GROUP_PERMISSION_CLOSED) {
-                        $social_right_content .=  get_lang('ThisIsACloseGroup');
-                    }
-                $social_right_content .=  '</div>';
-            }
 
-            if (!$is_group_member && $group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
-                $role = $usergroup->get_user_group_role(api_get_user_id(), $group_id);
-                if ($role == GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER) {
-                    $social_right_content .=  Display::return_message(get_lang('YouAlreadySentAnInvitation'));
-                }
+    //Group's title
+    $social_right_content .=  Display::tag('h3', Security::remove_XSS($group_info['name'], STUDENT, true));
+
+    //Privacy
+    if (!$is_group_member) {
+        $social_right_content .=  '<div class="social-group-details-info">';
+            $social_right_content .=  '<span>'.get_lang('Privacy').' : </span>';
+            if ($group_info['visibility']== GROUP_PERMISSION_OPEN) {
+                $social_right_content .=  get_lang('ThisIsAnOpenGroup');
+            } elseif ($group_info['visibility']== GROUP_PERMISSION_CLOSED) {
+                $social_right_content .=  get_lang('ThisIsACloseGroup');
             }
+        $social_right_content .=  '</div>';
+    }
 
-            if (!empty($relation_group_title)) {
-                /*
-                echo '<div class="social-group-details-info">';
-                echo '<span>'.get_lang('StatusInThisGroup').' : </span>';
-                echo $relation_group_title;
-                echo '</div>';*/
-            }
+    if (!$is_group_member && $group_info['visibility'] == GROUP_PERMISSION_CLOSED) {
+        $role = $usergroup->get_user_group_role(api_get_user_id(), $group_id);
+        if ($role == GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER) {
+            $social_right_content .=  Display::return_message(get_lang('YouAlreadySentAnInvitation'));
+        }
+    }
+
+    if (!empty($relation_group_title)) {
+        /*
+        echo '<div class="social-group-details-info">';
+        echo '<span>'.get_lang('StatusInThisGroup').' : </span>';
+        echo $relation_group_title;
+        echo '</div>';*/
+    }
 
-            //Group's tags
-            /*
-            if (!empty($tags)) {
-                $social_right_content .=  '<div id="social-group-details-info"><span>'.get_lang('Tags').' : </span>'.$tags.'</div>';
-            }*/
+    //Group's tags
+    /*
+    if (!empty($tags)) {
+        $social_right_content .=  '<div id="social-group-details-info"><span>'.get_lang('Tags').' : </span>'.$tags.'</div>';
+    }*/
 		$social_right_content .=  '</div>';
 	$social_right_content .=  '</div>';
 
 	//-- Show message groups
 	$social_right_content .=  '<div class="span9">';
 
-		if ($is_group_member || $group_info['visibility'] == GROUP_PERMISSION_OPEN) {
-		    if (!$is_group_member) {
-    		    if (!in_array($my_group_role, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, GROUP_USER_PERMISSION_PENDING_INVITATION))) {
-                    $social_right_content .=  '<a class="btn" href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
-                } elseif ($my_group_role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
-                    $social_right_content .=  '<a class="btn" href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>';
-                }
-                $social_right_content .=  '<br /><br />';
-		    }
-			$content = MessageManager::display_messages_for_group($group_id);
-			if ($is_group_member) {
-    			if (empty($content)) {
-    				$create_thread_link =  '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax btn" title="'.get_lang('ComposeMessage').'">'.get_lang('YouShouldCreateATopic').'</a></li>';
-    			} else {
-    			    $create_thread_link = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax btn" title="'.get_lang('ComposeMessage').'">'.get_lang('NewTopic').'</a>';
-    			}
-			}
-			$members = $usergroup->get_users_by_group($group_id);
-            $member_content = '';
+    if ($is_group_member || $group_info['visibility'] == GROUP_PERMISSION_OPEN) {
+        if (!$is_group_member) {
+            if (!in_array($my_group_role, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, GROUP_USER_PERMISSION_PENDING_INVITATION))) {
+                $social_right_content .=  '<a class="btn" href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
+            } elseif ($my_group_role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
+                $social_right_content .=  '<a class="btn" href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>';
+            }
+            $social_right_content .=  '<br /><br />';
+        }
+        $content = MessageManager::display_messages_for_group($group_id);
+        if ($is_group_member) {
+            if (empty($content)) {
+                $create_thread_link =  '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax btn" title="'.get_lang('ComposeMessage').'">'.get_lang('YouShouldCreateATopic').'</a></li>';
+            } else {
+                $create_thread_link = '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=400&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&action=add_message_group" class="ajax btn" title="'.get_lang('ComposeMessage').'">'.get_lang('NewTopic').'</a>';
+            }
+        }
+        $members = $usergroup->get_users_by_group($group_id);
+        $member_content = '';
 
-    		//Members
-    		if (count($members) > 0) {
-				if ($my_group_role == GROUP_USER_PERMISSION_ADMIN) {
-				    $member_content .= Display::url(Display::return_icon('edit.gif', get_lang('EditMembersList')).' '.get_lang('EditMembersList'), 'group_members.php?id='.$group_id);
-				}
-				foreach($members as $member) {
-					// if is a member
-					if (in_array($member['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) {
-						//add icons
-						if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
-							$icon= Display::return_icon('social_group_admin.png', get_lang('Admin'));
-						} elseif ($member['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
-							$icon= Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
-						} else{
-							$icon= '';
-						}
-						$image_path = UserManager::get_user_picture_path_by_id($member['user_id'], 'web', false, true);
-						$picture = UserManager::get_picture_user($member['user_id'], $image_path['file'], 60, USER_IMAGE_SIZE_MEDIUM);
+        //Members
+        if (count($members) > 0) {
+            if ($my_group_role == GROUP_USER_PERMISSION_ADMIN) {
+                $member_content .= Display::url(Display::return_icon('edit.gif', get_lang('EditMembersList')).' '.get_lang('EditMembersList'), 'group_members.php?id='.$group_id);
+            }
+            foreach($members as $member) {
+                // if is a member
+                if (in_array($member['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) {
+                    //add icons
+                    if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
+                        $icon= Display::return_icon('social_group_admin.png', get_lang('Admin'));
+                    } elseif ($member['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
+                        $icon= Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
+                    } else{
+                        $icon= '';
+                    }
+                    $image_path = UserManager::get_user_picture_path_by_id($member['user_id'], 'web', false, true);
+                    $picture = UserManager::get_picture_user($member['user_id'], $image_path['file'], 60, USER_IMAGE_SIZE_MEDIUM);
 
-						$member_content .= '<div class="">';
-						$member_name = Display::url(api_get_person_name(Text::cut($member['firstname'],15),Text::cut($member['lastname'],15)).'&nbsp;'.$icon, 'profile.php?u='.$member['user_id']);
-						$member_content .= Display::div('<img height="44" border="2" align="middle" vspace="10" class="social-groups-image" src="'.$picture['file'].'"/>&nbsp'.$member_name);
-						$member_content .= '</div>';
+                    $member_content .= '<div class="">';
+                    $member_name = Display::url(api_get_person_name(Text::cut($member['firstname'],15),Text::cut($member['lastname'],15)).'&nbsp;'.$icon, 'profile.php?u='.$member['user_id']);
+                    $member_content .= Display::div('<img height="44" border="2" align="middle" vspace="10" class="social-groups-image" src="'.$picture['file'].'"/>&nbsp'.$member_name);
+                    $member_content .= '</div>';
 
-					}
-				}
-    		}
-    		if (!empty($create_thread_link)) {
-    			$create_thread_link =  Display::div($create_thread_link, array('style'=>'padding-top:2px;height:40px'));
-    		}
-    		$headers = array(get_lang('Discussions'), get_lang('Members'));
-			$social_right_content .= Display::tabs($headers, array($create_thread_link.$content, $member_content),'tabs');
-		} else {
-			// if I already sent an invitation message
-			if (!in_array($my_group_role, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, GROUP_USER_PERMISSION_PENDING_INVITATION))) {
-				$social_right_content .=  '<a class="btn" href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
-			} elseif ($my_group_role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
-				$social_right_content .=  '<a class="btn" href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>';
-			}
-		}
+                }
+            }
+        }
+        if (!empty($create_thread_link)) {
+            $create_thread_link =  Display::div($create_thread_link, array('style'=>'padding-top:2px;height:40px'));
+        }
+        $headers = array(get_lang('Discussions'), get_lang('Members'));
+        $social_right_content .= Display::tabs($headers, array($create_thread_link.$content, $member_content),'tabs');
+    } else {
+        // if I already sent an invitation message
+        if (!in_array($my_group_role, array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER, GROUP_USER_PERMISSION_PENDING_INVITATION))) {
+            $social_right_content .=  '<a class="btn" href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('JoinGroup').'</a>';
+        } elseif ($my_group_role == GROUP_USER_PERMISSION_PENDING_INVITATION) {
+            $social_right_content .=  '<a class="btn" href="groups.php?id='.$group_id.'&action=join&u='.api_get_user_id().'">'.get_lang('YouHaveBeenInvitedJoinNow').'</a>';
+        }
+    }
 	$social_right_content .=  '</div>'; // end layout messages
 
 } else {
@@ -369,6 +370,7 @@ if ($group_id != 0 ) {
 
 		// Newest groups
 		$results = $usergroup->get_groups_by_age(4,false);
+
 		$grid_newest_groups = array();
 		foreach ($results as $result) {
 			$result['name'] = Security::remove_XSS($result['name'], STUDENT, true);

+ 48 - 0
main/template/default/layout/footer.tpl

@@ -99,6 +99,54 @@ function maxCharForTextarea(obj) {
     }
 }
 
+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];
+
+    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;
+}
+
+
+var value = 1;
+$("#advanced_parameters").on("click", function() {
+    $("#options").toggle(function() {
+        if (value == 1) {
+            $(".advanced_parameters").addClass("btn-hide");
+            value = 0;
+        } else {
+            $(".advanced_parameters").removeClass("btn-hide");
+            value = 1;
+        }
+    });
+});
+
+
 /* Makes row highlighting possible */
 $(document).ready( function() {
     //Chosen select