chamilo / chamilo-lms

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/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/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 +34 added lines, -34 removed lines

@@ -23,7 +23,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);
@@ -43,17 +43,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']);
 }
 
@@ -63,7 +63,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 = '';
@@ -101,7 +101,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()."
@@ -113,15 +113,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);
@@ -140,10 +140,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;
             }
 
@@ -160,12 +160,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));
@@ -242,7 +242,7 @@ 
 }
 </script>';
 
-$formSent=0;
+$formSent = 0;
 $errorMsg = '';
 $UserList = array();
 
@@ -257,7 +257,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) {
@@ -299,7 +299,7 @@ 
             $affected_rows = 0;
     }
 
-    if ($affected_rows)	{
+    if ($affected_rows) {
         $msg = get_lang('AssignedUsersHaveBeenUpdatedSuccessfully');
     }
 }
@@ -311,17 +311,17 @@ 
 
 if ($userStatus != STUDENT_BOSS) {
     $actionsLeft = Display::url(
-        Display::return_icon('course-add.png', get_lang('AssignCourses'), null, ICON_SIZE_MEDIUM ), "dashboard_add_courses_to_user.php?user=$user_id"
+        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 ) , "dashboard_add_sessions_to_user.php?user=$user_id"
+        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'), '#', array('class' => 'btn btn-default advanced_options', 'id' => 'advanced_search'));
+$actionsRight = Display::url('<em class="fa fa-search"></em> '.get_lang('AdvancedSearch'), '#', array('class' => 'btn btn-default advanced_options', 'id' => 'advanced_search'));
 
-$toolbar = Display::toolbarAction('toolbar-dashboard', $content = array( 0 => $actionsLeft, 1 => $actionsRight ));
+$toolbar = Display::toolbarAction('toolbar-dashboard', $content = array(0 => $actionsLeft, 1 => $actionsRight));
 echo $toolbar;
 
 echo '<div id="advanced_search_options" style="display:none">';
@@ -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%'";
+	$search_user = "AND ".(api_sort_by_first_name() ? 'firstname' : 'lastname')." LIKE '$needle%'";
 }
 
 $sqlConditions = null;
@@ -395,12 +395,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
 }
 ?>
@@ -415,7 +415,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 } ?>
@@ -428,8 +428,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); ?>
@@ -481,10 +481,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>';

main/admin/sub_language.php

Indentation +164 added lines, -164 removed lines

@@ -59,30 +59,30 @@ 
 $sublanguage_folder_error = false;
 
 if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
-	$language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
-	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
-	$all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
-	$all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
-	$sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
+    $language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
+    $sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
+    $all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
+    $all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
+    $sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
 
-	if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
-		$sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
-	}
-	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
-		$language_id_exist = true;
-	} else {
-		$language_id_exist = false;
-	}
+    if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
+        $sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
+    }
+    if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
+        $language_id_exist = true;
+    } else {
+        $language_id_exist = false;
+    }
 } else {
-	$language_name='';
-	$language_id_exist=false;
+    $language_name='';
+    $language_id_exist=false;
 }
 
 $intro = sprintf(get_lang('RegisterTermsOfSubLanguageForX'), strtolower($sub_language_name));
 $path_folder = api_get_path(SYS_LANG_PATH).$all_data_of_language['dokeos_folder'];
 
 if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder'])==0) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 Display :: display_header($language_name);
@@ -94,10 +94,10 @@ 
 echo '</div>';
 
 if (!empty($_SESSION['msg'])) {
-	echo $_SESSION['msg'];
-	unset($_SESSION['msg']);
+    echo $_SESSION['msg'];
+    unset($_SESSION['msg']);
 } else {
-	echo '<br />';
+    echo '<br />';
 }
 
 
@@ -115,7 +115,7 @@ 
 echo $html;
 echo '<br /><br /><br />';
 if (!empty($sublanguage_folder_error)) {
-	Display::display_warning_message($sublanguage_folder_error);
+    Display::display_warning_message($sublanguage_folder_error);
 }
 echo '<div id="div_message_information_id">&nbsp;</div>';
 
