chamilo / chamilo-lms

main/admin/course_export.php

Indentation +21 added lines, -21 removed lines

@@ -46,7 +46,7 @@ 
         $courses = $course_list;
     }
 
-	if (!empty($courses)) {
+    if (!empty($courses)) {
 
         $archiveFile = 'export_courses_list_'.api_get_local_time();
 
@@ -98,13 +98,13 @@ 
                 Export::arrayToXls($listToExport, $archiveFile);
                 break;
         }
-	} else {
+    } else {
         Display::addFlash(
             Display::return_message(
                 get_lang('ThereAreNotSelectedCoursesOrCoursesListIsEmpty')
             )
         );
-	}
+    }
 }
 
 
@@ -114,29 +114,29 @@ 
 $form->addHeader($tool_name);
 $form->addHidden('formSent', 1);
 $form->addElement(
-	'radio',
-	'select_type',
-	get_lang('Option'),
-	get_lang('ExportAllCoursesList'),
-	 '1',
-	 ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"]
+    'radio',
+    'select_type',
+    get_lang('Option'),
+    get_lang('ExportAllCoursesList'),
+        '1',
+        ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='none';}"]
 );
 
 $form->addElement(
-	'radio',
-	'select_type',
-	'',
-	get_lang('ExportSelectedCoursesFromCoursesList'),
-	'2',
-	['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"]
+    'radio',
+    'select_type',
+    '',
+    get_lang('ExportSelectedCoursesFromCoursesList'),
+    '2',
+    ['onclick' => "javascript: if(this.checked){document.getElementById('div-course-list').style.display='block';}"]
 );
 
 if (!empty($course_list)) {
-	$form->addHtml('<div id="div-course-list" style="display:none">');
-	$coursesInList = [];
-	foreach ($course_list as $course) {
-		$coursesInList[$course['code']] = $course['title'].' ('.$course['code'].')';
-	}
+    $form->addHtml('<div id="div-course-list" style="display:none">');
+    $coursesInList = [];
+    foreach ($course_list as $course) {
+        $coursesInList[$course['code']] = $course['title'].' ('.$course['code'].')';
+    }
 
     $form->addSelect(
         'course_code',
@@ -145,7 +145,7 @@ 
         ['multiple' => 'multiple']
     );
 
-	$form->addHtml('</div>');
+    $form->addHtml('</div>');
 }
 
 $form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV' , 'csv', null);

Spacing +9 added lines, -9 removed lines

@@ -14,7 +14,7 @@ 
 api_protect_admin_script();
 
 $tool_name = get_lang('ExportCourses');
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 set_time_limit(0);
 
@@ -64,17 +64,17 @@ 
         $dataToExport = [];
 
         foreach ($courses as $course) {
-            $dataToExport['code'] = str_replace(';',',',$course['code']);
-            $dataToExport['title'] = str_replace(';',',',$course['title']);
-            $dataToExport['category_code'] = str_replace(';',',',$course['category_code']);
+            $dataToExport['code'] = str_replace(';', ',', $course['code']);
+            $dataToExport['title'] = str_replace(';', ',', $course['title']);
+            $dataToExport['category_code'] = str_replace(';', ',', $course['category_code']);
             $categoryInfo = CourseCategory::getCategory($course['category_code']);
             if ($categoryInfo) {
-                $dataToExport['category_name'] = str_replace(';',',',$categoryInfo['name']);
+                $dataToExport['category_name'] = str_replace(';', ',', $categoryInfo['name']);
             } else {
                 $dataToExport['category_name'] = '';
             }
-            $dataToExport['tutor_name'] = str_replace(';',',',$course['tutor_name']);
-            $dataToExport['course_language'] = str_replace(';',',',$course['course_language']);
+            $dataToExport['tutor_name'] = str_replace(';', ',', $course['tutor_name']);
+            $dataToExport['course_language'] = str_replace(';', ',', $course['course_language']);
 
             $dataToExport['students'] = '';
             $dataToExport['teachers'] = '';
@@ -156,8 +156,8 @@ 
 	$form->addHtml('</div>');
 }
 
-$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV' , 'csv', null);
-$form->addElement('radio', 'file_type', '' , 'XLS' , 'xls', null);
+$form->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV', 'csv', null);
+$form->addElement('radio', 'file_type', '', 'XLS', 'xls', null);
 $form->addElement('radio', 'file_type', null, 'XML', 'xml', null, array('id' => 'file_type_xml'));
 
 $form->setDefaults(['select_type' => '1', 'file_type' => 'csv']);

main/admin/ldap_form_add_users_group.php

Indentation +41 added lines, -41 removed lines

@@ -11,58 +11,58 @@
  */
 $nbre=0;
 echo '<form name="form" method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'">';
-	if($statut==1)
-	{
-		echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
-	}
-	else
-	{
-		echo '<input type="hidden" name="mailling" value="1">';
-	}
+    if($statut==1)
+    {
+        echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
+    }
+    else
+    {
+        echo '<input type="hidden" name="mailling" value="1">';
+    }
 if(!empty($course))
 {
-	echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
+    echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
 }
 elseif(!empty($id_session))
 {
-	echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
+    echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
 }
 $is_western_name_order = api_is_western_name_order();
 echo '<input type="hidden" name="confirmed" value="yes">';
 echo '<table border="0" cellspacing="0" width="100%">';
 echo '<tr align="center" id="header3">' .
-		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
-		'<td width="40%"><b>'.get_lang('Email').'</b></td>' .
-		($is_western_name_order
-			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
-			'<td width="15%"><b>'.get_lang('Name').'</b></td>'
-			: '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
-			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
-		'<td width="15%"><b>'.get_lang('Login').'</b></td>' .
-	  '</tr>'."\n";
+        '<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
+        '<td width="40%"><b>'.get_lang('Email').'</b></td>' .
+        ($is_western_name_order
+            ? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
+            '<td width="15%"><b>'.get_lang('Name').'</b></td>'
+            : '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
+            '<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
+        '<td width="15%"><b>'.get_lang('Login').'</b></td>' .
+        '</tr>'."\n";
 while (list ($key, $val) = each($nom_form)) {
-	$nbre=$nbre+1;
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
-	echo '<tr align="center" id="header'.$ndiv.'">';
-	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
-	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
-	if ($is_western_name_order)
-	{
-		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
-		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
-	}
-	else
-	{
-		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
-		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
-	}
-	echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">';
-	echo '<input type="hidden" name="tutor_form['.$key.']" value="0">';
-	echo '<input type="hidden" name="admin_form['.$key.']" value="1">';
-	echo '<input type="hidden" name="password_form['.$key.']"  value="'.$password_form[$key].'">';
-	echo '<input type="hidden" name="statut['.$key.']"  value="'.$statut.'">';
-	echo '</td>';
-	echo '</tr>';
+    $nbre=$nbre+1;
+    if($nbre & 1) $ndiv=2; else $ndiv=3;
+    echo '<tr align="center" id="header'.$ndiv.'">';
+    echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
+    echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
+    if ($is_western_name_order)
+    {
+        echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
+        echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
+    }
+    else
+    {
+        echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
+        echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
+    }
+    echo '<td>'.$username_form[$key].'<input type="hidden" name="username_form['.$key.']" size="10" value="'.$username_form[$key].'">';
+    echo '<input type="hidden" name="tutor_form['.$key.']" value="0">';
+    echo '<input type="hidden" name="admin_form['.$key.']" value="1">';
+    echo '<input type="hidden" name="password_form['.$key.']"  value="'.$password_form[$key].'">';
+    echo '<input type="hidden" name="statut['.$key.']"  value="'.$statut.'">';
+    echo '</td>';
+    echo '</tr>';
 }
 echo '</table>';
 echo '<br />';

Spacing +13 added lines, -13 removed lines

@@ -9,9 +9,9 @@ 
 /**
  * This form is included by ldap_import_students.php and ldap_import_students_to_session.php
  */
-$nbre=0;
+$nbre = 0;
 echo '<form name="form" method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'">';
-	if($statut==1)
+	if ($statut == 1)
 	{
 		echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
 	}
@@ -19,30 +19,30 @@ 
 	{
 		echo '<input type="hidden" name="mailling" value="1">';
 	}
-if(!empty($course))
+if (!empty($course))
 {
 	echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
 }
-elseif(!empty($id_session))
+elseif (!empty($id_session))
 {
 	echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
 }
 $is_western_name_order = api_is_western_name_order();
 echo '<input type="hidden" name="confirmed" value="yes">';
 echo '<table border="0" cellspacing="0" width="100%">';
-echo '<tr align="center" id="header3">' .
-		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>' .
-		'<td width="40%"><b>'.get_lang('Email').'</b></td>' .
+echo '<tr align="center" id="header3">'.
+		'<td width="15%"><input type="button" value="'.get_lang('AllSlashNone').'" onClick="checkAll();"></td>'.
+		'<td width="40%"><b>'.get_lang('Email').'</b></td>'.
 		($is_western_name_order
-			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>' .
+			? '<td width="15%"><b>'.get_lang('FirstName').'</b></td>'.
 			'<td width="15%"><b>'.get_lang('Name').'</b></td>'
-			: '<td width="15%"><b>'.get_lang('Name').'</b></td>' .
-			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>') .
-		'<td width="15%"><b>'.get_lang('Login').'</b></td>' .
+			: '<td width="15%"><b>'.get_lang('Name').'</b></td>'.
+			'<td width="15%"><b>'.get_lang('FirstName').'</b></td>').
+		'<td width="15%"><b>'.get_lang('Login').'</b></td>'.
 	  '</tr>'."\n";
 while (list ($key, $val) = each($nom_form)) {
-	$nbre=$nbre+1;
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
+	$nbre = $nbre + 1;
+	if ($nbre & 1) $ndiv = 2; else $ndiv = 3;
 	echo '<tr align="center" id="header'.$ndiv.'">';
 	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
 	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';

Braces +8 added lines, -7 removed lines

@@ -14,16 +14,14 @@ 
 	if($statut==1)
 	{
 		echo get_lang('EmailNotifySubscription').': <input type="checkbox" name="mailling" value="1" checked="checked"><i>'.get_lang('DontUnchek').'</i>';
-	}
-	else
+	} else
 	{
 		echo '<input type="hidden" name="mailling" value="1">';
 	}
 if(!empty($course))
 {
 	echo '<input type="hidden" name="course" value="'.Security::remove_XSS($course).'">';
-}
-elseif(!empty($id_session))
+} elseif(!empty($id_session))
 {
 	echo '<input type="hidden" name="id_session" value="'.Security::remove_XSS($id_session).'">';
 }
@@ -42,7 +40,11 @@ 
 	  '</tr>'."\n";
 while (list ($key, $val) = each($nom_form)) {
 	$nbre=$nbre+1;
-	if($nbre & 1) $ndiv=2; else $ndiv=3;
+	if($nbre & 1) {
+	    $ndiv=2;
+	} else {
+	    $ndiv=3;
+	}
 	echo '<tr align="center" id="header'.$ndiv.'">';
 	echo '<td><input type="checkbox" name="checkboxes[]" value="'.$key.'" checked="checked"></td>';
 	echo '<td>'.$email_form[$key].'<input type="hidden" name="email_form['.$key.']" size="40" value="'.$email_form[$key].'"></td>';
@@ -50,8 +52,7 @@ 
 	{
 		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';
 		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
-	}
-	else
+	} else
 	{
 		echo '<td>'.$nom_form[$key].'<input type="hidden" name="nom_form['.$key.']" size="20" value="'.$nom_form[$key].'"></td>';
 		echo '<td>'.$prenom_form[$key].'<input type="hidden" name="prenom_form['.$key.']" size="20" value="'.$prenom_form[$key].'"></td>';

main/admin/skill_list.php

Spacing +7 added lines, -7 removed lines

@@ -20,7 +20,7 @@ 
 }
 
 $action = isset($_GET['action']) ? $_GET['action'] : 'list';
-$skillId = isset($_GET['id']) ? intval($_GET['id']): 0;
+$skillId = isset($_GET['id']) ? intval($_GET['id']) : 0;
 
 $entityManager = Database::getManager();
 
@@ -55,7 +55,7 @@ 
             );
         }
 
