chamilo / chamilo-lms

main/admin/course_export.php

Spacing +8 added lines, -8 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);
 
@@ -62,11 +62,11 @@ 
 
         $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['tutor_name'] = str_replace(';',',',$course['tutor_name']);
-            $dataToExport['course_language'] = str_replace(';',',',$course['course_language']);
+            $dataToExport['code'] = str_replace(';', ',', $course['code']);
+            $dataToExport['title'] = str_replace(';', ',', $course['title']);
+            $dataToExport['category_code'] = str_replace(';', ',', $course['category_code']);
+            $dataToExport['tutor_name'] = str_replace(';', ',', $course['tutor_name']);
+            $dataToExport['course_language'] = str_replace(';', ',', $course['course_language']);
 
             $dataToExport['students'] = '';
             $dataToExport['teachers'] = '';
@@ -148,8 +148,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

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>';

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);

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

main/admin/user_list.php

Spacing +47 added lines, -47 removed lines

@@ -106,10 +106,10 @@ 
 function display_advanced_search_form () {
     if ($("#advanced_search_form").css("display") == "none") {
         $("#advanced_search_form").css("display","block");
-        $("#img_plus_and_minus").html(\' '.Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'\');
+        $("#img_plus_and_minus").html(\' '.Display::return_icon('div_hide.gif', get_lang('Hide'), array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'\');
     } else {
         $("#advanced_search_form").css("display","none");
-        $("#img_plus_and_minus").html(\' '.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'\');
+        $("#img_plus_and_minus").html(\' '.Display::return_icon('div_show.gif', get_lang('Show'), array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedSearch').'\');
     }
 }
 
@@ -185,8 +185,8 @@ 
 
     // adding the filter to see the user's only of the current access_url
     if ((api_is_platform_admin() || api_is_session_admin()) && api_get_multiple_access_url()) {
-        $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-        $sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.id=url_rel_user.user_id)";
+        $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $sql .= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.id=url_rel_user.user_id)";
     }
 
     $keywordList = array(
@@ -217,11 +217,11 @@ 
     if (isset($keyword_extra_data) && !empty($keyword_extra_data)) {
         $extra_info = UserManager::get_extra_field_information_by_name($keyword_extra_data);
         $field_id = $extra_info['id'];
-        $sql.= " INNER JOIN user_field_values ufv ON u.id=ufv.user_id AND ufv.field_id=$field_id ";
+        $sql .= " INNER JOIN user_field_values ufv ON u.id=ufv.user_id AND ufv.field_id=$field_id ";
     }
 
     if (isset($_GET['keyword']) && !empty($_GET['keyword'])) {
-        $keywordFiltered = Database::escape_string("%". $_GET['keyword'] ."%");
+        $keywordFiltered = Database::escape_string("%".$_GET['keyword']."%");
         $sql .= " WHERE (
                     u.firstname LIKE '$keywordFiltered' OR
                     u.lastname LIKE '$keywordFiltered' OR
@@ -252,7 +252,7 @@ 
 
         $sql .= " $query_admin_table
                 WHERE (
-                    u.firstname LIKE '". Database::escape_string("%".$keywordListValues['keyword_firstname']."%")."' AND
+                    u.firstname LIKE '".Database::escape_string("%".$keywordListValues['keyword_firstname']."%")."' AND
                     u.lastname LIKE '". Database::escape_string("%".$keywordListValues['keyword_lastname']."%")."' AND
                     u.username LIKE '". Database::escape_string("%".$keywordListValues['keyword_username']."%")."' AND
                     u.email LIKE '". Database::escape_string("%".$keywordListValues['keyword_email']."%")."' AND
@@ -264,7 +264,7 @@ 
 
         if (isset($keyword_active) && !isset($keyword_inactive)) {
             $sql .= " AND u.active='1'";
-        } elseif(isset($keyword_inactive) && !isset($keyword_active)) {
+        } elseif (isset($keyword_inactive) && !isset($keyword_active)) {
             $sql .= " AND u.active='0'";
         }
         $sql .= " ) ";
@@ -307,7 +307,7 @@ 
     $lastname = $userInfo['lastname'];
 
 	if (api_is_western_name_order()) {
-		$message = sprintf(get_lang('AttemptingToLoginAs'),$firstname,$lastname, $userId);
+		$message = sprintf(get_lang('AttemptingToLoginAs'), $firstname, $lastname, $userId);
 	} else {
 		$message = sprintf(get_lang('AttemptingToLoginAs'), $lastname, $firstname, $userId);
 	}
@@ -341,7 +341,7 @@ 
         Session::write('login_as', true);
 
         $target_url = api_get_path(WEB_PATH)."user_portal.php";
-        $message .= '<br />'.sprintf(get_lang('LoginSuccessfulGoToX'),'<a href="'.$target_url.'">'.$target_url.'</a>');
+        $message .= '<br />'.sprintf(get_lang('LoginSuccessfulGoToX'), '<a href="'.$target_url.'">'.$target_url.'</a>');
         Display :: display_header(get_lang('UserList'));
         Display :: display_normal_message($message, false);
         Display :: display_footer();
@@ -384,11 +384,11 @@ 
         $sql .= "AND password LIKE '$easyPassword' ";
     }*/
 
-    if (!in_array($direction, array('ASC','DESC'))) {
+    if (!in_array($direction, array('ASC', 'DESC'))) {
     	$direction = 'ASC';
     }
     $column = intval($column);
-    $from 	= intval($from);
+    $from = intval($from);
     $number_of_items = intval($number_of_items);
 
     $preventSessionAdminsToManageAllUsers = api_get_setting('prevent_session_admins_to_manage_all_users');
@@ -401,7 +401,7 @@ 
 
 	$res = Database::query($sql);
 
-	$users = array ();
+	$users = array();
     $t = time();
 	while ($user = Database::fetch_row($res)) {
 		$userPicture = UserManager::getUserPicture($user[0], USER_IMAGE_SIZE_SMALL);
@@ -462,13 +462,13 @@ 
  */
 function modify_filter($user_id, $url_params, $row) {
 	global $charset, $_admins_list;
-	$is_admin   = in_array($user_id,$_admins_list);
+	$is_admin   = in_array($user_id, $_admins_list);
 	$statusname = api_get_status_langvars();
 	$user_is_anonymous = false;
     $current_user_status_label = $row['7'];
 
 	if ($current_user_status_label == $statusname[ANONYMOUS]) {
-		$user_is_anonymous =true;
+		$user_is_anonymous = true;
 	}
 	$result = '';
 	if (!$user_is_anonymous) {
@@ -484,8 +484,8 @@ 
 					<div class="blackboard_hide" id="div_s_'.$user_id.'">&nbsp;&nbsp;</div>
 					</a>';
 	} else {
-		$result .= Display::return_icon('course_na.png',get_lang('Courses')).'&nbsp;&nbsp;';
-		$result .= Display::return_icon('course_na.png',get_lang('Sessions')).'&nbsp;&nbsp;';
+		$result .= Display::return_icon('course_na.png', get_lang('Courses')).'&nbsp;&nbsp;';
+		$result .= Display::return_icon('course_na.png', get_lang('Sessions')).'&nbsp;&nbsp;';
 	}
 
 	if (api_is_platform_admin()) {
@@ -521,14 +521,14 @@ 
         $editProfileUrl = Display::getProfileEditionLink($user_id, true);
 
         if (!$user_is_anonymous && api_global_admin_can_edit_admin($user_id, null, true)) {
-            $result .= '<a href="' . $editProfileUrl . '">'.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
+            $result .= '<a href="'.$editProfileUrl.'">'.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
 		} else {
             $result .= Display::return_icon('edit_na.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>&nbsp;';
 		}
 	}
 
 	if ($is_admin) {
-		$result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'),array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
+		$result .= Display::return_icon('admin_star.png', get_lang('IsAdministrator'), array('width'=> ICON_SIZE_SMALL, 'heigth'=> ICON_SIZE_SMALL));
 	} else {
 		$result .= Display::return_icon('admin_star_na.png', get_lang('IsNotAdministrator'));
 	}
@@ -580,7 +580,7 @@ 
                 api_global_admin_can_edit_admin($user_id)
             ) {
                 // you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
-                $result .= ' <a href="user_list.php?action=delete_user&user_id='.$user_id.'&'.$url_params.'&sec_token='.$_SESSION['sec_token'].'"  onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
+                $result .= ' <a href="user_list.php?action=delete_user&user_id='.$user_id.'&'.$url_params.'&sec_token='.$_SESSION['sec_token'].'"  onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).'</a>';
             } else {
                 $result .= Display::return_icon('delete_na.png', get_lang('Delete'), array(), ICON_SIZE_SMALL);
             }
@@ -618,7 +618,7 @@ 
 
     if ($action == 'edit') {
         $result = Display::return_icon($image.'.png', get_lang('AccountExpired'), array(), 16);
-    } elseif ($row['0']<>$_user['user_id']) {
+    } elseif ($row['0'] <> $_user['user_id']) {
     	// you cannot lock yourself out otherwise you could disable all the accounts including your own => everybody is locked out and nobody can change it anymore.
 		$result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array('onclick'=>'active_user(this);', 'id'=>'img_'.$row['0']), 16).'</a>';
 	}
@@ -640,11 +640,11 @@ 
 }
 
 if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
-    $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
-    $interbreadcrumb[] = array ("url" => 'user_list.php', "name" => get_lang('UserList'));
+    $interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array("url" => 'user_list.php', "name" => get_lang('UserList'));
     $tool_name = get_lang('SearchUsers');
 } else {
-    $interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
     $tool_name = get_lang('UserList');
 }
 
@@ -657,10 +657,10 @@ 
             case 'add_user_to_my_url':
                 $user_id = $_REQUEST["user_id"];
                 $result = UrlManager::add_user_to_url($user_id, $current_access_url_id);
-                if ($result ) {
+                if ($result) {
                     $user_info = api_get_user_info($user_id);
                     $message = get_lang('UserAdded').' '.$user_info['firstname'].' '.$user_info['lastname'].' ('.$user_info['username'].')';
-                    $message  = Display::return_message($message, 'confirmation');
+                    $message = Display::return_message($message, 'confirmation');
                 }
                 break;
 			case 'show_message' :
@@ -694,7 +694,7 @@ 
 							$message = Display :: return_message(get_lang('CannotDeleteUserBecauseOwnsCourse'), 'error');
 						}
 					} else {
-						$message = Display :: return_message(get_lang('CannotDeleteUser'),'error');
+						$message = Display :: return_message(get_lang('CannotDeleteUser'), 'error');
 					}
 				}
 				break;
@@ -704,8 +704,8 @@ 
 					$number_of_deleted_users = 0;
 					if (is_array($_POST['id'])) {
 						foreach ($_POST['id'] as $index => $user_id) {
-							if($user_id != $_user['user_id']) {
-								if(UserManager :: delete_user($user_id)) {
+							if ($user_id != $_user['user_id']) {
+								if (UserManager :: delete_user($user_id)) {
 									$number_of_deleted_users++;
 								}
 							}
@@ -738,17 +738,17 @@ 
     </a>'
 );
 
-$actions  = '';
+$actions = '';
 if (api_is_platform_admin()) {
 	$actions .= '<div style="float:right;">'.
 		 '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
-         Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
+         Display::return_icon('new_user.png', get_lang('AddUsers'), '', ICON_SIZE_MEDIUM).'</a>'.
 		 '</div>';
 }
 $actions .= $form->return_form();
 
 if (isset ($_GET['keyword'])) {
-	$parameters = array ('keyword' => Security::remove_XSS($_GET['keyword']));
+	$parameters = array('keyword' => Security::remove_XSS($_GET['keyword']));
 } elseif (isset ($_GET['keyword_firstname'])) {
 	$parameters['keyword_firstname'] 	= Security::remove_XSS($_GET['keyword_firstname']);
 	$parameters['keyword_lastname']	 	= Security::remove_XSS($_GET['keyword_lastname']);
@@ -757,7 +757,7 @@ 
 	$parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
 	$parameters['keyword_status'] 		= Security::remove_XSS($_GET['keyword_status']);
 	$parameters['keyword_active'] 		= Security::remove_XSS($_GET['keyword_active']);
-	$parameters['keyword_inactive'] 	= Security::remove_XSS($_GET['keyword_inactive']);
+	$parameters['keyword_inactive'] = Security::remove_XSS($_GET['keyword_inactive']);
 }
 // Create a sortable table with user-data
 $parameters['sec_token'] = Security::get_token();
@@ -774,15 +774,15 @@ 
 // Display Advanced search form.
 $form = new FormValidator('advanced_search', 'get', '', '', array(), FormValidator::LAYOUT_HORIZONTAL);
 
-$form->addElement('html','<div id="advanced_search_form" style="display:none;">');
+$form->addElement('html', '<div id="advanced_search_form" style="display:none;">');
 $form->addElement('header', get_lang('AdvancedSearch'));
-$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);
 
-$form->addText('keyword_username',get_lang('LoginName'),false);
-$form->addText('keyword_email',get_lang('Email'),false);
+$form->addText('keyword_username', get_lang('LoginName'), false);
+$form->addText('keyword_email', get_lang('Email'), false);
 
-$form->addText('keyword_officialcode',get_lang('OfficialCode'),false);
+$form->addText('keyword_officialcode', get_lang('OfficialCode'), false);
 
 $status_options = array();
 $status_options['%'] = get_lang('All');
@@ -792,12 +792,12 @@ 
 $status_options[SESSIONADMIN] = get_lang('SessionsAdmin');
 $status_options[PLATFORM_ADMIN] = get_lang('Administrator');
 
-$form->addElement('select','keyword_status',get_lang('Profile'), $status_options    );
+$form->addElement('select', 'keyword_status', get_lang('Profile'), $status_options);
 
 $active_group = array();
-$active_group[] = $form->createElement('checkbox','keyword_active','', get_lang('Active'));
-$active_group[] = $form->createElement('checkbox','keyword_inactive','', get_lang('Inactive'));
-$form->addGroup($active_group,'',get_lang('ActiveAccount'), '<br/>',false);
+$active_group[] = $form->createElement('checkbox', 'keyword_active', '', get_lang('Active'));
+$active_group[] = $form->createElement('checkbox', 'keyword_inactive', '', get_lang('Inactive'));
+$form->addGroup($active_group, '', get_lang('ActiveAccount'), '<br/>', false);
 
 $form->addElement('checkbox', 'check_easy_passwords', null, get_lang('CheckEasyPasswords'));
 
@@ -808,7 +808,7 @@ 
 $defaults['keyword_active'] = 1;
 $defaults['keyword_inactive'] = 1;
 $form->setDefaults($defaults);
-$form->addElement('html','</div>');
+$form->addElement('html', '</div>');
 
 $form = $form->returnForm();
 
@@ -890,10 +890,10 @@ 
                 }
                 if ($add_user) {
                     $row_table = array();
-                    $row_table[] =  api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].') ';
-                    $row_table[] =  $access_info_to_string;
+                    $row_table[] = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].') ';
+                    $row_table[] = $access_info_to_string;
                     $url = api_get_self().'?action=add_user_to_my_url&user_id='.$user['id'].'&sec_token='.$_SESSION['sec_token'];
-                    $row_table[] =  Display::url(get_lang('AddUserToMyURL'), $url, array('class' => 'btn'));
+                    $row_table[] = Display::url(get_lang('AddUserToMyURL'), $url, array('class' => 'btn'));
 
                     foreach ($row_table as $cell) {
                         $table->setCellContents($row, $column, $cell);

main/admin/index.php

Spacing +15 added lines, -15 removed lines

@@ -19,7 +19,7 @@ 
 $nameTools = get_lang('PlatformAdmin');
 
 $accessUrlId = 0;
-$adminExtraContentDir = api_get_path(SYS_APP_PATH) . "home/admin/";
+$adminExtraContentDir = api_get_path(SYS_APP_PATH)."home/admin/";
 
 if (api_is_multiple_url_enabled()) {
     $accessUrlId = api_get_current_access_url_id();
@@ -28,7 +28,7 @@ 
         $urlInfo = api_get_access_url($accessUrlId);
         $url = api_remove_trailing_slash(preg_replace('/https?:\/\//i', '', $urlInfo['url']));
         $cleanUrl = str_replace('/', '-', $url);
-        $adminExtraContentDir = api_get_path(SYS_APP_PATH) . "home/$cleanUrl/admin/";
+        $adminExtraContentDir = api_get_path(SYS_APP_PATH)."home/$cleanUrl/admin/";
     }
 }
 
@@ -96,7 +96,7 @@ 
             <div class="form-group">
                 <input class="form-control" type="text" name="keyword" value="">
                 <button class="btn btn-default" type="submit">
-                    <em class="fa fa-search"></em> ' . get_lang('Search') . '
+                    <em class="fa fa-search"></em> ' . get_lang('Search').'
                 </button>
             </div>
         </form>';
@@ -149,7 +149,7 @@ 
             <div class="form-group">
                 <input class="form-control" type="text" name="keyword" value="">
                 <button class="btn btn-default" type="submit">
-                    <em class="fa fa-search"></em> ' . get_lang('Search') . '
+                    <em class="fa fa-search"></em> ' . get_lang('Search').'
                 </button>
             </div>
         </form>';
@@ -209,7 +209,7 @@ 
                 <input class="form-control" type="text" name="search_field" value="" >
                 <input type="hidden" value="search_setting" name="category">
                 <button class="btn btn-default" type="submit">
-                    <em class="fa fa-search"></em> ' . get_lang('Search') . '
+                    <em class="fa fa-search"></em> ' . get_lang('Search').'
                 </button>
             </div>
         </form>';
@@ -222,18 +222,18 @@ 
     $items[] = array('url' => 'settings.php?category=Regions', 'label' => get_lang('Regions'));
     $items[] = array('url' => 'system_announcements.php', 'label' => get_lang('SystemAnnouncements'));
     $items[] = array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'calendar/agenda_js.php?type=admin',
+        'url' => api_get_path(WEB_CODE_PATH).'calendar/agenda_js.php?type=admin',
         'label' => get_lang('GlobalAgenda')
     );
     $items[] = array('url' => 'configure_homepage.php', 'label' => get_lang('ConfigureHomePage'));
     $items[] = array('url' => 'configure_inscription.php', 'label' => get_lang('ConfigureInscription'));
     $items[] = array('url' => 'statistics/index.php', 'label' => get_lang('Statistics'));
     $items[] = array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'mySpace/company_reports.php',
+        'url' => api_get_path(WEB_CODE_PATH).'mySpace/company_reports.php',
         'label' => get_lang('Reports')
     );
     $items[] = array(
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/teacher_time_report.php',
+        'url' => api_get_path(WEB_CODE_PATH).'admin/teacher_time_report.php',
         'label' => get_lang('TeacherTimeReport')
     );
 
@@ -282,7 +282,7 @@ 
                     <div class="form-group">
                         <input class="form-control" type="text" name="keyword" value="">
                         <button class="btn btn-default" type="submit">
-                            <em class="fa fa-search"></em> ' . get_lang('Search') . '
+                            <em class="fa fa-search"></em> ' . get_lang('Search').'
                         </button>
                     </div>
                 </form>';
@@ -310,7 +310,7 @@ 
 
 if (api_is_platform_admin()) {
     // option only visible in development mode. Enable through code if required
-    if (is_dir(api_get_path(SYS_TEST_PATH) . 'datafiller/')) {
+    if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) {
         $items[] = array('url' => 'user_move_stats.php', 'label' => get_lang('MoveUserStats'));
     }
     $items[] = array('url' => 'career_dashboard.php', 'label' => get_lang('CareersAndPromotions'));
@@ -337,7 +337,7 @@ 
     $items = array();
     $items[] = array('url' => 'special_exports.php', 'label' => get_lang('SpecialExports'));
     $items[] = array('url' => 'system_status.php', 'label' => get_lang('SystemStatus'));
-    if (is_dir(api_get_path(SYS_TEST_PATH) . 'datafiller/')) {
+    if (is_dir(api_get_path(SYS_TEST_PATH).'datafiller/')) {
         $items[] = array('url' => 'filler.php', 'label' => get_lang('DataFiller'));
     }
 
@@ -381,12 +381,12 @@ 
         $items[] = array('url' => 'skill_list.php', 'label' => get_lang('ManageSkills'));
         //$items[] = array('url'=>'skills_profile.php',   'label' => get_lang('SkillsProfile'));
         $items[] = array(
-            'url' => api_get_path(WEB_CODE_PATH) . 'social/skills_ranking.php',
+            'url' => api_get_path(WEB_CODE_PATH).'social/skills_ranking.php',
             'label' => get_lang('SkillsRanking')
         );
         $items[] = array('url' => 'skills_gradebook.php', 'label' => get_lang('SkillsAndGradebooks'));
         $items[] = array(
-            'url' => api_get_path(WEB_CODE_PATH) . 'admin/skill_badge.php',
+            'url' => api_get_path(WEB_CODE_PATH).'admin/skill_badge.php',
             'label' => get_lang('Badges')
         );
         $blocks['skills']['items'] = $items;
@@ -439,7 +439,7 @@ 
         }
     }
 }
-$admin_ajax_url = api_get_path(WEB_AJAX_PATH) . 'admin.ajax.php';
+$admin_ajax_url = api_get_path(WEB_AJAX_PATH).'admin.ajax.php';
 
 $tpl = new Template();
 
@@ -492,7 +492,7 @@ 
                 die;
             }
 
-            $fullFilePath = $adminExtraContentDir . $extraData['block'];
+            $fullFilePath = $adminExtraContentDir.$extraData['block'];
             $fullFilePath .= "_extra.html";
 
             file_put_contents($fullFilePath, $extraData['extra_content']);

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/user_update_import.php

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);
                 }
             }
@@ -253,7 +253,7 @@ 
     global $current_tag;
     switch ($data) {
         case 'Contact':
-            $user = array ();
+            $user = array();
             break;
         default:
             $current_tag = $data;
@@ -350,7 +350,7 @@ 
 
     if (in_array($ext_import_file, $allowed_file_mimetype)) {
         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);
             $error_kind_file = false;
         } elseif (strcmp($file_type, 'xml') === 0 && $ext_import_file == $allowed_file_mimetype[1]) {
@@ -424,7 +424,7 @@ 
     Display::display_error_message($error_message);
 }
 
-$form = new FormValidator('user_update_import','post','user_update_import.php');
+$form = new FormValidator('user_update_import', 'post', 'user_update_import.php');
 $form->addElement('header', '', $tool_name);
 $form->addElement('hidden', 'formSent');
 $form->addElement('file', 'import_file', get_lang('ImportFileLocation'));