@@ -130,182 +130,182 @@ 
  *
  */
 function search_language_term(
-	$term,
-	$search_in_variable = true,
-	$search_in_english = true,
-	$search_in_parent = true,
-	$search_in_sub_language = true
+    $term,
+    $search_in_variable = true,
+    $search_in_english = true,
+    $search_in_parent = true,
+    $search_in_sub_language = true
 ) {
-	//These the $_REQUEST['id'] and the $_REQUEST['sub_language_id'] variables are process in global.inc.php (LOAD LANGUAGE FILES SECTION)
-	/*
+    //These the $_REQUEST['id'] and the $_REQUEST['sub_language_id'] variables are process in global.inc.php (LOAD LANGUAGE FILES SECTION)
+    /*
 		These 4 arrays are set in global.inc.php with the condition that will be load from sub_language.php or sub_language_ajax.inc.php
 		$english_language_array
 		$parent_language_array
 		$sub_language_array
 		$language_files_to_load
 	*/
-	global $language_files_to_load, $sub_language_array, $english_language_array, $parent_language_array;
-	$language_files_to_load_keys = array_flip($language_files_to_load);
-	$array_to_search = $parent_language_array;
-	$list_info = array();
-	$term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
-	//@todo optimize this foreach
-	foreach ($language_files_to_load as $lang_file) {
-		//searching in parent language of the sub language
-		if ($search_in_parent) {
-			$variables = $parent_language_array[$lang_file];
-			foreach ($variables as $parent_name_variable =>$parent_variable_value) {
-				//arrays are avoided
-				if (is_array($parent_variable_value)) {
-					continue;
-				}
-				$founded = false;
-				// searching the item in the parent tool
-				if (preg_match($term,$parent_variable_value)!==0) {
-					$founded = true;
-				}
-				if ($founded) {
-					//loading variable from the english array
-					$sub_language_name_variable = $sub_language_array[$lang_file][$parent_name_variable];
-					//loading variable from the english array
-					$english_name_variable = $english_language_array[$lang_file][$parent_name_variable];
+    global $language_files_to_load, $sub_language_array, $english_language_array, $parent_language_array;
+    $language_files_to_load_keys = array_flip($language_files_to_load);
+    $array_to_search = $parent_language_array;
+    $list_info = array();
+    $term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
+    //@todo optimize this foreach
+    foreach ($language_files_to_load as $lang_file) {
+        //searching in parent language of the sub language
+        if ($search_in_parent) {
+            $variables = $parent_language_array[$lang_file];
+            foreach ($variables as $parent_name_variable =>$parent_variable_value) {
+                //arrays are avoided
+                if (is_array($parent_variable_value)) {
+                    continue;
+                }
+                $founded = false;
+                // searching the item in the parent tool
+                if (preg_match($term,$parent_variable_value)!==0) {
+                    $founded = true;
+                }
+                if ($founded) {
+                    //loading variable from the english array
+                    $sub_language_name_variable = $sub_language_array[$lang_file][$parent_name_variable];
+                    //loading variable from the english array
+                    $english_name_variable = $english_language_array[$lang_file][$parent_name_variable];
 
-					//config buttons
-					/*if (strlen($english_name_variable)>1500) {
+                    //config buttons
+                    /*if (strlen($english_name_variable)>1500) {
 						$size =20;
 					} else {
 						$size =4;
 					}*/
 
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+                    $obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
 
-					$list_info[] = array(
-						$lang_file . '.inc.php',
-						$parent_name_variable,
-						$english_name_variable,
-						$parent_variable_value,
-						$obj_text,
-						$obj_button
-					);
-				}
-			}
-		}
+                    $list_info[] = array(
+                        $lang_file . '.inc.php',
+                        $parent_name_variable,
+                        $english_name_variable,
+                        $parent_variable_value,
+                        $obj_text,
+                        $obj_button
+                    );
+                }
+            }
+        }
 
-		//search in english
-		if ($search_in_english || $search_in_variable) {
-			$variables = $english_language_array[$lang_file];
-			foreach ($variables as $name_variable =>$variable_value) {
-				if (is_array($variable_value)) {
-					continue;
-				}
+        //search in english
+        if ($search_in_english || $search_in_variable) {
+            $variables = $english_language_array[$lang_file];
+            foreach ($variables as $name_variable =>$variable_value) {
+                if (is_array($variable_value)) {
+                    continue;
+                }
 
-				if (is_array($variable_value))
-					echo $lang_file;
-				$founded = false;
-				if ($search_in_english && $search_in_variable) {
-					// searching the item in the parent tool
-					if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
-						$founded = true;
-					}
-				} else {
-					if ($search_in_english) {
-						if (preg_match($term,$variable_value)!==0) {
-							$founded = true;
-						}
-					} else {
-						if (preg_match($term,$name_variable)!==0) {
-							$founded = true;
-						}
-					}
-				}
+                if (is_array($variable_value))
+                    echo $lang_file;
+                $founded = false;
+                if ($search_in_english && $search_in_variable) {
+                    // searching the item in the parent tool
+                    if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
+                        $founded = true;
+                    }
+                } else {
+                    if ($search_in_english) {
+                        if (preg_match($term,$variable_value)!==0) {
+                            $founded = true;
+                        }
+                    } else {
+                        if (preg_match($term,$name_variable)!==0) {
+                            $founded = true;
+                        }
+                    }
+                }
 
-				if ($founded) {
-					//loading variable from the english array
-					$sub_language_name_variable = null;
-					if (isset($sub_language_array[$lang_file][$name_variable])) {
-						$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
-					}
-					$parent_variable_value = null;
-					if (isset($parent_language_array[$lang_file][$name_variable])) {
-						$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
-					}
-					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
-						$sub_language_name_variable.'
+                if ($founded) {
+                    //loading variable from the english array
+                    $sub_language_name_variable = null;
+                    if (isset($sub_language_array[$lang_file][$name_variable])) {
+                        $sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
+                    }
+                    $parent_variable_value = null;
+                    if (isset($parent_language_array[$lang_file][$name_variable])) {
+                        $parent_variable_value = $parent_language_array[$lang_file][$name_variable];
+                    }
+                    //config buttons
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
+                        $sub_language_name_variable.'
 						</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+                    $obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
-					//loading variable from the english array
-					$english_name_variable = $english_language_array[$lang_file][$name_variable];
+                    //loading variable from the english array
+                    $english_name_variable = $english_language_array[$lang_file][$name_variable];
 
-					$list_info[] = array(
-						$lang_file . '.inc.php',
-						$name_variable,
-						$english_name_variable,
-						$parent_variable_value,
-						$obj_text,
-						$obj_button
-					);
-				}
-			}
-		}
+                    $list_info[] = array(
+                        $lang_file . '.inc.php',
+                        $name_variable,
+                        $english_name_variable,
+                        $parent_variable_value,
+                        $obj_text,
+                        $obj_button
+                    );
+                }
+            }
+        }
 
-		// Search in sub language
-		if ($search_in_sub_language) {
-			$variables = $sub_language_array[$lang_file];
-			foreach ($variables as $name_variable =>$variable_value) {
-				if (is_array($parent_variable_value)) {
-					continue;
-				}
+        // Search in sub language
+        if ($search_in_sub_language) {
+            $variables = $sub_language_array[$lang_file];
+            foreach ($variables as $name_variable =>$variable_value) {
+                if (is_array($parent_variable_value)) {
+                    continue;
+                }
 
-				$founded = false;
-				// searching the item in the parent tool
-				if (preg_match($term,$variable_value)!==0) {
-					$founded = true;
-				}
-				if ($founded) {
-					//loading variable from the english array
-					$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
-					$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
-					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+                $founded = false;
+                // searching the item in the parent tool
+                if (preg_match($term,$variable_value)!==0) {
+                    $founded = true;
+                }
+                if ($founded) {
+                    //loading variable from the english array
+                    $sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
+                    $parent_variable_value = $parent_language_array[$lang_file][$name_variable];
+                    //config buttons
+                    $obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+                    $obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
-					//loading variable from the english array
-					$english_name_variable = $english_language_array[$lang_file][$name_variable];
-					$list_info[]=array($lang_file.'.inc.php',
-						$name_variable,
-						$english_name_variable,
-						$parent_variable_value,$obj_text,$obj_button);
-				}
-			}
-		}
-	}
+                    //loading variable from the english array
+                    $english_name_variable = $english_language_array[$lang_file][$name_variable];
+                    $list_info[]=array($lang_file.'.inc.php',
+                        $name_variable,
+                        $english_name_variable,
+                        $parent_variable_value,$obj_text,$obj_button);
+                }
+            }
+        }
+    }
 
