chamilo / chamilo-lms

main/admin/dashboard_add_courses_to_user.php

Indentation +29 added lines, -29 removed lines

@@ -36,20 +36,20 @@ 
 
 // setting the name of the tool
 if (UserManager::is_admin($user_id)) {
-	$tool_name= get_lang('AssignCoursesToPlatformAdministrator');
+    $tool_name= get_lang('AssignCoursesToPlatformAdministrator');
 } else if ($user_info['status'] == SESSIONADMIN) {
-	$tool_name= get_lang('AssignCoursesToSessionsAdministrator');
+    $tool_name= get_lang('AssignCoursesToSessionsAdministrator');
 } else {
-	$tool_name= get_lang('AssignCoursesToHumanResourcesManager');
+    $tool_name= get_lang('AssignCoursesToHumanResourcesManager');
 }
 
 $add_type = 'multiple';
 if(isset($_GET['add_type']) && $_GET['add_type']!='') {
-	$add_type = Security::remove_XSS($_REQUEST['add_type']);
+    $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
 if (!api_is_platform_admin()) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 function search_courses($needle, $type)
@@ -60,7 +60,7 @@ 
     $return = '';
     if (!empty($needle) && !empty($type)) {
         // xajax send utf8 datas... datas in db can be non-utf8 datas
-		$needle = Database::escape_string($needle);
+        $needle = Database::escape_string($needle);
 
         $assigned_courses_to_hrm = CourseManager::get_courses_followed_by_drh($user_id);
         $assigned_courses_code = array_keys($assigned_courses_to_hrm);
@@ -88,16 +88,16 @@ 
                 		$without_assigned_courses ";
         }
 
-		$rs	= Database::query($sql);
+        $rs	= Database::query($sql);
 
-		$return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
-		while($course = Database :: fetch_array($rs)) {
-			$return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
-		}
-		$return .= '</select>';
-		$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
-	}
-	return $xajax_response;
+        $return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
+        while($course = Database :: fetch_array($rs)) {
+            $return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
+        }
+        $return .= '</select>';
+        $xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+    }
+    return $xajax_response;
 }
 
 $xajax->processRequests();
@@ -181,23 +181,23 @@ 
 $assigned_courses_to_hrm = CourseManager::get_courses_followed_by_drh($user_id);
 $assigned_courses_code = array_keys($assigned_courses_to_hrm);
 foreach ($assigned_courses_code as &$value) {
-	$value = "'".$value."'";
+    $value = "'".$value."'";
 }
 
 $without_assigned_courses = '';
 if (count($assigned_courses_code) > 0) {
-	$without_assigned_courses = " AND c.code NOT IN(".implode(',',$assigned_courses_code).")";
+    $without_assigned_courses = " AND c.code NOT IN(".implode(',',$assigned_courses_code).")";
 }
 
 $needle = '%';
 $firstLetter = null;
 if (isset($_POST['firstLetterCourse'])) {
-	$firstLetter = $_POST['firstLetterCourse'];
-	$needle = Database::escape_string($firstLetter.'%');
+    $firstLetter = $_POST['firstLetterCourse'];
+    $needle = Database::escape_string($firstLetter.'%');
 }
 
 if (api_is_multiple_url_enabled()) {
-	$sql = " SELECT c.code, c.title
+    $sql = " SELECT c.code, c.title
             FROM $tbl_course c
             LEFT JOIN $tbl_course_rel_access_url a
             ON (a.c_id = c.id)
@@ -207,7 +207,7 @@ 
             ORDER BY c.title";
 
 } else {
-	$sql= " SELECT c.code, c.title
+    $sql= " SELECT c.code, c.title
 	        FROM $tbl_course c
             WHERE  c.code LIKE '$needle' $without_assigned_courses
             ORDER BY c.title";
@@ -221,7 +221,7 @@ 
 <input type="hidden" name="formSent" value="1" />
 <?php
 if(!empty($msg)) {
-	Display::display_normal_message($msg); //main API
+    Display::display_normal_message($msg); //main API
 }
 ?>
 
@@ -269,13 +269,13 @@ 
     </div>
     <div class="col-md-4">
         <h5><?php
-	  	if (UserManager::is_admin($user_id)) {
-			echo get_lang('AssignedCoursesListToPlatformAdministrator');
-		} else if ($user_info['status'] == SESSIONADMIN) {
-			echo get_lang('AssignedCoursesListToSessionsAdministrator');
-		} else {
-			echo get_lang('AssignedCoursesListToHumanResourcesManager');
-		}
+            if (UserManager::is_admin($user_id)) {
+            echo get_lang('AssignedCoursesListToPlatformAdministrator');
+        } else if ($user_info['status'] == SESSIONADMIN) {
+            echo get_lang('AssignedCoursesListToSessionsAdministrator');
+        } else {
+            echo get_lang('AssignedCoursesListToHumanResourcesManager');
+        }
             ?>: </h5>
         
         <select id='destination' name="CoursesList[]" multiple="multiple" size="20" style="width:320px;">

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
 
 // setting breadcrumbs
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'user_list.php','name' => get_lang('UserList'));
+$interbreadcrumb[] = array('url' => 'user_list.php', 'name' => get_lang('UserList'));
 
 // Database Table Definitions
 $tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
@@ -36,15 +36,15 @@ 
 
 // setting the name of the tool
 if (UserManager::is_admin($user_id)) {
-	$tool_name= get_lang('AssignCoursesToPlatformAdministrator');
+	$tool_name = get_lang('AssignCoursesToPlatformAdministrator');
 } else if ($user_info['status'] == SESSIONADMIN) {
-	$tool_name= get_lang('AssignCoursesToSessionsAdministrator');
+	$tool_name = get_lang('AssignCoursesToSessionsAdministrator');
 } else {
-	$tool_name= get_lang('AssignCoursesToHumanResourcesManager');
+	$tool_name = get_lang('AssignCoursesToHumanResourcesManager');
 }
 
 $add_type = 'multiple';