-        header('Location: ' . api_get_self());
+        header('Location: '.api_get_self());
         exit;
         break;
     case 'disable':
@@ -108,33 +108,33 @@ 
             );
         }
 
-        header('Location: ' . api_get_self());
+        header('Location: '.api_get_self());
         exit;
         break;
     case 'list':
         //no break
     default:
-        $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+        $interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
 
         $message = Session::has('message') ? Session::read('message') : null;
 
         $toolbar = Display::toolbarButton(
             get_lang('CreateSkill'),
-            api_get_path(WEB_CODE_PATH) . 'admin/skill_create.php',
+            api_get_path(WEB_CODE_PATH).'admin/skill_create.php',
             'plus',
             'success',
             ['title' => get_lang('CreateSkill')]
         );
         $toolbar .= Display::toolbarButton(
             get_lang('SkillsWheel'),
-            api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php',
+            api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php',
             'bullseye',
             'primary',
             ['title' => get_lang('CreateSkill')]
         );
         $toolbar .= Display::toolbarButton(
             get_lang('BadgesManagement'),
-            api_get_path(WEB_CODE_PATH) . 'admin/skill_badge_list.php',
+            api_get_path(WEB_CODE_PATH).'admin/skill_badge_list.php',
             'shield',
             'warning',
             ['title' => get_lang('BadgesManagement')]

main/admin/inactive_user_list.php

Spacing +2 added lines, -2 removed lines

@@ -24,10 +24,10 @@
 Display :: display_header($tool_name, "");
 
 //On sélectionne les user élèves
-$sql = "SELECT user_id FROM ".$table_user." user WHERE user.status= '5' ORDER by lastname " ;
+$sql = "SELECT user_id FROM ".$table_user." user WHERE user.status= '5' ORDER by lastname ";
 $result = Database::query($sql);
 
-while($row = Database::fetch_array($result)) {
+while ($row = Database::fetch_array($result)) {
     $user_id = $row['user_id'];
     //  pour chaque élève, on trouve la dernière connexion
     //$last_connection_date = UserManager:: delete_inactive_student($user_id, 2, true);

Indentation +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
     @author Andre Boivin base code
 	@author Julio Montoya fixing lot of little details
 	@todo this script is not ready for a production use that's why I'm commenting the function delete_inactive_student
-
-*	@package chamilo.admin
+ *	@package chamilo.admin
 *	script pour effacer les user inactif depuis x temps
 */
 $cidReset = true;

main/admin/usergroup_user_import.php

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 
         foreach ($mandatory_fields as $field) {
             if (!isset($user_class[$field]) || strlen($user_class[$field]) == 0) {
-                $user_class['error'] = get_lang($field . 'Mandatory');
+                $user_class['error'] = get_lang($field.'Mandatory');
                 $errors[] = $user_class;
             }
         }
@@ -37,7 +37,7 @@ 
                 // 2.1.1 Check whether code exists in DB
                 $exists = $usergroup->usergroup_exists($user_class['ClassName']);
                 if (!$exists) {
-                    $user_class['error'] = get_lang('CodeDoesNotExists') . ': ' . $user_class['ClassName'];
+                    $user_class['error'] = get_lang('CodeDoesNotExists').': '.$user_class['ClassName'];
                     $errors[] = $user_class;
                 } else {
                     $classcodes[$user_class['CourseCode']] = 1;
@@ -49,14 +49,14 @@ 
         if (!UserManager::is_username_empty($user_class['UserName'])) {
             // 3.1. Check whether username is too long.
             if (UserManager::is_username_too_long($user_class['UserName'])) {
-                $user_class['error'] = get_lang('UserNameTooLong') . ': ' . $user_class['UserName'];
+                $user_class['error'] = get_lang('UserNameTooLong').': '.$user_class['UserName'];
                 $errors[] = $user_class;
             }
 
             $username = UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames);
             // 3.2. Check whether username exists.
             if (UserManager::is_username_available($username)) {
-                $user_class['error'] = get_lang('UnknownUser') . ': ' . $username;
+                $user_class['error'] = get_lang('UnknownUser').': '.$username;
                 $errors[] = $user_class;
             }
         }
@@ -105,8 +105,8 @@ 
             $class_name = $user_data['class_name'];
             $user_list_name = $user_data['user_list_name'];
             $usergroup->subscribe_users_to_usergroup($class_id, $user_list, $deleteUsersNotInList);
-            $message .= Display::return_message(get_lang('Class') . ': ' . $class_name . '<br />', 'normal', false);
-            $message .= Display::return_message(get_lang('Users') . ': ' . implode(', ', $user_list_name));
+            $message .= Display::return_message(get_lang('Class').': '.$class_name.'<br />', 'normal', false);
+            $message .= Display::return_message(get_lang('Users').': '.implode(', ', $user_list_name));
         }
     }
     return $message;
@@ -128,7 +128,7 @@ 
 $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script(true);
 
-$tool_name = get_lang('AddUsersToAClass') . ' CSV';
+$tool_name = get_lang('AddUsersToAClass').' CSV';
 
 $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 $interbreadcrumb[] = array('url' => 'usergroups.php', 'name' => get_lang('Classes'));
@@ -164,7 +164,7 @@ 
 if (count($errors) != 0) {
     $error_message = "\n";
     foreach ($errors as $index => $error_class_user) {
-        $error_message .= get_lang('Line') . ' ' . $error_class_user['line'] . ': ' . $error_class_user['error'] . '</b>';
+        $error_message .= get_lang('Line').' '.$error_class_user['line'].': '.$error_class_user['error'].'</b>';
         $error_message .= "<br />";
     }
     $error_message .= "\n";
@@ -172,7 +172,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>UserName</b>;<b>ClassName</b>
 jdoe;class01

Doc Comments +3 added lines, -1 removed lines

@@ -11,6 +11,7 @@ 
 
 /**
  * Validates imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $user_classes
  */
 function validate_data($user_classes) {
     global $purification_option_for_usernames;
@@ -66,6 +67,7 @@ 
 
 /**
  * Saves imported data.
+ * @param Ddeboer\DataImport\Reader\CsvReader $users_classes
  */
 function save_data($users_classes, $deleteUsersNotInList = false) {
 
@@ -115,7 +117,7 @@ 
 /**
  * Reads a CSV-file.
  * @param string $file Path to the CSV-file
- * @return array All course-information read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All course-information read from the file
  */
 function parse_csv_data($file) {
     $courses = Import::csvToArray($file);

main/admin/event_type.php

Spacing +3 added lines, -3 removed lines

@@ -45,9 +45,9 @@ 
 
 $languages = api_get_languages();
 
-$ajaxPath = api_get_path(WEB_CODE_PATH) . 'inc/ajax/events.ajax.php';
+$ajaxPath = api_get_path(WEB_CODE_PATH).'inc/ajax/events.ajax.php';
 
-$action_array = array(array('url' =>'event_controller.php?action=listing' , 'content' => Display::return_icon('view_text.png', get_lang('ListView'), array(), ICON_SIZE_MEDIUM)));
+$action_array = array(array('url' =>'event_controller.php?action=listing', 'content' => Display::return_icon('view_text.png', get_lang('ListView'), array(), ICON_SIZE_MEDIUM)));
 
 $key_lang = get_lang('YouHaveSomeUnsavedChanges');
 $users = UserManager::get_user_list(array(), array('firstname'));
@@ -311,7 +311,7 @@ 
         <select class="col-md-6" multiple="1" id="eventList" onchange="confirmMessage(this.name); return false;" name="eventList">
         <?php
         foreach ($event_config as $key => $config) {
-            echo '<option value="' . $key . '">' . $config['name_lang_var'] . '</option>';
+            echo '<option value="'.$key.'">'.$config['name_lang_var'].'</option>';
         }
         ?>
         </select>

main/admin/dashboard_add_users_to_user.php

Indentation +19 added lines, -19 removed lines

@@ -54,7 +54,7 @@ 
 
 $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()) {
@@ -120,8 +120,8 @@ 
             ";
         }
 
-		$rs	= Database::query($sql);
-		$xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
+        $rs	= Database::query($sql);
+        $xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
 
         if ($type == 'single') {
             $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -160,7 +160,7 @@ 
                     $return .= '...<br />';
                 }
             }
-           $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+            $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
         } else {
             $return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">';
             while($user = Database :: fetch_array($rs)) {
@@ -170,8 +170,8 @@ 
             $return .= '</select>';
             $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
         }
-	}
-	return $xajax_response;
+    }
+    return $xajax_response;
 }
 
 $xajax->processRequests();
