chamilo / chamilo-lms

main/admin/course_request_review.php

Spacing +2 added lines, -2 removed lines

@@ -189,8 +189,8 @@
 {
     $code = CourseRequestManager::get_course_request_code($id);
     $result = '<a href="course_request_edit.php?id='.$id.'&caller=0">'.Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align: middle;')).'</a>'.
-        '&nbsp;<a href="?accept_course_request='.$id.'">'.Display::return_icon('accept.png', get_lang('AcceptThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ANewCourseWillBeCreated'), $code), ENT_QUOTES)).'\')) return false;'),16).'</a>'.
-        '&nbsp;<a href="?reject_course_request='.$id.'">'.Display::return_icon('error.png', get_lang('RejectThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ACourseRequestWillBeRejected'), $code), ENT_QUOTES)).'\')) return false;'),16).'</a>';
+        '&nbsp;<a href="?accept_course_request='.$id.'">'.Display::return_icon('accept.png', get_lang('AcceptThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ANewCourseWillBeCreated'), $code), ENT_QUOTES)).'\')) return false;'), 16).'</a>'.
+        '&nbsp;<a href="?reject_course_request='.$id.'">'.Display::return_icon('error.png', get_lang('RejectThisCourseRequest'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('ACourseRequestWillBeRejected'), $code), ENT_QUOTES)).'\')) return false;'), 16).'</a>';
     if (!CourseRequestManager::additional_info_asked($id)) {
         $result .= '&nbsp;<a href="?request_info='.$id.'">'.Display::return_icon('request_info.gif', get_lang('AskAdditionalInfo'), array('style' => 'vertical-align: middle;', 'onclick' => 'javascript: if (!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('AdditionalInfoWillBeAsked'), $code), ENT_QUOTES)).'\')) return false;')).'</a>';
     }

main/admin/ldap_users_synchro.php

Spacing +24 added lines, -24 removed lines

@@ -8,43 +8,43 @@ 
  */
 exit(); //not yet functional, needs to be revised
 
-$cidReset=true;
+$cidReset = true;
 
 require('../inc/global.inc.php');
 $libpath = api_get_path(LIBRARY_PATH);
 require("../auth/ldap/authldap.php");
-$annee_base=date('Y');
+$annee_base = date('Y');
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script();
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => api_get_self(),"name" => get_lang('SessionsList'));
+$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => api_get_self(), "name" => get_lang('SessionsList'));
 
 // Database Table Definitions
 $tbl_session						= Database::get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_rel_class				= Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
-$tbl_session_rel_course				= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
-$tbl_session_rel_course_rel_user	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-$tbl_course							= Database::get_main_table(TABLE_MAIN_COURSE);
-$tbl_user							= Database::get_main_table(TABLE_MAIN_USER);
-$tbl_session_rel_user				= Database::get_main_table(TABLE_MAIN_SESSION_USER);
-$tbl_class							= Database::get_main_table(TABLE_MAIN_CLASS);
-$tbl_class_user						= Database::get_main_table(TABLE_MAIN_CLASS_USER);
+$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
+$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
+$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
+$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS);
+$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
 
-$tbl_session_rel_etape 				= "session_rel_etape";
+$tbl_session_rel_etape = "session_rel_etape";
 
-$id_session=intval($_GET['id_session']);
+$id_session = intval($_GET['id_session']);
 
-$formSent=0;
-$errorMsg=$firstLetterUser=$firstLetterSession='';
-$UserList=$SessionList=array();
-$users=$sessions=array();
-$noPHP_SELF=true;
+$formSent = 0;
+$errorMsg = $firstLetterUser = $firstLetterSession = '';
+$UserList = $SessionList = array();
+$users = $sessions = array();
+$noPHP_SELF = true;
 
-$page=intval($_GET['page']);
-$action=$_REQUEST['action'];
+$page = intval($_GET['page']);
+$action = $_REQUEST['action'];
 
 $tool_name = get_lang('Synchro LDAP : Import Etudiants/Etapes dans session');
 Display::display_header($tool_name);
@@ -59,10 +59,10 @@ 
 		</form>
 
 <?php
-if (isset($action) && ($action=="synchro")) {
-	$included=true;
+if (isset($action) && ($action == "synchro")) {
+	$included = true;
 	require('ldap_synchro.php');
-	Display :: display_normal_message($message,false);
+	Display :: display_normal_message($message, false);
 }
 Display::display_footer();
 ?>

Indentation +3 added lines, -3 removed lines

@@ -60,9 +60,9 @@
 
 <?php
 if (isset($action) && ($action=="synchro")) {
-	$included=true;
-	require('ldap_synchro.php');
-	Display :: display_normal_message($message,false);
+    $included=true;
+    require('ldap_synchro.php');
+    Display :: display_normal_message($message,false);
 }
 Display::display_footer();
 ?>

main/admin/usergroup_export.php

Spacing +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
 
 $tool_name = get_lang('Export');
 
-$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'));
 
 set_time_limit(0);
 

main/admin/course_list.php

Spacing +18 added lines, -18 removed lines

@@ -26,7 +26,7 @@ 
         api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1
     ) {
         $access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $sql.= " INNER JOIN $access_url_rel_course_table url_rel_course
+        $sql .= " INNER JOIN $access_url_rel_course_table url_rel_course
                  ON (c.id = url_rel_course.c_id)";
     }
 
@@ -62,7 +62,7 @@ 
     if ((api_is_platform_admin() || api_is_session_admin()) &&
         api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1
     ) {
-        $sql.= " AND url_rel_course.access_url_id = ".api_get_current_access_url_id();
+        $sql .= " AND url_rel_course.access_url_id = ".api_get_current_access_url_id();
     }
 
     $res = Database::query($sql);
@@ -101,7 +101,7 @@ 
         api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1
     ) {
         $access_url_rel_course_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_COURSE);
-        $sql.= " INNER JOIN $access_url_rel_course_table url_rel_course
+        $sql .= " INNER JOIN $access_url_rel_course_table url_rel_course
                  ON (course.id = url_rel_course.c_id)";
     }
 
@@ -136,7 +136,7 @@ 
     if ((api_is_platform_admin() || api_is_session_admin()) &&
         api_is_multiple_url_enabled() && api_get_current_access_url_id() != -1
     ) {
-        $sql.= " AND url_rel_course.access_url_id=".api_get_current_access_url_id();
+        $sql .= " AND url_rel_course.access_url_id=".api_get_current_access_url_id();
     }
 
     $sql .= " ORDER BY col$column $direction ";