-if(isset($_GET['add_type']) && $_GET['add_type']!='') {
+if (isset($_GET['add_type']) && $_GET['add_type'] != '') {
 	$add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
@@ -54,7 +54,7 @@ 
 
 function search_courses($needle, $type)
 {
-    global $tbl_course, $tbl_course_rel_access_url,$user_id;
+    global $tbl_course, $tbl_course_rel_access_url, $user_id;
 
     $xajax_response = new xajaxResponse();
     $return = '';
@@ -69,7 +69,7 @@ 
         }
         $without_assigned_courses = '';
         if (count($assigned_courses_code) > 0) {
-            $without_assigned_courses = " AND c.code NOT IN(".implode(',',$assigned_courses_code).")";
+            $without_assigned_courses = " AND c.code NOT IN(".implode(',', $assigned_courses_code).")";
         }
 
         if (api_is_multiple_url_enabled()) {
@@ -88,14 +88,14 @@ 
                 		$without_assigned_courses ";
         }
 
-		$rs	= Database::query($sql);
+		$rs = Database::query($sql);
 
 		$return .= '<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" >';
-		while($course = Database :: fetch_array($rs)) {
-			$return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'],ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
+		while ($course = Database :: fetch_array($rs)) {
+			$return .= '<option value="'.$course['code'].'" title="'.htmlspecialchars($course['title'], ENT_QUOTES).'">'.$course['title'].' ('.$course['code'].')</option>';
 		}
 		$return .= '</select>';
-		$xajax_response -> addAssign('ajax_list_courses_multiple','innerHTML',api_utf8_encode($return));
+		$xajax_response -> addAssign('ajax_list_courses_multiple', 'innerHTML', api_utf8_encode($return));
 	}
 	return $xajax_response;
 }
@@ -153,7 +153,7 @@ 
 }
 </script>';
 
-$formSent=0;
+$formSent = 0;
 $errorMsg = $firstLetterCourse = '';
 $UserList = array();
 
@@ -161,7 +161,7 @@ 
 if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
     $courses_list = $_POST['CoursesList'];
     $affected_rows = CourseManager::subscribeCoursesToDrhManager($user_id, $courses_list);
-    if ($affected_rows)	{
+    if ($affected_rows) {
         $msg = get_lang('AssignedCoursesHaveBeenUpdatedSuccessfully');
     }
 }
@@ -186,7 +186,7 @@ 
 
 $without_assigned_courses = '';
 if (count($assigned_courses_code) > 0) {
-	$without_assigned_courses = " AND c.code NOT IN(".implode(',',$assigned_courses_code).")";
+	$without_assigned_courses = " AND c.code NOT IN(".implode(',', $assigned_courses_code).")";
 }
 
 $needle = '%';
@@ -207,20 +207,20 @@ 
             ORDER BY c.title";
 
 } else {
-	$sql= " SELECT c.code, c.title
+	$sql = " SELECT c.code, c.title
 	        FROM $tbl_course c
             WHERE  c.code LIKE '$needle' $without_assigned_courses
             ORDER BY c.title";
 }
 
 
-$result	= Database::query($sql);
+$result = Database::query($sql);
 
 ?>
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" style="margin:0px;">
 <input type="hidden" name="formSent" value="1" />
 <?php
-if(!empty($msg)) {
+if (!empty($msg)) {
 	Display::display_normal_message($msg); //main API
 }
 ?>
@@ -232,7 +232,7 @@ 
         <div id="ajax_list_courses_multiple">
 	<select id="origin" name="NoAssignedCoursesList[]" multiple="multiple" size="20" style="width:340px;">
 	<?php while ($enreg = Database::fetch_array($result)) { ?>
-            <option value="<?php echo $enreg['code']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'],ENT_QUOTES).'"';?>><?php echo $enreg['title'].' ('.$enreg['code'].')'; ?></option>
+            <option value="<?php echo $enreg['code']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'], ENT_QUOTES).'"'; ?>><?php echo $enreg['title'].' ('.$enreg['code'].')'; ?></option>
 	<?php } ?>
 	</select>
         </div>
@@ -240,8 +240,8 @@ 
     </div>
     <div class="col-md-4">
         <div class="code-course">
-        <?php if($add_type == 'multiple') { ?>
-        <p><?php echo get_lang('FirstLetterCourse');?> :</p>
+        <?php if ($add_type == 'multiple') { ?>
+        <p><?php echo get_lang('FirstLetterCourse'); ?> :</p>
         <select name="firstLetterCourse" class="selectpicker form-control" onchange = "xajax_search_courses(this.value,'multiple')">
             <option value="%">--</option>
             <?php  echo Display :: get_alphabet_options($firstLetter); ?>
@@ -283,7 +283,7 @@ 
             if (is_array($assigned_courses_to_hrm)) {
                 foreach ($assigned_courses_to_hrm as $enreg) {
             ?>
-                <option value="<?php echo $enreg['code']; ?>" <?php echo 'title="' . htmlspecialchars($enreg['title'], ENT_QUOTES) . '"'; ?>><?php echo $enreg['title'] . ' (' . $enreg['code'] . ')'; ?></option>
+                <option value="<?php echo $enreg['code']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'], ENT_QUOTES).'"'; ?>><?php echo $enreg['title'].' ('.$enreg['code'].')'; ?></option>
             <?php
                     }
                 }

main/admin/access_url_edit_usergroup_to_url.php

Indentation +22 added lines, -22 removed lines

@@ -121,7 +121,7 @@ 
         $userGroupList[$item['id']] = $item;
     }
 } else {
-	$userGroups = UrlManager::get_url_rel_usergroup_data();
+    $userGroups = UrlManager::get_url_rel_usergroup_data();
 
     foreach ($userGroups as $item) {
         if ($item['access_url_id'] == $access_url_id) {
@@ -132,11 +132,11 @@ 
 }
 
 if ($add_type == 'multiple') {
-	$link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
-	$link_add_type_multiple = get_lang('SessionAddTypeMultiple');
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
+    $link_add_type_multiple = get_lang('SessionAddTypeMultiple');
 } else {
-	$link_add_type_unique = get_lang('SessionAddTypeUnique');
-	$link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
+    $link_add_type_unique = get_lang('SessionAddTypeUnique');
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
 }
 
 $url_list = UrlManager::get_url_data();
@@ -200,30 +200,30 @@ 
     <?php } else { ?>
 	  <select id="origin_users" name="no_course_list[]" multiple="multiple" size="15" style="width:380px;">
 		<?php
-		foreach ($noUserGroupList as $noItem) {
-		?>
+        foreach ($noUserGroupList as $noItem) {
+        ?>
 			<option value="<?php echo $noItem['id']; ?>">
                 <?php echo $noItem['name']; ?>
             </option>
 		<?php
-		}
-		?>
+        }
+        ?>
 	  </select>
 	<?php
-  	  }
-  	 ?>
+        }
+        ?>
   </div>
   </td>
   <td width="10%" valign="middle" align="center">
   <?php
-  if ($ajax_search) {
-	?>
+    if ($ajax_search) {
+    ?>
 	<button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
         <em class="fa fa-arrow-left"></em>
 	</button>
   	<?php
-  } else {
-  	?>
+    } else {
+        ?>
 	<button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" >
         <em class="fa fa-arrow-right"></em>
 	</button>
@@ -232,8 +232,8 @@ 
         <em class="fa fa-arrow-left"></em>
 	</button>
 	<?php
-  }
-  ?>
+    }
+    ?>
 	<br /><br /><br /><br /><br /><br />
   </td>
   <td align="center">
@@ -254,11 +254,11 @@ 
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		if(isset($_GET['add']))
-			echo '<button class="save" onclick="valide()" >'.get_lang('AddUserGroupToURL').'</button>';
-		else
-			echo '<button class="save" onclick="valide()" >'.get_lang('EditUserGroupToURL').'</button>';
-		?>
+        if(isset($_GET['add']))
+            echo '<button class="save" onclick="valide()" >'.get_lang('AddUserGroupToURL').'</button>';
+        else
+            echo '<button class="save" onclick="valide()" >'.get_lang('EditUserGroupToURL').'</button>';
+        ?>
 	</td>
 </tr>
 </table>

Spacing +14 added lines, -14 removed lines

@@ -25,8 +25,8 @@ 
 
 // setting breadcrumbs
 $tool_name = get_lang('EditUserGroupToURL');
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
 
 $add_type = 'multiple';
 if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
@@ -73,10 +73,10 @@ 
 }
 </script>';
 