@@ -284,7 +284,7 @@ 
 
 $msg = '';
 if (isset($_POST['formSent']) && intval($_POST['formSent']) == 1) {
-	$user_list = $_POST['UsersList'];
+    $user_list = $_POST['UsersList'];
 
     switch ($userStatus) {
         case DRH:
@@ -349,13 +349,13 @@ 
 $assigned_users_id = array_keys($assigned_users_to_hrm);
 $without_assigned_users = '';
 if (count($assigned_users_id) > 0) {
-	$without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
+    $without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
 }
 
 $search_user = '';
 if (!empty($firstLetterUser)) {
-	$needle = Database::escape_string($firstLetterUser);
-	$search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
+    $needle = Database::escape_string($firstLetterUser);
+    $search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
 }
 
 $sqlConditions = null;
@@ -375,7 +375,7 @@ 
 }
 
 if (api_is_multiple_url_enabled()) {
-	$sql = "SELECT user.user_id, username, lastname, firstname
+    $sql = "SELECT user.user_id, username, lastname, firstname
 	        FROM $tbl_user user  LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id)
 			WHERE
                 $without_assigned_users
@@ -385,7 +385,7 @@ 
                 $sqlConditions
             ORDER BY firstname";
 } else {
-	$sql = "SELECT user_id, username, lastname, firstname
+    $sql = "SELECT user_id, username, lastname, firstname
 	        FROM $tbl_user user
 			WHERE
 			    $without_assigned_users
@@ -401,7 +401,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
 }
 ?>
 