-	$list_info = array_unique_dimensional($list_info);
-	return $list_info;
+    $list_info = array_unique_dimensional($list_info);
+    return $list_info;
 }
 
 // Allow see data in sort table
 $list_info = array();
 if (isset($_REQUEST['txt_search_word'])) {
-	//@todo fix to accept a char with 1 char
-	if (strlen(trim($_REQUEST['txt_search_word']))>2) {
-		$list_info = search_language_term(
-			$_REQUEST['txt_search_word'],
-			true,
-			true,
-			true,
-			true
-		);
-	}
+    //@todo fix to accept a char with 1 char
+    if (strlen(trim($_REQUEST['txt_search_word']))>2) {
+        $list_info = search_language_term(
+            $_REQUEST['txt_search_word'],
+            true,
+            true,
+            true,
+            true
+        );
+    }
 }
 
 $parameters = array(
-	'id' => intval($_GET['id']),
-	'sub_language_id' => intval($_GET['sub_language_id']),
-	'txt_search_word' => $txt_search_word
+    'id' => intval($_GET['id']),
+    'sub_language_id' => intval($_GET['sub_language_id']),
+    'txt_search_word' => $txt_search_word
 );
 $table = new SortableTableFromArrayConfig($list_info, 1,20,'data_info');
 $table->set_additional_parameters($parameters);

Spacing +39 added lines, -39 removed lines

@@ -11,7 +11,7 @@ 
 $this_section = SECTION_PLATFORM_ADMIN;
 
 api_protect_admin_script();