@@ -206,13 +206,13 @@ 
 
     if (isset($_GET['session_id']) && !empty($_GET['session_id'])) {
         $sessionId = intval($_GET['session_id']);
-        $sql.= " WHERE s.id = ".$sessionId;
+        $sql .= " WHERE s.id = ".$sessionId;
     }
 
     $sql .= " ORDER BY col$column $direction ";
     $sql .= " LIMIT $from,$number_of_items";
     $res = Database::query($sql);
-    $courses = array ();
+    $courses = array();
     while ($course = Database::fetch_array($res)) {
         // Place colour icons in front of courses.
         $show_visual_code = $course['visual_code'] != $course[2] ? Display::label($course['visual_code'], 'info') : null;
@@ -255,7 +255,7 @@ 
  */
 function get_course_visibility_icon($v) {
     $style = 'margin-bottom:0;margin-right:5px;';
-    switch($v) {
+    switch ($v) {
         case 0:
             return Display::return_icon('bullet_red.png', get_lang('CourseVisibilityClosed'), array('style' => $style));
             break;
@@ -342,7 +342,7 @@ 
     $form->setDefaults($defaults);
     $content .= $form->return_form();
 } else {
-    $interbreadcrumb[] = array ('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
     $tool_name = get_lang('CourseList');
 
     if (isset($_GET['action'])) {
@@ -369,7 +369,7 @@ 
     $form = new FormValidator('search_simple', 'get', '', '', array(), FormValidator::LAYOUT_INLINE);
     $form->addElement('text', 'keyword', null, array('id' => 'course-search-keyword'));
     $form->addButtonSearch(get_lang('SearchCourse'));
-    $advanced = '<a class="btn btn-default" href="'.  api_get_path(WEB_CODE_PATH).'admin/course_list.php?search=advanced"><em class="fa fa-search"></em> '.get_lang('AdvancedSearch').'</a>';
+    $advanced = '<a class="btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'admin/course_list.php?search=advanced"><em class="fa fa-search"></em> '.get_lang('AdvancedSearch').'</a>';
 
     // Create a filter by session
     $sessionFilter = new FormValidator('course_filter', 'get', '', '', array(), FormValidator::LAYOUT_INLINE);
@@ -390,9 +390,9 @@ 
     $courseListUrl = api_get_self();
     $actions .= '<div class="row">';
     $actions .= '<div class="col-md-2">';
-    $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'),'',ICON_SIZE_MEDIUM).'</a> ';
+    $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'), '', ICON_SIZE_MEDIUM).'</a> ';
     if (api_get_setting('course_validation') == 'true') {
-        $actions .= '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'),'',ICON_SIZE_MEDIUM).'</a>';
+        $actions .= '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'), '', ICON_SIZE_MEDIUM).'</a>';
     }
     $actions .= '</div>';
     $actions .= '<div class="col-md-4">';
@@ -430,18 +430,18 @@ 
         $table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data', 2, 20, 'ASC', 'course-list');
     }
 
-    $parameters=array();
+    $parameters = array();
 
     if (isset ($_GET['keyword'])) {
-        $parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
+        $parameters = array('keyword' => Security::remove_XSS($_GET['keyword']));
     } elseif (isset ($_GET['keyword_code'])) {
-        $parameters['keyword_code'] 		= Security::remove_XSS($_GET['keyword_code']);
-        $parameters['keyword_title'] 		= Security::remove_XSS($_GET['keyword_title']);
+        $parameters['keyword_code'] = Security::remove_XSS($_GET['keyword_code']);
+        $parameters['keyword_title'] = Security::remove_XSS($_GET['keyword_title']);
         $parameters['keyword_category'] 	= Security::remove_XSS($_GET['keyword_category']);
         $parameters['keyword_language'] 	= Security::remove_XSS($_GET['keyword_language']);
-        $parameters['keyword_visibility'] 	= Security::remove_XSS($_GET['keyword_visibility']);
-        $parameters['keyword_subscribe'] 	= Security::remove_XSS($_GET['keyword_subscribe']);
-        $parameters['keyword_unsubscribe'] 	= Security::remove_XSS($_GET['keyword_unsubscribe']);
+        $parameters['keyword_visibility'] = Security::remove_XSS($_GET['keyword_visibility']);
+        $parameters['keyword_subscribe'] = Security::remove_XSS($_GET['keyword_subscribe']);
+        $parameters['keyword_unsubscribe'] = Security::remove_XSS($_GET['keyword_unsubscribe']);
     }
 
     $table->set_additional_parameters($parameters);

main/admin/ldap_synchro.php

Braces +1 added lines, -2 removed lines

@@ -118,8 +118,7 @@
 		if (isset($included) && ($included))
 		{
 			$message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>';
-		}
-		else
+		} else
 		{
 			print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n";
 		}

Indentation +102 added lines, -102 removed lines