@@ -454,26 +454,26 @@ 
             </div>
             
           <?php
-          }
-          ?>
+            }
+            ?>
             <div class="separate-action">
                 <?php
-		echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
+        echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
             ?>
             </div>
         </div>
     </div>
     <div class="col-md-4">
         <?php
-	if (UserManager::is_admin($user_id)) {
-		echo get_lang('AssignedUsersListToPlatformAdministrator');
+    if (UserManager::is_admin($user_id)) {
+        echo get_lang('AssignedUsersListToPlatformAdministrator');
             } else if ($user_info['status'] == SESSIONADMIN) {
                     echo get_lang('AssignedUsersListToSessionsAdministrator');
             } else if ($user_info['status'] == STUDENT_BOSS) {
                     echo get_lang('AssignedUsersListToStudentBoss');
             } else {
                     echo get_lang('AssignedUsersListToHumanResourcesManager');
-	}
+    }
         ?>
         <div class="form-group">
             <div class="col-sm-12">

Spacing +33 added lines, -33 removed lines

@@ -24,7 +24,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_user = Database::get_main_table(TABLE_MAIN_USER);
@@ -44,17 +44,17 @@ 
 $isAdmin = UserManager::is_admin($user_id);
 if ($isAdmin) {
     $userStatus = PLATFORM_ADMIN;
-    $tool_name= get_lang('AssignUsersToPlatformAdministrator');
+    $tool_name = get_lang('AssignUsersToPlatformAdministrator');
 } else if ($user_info['status'] == SESSIONADMIN) {
-    $tool_name= get_lang('AssignUsersToSessionsAdministrator');
-} else if  ($user_info['status'] == STUDENT_BOSS) {
-    $tool_name= get_lang('AssignUsersToBoss');
+    $tool_name = get_lang('AssignUsersToSessionsAdministrator');
+} else if ($user_info['status'] == STUDENT_BOSS) {
+    $tool_name = get_lang('AssignUsersToBoss');
 } else {
-    $tool_name= get_lang('AssignUsersToHumanResourcesManager');
+    $tool_name = get_lang('AssignUsersToHumanResourcesManager');
 }
 
 $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']);
 }
 