-$form_sent=0;
-$errorMsg='';
-$UserList=$SessionList=array();
-$users=$sessions=array();
+$form_sent = 0;
+$errorMsg = '';
+$UserList = $SessionList = array();
+$users = $sessions = array();
 
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     $form_sent = $_POST['form_sent'];
@@ -125,7 +125,7 @@ 
 
     foreach ($userGroups as $item) {
         if ($item['access_url_id'] == $access_url_id) {
-            $userGroupList[$item['id']] = $item ;
+            $userGroupList[$item['id']] = $item;
         }
     }
     $noUserGroupList = $userGroup->getUserGroupNotInList(array_keys($userGroupList));
@@ -149,7 +149,7 @@ 
     name="formulaire"
     method="post"
     action="<?php echo api_get_self(); ?>"
-    style="margin:0px;" <?php if ($ajax_search){ echo ' onsubmit="valide();"'; } ?>
+    style="margin:0px;" <?php if ($ajax_search) { echo ' onsubmit="valide();"'; } ?>
 >
 <?php echo get_lang('SelectUrl').' : '; ?>
 <select name="access_url_id" onchange="javascript:send();">
@@ -161,11 +161,11 @@ 
         if (!empty($access_url_id)) {
             if ($url_obj[0] == $access_url_id) {
                 $checked = 'selected=true';
-                $url_selected=$url_obj[1];
+                $url_selected = $url_obj[1];
             }
         }