@@ -44,121 +44,121 @@
 $users=Database::store_result($result);
 
 foreach($Sessions as $session){
-	$id_session = $session['id'];
-	$name_session = $session['name'];
-	$UserList=array();
-	$UserUpdate=array();
-	$UserAdd=array();
+    $id_session = $session['id'];
+    $name_session = $session['name'];
+    $UserList=array();
+    $UserUpdate=array();
+    $UserAdd=array();
 
-	// Parse des code etape de la session
-	/*
+    // Parse des code etape de la session
+    /*
 	$sql = "SELECT  id_session, code_etape, etape_description, code_ufr, annee
 		FROM $tbl_session_rel_etape
 		WHERE id_session='$id_session'
 		ORDER BY code_ufr, code_etape";
 	$result = Database::query($sql);
 	*/
-	$ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
-	ldap_set_version($ds);
-	// Import des utilisateurs des etapes dans la session
-	if ($ds)
-	{
-		$r = false;
-		$res = ldap_handle_bind($ds, $r);
-		$UserList=array();
-		if($result !== false)
-		{
-			//while($row = Database::fetch_array($result))
-			//{
-				/*
+    $ds = ldap_connect($ldap_host, $ldap_port) or die(get_lang('LDAPConnectionError'));
+    ldap_set_version($ds);
+    // Import des utilisateurs des etapes dans la session
+    if ($ds)
+    {
+        $r = false;
+        $res = ldap_handle_bind($ds, $r);
+        $UserList=array();
+        if($result !== false)
+        {
+            //while($row = Database::fetch_array($result))
+            //{
+                /*
 				$annee = $row['annee'];
 				$code_ufr = $row['code_ufr'];
 				$etape = $row['code_etape'];
 				*/
-				// LDAP Query
-				// edupersonorgunitdn=ou=12CI1,ou=2006,ou=diploma,o=Paris1,dc=univ-paris1,dc=fr
-				//etapescommented
-				//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
-				$sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
-				$info = ldap_get_entries($ds, $sr);
-				for ($key = 0; $key < $info["count"]; $key ++)
-				{
-					echo "<pre>";
-					print_r($info[$key]);
-					echo "</pre>";
-					$lastname = api_utf8_decode($info[$key]["sn"][0]);
-					$firstname = api_utf8_decode($info[$key]["givenname"][0]);
-					$email = $info[$key]["mail"][0];
-					// Get uid from dn
-					$dn_array=ldap_explode_dn($info[$key]["dn"],1);
-					$username = $dn_array[0]; // uid is first key
-					$outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
-					$val = ldap_get_values_len($ds, $sr, "userPassword");
-					$password = $val[0];
-					// Pour faciliter la gestion on ajoute le code "etape-annee"
-					$official_code=$etape."-".$annee;
-					$auth_source="ldap";
-					// Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
-					$expiration_date='';
-					$active=1;
-					// Ajout de l'utilisateur
-					if (UserManager::is_username_available($username)) {
-						$user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
-						$UserAdd[]=$user_id;
-					} else {
-						$user = api_get_user_info_from_username($username);
-						$user_id=$user['user_id'];
-						UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
-						$UserUpdate[]=$user_id;
-					}
-					$UserList[]=$user_id;
-				}
-			//}
-		}
-		if (isset($included) && ($included))
-		{
-			$message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>';
-		}
-		else
-		{
-			print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n";
-		}
+                // LDAP Query
+                // edupersonorgunitdn=ou=12CI1,ou=2006,ou=diploma,o=Paris1,dc=univ-paris1,dc=fr
+                //etapescommented
+                //$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
+                $sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
+                $info = ldap_get_entries($ds, $sr);
+                for ($key = 0; $key < $info["count"]; $key ++)
+                {
+                    echo "<pre>";
+                    print_r($info[$key]);
+                    echo "</pre>";
+                    $lastname = api_utf8_decode($info[$key]["sn"][0]);
+                    $firstname = api_utf8_decode($info[$key]["givenname"][0]);
+                    $email = $info[$key]["mail"][0];
+                    // Get uid from dn
+                    $dn_array=ldap_explode_dn($info[$key]["dn"],1);
+                    $username = $dn_array[0]; // uid is first key
+                    $outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
+                    $val = ldap_get_values_len($ds, $sr, "userPassword");
+                    $password = $val[0];
+                    // Pour faciliter la gestion on ajoute le code "etape-annee"
+                    $official_code=$etape."-".$annee;
+                    $auth_source="ldap";
+                    // Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
+                    $expiration_date='';
+                    $active=1;
+                    // Ajout de l'utilisateur
+                    if (UserManager::is_username_available($username)) {
+                        $user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
+                        $UserAdd[]=$user_id;
+                    } else {
+                        $user = api_get_user_info_from_username($username);
+                        $user_id=$user['user_id'];
+                        UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
+                        $UserUpdate[]=$user_id;
+                    }
+                    $UserList[]=$user_id;
+                }
+            //}
+        }
+        if (isset($included) && ($included))
+        {
+            $message .= "> $name_session: ".count($UserAdd)." ".get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified').'<br/>';
+        }
+        else
+        {
+            print "> $name_session: ".count($UserAdd).get_lang('Added').' '.get_lang('And').' '.count($UserUpdate).' '.get_lang('Modified')."\n";
+        }
 
-		// Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
-		$result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
-		$CourseList=array();
-		while($row=Database::fetch_array($result)) {
-			$CourseList[]= $row['c_id'];
-		}
+        // Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
+        $result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
+        $CourseList=array();
+        while($row=Database::fetch_array($result)) {
+            $CourseList[]= $row['c_id'];
+        }
 
-		foreach ($CourseList as $enreg_course) {
-			// On ajoute la relation entre l'utilisateur et le cours
-			foreach ($UserList as $enreg_user) {
-				$sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(session_id,c_id,user_id)
+        foreach ($CourseList as $enreg_course) {
+            // On ajoute la relation entre l'utilisateur et le cours
+            foreach ($UserList as $enreg_user) {
+                $sql = "INSERT IGNORE INTO $tbl_session_rel_course_rel_user(session_id,c_id,user_id)
 						VALUES('$id_session','$enreg_course','$enreg_user')";
-				Database::query($sql);
-			}
-			$sql = "SELECT COUNT(user_id) as nbUsers " .
-					"FROM $tbl_session_rel_course_rel_user " .
-					"WHERE session_id='$id_session' AND c_id='$enreg_course'";
-			$rs = Database::query($sql);
-			list($nbr_users) = Database::fetch_array($rs);
-			$sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users
+                Database::query($sql);
+            }
+            $sql = "SELECT COUNT(user_id) as nbUsers " .
+                    "FROM $tbl_session_rel_course_rel_user " .
+                    "WHERE session_id='$id_session' AND c_id='$enreg_course'";
+            $rs = Database::query($sql);
+            list($nbr_users) = Database::fetch_array($rs);
+            $sql = "UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users
 					WHERE session_id='$id_session' AND c_id = '$enreg_course'";
-			Database::query($sql);
-		}
-		// On ajoute la relation entre l'utilisateur et la session
-		foreach($UserList as $enreg_user){
-			$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
-					"VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
-			Database::query($sql);
-		}
-		$sql = "SELECT COUNT(user_id) as nbUsers " .
-				"FROM $tbl_session_rel_user " .
-				"WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
-		$rs = Database::query($sql);
-		list($nbr_users) = Database::fetch_array($rs);
-		$sql = "UPDATE $tbl_session SET nbr_users=$nbr_users WHERE id='$id_session'";
-		Database::query($sql);
-	}
+            Database::query($sql);
+        }
+        // On ajoute la relation entre l'utilisateur et la session
+        foreach($UserList as $enreg_user){
+            $sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
+                    "VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
+            Database::query($sql);
+        }
+        $sql = "SELECT COUNT(user_id) as nbUsers " .
+                "FROM $tbl_session_rel_user " .
+                "WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
+        $rs = Database::query($sql);
+        list($nbr_users) = Database::fetch_array($rs);
+        $sql = "UPDATE $tbl_session SET nbr_users=$nbr_users WHERE id='$id_session'";
+        Database::query($sql);
+    }
 }

Spacing +46 added lines, -46 removed lines

@@ -8,47 +8,47 @@ 
  */
 exit(); //not yet functional, needs to be revised
 
-$cidReset=true;
+$cidReset = true;
 
 require('../inc/global.inc.php');
 $libpath = api_get_path(LIBRARY_PATH);
 require_once('../auth/ldap/authldap.php');