@@ -64,7 +64,7 @@ 
 
 function search_users($needle, $type)
 {
-    global $tbl_access_url_rel_user,  $tbl_user, $user_anonymous, $current_user_id, $user_id, $userStatus;
+    global $tbl_access_url_rel_user, $tbl_user, $user_anonymous, $current_user_id, $user_id, $userStatus;
 
     $xajax_response = new xajaxResponse();
     $return = '';
@@ -102,7 +102,7 @@ 
                     LEFT JOIN $tbl_access_url_rel_user au ON (au.user_id = user.user_id)
                     WHERE
                         ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
-                        status NOT IN(".DRH.", ".SESSIONADMIN.", " . STUDENT_BOSS . ") AND
+                        status NOT IN(".DRH.", ".SESSIONADMIN.", ".STUDENT_BOSS.") AND
                         user.user_id NOT IN ($user_anonymous, $current_user_id, $user_id)
                         $without_assigned_users AND
                         access_url_id = ".api_get_current_access_url_id()."
@@ -114,15 +114,15 @@ 
                     FROM $tbl_user user
                     WHERE
                         ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%' AND
-                        status NOT IN(".DRH.", ".SESSIONADMIN.", " . STUDENT_BOSS . ") AND
+                        status NOT IN(".DRH.", ".SESSIONADMIN.", ".STUDENT_BOSS.") AND
                         user_id NOT IN ($user_anonymous, $current_user_id, $user_id)
                     $without_assigned_users
                     $order_clause
             ";
         }
 