-        if ($url_obj['active']==1) { ?>
-            <option <?php echo $checked;?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?>
+        if ($url_obj['active'] == 1) { ?>
+            <option <?php echo $checked; ?> value="<?php echo $url_obj[0]; ?>"> <?php echo $url_obj[1]; ?>
             </option>
         <?php
         }
@@ -188,7 +188,7 @@ 
   <td align="center"><b><?php echo get_lang('UserGroupListInPlatform') ?> :</b>
   </td>
   <td></td>
-  <td align="center"><b><?php printf(get_lang('UserGroupListInX'),$url_selected); ?></b></td>
+  <td align="center"><b><?php printf(get_lang('UserGroupListInX'), $url_selected); ?></b></td>
 </tr>
 
 <tr>
@@ -239,7 +239,7 @@ 
   <td align="center">
   <select id="destination_users" name="course_list[]" multiple="multiple" size="15" style="width:380px;">
 <?php
-foreach($userGroupList as $item) {
+foreach ($userGroupList as $item) {
 ?>
 	<option value="<?php echo $item['id']; ?>">
         <?php echo $item['name']; ?>
@@ -254,7 +254,7 @@ 
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		if(isset($_GET['add']))
+		if (isset($_GET['add']))
 			echo '<button class="save" onclick="valide()" >'.get_lang('AddUserGroupToURL').'</button>';
 		else
 			echo '<button class="save" onclick="valide()" >'.get_lang('EditUserGroupToURL').'</button>';

Braces +5 added lines, -4 removed lines

@@ -254,10 +254,11 @@
 	<td colspan="3" align="center">
 		<br />
 		<?php
-		if(isset($_GET['add']))
-			echo '<button class="save" onclick="valide()" >'.get_lang('AddUserGroupToURL').'</button>';
-		else
-			echo '<button class="save" onclick="valide()" >'.get_lang('EditUserGroupToURL').'</button>';
+		if(isset($_GET['add'])) {
+					echo '<button class="save" onclick="valide()" >'.get_lang('AddUserGroupToURL').'</button>';
+		} else {
+					echo '<button class="save" onclick="valide()" >'.get_lang('EditUserGroupToURL').'</button>';
+		}
 		?>
 	</td>
 </tr>

main/admin/extra_field_workflow.php

Spacing +17 added lines, -17 removed lines

@@ -15,7 +15,7 @@ 
 api_protect_admin_script();
 
 // setting breadcrumbs
-$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 $tool_name = null;
 
@@ -36,35 +36,35 @@ 
 $token = Security::get_token();
 
 if ($action == 'add') {
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extraField->type,'name' => $extraField->pageName);
-    $interbreadcrumb[]=array(
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extraField->type, 'name' => $extraField->pageName);
+    $interbreadcrumb[] = array(
         'url' => 'extra_fields.php?type='.$extraField->type.'&action=edit&id='.$extraFieldInfo['id'],
         'name' => $extraFieldInfo['display_text']
     );
-    $interbreadcrumb[]=array(
+    $interbreadcrumb[] = array(
         'url' => 'extra_field_options.php?type='.$extraField->type.'&field_id='.$extraFieldInfo['id'],
         'name' => get_lang('EditExtraFieldOptions')
     );
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('Add'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Add'));
 } elseif ($action == 'edit') {
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extraField->type,'name' => $extraField->pageName);
-    $interbreadcrumb[]=array(
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extraField->type, 'name' => $extraField->pageName);
+    $interbreadcrumb[] = array(
         'url' => 'extra_fields.php?type='.$extraField->type.'&action=edit&id='.$extraFieldInfo['id'],
         'name' => $extraFieldInfo['display_text']
     );
-    $interbreadcrumb[]=array(
+    $interbreadcrumb[] = array(
         'url' => 'extra_field_options.php?type='.$extraField->type.'&field_id='.$extraFieldInfo['id'],
         'name' => get_lang('EditExtraFieldOptions')
     );
 
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('Edit'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Edit'));
 } else {
-    $interbreadcrumb[]=array('url' => 'extra_fields.php?type='.$extraField->type,'name' => $extraField->pageName);
-    $interbreadcrumb[]=array(
+    $interbreadcrumb[] = array('url' => 'extra_fields.php?type='.$extraField->type, 'name' => $extraField->pageName);
+    $interbreadcrumb[] = array(
         'url' =>  'extra_fields.php?type='.$extraField->type.'&action=edit&id='.$extraFieldInfo['id'],
         'name' => $extraFieldInfo['display_text']
     );
-    $interbreadcrumb[]=array('url' => '#','name' => get_lang('EditExtraFieldOptions'));
+    $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('EditExtraFieldOptions'));
 }
 
 $roleId = isset($_REQUEST['roleId']) ? $_REQUEST['roleId'] : null;
@@ -74,9 +74,9 @@ 
 $paramsNoRole = 'field_id='.$field_id.'&type='.$extraField->type;
 
 //The order is important you need to check the the $column variable in the model.ajax.php file
-$columns = array(get_lang('Name'), get_lang('Value'),  get_lang('Order'), get_lang('Actions'));
+$columns = array(get_lang('Name'), get_lang('Value'), get_lang('Order'), get_lang('Actions'));
 
-$htmlHeadXtra[]='<script>
+$htmlHeadXtra[] = '<script>
 
     function setHidden(obj) {
         var name = $(obj).attr("name");
@@ -177,9 +177,9 @@ 
 if (!empty($roleId)) {
     $form->addElement('html', $table->toHtml());
     $group = array();
-    $group[]= $form->createElement('button', 'submit', get_lang('Save'));
-    $group[]= $form->createElement('button', 'select_all', get_lang('SelectAll'), array('class' => 'btn select_all'));
-    $group[]= $form->createElement('button', 'unselect_all', get_lang('UnSelectAll'), array('class' => 'btn unselect_all'));
+    $group[] = $form->createElement('button', 'submit', get_lang('Save'));
+    $group[] = $form->createElement('button', 'select_all', get_lang('SelectAll'), array('class' => 'btn select_all'));
+    $group[] = $form->createElement('button', 'unselect_all', get_lang('UnSelectAll'), array('class' => 'btn unselect_all'));
     $form->addGroup($group, '', null, ' ');
 
     $form->setDefaults(array('status' => $roleId));

main/admin/skills_wheel.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 $url = api_get_path(WEB_AJAX_PATH)."skill.ajax.php?a=get_skills_tree_json&load_user=$load_user";
 $tpl->assign('wheel_url', $url);
 
-$url  = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1';
+$url = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1';
 $tpl->assign('url', $url);
 $tpl->assign('isAdministration', true);
 

main/admin/usergroup_import.php

Spacing +6 added lines, -6 removed lines

@@ -23,8 +23,8 @@ 
             // 2. Check whether class doesn't exist yet.
             if ($usergroup->usergroup_exists($class['name'])) {
                 $class['line'] = $index + 2;
-                $class['error'] = get_lang('ClassNameExists') .
-                    ': <strong>' .$class['name'] . '</strong>';
+                $class['error'] = get_lang('ClassNameExists').
+                    ': <strong>'.$class['name'].'</strong>';
                 $errors[] = $class;
             }
         }
@@ -98,7 +98,7 @@ 
 $form = new FormValidator('import_classes');
 $form->addElement('file', 'import_file', get_lang('ImportCSVFileLocation'));
 $group = array();
-$group[] = $form->createElement('radio', 'file_type', '', 'CSV (<a href="example_class.csv" target="_blank">' . get_lang('ExampleCSVFile') . '</a>)', 'csv');
+$group[] = $form->createElement('radio', 'file_type', '', 'CSV (<a href="example_class.csv" target="_blank">'.get_lang('ExampleCSVFile').'</a>)', 'csv');
 $form->addGroup($group, '', get_lang('FileType'), '<br/>');
 $form->addButtonImport(get_lang('Import'));
 
@@ -107,12 +107,12 @@ 
     $errors = validate_data($classes);
     if (count($errors) == 0) {
         $number_of_added_classes = save_data($classes);
-        Display::display_normal_message($number_of_added_classes . ' ' . get_lang('Added'));
+        Display::display_normal_message($number_of_added_classes.' '.get_lang('Added'));
     } else {
         $error_message = get_lang('ErrorsWhenImportingFile');
         $error_message .= '<ul>';
         foreach ($errors as $index => $error_class) {
-            $error_message .= '<li>' . $error_class['error'] . ' (' . get_lang('Line') . ' ' . $error_class['line'] . ')';
+            $error_message .= '<li>'.$error_class['error'].' ('.get_lang('Line').' '.$error_class['line'].')';
             $error_message .= '</li>';
         }
         $error_message .= '</ul>';
@@ -123,7 +123,7 @@ 
 
 $form->display();
 ?>
-<p><?php echo get_lang('CSVMustLookLike') . ' (' . get_lang('MandatoryFields') . ')'; ?> :</p>
+<p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>
 
 <pre>
 <b>name;description;</b>users

main/admin/promotions.php

Indentation +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 <script>
 $(function() {
 <?php
-     echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
+        echo Display::grid_js('promotions', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
 ?>
 });
 </script>

Spacing +7 added lines, -7 removed lines

@@ -16,8 +16,8 @@ 
 $htmlHeadXtra[] = api_get_jqgrid_js();
 
 // setting breadcrumbs
-$interbreadcrumb[] = array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'career_dashboard.php', 'name' => get_lang('CareersAndPromotions'));
 
 $action = isset($_GET['action']) ? $_GET['action'] : null;
 
@@ -102,10 +102,10 @@ 
 $extra_params['height'] = 'auto'; //use the width of the parent
 //With this function we can add actions to the jgrid
 $action_links = 'function action_formatter (cellvalue, options, rowObject) {
-    return \'<a href="add_sessions_to_promotion.php?id=\'+options.rowId+\'">'.Display::return_icon('session_to_promotion.png',get_lang('SubscribeSessionsToPromotions'),'',ICON_SIZE_SMALL).'</a>'.
-    '&nbsp;<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).'</a>'.
-    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=copy&id=\'+options.rowId+\'">'.Display::return_icon('copy.png',get_lang('Copy'),'',ICON_SIZE_SMALL).'</a>'.
-    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'</a> \';
+    return \'<a href="add_sessions_to_promotion.php?id=\'+options.rowId+\'">'.Display::return_icon('session_to_promotion.png', get_lang('SubscribeSessionsToPromotions'), '', ICON_SIZE_SMALL).'</a>'.
+    '&nbsp;<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>'.
+    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=copy&id=\'+options.rowId+\'">'.Display::return_icon('copy.png', get_lang('Copy'), '', ICON_SIZE_SMALL).'</a>'.
+    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."\'".')) return false;"  href="?sec_token='.$token.'&action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a> \';
 }';
 
 ?>
@@ -150,7 +150,7 @@ 
             $promotion->display();
         } else {
             echo '<div class="actions">';
-            echo Display::url(Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM), api_get_self());
+            echo Display::url(Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM), api_get_self());
             echo '</div>';
             $form->addElement('hidden', 'sec_token');
             $form->setConstants(array('sec_token' => $token));

main/admin/access_url_add_courses_to_url.php

Indentation +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
       <?php
         echo Display :: get_alphabet_options($first_letter_course);
         echo Display :: get_numeric_options(0,9,$first_letter_course);
-      ?>
+        ?>
      </select>
     </td>
         <td width="20%">&nbsp;</td>

Spacing +10 added lines, -10 removed lines

@@ -10,7 +10,7 @@ 
 $cidReset = true;
 require_once '../inc/global.inc.php';
 
-$this_section=SECTION_PLATFORM_ADMIN;
+$this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_global_admin_script();
 
@@ -21,7 +21,7 @@ 
 
 $form_sent = 0;
 $first_letter_course = '';
-$courses = array ();
+$courses = array();
 $url_list = array();
 $users = array();
 
@@ -32,8 +32,8 @@ 
 
 /*	Header   */
 $tool_name = get_lang('AddCoursesToURL');
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
 
 Display :: display_header($tool_name);
 
@@ -48,8 +48,8 @@ 
 
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     $form_sent = $_POST['form_sent'];
-    $courses = is_array($_POST['course_list']) ? $_POST['course_list'] : array() ;
-    $url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
+    $courses = is_array($_POST['course_list']) ? $_POST['course_list'] : array();
+    $url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array();
     $first_letter_course = $_POST['first_letter_course'];
 
     foreach ($users as $key => $value) {
@@ -70,7 +70,7 @@ 
     $sql = "SELECT count(*) as num_courses FROM $tbl_course";
     $result = Database::query($sql);
     $num_row = Database::fetch_array($result);
-    if ($num_row['num_courses']>1000) {
+    if ($num_row['num_courses'] > 1000) {
         //if there are too much num_courses to gracefully handle with the HTML select list,
         // assign a default filter on users names
         $first_letter_user = 'A';
@@ -106,7 +106,7 @@ 
       <option value="">--</option>
       <?php
         echo Display :: get_alphabet_options($first_letter_course);
-        echo Display :: get_numeric_options(0,9,$first_letter_course);
+        echo Display :: get_numeric_options(0, 9, $first_letter_course);
       ?>
      </select>
     </td>
@@ -119,7 +119,7 @@ 
     <td width="40%" align="center">
      <select name="course_list[]" multiple="multiple" size="20" style="width:400px;">
 		<?php foreach ($db_courses as $course) { ?>
-			<option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>><?php echo $course['title'].' ('.$course['code'].')'; ?>
+			<option value="<?php echo $course['code']; ?>" <?php if (in_array($course['code'], $courses)) echo 'selected="selected"'; ?>><?php echo $course['title'].' ('.$course['code'].')'; ?>
             </option>
         <?php } ?>
     </select>
@@ -130,7 +130,7 @@ 
    <td width="40%" align="center">
     <select name="url_list[]" multiple="multiple" size="20" style="width:300px;">
 		<?php foreach ($db_urls as $url_obj) { ?>
-        <option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?>
+        <option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?>
         </option>
 		<?php } ?>
     </select>

Braces +8 added lines, -2 removed lines

@@ -119,7 +119,10 @@ 
     <td width="40%" align="center">
      <select name="course_list[]" multiple="multiple" size="20" style="width:400px;">
 		<?php foreach ($db_courses as $course) { ?>
-			<option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>><?php echo $course['title'].' ('.$course['code'].')'; ?>
+			<option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $course['title'].' ('.$course['code'].')'; ?>
             </option>
         <?php } ?>
     </select>
@@ -130,7 +133,10 @@ 
    <td width="40%" align="center">
     <select name="url_list[]" multiple="multiple" size="20" style="width:300px;">
 		<?php foreach ($db_urls as $url_obj) { ?>
-        <option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>><?php echo $url_obj['url']; ?>
+        <option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) {
+    echo 'selected="selected"';
+}
+?>><?php echo $url_obj['url']; ?>
         </option>
 		<?php } ?>
     </select>

main/admin/ldap_import_students_to_session.php

Spacing +19 added lines, -19 removed lines

@@ -9,7 +9,7 @@ 
  * Code
  */
 // resetting the course id
-$cidReset=true;
+$cidReset = true;
 require_once('../inc/global.inc.php');
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -17,11 +17,11 @@ 
 api_protect_admin_script();
 require('../auth/ldap/authldap.php');
 
-$annee_base=date('Y');
+$annee_base = date('Y');
 
 $tool_name = get_lang('LDAPImport');
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 $htmlHeadXtra[] = '<script language="JavaScript" type="text/javascript">
 var buttoncheck = 1;
@@ -64,7 +64,7 @@ 
 		echo '</div>';
 
 }
-elseif(!empty($annee) && empty($id_session))
+elseif (!empty($annee) && empty($id_session))
 {
 	Display::display_header($tool_name);
 	echo '<div style="align:center">';
@@ -73,14 +73,14 @@ 
 	echo '<select name="id_session">';
 
 	$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-	$sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date " .
+	$sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date ".
 		" FROM $tbl_session ".
 		" ORDER BY name";
 	$result = Database::query($sql);
 
-	$sessions=Database::store_result($result);
-	$nbr_results=count($sessions);
-	foreach($sessions as $row) {
+	$sessions = Database::store_result($result);
+	$nbr_results = count($sessions);
+	foreach ($sessions as $row) {
 		echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>';
 	}
 	echo '</select>';
@@ -112,7 +112,7 @@ 
 
 		$info = ldap_get_entries($ds, $sr);
 
-		for ($key = 0; $key < $info["count"]; $key ++) {
+		for ($key = 0; $key < $info["count"]; $key++) {
 			$nom_form[] = $info[$key]["sn"][0];
 			$prenom_form[] = $info[$key]["givenname"][0];
 			$email_form[] = $info[$key]["mail"][0];
@@ -132,7 +132,7 @@ 
 		asort($nom_form);
 		reset($nom_form);
 
-		$statut=5;
+		$statut = 5;
 		include ('ldap_form_add_users_group.php');
 	} else {
 		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
@@ -143,24 +143,24 @@ 
     echo '</div>';
 
 }
-elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
+elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed'] == 'yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
+	$id = $_POST['username_form'];
+	$UserList = array();
 	$userid_match_login = array();
 	foreach ($id as $form_index=>$user_id)
 	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+		if (is_array($_POST['checkboxes']) && in_array($form_index, array_values($_POST['checkboxes'])))
 		{
 			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
+			$UserList[] = $tmp;
 			$userid_match_login[$tmp] = $user_id;
 		}
 	}
 	if (!empty($_POST['id_session'])) {
 		$num = 0;
 		$tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-		$tbl_session	  = Database::get_main_table(TABLE_MAIN_SESSION);
+		$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
 		foreach ($UserList as $user_id) {
                     $res_user = Database::insert(
                         $tbl_session_user,
@@ -175,7 +175,7 @@ 
                     }
 		}
 
-		if($num>0) {
+		if ($num > 0) {
 			$sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session);
 			$res = Database::query($sql);
 		}
@@ -203,8 +203,8 @@ 
 	else
 	{
 		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
+		$message = get_lang('NoUserAdded');
+		Display :: display_normal_message($message, false);
 	}
 	echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';

Braces +2 added lines, -4 removed lines

@@ -63,8 +63,7 @@ 
 		echo '</form>';
 		echo '</div>';
 
-}
-elseif(!empty($annee) && empty($id_session))
+} elseif(!empty($annee) && empty($id_session))
 {
 	Display::display_header($tool_name);
 	echo '<div style="align:center">';
@@ -142,8 +141,7 @@ 
     echo '<br /><br />';
     echo '</div>';
 
-}
-elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
+} elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
 {
 	$id=$_POST['username_form'];
 	$UserList=array();

Indentation +111 added lines, -111 removed lines

@@ -53,93 +53,93 @@ 
 //if ($annee == "" && $composante == "" && $etape == "") {
 if (empty($annee) && empty($id_session))
 {
-		Display::display_header($tool_name);
-		echo '<div style="align:center">';
-		echo Display::return_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')).' '.get_lang('LDAPSelectFilterOnUsersOU');
-		echo '<form method="get" action="'.api_get_self().'"><br />';
-		echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
-		echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"> ';
-		echo '<input type="submit" value="'.get_lang('Submit').'">';
-		echo '</form>';
-		echo '</div>';
+        Display::display_header($tool_name);
+        echo '<div style="align:center">';
+        echo Display::return_icon('group.gif', get_lang('LDAPSelectFilterOnUsersOU')).' '.get_lang('LDAPSelectFilterOnUsersOU');
+        echo '<form method="get" action="'.api_get_self().'"><br />';
+        echo '<em>'.get_lang('LDAPOUAttributeFilter').' :</em> ';
+        echo '<input  type="text" name="annee" size="4" maxlength="30" value="'.$annee_base.'"> ';
+        echo '<input type="submit" value="'.get_lang('Submit').'">';
+        echo '</form>';
+        echo '</div>';
 
 }
 elseif(!empty($annee) && empty($id_session))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align:center">';
-	echo Display::return_icon(
-			'course.png',
-			get_lang('SelectSessionToImportUsersTo')).' '.get_lang('SelectSessionToImportUsersTo').'<br />';
-	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
-	echo '<select name="id_session">';
-
-	$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
-	$sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date " .
-		" FROM $tbl_session ".
-		" ORDER BY name";
-	$result = Database::query($sql);
-
-	$sessions=Database::store_result($result);
-	$nbr_results=count($sessions);
-	foreach($sessions as $row) {
-		echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>';
-	}
-	echo '</select>';
-	echo '<input type="submit" value="'.get_lang('Submit').'">';
-	echo '</form>';
-	echo '</div>';
+    Display::display_header($tool_name);
+    echo '<div style="align:center">';
+    echo Display::return_icon(
+            'course.png',
+            get_lang('SelectSessionToImportUsersTo')).' '.get_lang('SelectSessionToImportUsersTo').'<br />';
+    echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
+    echo '<select name="id_session">';
+
+    $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
+    $sql = "SELECT id,name,nbr_courses,access_start_date,access_end_date " .
+        " FROM $tbl_session ".
+        " ORDER BY name";
+    $result = Database::query($sql);
+
+    $sessions=Database::store_result($result);
+    $nbr_results=count($sessions);
+    foreach($sessions as $row) {
+        echo '<option value="'.$row['id'].'">'.api_htmlentities($row['name']).' ('.$row['access_start_date'].' - '.$row['access_end_date'].')</option>';
+    }
+    echo '</select>';
+    echo '<input type="submit" value="'.get_lang('Submit').'">';
+    echo '</form>';
+    echo '</div>';
 }
 // form4  annee != 0; composante != 0 etape != 0
 //elseif ($annee <> "" && $composante <> "" && $etape <> "" && $listeok != 'yes') {
 elseif (!empty($annee) && !empty($id_session) && empty($_POST['confirmed']))
 {
-	Display::display_header($tool_name);
-	echo '<div style="align: center;">';
-	echo '<br />';
-	echo '<br />';
-	echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
-	//echo "Connection ...";
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
-	ldap_set_version($ds);
-
-	if ($ds) {
-
-		$r = false;
-		$res = ldap_handle_bind($ds, $r);
-
-		//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
-		//echo "(ou=*$annee,ou=$composante)";
-		$sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
-
-		$info = ldap_get_entries($ds, $sr);
-
-		for ($key = 0; $key < $info["count"]; $key ++) {
-			$nom_form[] = $info[$key]["sn"][0];
-			$prenom_form[] = $info[$key]["givenname"][0];
-			$email_form[] = $info[$key]["mail"][0];
-			// Get uid from dn
-			//$dn_array=ldap_explode_dn($info[$key]["dn"],1);
-			//$username_form[] = $dn_array[0]; // uid is first key
-			$username_form[] = $info[$key]['uid'][0];
-			$outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
-			//$val = ldap_get_values_len($ds, $entry, "userPassword");
-			//$password_form[] = $val[0];
-			$password_form[] = $info[$key]['userPassword'][0];
-		}
-		ldap_unbind($ds);
-
-		/*-----------------------------------------------*/
-
-		asort($nom_form);
-		reset($nom_form);
-
-		$statut=5;
-		include ('ldap_form_add_users_group.php');
-	} else {
-		echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
-	}
-	echo '<br /><br />';
+    Display::display_header($tool_name);
+    echo '<div style="align: center;">';
+    echo '<br />';
+    echo '<br />';
+    echo '<h3>'.Display::return_icon('group.gif', get_lang('SelectStudents')).' '.get_lang('SelectStudents').'</h3>';
+    //echo "Connection ...";
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    ldap_set_version($ds);
+
+    if ($ds) {
+
+        $r = false;
+        $res = ldap_handle_bind($ds, $r);
+
+        //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "(|(edupersonprimaryorgunitdn=ou=$etape,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn)(edupersonprimaryorgunitdn=ou=02PEL,ou=$annee,ou=diploma,o=Paris1,$LDAPbasedn))");
+        //echo "(ou=*$annee,ou=$composante)";
+        $sr = @ ldap_search($ds, $ldap_basedn, "(ou=*$annee)");
+
+        $info = ldap_get_entries($ds, $sr);
+
+        for ($key = 0; $key < $info["count"]; $key ++) {
+            $nom_form[] = $info[$key]["sn"][0];
+            $prenom_form[] = $info[$key]["givenname"][0];
+            $email_form[] = $info[$key]["mail"][0];
+            // Get uid from dn
+            //$dn_array=ldap_explode_dn($info[$key]["dn"],1);
+            //$username_form[] = $dn_array[0]; // uid is first key
+            $username_form[] = $info[$key]['uid'][0];
+            $outab[] = $info[$key]["eduPersonPrimaryAffiliation"][0]; // Ici "student"
+            //$val = ldap_get_values_len($ds, $entry, "userPassword");
+            //$password_form[] = $val[0];
+            $password_form[] = $info[$key]['userPassword'][0];
+        }
+        ldap_unbind($ds);
+
+        /*-----------------------------------------------*/
+
+        asort($nom_form);
+        reset($nom_form);
+
+        $statut=5;
+        include ('ldap_form_add_users_group.php');
+    } else {
+        echo '<h4>'.get_lang('UnableToConnectTo').' '.$host.'</h4>';
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
     echo '</div>';
@@ -147,23 +147,23 @@ 
 }
 elseif (!empty($annee) && !empty($id_session) && ($_POST['confirmed']=='yes'))
 {
-	$id=$_POST['username_form'];
-	$UserList=array();
-	$userid_match_login = array();
-	foreach ($id as $form_index=>$user_id)
-	{
-		if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
-		{
-			$tmp = ldap_add_user($user_id);
-			$UserList[]= $tmp;
-			$userid_match_login[$tmp] = $user_id;
-		}
-	}
-	if (!empty($_POST['id_session'])) {
-		$num = 0;
-		$tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
-		$tbl_session	  = Database::get_main_table(TABLE_MAIN_SESSION);
-		foreach ($UserList as $user_id) {
+    $id=$_POST['username_form'];
+    $UserList=array();
+    $userid_match_login = array();
+    foreach ($id as $form_index=>$user_id)
+    {
+        if(is_array($_POST['checkboxes']) && in_array($form_index,array_values($_POST['checkboxes'])))
+        {
+            $tmp = ldap_add_user($user_id);
+            $UserList[]= $tmp;
+            $userid_match_login[$tmp] = $user_id;
+        }
+    }
+    if (!empty($_POST['id_session'])) {
+        $num = 0;
+        $tbl_session_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
+        $tbl_session	  = Database::get_main_table(TABLE_MAIN_SESSION);
+        foreach ($UserList as $user_id) {
                     $res_user = Database::insert(
                         $tbl_session_user,
                         [
@@ -175,15 +175,15 @@ 
                     if ($res_user !== false) {
                         $num++;
                     }
-		}
-
-		if($num>0) {
-			$sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session);
-			$res = Database::query($sql);
-		}
-		header('Location: resume_session.php?id_session='.Security::remove_XSS($_POST['id_session']));
-	}
-	/*
+        }
+
+        if($num>0) {
+            $sql = 'UPDATE '.$tbl_session.' SET nbr_users = (nbr_users + '.$num.') WHERE id = '.intval($id_session);
+            $res = Database::query($sql);
+        }
+        header('Location: resume_session.php?id_session='.Security::remove_XSS($_POST['id_session']));
+    }
+    /*
 	else
 	{
 		Display :: display_header($tool_name);
@@ -202,13 +202,13 @@ 
 		Display :: display_normal_message($message,false);
 	}
 	*/
-	else
-	{
-		Display::display_header($tool_name);
-		$message=get_lang('NoUserAdded');
-		Display :: display_normal_message($message,false);
-	}
-	echo '<br /><br />';
+    else
+    {
+        Display::display_header($tool_name);
+        $message=get_lang('NoUserAdded');
+        Display :: display_normal_message($message,false);
+    }
+    echo '<br /><br />';
     echo '<a href="ldap_import_students.php?annee=&composante=&etape=">'.get_lang('BackToNewSearch').'</a>';
     echo '<br /><br />';
 }

main/admin/access_url_add_users_to_url.php

Indentation +30 added lines, -30 removed lines

@@ -13,8 +13,8 @@ 
 
 api_protect_global_admin_script();
 if (!api_get_multiple_access_url()) {
-	header('Location: index.php');
-	exit;
+    header('Location: index.php');
+    exit;
 }
 
 $form_sent = 0;
@@ -44,36 +44,36 @@ 
 api_display_tool_title($tool_name);
 
 if ($_POST['form_sent']) {
-	$form_sent = $_POST['form_sent'];
-	$users = is_array($_POST['user_list']) ? $_POST['user_list'] : array() ;
-	$url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
-	$first_letter_user = $_POST['first_letter_user'];
+    $form_sent = $_POST['form_sent'];
+    $users = is_array($_POST['user_list']) ? $_POST['user_list'] : array() ;
+    $url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
+    $first_letter_user = $_POST['first_letter_user'];
 
-	foreach($users as $key => $value) {
-		$users[$key] = intval($value);
-	}
+    foreach($users as $key => $value) {
+        $users[$key] = intval($value);
+    }
 
-	if ($form_sent == 1) {
-		if (count($users) == 0 || count($url_list) == 0) {
-			Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL'));
-		} else {
-			UrlManager::add_users_to_urls($users,$url_list);
-			Display :: display_confirmation_message(get_lang('UsersBelongURL'));
-		}
-	}
+    if ($form_sent == 1) {
+        if (count($users) == 0 || count($url_list) == 0) {
+            Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL'));
+        } else {
+            UrlManager::add_users_to_urls($users,$url_list);
+            Display :: display_confirmation_message(get_lang('UsersBelongURL'));
+        }
+    }
 }
 
 /*	Display GUI	*/
 if (empty($first_letter_user)) {
-	$sql = "SELECT count(*) as nb_users FROM $tbl_user";
-	$result = Database::query($sql);
-	$num_row = Database::fetch_array($result);
+    $sql = "SELECT count(*) as nb_users FROM $tbl_user";
+    $result = Database::query($sql);
+    $num_row = Database::fetch_array($result);
     if ($num_row['nb_users']>1000) {
         //if there are too much users to gracefully handle with the HTML select list,
         // assign a default filter on users names
         $first_letter_user = 'A';
     }
-	unset($result);
+    unset($result);
 }
 $first_letter_user_lower = Database::escape_string(api_strtolower($first_letter_user));
 
@@ -104,7 +104,7 @@ 
       <option value="">--</option>
       <?php
         echo Display :: get_alphabet_options($first_letter_user);
-      ?>
+        ?>
      </select>
     </td>
         <td width="20%">&nbsp;</td>
@@ -116,14 +116,14 @@ 
     <td width="40%" align="center">
      <select name="user_list[]" multiple="multiple" size="20" style="width:380px;">
 		<?php
-		foreach ($db_users as $user) {
-		?>
+        foreach ($db_users as $user) {
+        ?>
             <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>>
                 <?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?>
             </option>
 		<?php
-		}
-		?>
+        }
+        ?>
     </select>
    </td>
    <td width="20%" valign="middle" align="center">
@@ -132,14 +132,14 @@ 
    <td width="40%" align="center">
     <select name="url_list[]" multiple="multiple" size="20" style="width:230px;">
 		<?php
-		foreach ($db_urls as $url_obj) {
-			?>
+        foreach ($db_urls as $url_obj) {
+            ?>
 			<option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>>
                 <?php echo $url_obj['url']; ?>
 			</option>
 			<?php
-		}
-		?>
+        }
+        ?>
     </select>
    </td>
   </tr>

Spacing +13 added lines, -13 removed lines

@@ -20,24 +20,24 @@ 
 $form_sent = 0;
 $first_letter_user = '';
 $first_letter_course = '';
-$courses = array ();
+$courses = array();
 $url_list = array();
 $users = array();
 
 $tbl_access_url_rel_user = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 $tbl_access_url = Database :: get_main_table(TABLE_MAIN_ACCESS_URL);
-$tbl_user 		= Database :: get_main_table(TABLE_MAIN_USER);
+$tbl_user = Database :: get_main_table(TABLE_MAIN_USER);
 
 /*	Header	*/
 $tool_name = get_lang('AddUsersToURL');
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'access_urls.php', 'name' => get_lang('MultipleAccessURLs'));
 
 Display :: display_header($tool_name);
 
 echo '<div class="actions">';
 echo Display::url(
-    Display::return_icon('edit.png', get_lang('EditUsersToURL'),''),
+    Display::return_icon('edit.png', get_lang('EditUsersToURL'), ''),
     api_get_path(WEB_CODE_PATH).'admin/access_url_edit_users_to_url.php');
 echo '</div>';
 
@@ -45,11 +45,11 @@ 
 
 if ($_POST['form_sent']) {
 	$form_sent = $_POST['form_sent'];
-	$users = is_array($_POST['user_list']) ? $_POST['user_list'] : array() ;
-	$url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array() ;
+	$users = is_array($_POST['user_list']) ? $_POST['user_list'] : array();
+	$url_list = is_array($_POST['url_list']) ? $_POST['url_list'] : array();
 	$first_letter_user = $_POST['first_letter_user'];
 
-	foreach($users as $key => $value) {
+	foreach ($users as $key => $value) {
 		$users[$key] = intval($value);
 	}
 
@@ -57,7 +57,7 @@ 
 		if (count($users) == 0 || count($url_list) == 0) {
 			Display :: display_error_message(get_lang('AtLeastOneUserAndOneURL'));
 		} else {
-			UrlManager::add_users_to_urls($users,$url_list);
+			UrlManager::add_users_to_urls($users, $url_list);
 			Display :: display_confirmation_message(get_lang('UsersBelongURL'));
 		}
 	}
@@ -68,7 +68,7 @@ 
 	$sql = "SELECT count(*) as nb_users FROM $tbl_user";
 	$result = Database::query($sql);
 	$num_row = Database::fetch_array($result);
-    if ($num_row['nb_users']>1000) {
+    if ($num_row['nb_users'] > 1000) {
         //if there are too much users to gracefully handle with the HTML select list,
         // assign a default filter on users names
         $first_letter_user = 'A';
@@ -99,7 +99,7 @@ 
     <td width="40%" align="center">
      <b><?php echo get_lang('UserList'); ?></b>
      <br/><br/>
-     <?php echo get_lang('Select').' ' ; echo $target_name == 'firstname'? get_lang('FirstName') : get_lang('LastName'); ?>
+     <?php echo get_lang('Select').' '; echo $target_name == 'firstname' ? get_lang('FirstName') : get_lang('LastName'); ?>
      <select name="first_letter_user" onchange="javascript:document.formulaire.form_sent.value='2'; document.formulaire.submit();">
       <option value="">--</option>
       <?php
@@ -118,7 +118,7 @@ 
 		<?php
 		foreach ($db_users as $user) {
 		?>
-            <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>>
+            <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>>
                 <?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?>
             </option>
 		<?php
@@ -134,7 +134,7 @@ 
 		<?php
 		foreach ($db_urls as $url_obj) {
 			?>
-			<option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>>
+			<option value="<?php echo $url_obj['id']; ?>" <?php if (in_array($url_obj['id'], $url_list)) echo 'selected="selected"'; ?>>
                 <?php echo $url_obj['url']; ?>
 			</option>
 			<?php

Braces +8 added lines, -2 removed lines

@@ -118,7 +118,10 @@ 
 		<?php
 		foreach ($db_users as $user) {
 		?>
-            <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>>
+            <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'], $users)) {
+    echo 'selected="selected"';
+}
+?>>
                 <?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?>
             </option>
 		<?php
@@ -134,7 +137,10 @@ 
 		<?php
 		foreach ($db_urls as $url_obj) {
 			?>
-			<option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) echo 'selected="selected"'; ?>>
+			<option value="<?php echo $url_obj['id']; ?>" <?php if(in_array($url_obj['id'],$url_list)) {
+    echo 'selected="selected"';
+}
+?>>
                 <?php echo $url_obj['url']; ?>
 			</option>
 			<?php