-$annee_base=date('Y');
+$annee_base = date('Y');
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
 //api_protect_admin_script(); // on vire la secu... qui n'a pas lieu d'etre ici (script de synchro)
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => api_get_self(),"name" => "Liste des sessions");
+$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => api_get_self(), "name" => "Liste des sessions");
 
 // Database Table Definitions
 $tbl_session						= Database::get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_rel_class				= Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
-$tbl_session_rel_course				= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
-$tbl_session_rel_course_rel_user	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-$tbl_course							= Database::get_main_table(TABLE_MAIN_COURSE);
-$tbl_user							= Database::get_main_table(TABLE_MAIN_USER);
-$tbl_session_rel_user				= Database::get_main_table(TABLE_MAIN_SESSION_USER);
-$tbl_class							= Database::get_main_table(TABLE_MAIN_CLASS);
-$tbl_class_user						= Database::get_main_table(TABLE_MAIN_CLASS_USER);
+$tbl_session_rel_class = Database::get_main_table(TABLE_MAIN_SESSION_CLASS);
+$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
+$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
+$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
+$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
+$tbl_class = Database::get_main_table(TABLE_MAIN_CLASS);
+$tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
 
-$tbl_session_rel_etape 				= "session_rel_etape";
+$tbl_session_rel_etape = "session_rel_etape";
 
-$message="";
+$message = "";
 
-$result=Database::query("SELECT id, name FROM $tbl_session");
-$Sessions=Database::store_result($result);
+$result = Database::query("SELECT id, name FROM $tbl_session");
+$Sessions = Database::store_result($result);
 
-$result=Database::query($sql);
-$users=Database::store_result($result);
+$result = Database::query($sql);
+$users = Database::store_result($result);
 