-		$rs	= Database::query($sql);
-		$xajax_response->addAssign('ajax_list_users_multiple','innerHTML',api_utf8_encode($return));
+		$rs = Database::query($sql);
+		$xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
 
         if ($type == 'single') {
             $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@@ -141,10 +141,10 @@ 
 
             switch ($userStatus) {
                 case DRH:
-                    $sql .= " user.status <> 6 AND user.status <> " . DRH;
+                    $sql .= " user.status <> 6 AND user.status <> ".DRH;
                     break;
                 case STUDENT_BOSS:
-                    $sql .= " user.status <> 6 AND user.status <> " . STUDENT_BOSS;
+                    $sql .= " user.status <> 6 AND user.status <> ".STUDENT_BOSS;
                     break;
             }
 
@@ -161,12 +161,12 @@ 
                     $return .= '...<br />';
                 }
             }
-           $xajax_response->addAssign('ajax_list_users_single','innerHTML',api_utf8_encode($return));
+           $xajax_response->addAssign('ajax_list_users_single', 'innerHTML', api_utf8_encode($return));
         } else {
             $return .= '<select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15" ">';
-            while($user = Database :: fetch_array($rs)) {
+            while ($user = Database :: fetch_array($rs)) {
                 $person_name = api_get_person_name($user['firstname'], $user['lastname']);
-                $return .= '<option value="'.$user['user_id'].'" title="'.htmlspecialchars($person_name,ENT_QUOTES).'">'.$person_name.' ('.$user['username'].')</option>';
+                $return .= '<option value="'.$user['user_id'].'" title="'.htmlspecialchars($person_name, ENT_QUOTES).'">'.$person_name.' ('.$user['username'].')</option>';
             }
             $return .= '</select>';
             $xajax_response->addAssign('ajax_list_users_multiple', 'innerHTML', api_utf8_encode($return));
@@ -243,7 +243,7 @@ 
 }
 </script>';
 
-$formSent=0;
+$formSent = 0;
 $errorMsg = '';
 $UserList = array();
 
@@ -258,7 +258,7 @@ 
 
 $searchForm = new FormValidator('search', 'get', api_get_self().'?user='.$user_id);
 $searchForm->addHeader(get_lang('AdvancedSearch'));
-$renderer =& $searchForm->defaultRenderer();
+$renderer = & $searchForm->defaultRenderer();
 
 $searchForm->addElement('hidden', 'user', $user_id);
 foreach ($filters as $param) {
@@ -300,7 +300,7 @@ 
             $affected_rows = 0;
     }
 
-    if ($affected_rows)	{
+    if ($affected_rows) {
         $msg = get_lang('AssignedUsersHaveBeenUpdatedSuccessfully');
     }
 }
@@ -312,18 +312,18 @@ 
 $actionsLeft = '';
 if ($userStatus != STUDENT_BOSS) {
     $actionsLeft = Display::url(
-        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM ),
+        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM),
         "dashboard_add_courses_to_user.php?user=$user_id"
     );
 
     $actionsLeft .= Display::url(
-        Display::return_icon('session-add.png', get_lang('AssignSessions'), null, ICON_SIZE_MEDIUM ) ,
+        Display::return_icon('session-add.png', get_lang('AssignSessions'), null, ICON_SIZE_MEDIUM),
         "dashboard_add_sessions_to_user.php?user=$user_id"
     );
 }
 
 $actionsRight = Display::url(
-    '<em class="fa fa-search"></em> ' . get_lang('AdvancedSearch'),
+    '<em class="fa fa-search"></em> '.get_lang('AdvancedSearch'),
     '#',
     array('class' => 'btn btn-default advanced_options', 'id' => 'advanced_search')
 );