-$htmlHeadXtra[] ='<script type="text/javascript">
+$htmlHeadXtra[] = '<script type="text/javascript">
  $(document).ready(function() {
 	$(".save").click(function() {
 		button_name=$(this).attr("name");
@@ -53,14 +53,14 @@ 
 // setting the name of the tool
 $tool_name = get_lang('CreateSubLanguage');
 // setting breadcrumbs
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'languages.php', 'name' => get_lang('PlatformLanguages'));
 
 $sublanguage_folder_error = false;
 
-if (isset($_GET['id']) && $_GET['id']==strval(intval($_GET['id']))) {
-	$language_name              = SubLanguageManager::get_name_of_language_by_id ($_GET['id']);
-	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id ($_GET['sub_language_id']);
+if (isset($_GET['id']) && $_GET['id'] == strval(intval($_GET['id']))) {
+	$language_name              = SubLanguageManager::get_name_of_language_by_id($_GET['id']);
+	$sub_language_name          = SubLanguageManager::get_name_of_language_by_id($_GET['sub_language_id']);
 	$all_data_of_language       = SubLanguageManager::get_all_information_of_language($_GET['id']);
 	$all_data_of_sublanguage    = SubLanguageManager::get_all_information_of_language($_GET['sub_language_id']);
 	$sub_language_file          = api_get_path(SYS_LANG_PATH).$all_data_of_sublanguage['dokeos_folder'];
@@ -68,20 +68,20 @@ 
 	if (!file_exists($sub_language_file) || !is_writable($sub_language_file)) {
 		$sublanguage_folder_error = $sub_language_file.' '.get_lang('IsNotWritable');
 	}
-	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id'])===true) {
+	if (SubLanguageManager::check_if_exist_language_by_id($_GET['id']) === true) {
 		$language_id_exist = true;
 	} else {
 		$language_id_exist = false;
 	}
 } else {
-	$language_name='';
-	$language_id_exist=false;
+	$language_name = '';
+	$language_id_exist = false;
 }
 
 $intro = sprintf(get_lang('RegisterTermsOfSubLanguageForX'), strtolower($sub_language_name));
 $path_folder = api_get_path(SYS_LANG_PATH).$all_data_of_language['dokeos_folder'];
 
-if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder'])==0) {
+if (!is_dir($path_folder) || strlen($all_data_of_language['dokeos_folder']) == 0) {
 	api_not_allowed(true);
 }
 
@@ -102,16 +102,16 @@ 
 
 
 $txt_search_word = (!empty($_REQUEST['txt_search_word']) ? Security::remove_XSS($_REQUEST['txt_search_word']) : '');
-$html ='<div style="float:left" class="actions">';
-$html.='<form style="float:left"  id="Searchlanguage" name="Searchlanguage" method="GET" action="sub_language.php">';
-$html.='&nbsp;'.get_lang('OriginalName').'&nbsp; :&nbsp;';
+$html = '<div style="float:left" class="actions">';
+$html .= '<form style="float:left"  id="Searchlanguage" name="Searchlanguage" method="GET" action="sub_language.php">';
+$html .= '&nbsp;'.get_lang('OriginalName').'&nbsp; :&nbsp;';
 
-$html.='<input name="id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['id']).'" />';
-$html.='<input name="sub_language_id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['sub_language_id']).'" />';
-$html.='<input name="txt_search_word" type="text" size="50"  id="txt_search_word" value="'.$txt_search_word.'" />';
-$html.="&nbsp;".'<button name="SubmitSearchLanguage" class="search" type="submit">'.get_lang('Search').'</button>';
-$html.='</form>';
-$html.='</div>';
+$html .= '<input name="id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['id']).'" />';
+$html .= '<input name="sub_language_id" type="hidden"  id="id" value="'.Security::remove_XSS($_REQUEST['sub_language_id']).'" />';
+$html .= '<input name="txt_search_word" type="text" size="50"  id="txt_search_word" value="'.$txt_search_word.'" />';
+$html .= "&nbsp;".'<button name="SubmitSearchLanguage" class="search" type="submit">'.get_lang('Search').'</button>';
+$html .= '</form>';
+$html .= '</div>';
 echo $html;
 echo '<br /><br /><br />';
 if (!empty($sublanguage_folder_error)) {
@@ -148,7 +148,7 @@ 
 	$language_files_to_load_keys = array_flip($language_files_to_load);
 	$array_to_search = $parent_language_array;
 	$list_info = array();
-	$term='/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
+	$term = '/'.Security::remove_XSS(trim($_REQUEST['txt_search_word'])).'/i';
 	//@todo optimize this foreach
 	foreach ($language_files_to_load as $lang_file) {
 		//searching in parent language of the sub language
@@ -161,7 +161,7 @@ 
 				}
 				$founded = false;
 				// searching the item in the parent tool
-				if (preg_match($term,$parent_variable_value)!==0) {
+				if (preg_match($term, $parent_variable_value) !== 0) {
 					$founded = true;
 				}
 				if ($founded) {
@@ -177,11 +177,11 @@ 
 						$size =4;
 					}*/
 
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
+					$obj_text = '<textarea rows="10" cols="40" name="txt|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$parent_name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+					$obj_button = '<button class="save" type="button" name="btn|'.$parent_name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$parent_name_variable.'"  />'.get_lang('Save').'</button>';
 
 					$list_info[] = array(
-						$lang_file . '.inc.php',
+						$lang_file.'.inc.php',
 						$parent_name_variable,
 						$english_name_variable,
 						$parent_variable_value,
@@ -205,16 +205,16 @@ 
 				$founded = false;
 				if ($search_in_english && $search_in_variable) {
 					// searching the item in the parent tool
-					if (preg_match($term,$variable_value)!==0 || preg_match($term,$name_variable)!==0 ) {
+					if (preg_match($term, $variable_value) !== 0 || preg_match($term, $name_variable) !== 0) {
 						$founded = true;
 					}
 				} else {
 					if ($search_in_english) {
-						if (preg_match($term,$variable_value)!==0) {
+						if (preg_match($term, $variable_value) !== 0) {
 							$founded = true;
 						}
 					} else {
-						if (preg_match($term,$name_variable)!==0) {
+						if (preg_match($term, $name_variable) !== 0) {
 							$founded = true;
 						}
 					}
@@ -231,16 +231,16 @@ 
 						$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
 					}
 					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
+					$obj_text = '<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.
 						$sub_language_name_variable.'
 						</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+					$obj_button = '<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
 					//loading variable from the english array
 					$english_name_variable = $english_language_array[$lang_file][$name_variable];
 
 					$list_info[] = array(
-						$lang_file . '.inc.php',
+						$lang_file.'.inc.php',
 						$name_variable,
 						$english_name_variable,
 						$parent_variable_value,
@@ -261,7 +261,7 @@ 
 
 				$founded = false;
 				// searching the item in the parent tool
-				if (preg_match($term,$variable_value)!==0) {
+				if (preg_match($term, $variable_value) !== 0) {
 					$founded = true;
 				}
 				if ($founded) {
@@ -269,15 +269,15 @@ 
 					$sub_language_name_variable = $sub_language_array[$lang_file][$name_variable];
 					$parent_variable_value = $parent_language_array[$lang_file][$name_variable];
 					//config buttons
-					$obj_text='<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
-					$obj_button='<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
+					$obj_text = '<textarea rows="10" cols="40" name="txt|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="txtid_'.$language_files_to_load_keys[$lang_file].'_'.$name_variable.'" >'.$sub_language_name_variable.'</textarea>';
+					$obj_button = '<button class="save" type="button" name="btn|'.$name_variable.'|'.$language_files_to_load_keys[$lang_file].'" id="btnid_'.$name_variable.'"  />'.get_lang('Save').'</button>';
 
 					//loading variable from the english array
 					$english_name_variable = $english_language_array[$lang_file][$name_variable];
-					$list_info[]=array($lang_file.'.inc.php',
+					$list_info[] = array($lang_file.'.inc.php',
 						$name_variable,
 						$english_name_variable,
-						$parent_variable_value,$obj_text,$obj_button);
+						$parent_variable_value, $obj_text, $obj_button);
 				}
 			}
 		}
@@ -291,7 +291,7 @@ 
 $list_info = array();
 if (isset($_REQUEST['txt_search_word'])) {
 	//@todo fix to accept a char with 1 char
-	if (strlen(trim($_REQUEST['txt_search_word']))>2) {
+	if (strlen(trim($_REQUEST['txt_search_word'])) > 2) {
 		$list_info = search_language_term(
 			$_REQUEST['txt_search_word'],
 			true,
@@ -307,14 +307,14 @@ 
 	'sub_language_id' => intval($_GET['sub_language_id']),
 	'txt_search_word' => $txt_search_word
 );
-$table = new SortableTableFromArrayConfig($list_info, 1,20,'data_info');
+$table = new SortableTableFromArrayConfig($list_info, 1, 20, 'data_info');
 $table->set_additional_parameters($parameters);
 $table->set_header(0, get_lang('LanguageFile'));
 $table->set_header(1, get_lang('LanguageVariable'));
 $table->set_header(2, get_lang('EnglishName'));
 $table->set_header(3, get_lang('OriginalName'));
-$table->set_header(4, get_lang('SubLanguage'),false);
-$table->set_header(5, get_lang('Edit'),false);
+$table->set_header(4, get_lang('SubLanguage'), false);
+$table->set_header(5, get_lang('Edit'), false);
 $table->display();
 
 Display :: display_footer();

Braces +3 added lines, -2 removed lines

@@ -200,8 +200,9 @@
 					continue;
 				}
 
-				if (is_array($variable_value))
-					echo $lang_file;
+				if (is_array($variable_value)) {
+									echo $lang_file;
+				}
 				$founded = false;
 				if ($search_in_english && $search_in_variable) {
 					// searching the item in the parent tool

main/admin/extra_fields.php

Spacing +19 added lines, -19 removed lines

@@ -36,7 +36,7 @@ 
 $obj->setupBreadcrumb($interbreadcrumb, $action);
 
 //jqgrid will use this URL to do the selects
-$url = api_get_path(WEB_AJAX_PATH) . 'model.ajax.php?a=get_extra_fields&type=' . $extraFieldType;
+$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_extra_fields&type='.$extraFieldType;
 
 //The order is important you need to check the the $column variable in the model.ajax.php file
 $columns = $obj->getJqgridColumnNames();
@@ -64,43 +64,43 @@ 
         array(),
         $action_links,
         true
-    ). '
+    ).'
 
     $("#field_type").on("change", function() {
         id = $(this).val();
         switch(id) {
             case "1":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_text.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_text.png')).'");
                 break;
             case "2":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_text_area.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_text_area.png')).'");
                 break;
             case "3":
-                $("#example").html("' . addslashes(Display::return_icon('add_user_field_howto.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('add_user_field_howto.png')).'");
                 break;
             case "4":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_drop_down.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_drop_down.png')).'");
                 break;
             case "5":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_multidropdown.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_multidropdown.png')).'");
                 break;
             case "6":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')).'");
                 break;
             case "7":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_date_time.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_date_time.png')).'");
                 break;
             case "8":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_doubleselect.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_doubleselect.png')).'");
                 break;
             case "9":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_divider.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_divider.png')).'");
                 break;
             case "10":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_user_tag.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_user_tag.png')).'");
                 break;
             case "11":
-                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')) . '");
+                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')).'");
                 break;
         }
     });
@@ -119,7 +119,7 @@ 
         ) {
             api_not_allowed();
         }
-        $url = api_get_self() . '?type=' . $obj->type . '&action=' . Security::remove_XSS($_GET['action']);
+        $url = api_get_self().'?type='.$obj->type.'&action='.Security::remove_XSS($_GET['action']);
         $form = $obj->return_form($url, 'add');
 
         // The validation or display
@@ -135,8 +135,8 @@ 
             $obj->display();
         } else {
             echo '<div class="actions">';
-            echo '<a href="' . api_get_self() . '?type=' . $obj->type . '">' .
-            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM) . '</a>';
+            echo '<a href="'.api_get_self().'?type='.$obj->type.'">'.
+            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '</div>';
             $form->addElement('hidden', 'sec_token');
             $form->setConstants(array('sec_token' => $token));
@@ -145,7 +145,7 @@ 
         break;
     case 'edit':
         // Action handling: Editing
-        $url = api_get_self() . '?type=' . $obj->type . '&action=' . Security::remove_XSS($_GET['action']) . '&id=' . intval($_GET['id']);
+        $url = api_get_self().'?type='.$obj->type.'&action='.Security::remove_XSS($_GET['action']).'&id='.intval($_GET['id']);
         $form = $obj->return_form($url, 'edit');
 
         // The validation or display
@@ -159,8 +159,8 @@ 
             $obj->display();
         } else {
             echo '<div class="actions">';
-            echo '<a href="' . api_get_self() . '?type=' . $obj->type . '">' .
-            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM) . '</a>';
+            echo '<a href="'.api_get_self().'?type='.$obj->type.'">'.
+            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
             echo '</div>';
             $form->addElement('hidden', 'sec_token');
             $form->setConstants(array('sec_token' => $token));

main/admin/user_add.php

Indentation +69 added lines, -69 removed lines

@@ -149,27 +149,27 @@ 
 $form = new FormValidator('user_add');
 $form->addElement('header', '', $tool_name);
 if (api_is_western_name_order()) {
-	// Firstname
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
-	$form->applyFilter('firstname', 'html_filter');
-	$form->applyFilter('firstname', 'trim');
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
-	// Lastname
-	$form->addElement('text', 'lastname', get_lang('LastName'));
-	$form->applyFilter('lastname', 'html_filter');
-	$form->applyFilter('lastname', 'trim');
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
+    // Firstname
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
+    $form->applyFilter('firstname', 'html_filter');
+    $form->applyFilter('firstname', 'trim');
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
+    // Lastname
+    $form->addElement('text', 'lastname', get_lang('LastName'));
+    $form->applyFilter('lastname', 'html_filter');
+    $form->applyFilter('lastname', 'trim');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
 } else {
-	// Lastname
-	$form->addElement('text', 'lastname', get_lang('LastName'));
-	$form->applyFilter('lastname', 'html_filter');
-	$form->applyFilter('lastname', 'trim');
-	$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
-	// Firstname
-	$form->addElement('text', 'firstname', get_lang('FirstName'));
-	$form->applyFilter('firstname', 'html_filter');
-	$form->applyFilter('firstname', 'trim');
-	$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
+    // Lastname
+    $form->addElement('text', 'lastname', get_lang('LastName'));
+    $form->applyFilter('lastname', 'html_filter');
+    $form->applyFilter('lastname', 'trim');
+    $form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
+    // Firstname
+    $form->addElement('text', 'firstname', get_lang('FirstName'));
+    $form->applyFilter('firstname', 'html_filter');
+    $form->applyFilter('firstname', 'trim');
+    $form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
 }
 // Official code
 $form->addElement('text', 'official_code', get_lang('OfficialCode'), array('size' => '40'));
@@ -224,7 +224,7 @@ 
 $auth_sources = 0; //make available wider as we need it in case of form reset (see below)
 $nb_ext_auth_source_added = 0;
 if (isset($extAuthSource) && count($extAuthSource) > 0) {
-	$auth_sources = array();
+    $auth_sources = array();
     foreach ($extAuthSource as $key => $info) {
         // @todo : make uniform external authentification configuration (ex : cas and external_login ldap)
         // Special case for CAS. CAS is activated from Chamilo > Administration > Configuration > CAS
@@ -235,10 +235,10 @@ 
             $nb_ext_auth_source_added++;
         }
     }
-	if ($nb_ext_auth_source_added > 0) {
-    	$group[] = $form->createElement('radio', 'password_auto', null, get_lang('ExternalAuthentication').' ', 2);
-    	$group[] = $form->createElement('select', 'auth_source', null, $auth_sources);
-    	$group[] = $form->createElement('static', '', '', '<br />');
+    if ($nb_ext_auth_source_added > 0) {
+        $group[] = $form->createElement('radio', 'password_auto', null, get_lang('ExternalAuthentication').' ', 2);
+        $group[] = $form->createElement('select', 'auth_source', null, $auth_sources);
+        $group[] = $form->createElement('static', '', '', '<br />');
     }
 }
 
@@ -307,12 +307,12 @@ 
 $form->addElement('html', '<div id="drh_list" style="display:'.$display.';">');
 
 if (isset($drh_list) && is_array($drh_list)) {
-	foreach ($drh_list as $drh) {
+    foreach ($drh_list as $drh) {
         $drh_select->addOption(
             api_get_person_name($drh['firstname'], $drh['lastname']),
             $drh['user_id']
         );
-	}
+    }
 }
 $form->addElement('html', '</div>');
 
@@ -386,7 +386,7 @@ 
 
 // Validate form
 if ($form->validate()) {
-	$check = Security::check_token('post');
+    $check = Security::check_token('post');
     if ($check) {
         $user = $form->exportValues();
         $lastname = $user['lastname'];
@@ -402,15 +402,15 @@ 
         $send_mail = intval($user['mail']['send_mail']);
         $hr_dept_id = isset($user['hr_dept_id']) ? intval($user['hr_dept_id']) : 0;
 
-		if (isset($extAuthSource) && count($extAuthSource) > 0 &&
+        if (isset($extAuthSource) && count($extAuthSource) > 0 &&
             $user['password']['password_auto'] == '2'
         ) {
-			$auth_source = $user['password']['auth_source'];
-			$password = 'PLACEHOLDER';
-		} else {
-			$auth_source = PLATFORM_AUTH_SOURCE;
-			$password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
-		}
+            $auth_source = $user['password']['auth_source'];
+            $password = 'PLACEHOLDER';
+        } else {
+            $auth_source = PLATFORM_AUTH_SOURCE;
+            $password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
+        }
 
         if ($user['radio_expiration_date'] == '1') {
             $expiration_date = $user['expiration_date'];
@@ -418,7 +418,7 @@ 
             $expiration_date = null;
         }
 
-		$active = intval($user['active']);
+        $active = intval($user['active']);
 
         if (api_get_setting('login_is_email') == 'true') {
             $username = $email;
@@ -449,21 +449,21 @@ 
             $extra,
             null,
             $send_mail,
-			$platform_admin
+            $platform_admin
         );
 
-		Security::clear_token();
-		$tok = Security::get_token();
-		if ($user_id === false) {
-			//If any error ocurred during user creation, print it (api_failureList
-			// stores values as separate words, so rework it
-			$message = '';
-			$message_bits = explode(' ',api_get_last_failure());
-			foreach ($message_bits as $bit) {
-				$message .= ucfirst($bit);
-			}
-		} else {
- 			if (!empty($picture['name'])) {
+        Security::clear_token();
+        $tok = Security::get_token();
+        if ($user_id === false) {
+            //If any error ocurred during user creation, print it (api_failureList
+            // stores values as separate words, so rework it
+            $message = '';
+            $message_bits = explode(' ',api_get_last_failure());
+            foreach ($message_bits as $bit) {
+                $message .= ucfirst($bit);
+            }
+        } else {
+                if (!empty($picture['name'])) {
                 $picture_uri = UserManager::update_user_picture(
                     $user_id,
                     $_FILES['picture']['name'],
@@ -489,35 +489,35 @@ 
                     null,
                     $language
                 );
-			}
+            }
 
             $extraFieldValues = new ExtraFieldValue('user');
             $user['item_id'] = $user_id;
             $extraFieldValues->saveFieldValues($user);
 
-			$message = get_lang('UserAdded');
-		}
-		if (isset($user['submit_plus'])) {
-			//we want to add more. Prepare report message and redirect to the same page (to clean the form)
-			header('Location: user_add.php?message='.urlencode($message).'&sec_token='.$tok);
-			exit ();
-		} else {
-			$tok = Security::get_token();
-			header('Location: user_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
-			exit ();
-		}
-	}
+            $message = get_lang('UserAdded');
+        }
+        if (isset($user['submit_plus'])) {
+            //we want to add more. Prepare report message and redirect to the same page (to clean the form)
+            header('Location: user_add.php?message='.urlencode($message).'&sec_token='.$tok);
+            exit ();
+        } else {
+            $tok = Security::get_token();
+            header('Location: user_list.php?action=show_message&message='.urlencode($message).'&sec_token='.$tok);
+            exit ();
+        }
+    }
 } else {
-	if (isset($_POST['submit'])) {
-		Security::clear_token();
-	}
-	$token = Security::get_token();
-	$form->addElement('hidden', 'sec_token');
-	$form->setConstants(array('sec_token' => $token));
+    if (isset($_POST['submit'])) {
+        Security::clear_token();
+    }
+    $token = Security::get_token();
+    $form->addElement('hidden', 'sec_token');
+    $form->setConstants(array('sec_token' => $token));
 }
 
 if (!empty($message)){
-	$message = Display::return_message(stripslashes($message));
+    $message = Display::return_message(stripslashes($message));
 }
 $content = $form->returnForm();
 

Spacing +10 added lines, -10 removed lines

@@ -42,8 +42,8 @@ 
     });
     </script>';
 }
-$htmlHeadXtra[] = '<link  href="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
-$htmlHeadXtra[] = '<script src="'. api_get_path(WEB_PATH) .'web/assets/cropper/dist/cropper.min.js"></script>';
+$htmlHeadXtra[] = '<link  href="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.css" rel="stylesheet">';
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_PATH).'web/assets/cropper/dist/cropper.min.js"></script>';
 $htmlHeadXtra[] = '<script>
 $(document).ready(function() {
     var $image = $("#previewImage");
@@ -183,7 +183,7 @@ 
 }
 
 if (api_get_setting('login_is_email') == 'true') {
-    $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
+    $form->addRule('email', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
     $form->addRule('email', get_lang('UserTaken'), 'username_available');
 }
 
@@ -191,7 +191,7 @@ 
 $form->addElement('text', 'phone', get_lang('PhoneNumber'));
 // Picture
 $form->addElement('file', 'picture', get_lang('AddImage'), array('id' => 'picture', 'class' => 'picture-form'));
-$allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
+$allowed_picture_types = array('jpg', 'jpeg', 'png', 'gif');
 
 $form->addHtml(''
             . '<div class="form-group">'
@@ -214,7 +214,7 @@ 
 if (api_get_setting('login_is_email') != 'true') {
     $form->addElement('text', 'username', get_lang('LoginName'), array('id'=> 'username', 'maxlength' => USERNAME_MAX_LENGTH, 'autocomplete' => 'off'));
     $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
-    $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
+    $form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string) USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
     $form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
     $form->addRule('username', get_lang('UserTaken'), 'username_available');
 }
@@ -301,7 +301,7 @@ 
 );
 
 //drh list (display only if student)
-$display = isset($_POST['status']) && $_POST['status'] == STUDENT  || !isset($_POST['status']) ? 'block' : 'none';
+$display = isset($_POST['status']) && $_POST['status'] == STUDENT || !isset($_POST['status']) ? 'block' : 'none';
 
 //@todo remove the drh list here. This code is unused
 $form->addElement('html', '<div id="drh_list" style="display:'.$display.';">');
@@ -335,7 +335,7 @@ 
 $form->addGroup($group, 'mail', get_lang('SendMailToNewUser'), '&nbsp;');
 // Expiration Date
 $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
-$group = array ();
+$group = array();
 $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
 $group[] = $form->createElement(
     'DateTimePicker',
@@ -356,7 +356,7 @@ 
 $jquery_ready_content = $returnParams['jquery_ready_content'];
 
 // the $jquery_ready_content variable collects all functions that will be load in the $(document).ready javascript function
-$htmlHeadXtra[] ='<script>
+$htmlHeadXtra[] = '<script>
 $(document).ready(function(){
 	'.$jquery_ready_content.'
 });
@@ -458,7 +458,7 @@ 
 			//If any error ocurred during user creation, print it (api_failureList
 			// stores values as separate words, so rework it
 			$message = '';
-			$message_bits = explode(' ',api_get_last_failure());
+			$message_bits = explode(' ', api_get_last_failure());
 			foreach ($message_bits as $bit) {
 				$message .= ucfirst($bit);
 			}
@@ -516,7 +516,7 @@ 
 	$form->setConstants(array('sec_token' => $token));
 }
 
-if (!empty($message)){
+if (!empty($message)) {
 	$message = Display::return_message(stripslashes($message));
 }
 $content = $form->returnForm();