-foreach($Sessions as $session){
+foreach ($Sessions as $session) {
 	$id_session = $session['id'];
 	$name_session = $session['name'];
-	$UserList=array();
-	$UserUpdate=array();
-	$UserAdd=array();
+	$UserList = array();
+	$UserUpdate = array();
+	$UserAdd = array();
 
 	// Parse des code etape de la session
 	/*
@@ -65,8 +65,8 @@ 
 	{
 		$r = false;
 		$res = ldap_handle_bind($ds, $r);
-		$UserList=array();
-		if($result !== false)
+		$UserList = array();
+		if ($result !== false)
 		{
 			//while($row = Database::fetch_array($result))
 			//{
@@ -81,7 +81,7 @@ 
 				//$sr = @ ldap_search($ds, "ou=people,$LDAPbasedn", "edupersonorgunitdn=ou=$etape,ou=$annee,ou=diploma,$LDAPbasedn");
 				$sr = @ ldap_search($ds, $ldap_basedn, '(uid=*)');
 				$info = ldap_get_entries($ds, $sr);
-				for ($key = 0; $key < $info["count"]; $key ++)
+				for ($key = 0; $key < $info["count"]; $key++)
 				{
 					echo "<pre>";
 					print_r($info[$key]);
@@ -90,28 +90,28 @@ 
 					$firstname = api_utf8_decode($info[$key]["givenname"][0]);
 					$email = $info[$key]["mail"][0];
 					// Get uid from dn
-					$dn_array=ldap_explode_dn($info[$key]["dn"],1);
+					$dn_array = ldap_explode_dn($info[$key]["dn"], 1);
 					$username = $dn_array[0]; // uid is first key
 					$outab[] = $info[$key]["edupersonprimaryaffiliation"][0]; // Ici "student"
 					$val = ldap_get_values_len($ds, $sr, "userPassword");
 					$password = $val[0];
 					// Pour faciliter la gestion on ajoute le code "etape-annee"
-					$official_code=$etape."-".$annee;
-					$auth_source="ldap";
+					$official_code = $etape."-".$annee;
+					$auth_source = "ldap";
 					// Pas de date d'expiration d'etudiant (a recuperer par rapport au shadow expire LDAP)
-					$expiration_date='';
-					$active=1;
+					$expiration_date = '';
+					$active = 1;
 					// Ajout de l'utilisateur
 					if (UserManager::is_username_available($username)) {
-						$user_id = UserManager::create_user($firstname,$lastname,$status,$email,$username,$password,$official_code,api_get_setting('platformLanguage'),$phone,$picture_uri,$auth_source,$expiration_date,$active);
-						$UserAdd[]=$user_id;
+						$user_id = UserManager::create_user($firstname, $lastname, $status, $email, $username, $password, $official_code, api_get_setting('platformLanguage'), $phone, $picture_uri, $auth_source, $expiration_date, $active);
+						$UserAdd[] = $user_id;
 					} else {
 						$user = api_get_user_info_from_username($username);
-						$user_id=$user['user_id'];
+						$user_id = $user['user_id'];
 						UserManager::update_user($user_id, $firstname, $lastname, $username, null, null, $email, $status, $official_code, $phone, $picture_uri, $expiration_date, $active);
-						$UserUpdate[]=$user_id;
+						$UserUpdate[] = $user_id;
 					}
-					$UserList[]=$user_id;
+					$UserList[] = $user_id;
 				}
 			//}
 		}
@@ -125,10 +125,10 @@ 
 		}
 
 		// Une fois les utilisateurs importer dans la base des utilisateurs, on peux les affecter la session
-		$result=Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
-		$CourseList=array();
-		while($row=Database::fetch_array($result)) {
-			$CourseList[]= $row['c_id'];
+		$result = Database::query("SELECT c_id FROM $tbl_session_rel_course WHERE session_id='$id_session'");
+		$CourseList = array();
+		while ($row = Database::fetch_array($result)) {
+			$CourseList[] = $row['c_id'];
 		}
 
 		foreach ($CourseList as $enreg_course) {
@@ -138,8 +138,8 @@ 
 						VALUES('$id_session','$enreg_course','$enreg_user')";
 				Database::query($sql);
 			}
-			$sql = "SELECT COUNT(user_id) as nbUsers " .
-					"FROM $tbl_session_rel_course_rel_user " .
+			$sql = "SELECT COUNT(user_id) as nbUsers ".
+					"FROM $tbl_session_rel_course_rel_user ".
 					"WHERE session_id='$id_session' AND c_id='$enreg_course'";
 			$rs = Database::query($sql);
 			list($nbr_users) = Database::fetch_array($rs);
@@ -148,13 +148,13 @@ 
 			Database::query($sql);
 		}
 		// On ajoute la relation entre l'utilisateur et la session
-		foreach($UserList as $enreg_user){
-			$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) " .
-					"VALUES('$id_session','$enreg_user', '" . api_get_utc_datetime() . "')";
+		foreach ($UserList as $enreg_user) {
+			$sql = "INSERT IGNORE INTO $tbl_session_rel_user(session_id, user_id, registered_at) ".
+					"VALUES('$id_session','$enreg_user', '".api_get_utc_datetime()."')";
 			Database::query($sql);
 		}
-		$sql = "SELECT COUNT(user_id) as nbUsers " .
-				"FROM $tbl_session_rel_user " .
+		$sql = "SELECT COUNT(user_id) as nbUsers ".
+				"FROM $tbl_session_rel_user ".
 				"WHERE session_id='$id_session' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
 		$rs = Database::query($sql);
 		list($nbr_users) = Database::fetch_array($rs);

main/admin/skill_badge.php

Spacing +2 added lines, -2 removed lines

@@ -23,14 +23,14 @@
 
 $interbreadcrumb = array(
     array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php',
+        'url' => api_get_path(WEB_CODE_PATH).'admin/index.php',
         'name' => get_lang('Administration')
     )
 );
 
 $toolbar = Display::toolbarButton(
     get_lang('ManageSkills'),
-    api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
+    api_get_path(WEB_CODE_PATH).'admin/skill_list.php',
     'list',
     'primary',
     ['title' => get_lang('ManageSkills')]

main/admin/user_import.php

Braces +8 added lines, -2 removed lines

@@ -505,8 +505,14 @@
     <p><?php echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>
     <blockquote>
 <pre>
-<b>LastName</b>;<b>FirstName</b>;<b>Email</b>;UserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;<span style="color:red;"><?php if (count($list) > 0) echo implode(';', $list).';'; ?></span>Courses;ClassId;
-<b>xxx</b>;<b>xxx</b>;<b>xxx</b>;xxx;xxx;<?php echo implode('/', $defined_auth_sources); ?>;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;<span style="color:red;"><?php if (count($list_reponse) > 0) echo implode(';', $list_reponse).';'; ?></span>xxx1|xxx2|xxx3;1;<br />
+<b>LastName</b>;<b>FirstName</b>;<b>Email</b>;UserName;Password;AuthSource;OfficialCode;PhoneNumber;Status;ExpiryDate;<span style="color:red;"><?php if (count($list) > 0) {
+    echo implode(';', $list).';';
+}
+?></span>Courses;ClassId;
+<b>xxx</b>;<b>xxx</b>;<b>xxx</b>;xxx;xxx;<?php echo implode('/', $defined_auth_sources); ?>;xxx;xxx;user/teacher/drh;0000-00-00 00:00:00;<span style="color:red;"><?php if (count($list_reponse) > 0) {
+    echo implode(';', $list_reponse).';';
+}
+?></span>xxx1|xxx2|xxx3;1;<br />
 </pre>
 </blockquote>
 <p><?php echo get_lang('XMLMustLookLike').' ('.get_lang('MandatoryFields').')'; ?> :</p>

Spacing +5 added lines, -5 removed lines

@@ -215,8 +215,8 @@ 
             // We are sure that the extra field exists.
             foreach ($extra_fields as $extras) {
                 if (isset($user[$extras[1]])) {
-                    $key 	= $extras[1];
-                    $value 	= $user[$extras[1]];
+                    $key = $extras[1];
+                    $value = $user[$extras[1]];
                     UserManager::update_extra_field_value($user_id, $key, $value);
                 }
             }
@@ -252,7 +252,7 @@ 
     global $current_tag;
     switch ($data) {
         case 'Contact':
-            $user = array ();
+            $user = array();
             break;
         default:
             $current_tag = $data;
@@ -345,7 +345,7 @@ 
     $allowed_file_mimetype = array('csv', 'xml');
     $error_kind_file = false;
 
-    $checkUniqueEmail = isset($_POST['check_unique_email']) ? $_POST['check_unique_email'] :null;
+    $checkUniqueEmail = isset($_POST['check_unique_email']) ? $_POST['check_unique_email'] : null;
 
     $uploadInfo = pathinfo($_FILES['import_file']['name']);
     $ext_import_file = $uploadInfo['extension'];
@@ -354,7 +354,7 @@ 
         if (strcmp($file_type, 'csv') === 0 &&
             $ext_import_file == $allowed_file_mimetype[0]
         ) {
-            $users	= parse_csv_data($_FILES['import_file']['tmp_name']);
+            $users = parse_csv_data($_FILES['import_file']['tmp_name']);
             $errors = validate_data($users, $checkUniqueEmail);
             $error_kind_file = false;
         } elseif (strcmp($file_type, 'xml') === 0 && $ext_import_file == $allowed_file_mimetype[1]) {

main/admin/dashboard_add_sessions_to_user.php

Braces +1 added lines, -2 removed lines

@@ -244,8 +244,7 @@
                             </button>
                         </div>    
                     <?php
-                    }
-                    else
+                    } else
                     {
                         ?>
                     <div class="separate-action">

Spacing +21 added lines, -21 removed lines

@@ -22,11 +22,11 @@ 
 
 // 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_session 			= Database::get_main_table(TABLE_MAIN_SESSION);
-$tbl_session_rel_user 	= Database::get_main_table(TABLE_MAIN_SESSION_USER);
+$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
+$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
 $tbl_session_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 
 // Initializing variables
@@ -46,7 +46,7 @@ 
 }
 
 $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']);
 }
 
@@ -71,20 +71,20 @@ 
         }
 
         if (api_is_multiple_url_enabled()) {
-            $sql 	= " SELECT s.id, s.name FROM $tbl_session s
+            $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()."";
         } else {
             $sql = "SELECT s.id, s.name FROM $tbl_session s
                     WHERE  s.name LIKE '$needle%' $without_assigned_sessions ";
         }
-        $rs	= Database::query($sql);
+        $rs = Database::query($sql);
         $return .= '<select class="form-control" id="origin" name="NoAssignedSessionsList[]" multiple="multiple" size="20">';
-        while($session = Database :: fetch_array($rs)) {
-            $return .= '<option value="'.$session['id'].'" title="'.htmlspecialchars($session['name'],ENT_QUOTES).'">'.$session['name'].'</option>';
+        while ($session = Database :: fetch_array($rs)) {
+            $return .= '<option value="'.$session['id'].'" title="'.htmlspecialchars($session['name'], ENT_QUOTES).'">'.$session['name'].'</option>';
         }
         $return .= '</select>';
-        $xajax_response->addAssign('ajax_list_sessions_multiple','innerHTML',api_utf8_encode($return));
+        $xajax_response->addAssign('ajax_list_sessions_multiple', 'innerHTML', api_utf8_encode($return));
     }
 
     return $xajax_response;
@@ -143,7 +143,7 @@ 
 }
 </script>';
 
-$formSent=0;
+$formSent = 0;
 $firstLetterSession = isset($_POST['firstLetterSession']) ? $_POST['firstLetterSession'] : null;
 $errorMsg = '';
 $UserList = array();
@@ -167,10 +167,10 @@ 
 
 // Actions
 if ($user_info['status'] != SESSIONADMIN) {
-    $actionsLeft = '<a href="dashboard_add_users_to_user.php?user='.$user_id.'">' .
-        Display::return_icon('add-user.png', get_lang('AssignUsers'), null, ICON_SIZE_MEDIUM ) . '</a>';
-    $actionsLeft .= '<a href="dashboard_add_courses_to_user.php?user='.$user_id.'">' .
-        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM) . '</a>';
+    $actionsLeft = '<a href="dashboard_add_users_to_user.php?user='.$user_id.'">'.
+        Display::return_icon('add-user.png', get_lang('AssignUsers'), null, ICON_SIZE_MEDIUM).'</a>';
+    $actionsLeft .= '<a href="dashboard_add_courses_to_user.php?user='.$user_id.'">'.
+        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM).'</a>';
 }
 
 echo Display::toolbarAction('toolbar-dashboard', array($actionsLeft));
@@ -185,7 +185,7 @@ 
 
 $without_assigned_sessions = '';
 if (count($assigned_sessions_id) > 0) {
-    $without_assigned_sessions = " AND s.id NOT IN (".implode(',',$assigned_sessions_id).") ";
+    $without_assigned_sessions = " AND s.id NOT IN (".implode(',', $assigned_sessions_id).") ";
 }
 
 $needle = '%';
@@ -206,9 +206,9 @@ 
 		    WHERE  s.name LIKE '$needle%' $without_assigned_sessions
             ORDER BY s.name";
 }
-$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;" <?php if($ajax_search){ echo ' onsubmit="valide();"';}?>>
+    <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" style="margin:0px;" <?php if ($ajax_search) { echo ' onsubmit="valide();"'; }?>>
         <input type="hidden" name="formSent" value="1" />
 
         <div class="row">
@@ -220,7 +220,7 @@ 
                         <?php
                         while ($enreg = Database::fetch_array($result)) {
                         ?>
-                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'],ENT_QUOTES).'"';?>>
+                            <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'], ENT_QUOTES).'"'; ?>>
                                 <?php echo $enreg['name']; ?>
                             </option>
                         <?php } ?>
@@ -230,7 +230,7 @@ 
             <div class="col-md-4">
                 <div class="code-course">
                     <?php if ($add_type == 'multiple') { ?>
-                    <p><?php echo get_lang('FirstLetterSession');?> :</p>
+                    <p><?php echo get_lang('FirstLetterSession'); ?> :</p>
                     <select class="selectpicker form-control" name="firstLetterSession" onchange = "xajax_search_sessions(this.value, 'multiple')">
                         <option value="%">--</option>
                             <?php  echo Display :: get_alphabet_options($firstLetterSession); ?>
@@ -285,9 +285,9 @@ 
                  <select id='destination' name="SessionsList[]" multiple="multiple" size="20" style="width:320px;">
                         <?php
                         if (is_array($assigned_sessions_to_hrm)) {
-                            foreach($assigned_sessions_to_hrm as $enreg) {
+                            foreach ($assigned_sessions_to_hrm as $enreg) {
                                 ?>
-                                <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'],ENT_QUOTES).'"'; ?>>
+                                <option value="<?php echo $enreg['id']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['name'], ENT_QUOTES).'"'; ?>>
                                     <?php echo $enreg['name'] ?>
                                 </option>
                             <?php }

main/admin/ldap_users_list.php

Spacing +30 added lines, -30 removed lines

@@ -30,7 +30,7 @@ 
 }
 */
 
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
 $tool_name = get_lang('SearchLDAPUsers');
 //Display :: display_header($tool_name); //cannot display now as we need to redirect
 //api_display_tool_title($tool_name);
@@ -38,7 +38,7 @@ 
 if (isset ($_GET['action']))
 {
 	$check = Security::check_token('get');
-	if($check)
+	if ($check)
 	{
 		switch ($_GET['action'])
 		{
@@ -59,41 +59,41 @@ 
 				break;
 			case 'lock' :
 				Display :: display_header($tool_name);
-				$message=lock_unlock_user('lock',$_GET['user_id']);
+				$message = lock_unlock_user('lock', $_GET['user_id']);
 				Display :: display_normal_message($message);
 				break;
 			case 'unlock';
 				Display :: display_header($tool_name);
-				$message=lock_unlock_user('unlock',$_GET['user_id']);
+				$message = lock_unlock_user('unlock', $_GET['user_id']);
 				Display :: display_normal_message($message);
 				break;
 			case 'add_user';
-				$id=$_GET['id'];
-				$UserList=array();
+				$id = $_GET['id'];
+				$UserList = array();
 				$userid_match_login = array();
 				foreach ($id as $user_id) {
 					$tmp = ldap_add_user($user_id);
-					$UserList[]= $tmp;
+					$UserList[] = $tmp;
 					$userid_match_login[$tmp] = $user_id;
 				}
-				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
+				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session'] > 0)) {
 					ldap_add_user_to_session($UserList, $_GET['id_session']);
 					header('Location: resume_session.php?id_session='.$_GET['id_session']);
 				} else {
 					Display :: display_header($tool_name);
-					if(count($userid_match_login)>0)
+					if (count($userid_match_login) > 0)
 					{
-						$message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
-						foreach($userid_match_login as $user_id => $login)
+						$message = get_lang('LDAPUsersAddedOrUpdated').':<br />';
+						foreach ($userid_match_login as $user_id => $login)
 						{
 							$message .= '- '.$login.'<br />';
 						}
 					}
 					else
 					{
-						$message=get_lang('NoUserAdded');
+						$message = get_lang('NoUserAdded');
 					}
-					Display :: display_normal_message($message,false);
+					Display :: display_normal_message($message, false);
 				}
 				break;
 			default :
@@ -113,7 +113,7 @@ 
 if (isset ($_POST['action']))
 {
 	$check = Security::check_token('get');
-	if($check)
+	if ($check)
 	{
 		switch ($_POST['action'])
 		{
@@ -122,15 +122,15 @@ 
 				$number_of_deleted_users = 0;
 				foreach ($_POST['id'] as $index => $user_id)
 				{
-					if($user_id != $_user['user_id'])
+					if ($user_id != $_user['user_id'])
 					{
-						if(UserManager :: delete_user($user_id))
+						if (UserManager :: delete_user($user_id))
 						{
 							$number_of_deleted_users++;
 						}
 					}
 				}
-				if($number_of_selected_users == $number_of_deleted_users)
+				if ($number_of_selected_users == $number_of_deleted_users)
 				{
 					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
 				}
@@ -142,17 +142,17 @@ 
 			case 'add_user' :
 				$number_of_selected_users = count($_POST['id']);
 				$number_of_added_users = 0;
-				$UserList=array();
+				$UserList = array();
 				foreach ($_POST['id'] as $index => $user_id)
 				{
-					if($user_id != $_user['user_id'])
+					if ($user_id != $_user['user_id'])
 					{
 						$UserList[] = ldap_add_user($user_id);
 					}
 				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
+				if (isset($_GET['id_session']) && (trim($_GET['id_session']) != ""))
 					addUserToSession($UserList, $_GET['id_session']);
-				if(count($UserList)>0)
+				if (count($UserList) > 0)
 				{
 					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
 				}
@@ -167,8 +167,8 @@ 
 	}
 }
 
-$form = new FormValidator('advanced_search','get');
-$form->addText('keyword_username',get_lang('LoginName'),false);
+$form = new FormValidator('advanced_search', 'get');
+$form->addText('keyword_username', get_lang('LoginName'), false);
 if (api_is_western_name_order())
 {
 	$form->addText('keyword_firstname', get_lang('FirstName'), false);
@@ -176,20 +176,20 @@ 
 }
 else
 {
-	$form->addText('keyword_lastname',get_lang('LastName'),false);
-	$form->addText('keyword_firstname',get_lang('FirstName'),false);
+	$form->addText('keyword_lastname', get_lang('LastName'), false);
+	$form->addText('keyword_firstname', get_lang('FirstName'), false);
 }
 if (isset($_GET['id_session']))
-	$form->addElement('hidden','id_session',$_GET['id_session']);
+	$form->addElement('hidden', 'id_session', $_GET['id_session']);
 
 $type = array();
 $type["all"] = get_lang('All');
-$type["employee"]  = get_lang('Teacher');
+$type["employee"] = get_lang('Teacher');
 $type["student"] = get_lang('Student');
 
-$form->addElement('select','keyword_type',get_lang('Status'),$type);
+$form->addElement('select', 'keyword_type', get_lang('Status'), $type);
 // Structure a rajouer ??
-$form->addElement('submit','submit',get_lang('Ok'));
+$form->addElement('submit', 'submit', get_lang('Ok'));
 //$defaults['keyword_active'] = 1;
 //$defaults['keyword_inactive'] = 1;
 //$form->setDefaults($defaults);
@@ -225,7 +225,7 @@ 
 //$table->set_column_filter(5, 'email_filter');
 //$table->set_column_filter(5, 'active_filter');
 $table->set_column_filter(5, 'modify_filter');
-$table->set_form_actions(array ('add_user' => get_lang('AddLDAPUsers')));
+$table->set_form_actions(array('add_user' => get_lang('AddLDAPUsers')));
 $table->display();
 
 /*

Braces +15 added lines, -20 removed lines

@@ -51,8 +51,7 @@ 
 				if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
 				{
 					Display :: display_normal_message(get_lang('UserDeleted'));
-				}
-				else
+				} else
 				{
 					Display :: display_error_message(get_lang('CannotDeleteUser'));
 				}
@@ -88,8 +87,7 @@ 
 						{
 							$message .= '- '.$login.'<br />';
 						}
-					}
-					else
+					} else
 					{
 						$message=get_lang('NoUserAdded');
 					}
@@ -100,13 +98,11 @@ 
 				Display :: display_header($tool_name);
 		}
 		Security::clear_token();
-	}
-	else
+	} else
 	{
 		Display::display_header($tool_name);
 	}
-}
-else
+} else
 {
 	Display::display_header($tool_name);
 }
@@ -133,8 +129,7 @@ 
 				if($number_of_selected_users == $number_of_deleted_users)
 				{
 					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
-				}
-				else
+				} else
 				{
 					Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
 				}
@@ -150,13 +145,13 @@ 
 						$UserList[] = ldap_add_user($user_id);
 					}
 				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
-					addUserToSession($UserList, $_GET['id_session']);
+				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!="")) {
+									addUserToSession($UserList, $_GET['id_session']);
+				}
 				if(count($UserList)>0)
 				{
 					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
-				}
-				else
+				} else
 				{
 					Display :: display_normal_message(get_lang('NoUserAdded'));
 				}
@@ -173,14 +168,14 @@ 
 {
 	$form->addText('keyword_firstname', get_lang('FirstName'), false);
 	$form->addText('keyword_lastname', get_lang('LastName'), false);
-}
-else
+} else
 {
 	$form->addText('keyword_lastname',get_lang('LastName'),false);
 	$form->addText('keyword_firstname',get_lang('FirstName'),false);
 }
-if (isset($_GET['id_session']))
+if (isset($_GET['id_session'])) {
 	$form->addElement('hidden','id_session',$_GET['id_session']);
+}
 
 $type = array();
 $type["all"] = get_lang('All');
@@ -201,8 +196,9 @@ 
 $parameters['keyword_firstname'] = @$_GET['keyword_firstname'] ?: null;
 $parameters['keyword_lastname'] = @$_GET['keyword_lastname'] ?: null;
 $parameters['keyword_email'] = @$_GET['keyword_email'] ?: null;
-if (isset($_GET['id_session']))
+if (isset($_GET['id_session'])) {
 	$parameters['id_session'] = $_GET['id_session'];
+}
 // Create a sortable table with user-data
 
 $parameters['sec_token'] = Security::get_token();
@@ -214,8 +210,7 @@ 
 {
 	$table->set_header(2, get_lang('FirstName'));
 	$table->set_header(3, get_lang('LastName'));
-}
-else
+} else
 {
 	$table->set_header(2, get_lang('LastName'));
 	$table->set_header(3, get_lang('FirstName'));

Indentation +132 added lines, -132 removed lines

@@ -20,7 +20,7 @@ 
 // Login as ...
 if ($action == "login_as" && !empty ($login_as_user_id))
 {
-	login_user($login_as_user_id);
+    login_user($login_as_user_id);
 }
 
 //if we already have a session id and a user...
@@ -37,150 +37,150 @@ 
 
 if (isset ($_GET['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_GET['action'])
-		{
-			case 'show_message' :
-				Display :: display_header($tool_name);
-				Display :: display_normal_message($_GET['message']);
-				break;
-			case 'delete_user' :
-				Display :: display_header($tool_name);
-				if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
-				{
-					Display :: display_normal_message(get_lang('UserDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('CannotDeleteUser'));
-				}
-				break;
-			case 'lock' :
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('lock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'unlock';
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('unlock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'add_user';
-				$id=$_GET['id'];
-				$UserList=array();
-				$userid_match_login = array();
-				foreach ($id as $user_id) {
-					$tmp = ldap_add_user($user_id);
-					$UserList[]= $tmp;
-					$userid_match_login[$tmp] = $user_id;
-				}
-				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
-					ldap_add_user_to_session($UserList, $_GET['id_session']);
-					header('Location: resume_session.php?id_session='.intval($_GET['id_session']));
-				} else {
-					Display :: display_header($tool_name);
-					if(count($userid_match_login)>0)
-					{
-						$message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
-						foreach($userid_match_login as $user_id => $login)
-						{
-							$message .= '- '.$login.'<br />';
-						}
-					}
-					else
-					{
-						$message=get_lang('NoUserAdded');
-					}
-					Display :: display_normal_message($message,false);
-				}
-				break;
-			default :
-				Display :: display_header($tool_name);
-		}
-		Security::clear_token();
-	}
-	else
-	{
-		Display::display_header($tool_name);
-	}
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_GET['action'])
+        {
+            case 'show_message' :
+                Display :: display_header($tool_name);
+                Display :: display_normal_message($_GET['message']);
+                break;
+            case 'delete_user' :
+                Display :: display_header($tool_name);
+                if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
+                {
+                    Display :: display_normal_message(get_lang('UserDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('CannotDeleteUser'));
+                }
+                break;
+            case 'lock' :
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('lock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'unlock';
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('unlock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'add_user';
+                $id=$_GET['id'];
+                $UserList=array();
+                $userid_match_login = array();
+                foreach ($id as $user_id) {
+                    $tmp = ldap_add_user($user_id);
+                    $UserList[]= $tmp;
+                    $userid_match_login[$tmp] = $user_id;
+                }
+                if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
+                    ldap_add_user_to_session($UserList, $_GET['id_session']);
+                    header('Location: resume_session.php?id_session='.intval($_GET['id_session']));
+                } else {
+                    Display :: display_header($tool_name);
+                    if(count($userid_match_login)>0)
+                    {
+                        $message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
+                        foreach($userid_match_login as $user_id => $login)
+                        {
+                            $message .= '- '.$login.'<br />';
+                        }
+                    }
+                    else
+                    {
+                        $message=get_lang('NoUserAdded');
+                    }
+                    Display :: display_normal_message($message,false);
+                }
+                break;
+            default :
+                Display :: display_header($tool_name);
+        }
+        Security::clear_token();
+    }
+    else
+    {
+        Display::display_header($tool_name);
+    }
 }
 else
 {
-	Display::display_header($tool_name);
+    Display::display_header($tool_name);
 }
 if (isset ($_POST['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_POST['action'])
-		{
-			case 'delete' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_deleted_users = 0;
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						if(UserManager :: delete_user($user_id))
-						{
-							$number_of_deleted_users++;
-						}
-					}
-				}
-				if($number_of_selected_users == $number_of_deleted_users)
-				{
-					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
-				}
-				break;
-			case 'add_user' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_added_users = 0;
-				$UserList=array();
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						$UserList[] = ldap_add_user($user_id);
-					}
-				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
-					addUserToSession($UserList, $_GET['id_session']);
-				if(count($UserList)>0)
-				{
-					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
-				}
-				else
-				{
-					Display :: display_normal_message(get_lang('NoUserAdded'));
-				}
-				break;
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_POST['action'])
+        {
+            case 'delete' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_deleted_users = 0;
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        if(UserManager :: delete_user($user_id))
+                        {
+                            $number_of_deleted_users++;
+                        }
+                    }
+                }
+                if($number_of_selected_users == $number_of_deleted_users)
+                {
+                    Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
+                }
+                break;
+            case 'add_user' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_added_users = 0;
+                $UserList=array();
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        $UserList[] = ldap_add_user($user_id);
+                    }
+                }
+                if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
+                    addUserToSession($UserList, $_GET['id_session']);
+                if(count($UserList)>0)
+                {
+                    Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
+                }
+                else
+                {
+                    Display :: display_normal_message(get_lang('NoUserAdded'));
+                }
+                break;
 
-		}
-		Security::clear_token();
-	}
+        }
+        Security::clear_token();
+    }
 }
 
 $form = new FormValidator('advanced_search','get');
 $form->addText('keyword_username',get_lang('LoginName'),false);
 if (api_is_western_name_order())
 {
-	$form->addText('keyword_firstname', get_lang('FirstName'), false);
-	$form->addText('keyword_lastname', get_lang('LastName'), false);
+    $form->addText('keyword_firstname', get_lang('FirstName'), false);
+    $form->addText('keyword_lastname', get_lang('LastName'), false);
 }
 else
 {
-	$form->addText('keyword_lastname',get_lang('LastName'),false);
-	$form->addText('keyword_firstname',get_lang('FirstName'),false);
+    $form->addText('keyword_lastname',get_lang('LastName'),false);
+    $form->addText('keyword_firstname',get_lang('FirstName'),false);
 }
 if (isset($_GET['id_session']))
-	$form->addElement('hidden','id_session',$_GET['id_session']);
+    $form->addElement('hidden','id_session',$_GET['id_session']);
 
 $type = array();
 $type["all"] = get_lang('All');
@@ -202,7 +202,7 @@ 
 $parameters['keyword_lastname'] = @$_GET['keyword_lastname'] ?: null;
 $parameters['keyword_email'] = @$_GET['keyword_email'] ?: null;
 if (isset($_GET['id_session']))
-	$parameters['id_session'] = $_GET['id_session'];
+    $parameters['id_session'] = $_GET['id_session'];
 // Create a sortable table with user-data
 
 $parameters['sec_token'] = Security::get_token();
@@ -212,13 +212,13 @@ 
 $table->set_header(1, get_lang('LoginName'));
 if (api_is_western_name_order())
 {
-	$table->set_header(2, get_lang('FirstName'));
-	$table->set_header(3, get_lang('LastName'));
+    $table->set_header(2, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
 }
 else
 {
-	$table->set_header(2, get_lang('LastName'));
-	$table->set_header(3, get_lang('FirstName'));
+    $table->set_header(2, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
 }
 $table->set_header(4, get_lang('Email'));
 $table->set_header(5, get_lang('Actions'));