@@ -360,13 +360,13 @@ 
 $assigned_users_id = array_keys($assigned_users_to_hrm);
 $without_assigned_users = '';
 if (count($assigned_users_id) > 0) {
-	$without_assigned_users = " user.user_id NOT IN(".implode(',',$assigned_users_id).") AND ";
+	$without_assigned_users = " user.user_id NOT IN(".implode(',', $assigned_users_id).") AND ";
 }
 
 $search_user = '';
 if (!empty($firstLetterUser)) {
 	$needle = Database::escape_string($firstLetterUser);
-	$search_user ="AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
+	$search_user = "AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
 }
 
 $sqlConditions = null;
@@ -406,12 +406,12 @@ 
 			    $sqlConditions
             ORDER BY firstname ";
 }
-$result	= Database::query($sql);
+$result = Database::query($sql);
 ?>
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" class="form-horizontal" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?user=<?php echo $user_id ?>" class="form-horizontal" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
 <input type="hidden" name="formSent" value="1" />
 <?php
-if(!empty($msg)) {
+if (!empty($msg)) {
 	Display::display_normal_message($msg); //main API
 }
 ?>
@@ -426,7 +426,7 @@ 
                     <select id="origin" class="form-control" name="NoAssignedUsersList[]" multiple="multiple" size="15">
                         <?php   while ($enreg = Database::fetch_array($result)) {
                                 $person_name = api_get_person_name($enreg['firstname'], $enreg['lastname']); ?>
-                                  <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name,ENT_QUOTES).'"';?>>
+                                  <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name, ENT_QUOTES).'"'; ?>>
                             <?php echo $person_name.' ('.$enreg['username'].')'; ?>
                         </option>
                         <?php } ?>
@@ -439,8 +439,8 @@ 
     </div>
     <div class="col-md-4">
         <div class="code-course">
-            <?php if($add_type == 'multiple') { ?>
-                <p><?php echo get_lang('FirstLetterUser');?></p>
+            <?php if ($add_type == 'multiple') { ?>
+                <p><?php echo get_lang('FirstLetterUser'); ?></p>
                 <select class="selectpicker show-tick form-control" name="firstLetterUser" onchange = "xajax_search_users(this.value,'multiple')">
                     <option value="%">--</option>
                     <?php echo Display::get_alphabet_options($firstLetterUser); ?>
@@ -492,10 +492,10 @@ 
                 <select id='destination' class="form-control" name="UsersList[]" multiple="multiple" size="15" >
                     <?php
                     if (is_array($assigned_users_to_hrm)) {
-                            foreach($assigned_users_to_hrm as $enreg) {
+                            foreach ($assigned_users_to_hrm as $enreg) {
                                     $person_name = api_get_person_name($enreg['firstname'], $enreg['lastname']);
                     ?>
-                            <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name,ENT_QUOTES).'"'; ?>>
+                            <option value="<?php echo $enreg['user_id']; ?>" <?php echo 'title="'.htmlspecialchars($person_name, ENT_QUOTES).'"'; ?>>
                         <?php echo $person_name.' ('.$enreg['username'].')'; ?>
                     </option>
                     <?php }

main/admin/class_list.php

Spacing +7 added lines, -7 removed lines

@@ -35,10 +35,10 @@ 
 function get_class_data($from, $number_of_items, $column, $direction = 'ASC') {
     $tbl_class_user = Database::get_main_table(TABLE_MAIN_CLASS_USER);
     $tbl_class = Database :: get_main_table(TABLE_MAIN_CLASS);
-    $from 				= intval($from);
-    $number_of_items 	= intval($number_of_items);
+    $from = intval($from);
+    $number_of_items = intval($number_of_items);
     $column 			= intval($column);
-    $direction 			= ($direction == 'ASC'?'ASC':'DESC');
+    $direction = ($direction == 'ASC' ? 'ASC' : 'DESC');
 
     $sql = "SELECT 	id AS col0, name AS col1, COUNT(user_id) AS col2, id AS col3
         FROM $tbl_class
@@ -48,7 +48,7 @@ 
     }
     $sql .= " GROUP BY id,name ORDER BY col$column $direction LIMIT $from,$number_of_items";
     $res = Database::query($sql);
-    $classes = array ();
+    $classes = array();
     while ($class = Database::fetch_row($res)) {
         $classes[] = $class;
     }
@@ -68,7 +68,7 @@ 
 }
 
 $tool_name = get_lang('ClassList');
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 
 if (isset($_POST['action'])) {
     switch ($_POST['action']) {
@@ -99,7 +99,7 @@ 
 
 // Create a search-box
 $form = new FormValidator('search_simple', 'get', '', '', null, false);
-$renderer =& $form->defaultRenderer();
+$renderer = & $form->defaultRenderer();
 $renderer->setCustomElementTemplate('<span>{element}</span> ');
 $form->addElement('text', 'keyword', get_lang('Keyword'));
 $form->addElement('button', 'submit', get_lang('Search'));
@@ -113,7 +113,7 @@ 
 $table->set_header(2, get_lang('NumberOfUsers'));
 $table->set_header(3, '', false);
 $table->set_column_filter(3, 'modify_filter');
-$table->set_form_actions(array ('delete_classes' => get_lang('DeleteSelectedClasses')), 'class');
+$table->set_form_actions(array('delete_classes' => get_lang('DeleteSelectedClasses')), 'class');
 
 $content .= $table->return_table();
 

main/admin/class_information.php

Spacing +21 added lines, -21 removed lines

@@ -18,8 +18,8 @@ 
     api_not_allowed();
 }
 
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'class_list.php', 'name' => get_lang('AdminClasses'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'class_list.php', 'name' => get_lang('AdminClasses'));
 
 $class_id = $_GET['id'];
 $class = ClassManager::get_class_info($class_id);
@@ -35,21 +35,21 @@ 
 $users = ClassManager::get_users($class_id);
 if (count($users) > 0) {
     $is_western_name_order = api_is_western_name_order();
-    $table_header[] = array (get_lang('OfficialCode'), true);
+    $table_header[] = array(get_lang('OfficialCode'), true);
     if ($is_western_name_order) {
-        $table_header[] = array (get_lang('FirstName'), true);
-        $table_header[] = array (get_lang('LastName'), true);
+        $table_header[] = array(get_lang('FirstName'), true);
+        $table_header[] = array(get_lang('LastName'), true);
     } else {
-        $table_header[] = array (get_lang('LastName'), true);
-        $table_header[] = array (get_lang('FirstName'), true);
+        $table_header[] = array(get_lang('LastName'), true);
+        $table_header[] = array(get_lang('FirstName'), true);
     }
-    $table_header[] = array (get_lang('Email'), true);
-    $table_header[] = array (get_lang('Status'), true);
-    $table_header[] = array ('', false);
+    $table_header[] = array(get_lang('Email'), true);
+    $table_header[] = array(get_lang('Status'), true);
+    $table_header[] = array('', false);
     $data = array();
-    foreach($users as $index => $user) {
+    foreach ($users as $index => $user) {
         $username = api_htmlentities(sprintf(get_lang('LoginX'), $user['username']), ENT_QUOTES);
-        $row = array ();
+        $row = array();
         $row[] = $user['official_code'];
         if ($is_western_name_order) {
             $row[] = $user['firstname'];
@@ -63,7 +63,7 @@ 
         $row[] = '<a href="user_information.php?user_id='.$user['user_id'].'">'.Display::return_icon('synthese_view.gif', get_lang('Info')).'</a>';
         $data[] = $row;
     }
-    Display::display_sortable_table($table_header,$data,array(),array(),array('id'=>$_GET['id']));
+    Display::display_sortable_table($table_header, $data, array(), array(), array('id'=>$_GET['id']));
 } else {
     echo get_lang('NoUsersInClass');
 }
@@ -73,22 +73,22 @@ 
  */
 $courses = ClassManager::get_courses($class_id);
 if (count($courses) > 0) {
-    $header[] = array (get_lang('Code'), true);
-    $header[] = array (get_lang('Title'), true);
-    $header[] = array ('', false);
-    $data = array ();
-    foreach( $courses as $index => $course) {
-        $row = array ();
+    $header[] = array(get_lang('Code'), true);
+    $header[] = array(get_lang('Title'), true);
+    $header[] = array('', false);
+    $data = array();
+    foreach ($courses as $index => $course) {
+        $row = array();
         $row[] = $course['visual_code'];
         $row[] = $course['title'];
         $row[] = '<a href="course_information.php?code='.$course['code'].'">'.Display::return_icon('info_small.gif', get_lang('Delete')).'</a>'.
-                    '<a href="'.api_get_path(WEB_COURSE_PATH).$course['directory'].'">'.Display::return_icon('course_home.gif', get_lang('CourseHome')).'</a>' .
+                    '<a href="'.api_get_path(WEB_COURSE_PATH).$course['directory'].'">'.Display::return_icon('course_home.gif', get_lang('CourseHome')).'</a>'.
                     '<a href="course_edit.php?course_code='.$course['code'].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
         $data[] = $row;
     }
     echo '<p><b>'.get_lang('Courses').'</b></p>';
     echo '<blockquote>';
-    Display :: display_sortable_table($header, $data, array (), array (), array('id'=>$_GET['id']));
+    Display :: display_sortable_table($header, $data, array(), array(), array('id'=>$_GET['id']));
     echo '</blockquote>';
 } else {
     echo '<p>'.get_lang('NoCoursesForThisClass').'</p>';