chamilo / chamilo-lms

main/admin/course_import.php

Spacing +4 added lines, -4 removed lines

@@ -12,13 +12,13 @@
  */
 function validate_data($courses)
 {
-    $errors = array ();
-    $coursecodes = array ();
+    $errors = array();
+    $coursecodes = array();
     foreach ($courses as $index => $course) {
-        $course['line'] = $index +1;
+        $course['line'] = $index + 1;
 
         // 1. Check whether mandatory fields are set.
-        $mandatory_fields = array ('Code', 'Title', 'CourseCategory');
+        $mandatory_fields = array('Code', 'Title', 'CourseCategory');
         foreach ($mandatory_fields as $field) {
             if (!isset($course[$field]) || strlen($course[$field]) == 0) {
                 $course['error'] = get_lang($field.'Mandatory');

Doc Comments +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
 /**
  * Read the CSV-file
  * @param string $file Path to the CSV-file
- * @return array All course-information read from the file
+ * @return Ddeboer\DataImport\Reader\CsvReader All course-information read from the file
  */
 function parse_csv_data($file)
 {

main/admin/subscribe_user2class.php

Spacing +9 added lines, -9 removed lines

@@ -32,16 +32,16 @@ 
 $result = Database::query($sql);
 
 if (!list ($class_name) = Database::fetch_row($result)) {
-    header('Location: class_list.php?filtreCours=' . urlencode($course));
+    header('Location: class_list.php?filtreCours='.urlencode($course));
     exit();
 }
 
 $noPHP_SELF = true;
 
-$tool_name = get_lang('AddUsersToAClass') . ' (' . $class_name . ')';
+$tool_name = get_lang('AddUsersToAClass').' ('.$class_name.')';
 
 $interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array("url" => "class_list.php?filtreCours=" . urlencode($course), "name" => get_lang('AdminClasses'));
+$interbreadcrumb[] = array("url" => "class_list.php?filtreCours=".urlencode($course), "name" => get_lang('AdminClasses'));
 
 if ($_POST['formSent']) {
     $form_sent = $_POST['formSent'];
@@ -59,7 +59,7 @@ 
                 foreach ($left_user_list as $user_id) {
                     ClassManager :: add_user($user_id, $class_id);
                 }
-                header('Location: class_list.php?filtreCours=' . urlencode($course));
+                header('Location: class_list.php?filtreCours='.urlencode($course));
                 exit();
             }
         } elseif ($remove_from_class) {
@@ -69,7 +69,7 @@ 
                 foreach ($right_user_list as $index => $user_id) {
                     ClassManager :: unsubscribe_user($user_id, $class_id);
                 }
-                header('Location: class_list.php?filtreCours=' . urlencode($course));
+                header('Location: class_list.php?filtreCours='.urlencode($course));
                 exit();
             }
         }
@@ -78,10 +78,10 @@ 
 Display :: display_header($tool_name);
 //api_display_tool_title($tool_name);
 $target_name = api_sort_by_first_name() ? 'firstname' : 'lastname';
-$sql = "SELECT u.user_id,lastname,firstname,username FROM $tbl_user u LEFT JOIN $tbl_class_user cu ON u.user_id=cu.user_id AND class_id='$class_id' WHERE " . $target_name . " LIKE '" . $first_letter_left . "%' AND class_id IS NULL ORDER BY " . (count($left_user_list) > 0 ? "(user_id IN(" . implode(',', $left_user_list) . ")) DESC," : "") . " " . $target_name;
+$sql = "SELECT u.user_id,lastname,firstname,username FROM $tbl_user u LEFT JOIN $tbl_class_user cu ON u.user_id=cu.user_id AND class_id='$class_id' WHERE ".$target_name." LIKE '".$first_letter_left."%' AND class_id IS NULL ORDER BY ".(count($left_user_list) > 0 ? "(user_id IN(".implode(',', $left_user_list).")) DESC," : "")." ".$target_name;
 $result = Database::query($sql);
 $left_users = Database::store_result($result);
-$sql = "SELECT u.user_id,lastname,firstname,username FROM $tbl_user u,$tbl_class_user cu WHERE cu.user_id=u.user_id AND class_id='$class_id' AND " . $target_name . " LIKE '" . $first_letter_right . "%' ORDER BY " . (count($right_user_list) > 0 ? "(user_id IN(" . implode(',', $right_user_list) . ")) DESC," : "") . " " . $target_name;
+$sql = "SELECT u.user_id,lastname,firstname,username FROM $tbl_user u,$tbl_class_user cu WHERE cu.user_id=u.user_id AND class_id='$class_id' AND ".$target_name." LIKE '".$first_letter_right."%' ORDER BY ".(count($right_user_list) > 0 ? "(user_id IN(".implode(',', $right_user_list).")) DESC," : "")." ".$target_name;
 $result = Database::query($sql);
 $right_users = Database::store_result($result);
 if (!empty($error_message)) {
@@ -122,7 +122,7 @@ 
                 <?php
                 foreach ($left_users as $user) {
                     ?>
-                        <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $left_user_list)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($user['firstname'], $user['lastname']) . ' (' . $user['username'] . ')'; ?></option>
+                        <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $left_user_list)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?></option>
                         <?php
                     }
                     ?>
@@ -138,7 +138,7 @@ 
                     <?php
                     foreach ($right_users as $user) {
                         ?>
-                        <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $right_user_list)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($user['firstname'], $user['lastname']) . ' (' . $user['username'] . ')'; ?></option>
+                        <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $right_user_list)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')'; ?></option>
     <?php
 }
 ?>

Braces +11 added lines, -5 removed lines

@@ -63,9 +63,9 @@ 
                 exit();
             }
         } elseif ($remove_from_class) {
-            if (count($right_user_list) == 0)
-                $error_message = get_lang('AtLeastOneUser');
-            else {
+            if (count($right_user_list) == 0) {
+                            $error_message = get_lang('AtLeastOneUser');
+            } else {
                 foreach ($right_user_list as $index => $user_id) {
                     ClassManager :: unsubscribe_user($user_id, $class_id);
                 }
@@ -122,7 +122,10 @@ 
                 <?php
                 foreach ($left_users as $user) {
                     ?>
-                        <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $left_user_list)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($user['firstname'], $user['lastname']) . ' (' . $user['username'] . ')'; ?></option>
+                        <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $left_user_list)) {
+    echo 'selected="selected"';
+}
+?>><?php echo api_get_person_name($user['firstname'], $user['lastname']) . ' (' . $user['username'] . ')'; ?></option>
                         <?php
                     }
                     ?>
@@ -138,7 +141,10 @@ 
                     <?php
                     foreach ($right_users as $user) {
                         ?>
-                        <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $right_user_list)) echo 'selected="selected"'; ?>><?php echo api_get_person_name($user['firstname'], $user['lastname']) . ' (' . $user['username'] . ')'; ?></option>
+                        <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $right_user_list)) {
+    echo 'selected="selected"';
+}
+?>><?php echo api_get_person_name($user['firstname'], $user['lastname']) . ' (' . $user['username'] . ')'; ?></option>
     <?php
 }
 ?>

main/admin/subscribe_user2course.php

Indentation +4 added lines, -4 removed lines

@@ -263,7 +263,7 @@ 
       <option value="">--</option>
       <?php
         echo Display :: get_alphabet_options($first_letter_user);
-      ?>
+        ?>
      </select>
     </td>
     <td width="20%">&nbsp;</td>
@@ -274,8 +274,8 @@ 
      <select name="firstLetterCourse" onchange="javascript:document.formulaire.form_sent.value='2'; document.formulaire.submit();">
       <option value="">--</option>
       <?php
-      echo Display :: get_alphabet_options($first_letter_course);
-      ?>
+        echo Display :: get_alphabet_options($first_letter_course);
+        ?>
      </select>
     </td>
    </tr>
@@ -295,7 +295,7 @@ 
         }
 
         echo $userName;
-      ?>
+        ?>
       </option>
 <?php
 }

Braces +8 added lines, -2 removed lines

@@ -287,7 +287,10 @@ 
     <td width="40%" align="center">
      <select name="UserList[]" multiple="multiple" size="20" style="width:300px;">
     <?php foreach ($db_users as $user) { ?>
-          <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) echo 'selected="selected"'; ?>>
+          <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) {
+    echo 'selected="selected"';
+}
+?>>
       <?php
         $userName = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')';
         if ($showOfficialCode) {
@@ -308,7 +311,10 @@ 
    <td width="40%" align="center">
     <select name="CourseList[]" multiple="multiple" size="20" style="width:300px;">
     <?php foreach ($db_courses as $course) { ?>
-         <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>>
+         <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) {
+    echo 'selected="selected"';
+}
+?>>
              <?php echo '('.$course['visual_code'].') '.$course['title']; ?>
          </option>
     <?php } ?>

Spacing +15 added lines, -15 removed lines

@@ -30,7 +30,7 @@ 
 
 /* Header */
 $tool_name = get_lang('AddUsersToACourse');
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
 
 $htmlHeadXtra[] = '<script>
 function validate_filter() {
@@ -142,12 +142,12 @@ 
                 if (isset($_POST[$varname]) && $_POST[$varname] != '0') {
                     $use_extra_fields = true;
                     if ($fieldtype == ExtraField::FIELD_TYPE_TAG) {
-                        $extra_field_result[]= UserManager::get_extra_user_data_by_tags(
+                        $extra_field_result[] = UserManager::get_extra_user_data_by_tags(
                             intval($_POST['field_id']),
                             $_POST[$varname]
                         );
                     } else {
-                        $extra_field_result[]= UserManager::get_extra_user_data_by_value(
+                        $extra_field_result[] = UserManager::get_extra_user_data_by_value(
                             $new_field['variable'],
                             $_POST[$varname]
                         );
@@ -163,8 +163,8 @@ 
     $final_result = array();
     if (count($extra_field_result) > 1) {
         for ($i = 0; $i < count($extra_field_result) - 1; $i++) {
-            if (is_array($extra_field_result[$i+1])) {
-                $final_result  = array_intersect($extra_field_result[$i], $extra_field_result[$i+1]);
+            if (is_array($extra_field_result[$i + 1])) {
+                $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i + 1]);
             }
         }
     } else {
@@ -172,14 +172,14 @@ 
     }
 
     if (api_is_multiple_url_enabled()) {
-        if (is_array($final_result) && count($final_result)>0) {
-            $where_filter = " AND u.user_id IN  ('".implode("','",$final_result)."') ";
+        if (is_array($final_result) && count($final_result) > 0) {
+            $where_filter = " AND u.user_id IN  ('".implode("','", $final_result)."') ";
         } else {
             //no results
             $where_filter = " AND u.user_id  = -1";
         }
     } else {
-        if (is_array($final_result) && count($final_result)>0) {
+        if (is_array($final_result) && count($final_result) > 0) {
             $where_filter = " AND user_id IN  ('".implode("','", $final_result)."') ";
         } else {
             //no results
@@ -200,10 +200,10 @@ 
 $sql = "SELECT user_id, lastname, firstname, username, official_code
         FROM $tbl_user
         WHERE user_id<>2 AND ".$target_name." LIKE '".$first_letter_user."%' $where_filter
-        ORDER BY ". (count($users) > 0 ? "(user_id IN(".implode(',', $users).")) DESC," : "")." ".$orderBy;
+        ORDER BY ".(count($users) > 0 ? "(user_id IN(".implode(',', $users).")) DESC," : "")." ".$orderBy;
 
 if (api_is_multiple_url_enabled()) {
-    $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+    $tbl_user_rel_access_url = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
     $access_url_id = api_get_current_access_url_id();
     if ($access_url_id != -1) {
         $sql = "SELECT u.user_id,lastname,firstname,username, official_code
@@ -215,7 +215,7 @@ 
                     access_url_id =  $access_url_id AND
                     (".$target_name." LIKE '".$first_letter_user."%' )
                     $where_filter
-                ORDER BY ". (count($users) > 0 ? "(u.user_id IN(".implode(',', $users).")) DESC," : "")." ".$orderBy;
+                ORDER BY ".(count($users) > 0 ? "(u.user_id IN(".implode(',', $users).")) DESC," : "")." ".$orderBy;
     }
 }
 
@@ -258,8 +258,8 @@ 
             $fieldtype = $new_field['type'];
             echo '&nbsp;<select name="'.$varname.'">';
             echo '<option value="0">--'.get_lang('Select').'--</option>';
-            foreach	($new_field['data'] as $option) {
-                $checked='';
+            foreach ($new_field['data'] as $option) {
+                $checked = '';
                 if ($fieldtype == ExtraField::FIELD_TYPE_TAG) {
                     if (isset($_POST[$varname])) {
                         if ($_POST[$varname] == $option['tag']) {
@@ -317,7 +317,7 @@ 
     <td width="40%" align="center">
      <select name="UserList[]" multiple="multiple" size="20" style="width:300px;">
     <?php foreach ($db_users as $user) { ?>
-          <option value="<?php echo $user['user_id']; ?>" <?php if(in_array($user['user_id'],$users)) echo 'selected="selected"'; ?>>
+          <option value="<?php echo $user['user_id']; ?>" <?php if (in_array($user['user_id'], $users)) echo 'selected="selected"'; ?>>
       <?php
         $userName = api_get_person_name($user['firstname'], $user['lastname']).' ('.$user['username'].')';
         if ($showOfficialCode) {
@@ -338,7 +338,7 @@ 
    <td width="40%" align="center">
     <select name="CourseList[]" multiple="multiple" size="20" style="width:300px;">
     <?php foreach ($db_courses as $course) { ?>
-         <option value="<?php echo $course['code']; ?>" <?php if(in_array($course['code'],$courses)) echo 'selected="selected"'; ?>>
+         <option value="<?php echo $course['code']; ?>" <?php if (in_array($course['code'], $courses)) echo 'selected="selected"'; ?>>
              <?php echo '('.$course['visual_code'].') '.$course['title']; ?>
          </option>
     <?php } ?>

main/admin/teacher_time_report.php

Spacing +1 added lines, -1 removed lines

@@ -295,7 +295,7 @@
 if (isset($_GET['export'])) {
     $dataToExport = $timeReport->prepareDataToExport($withFilter);
 
-    $fileName = get_lang('TeacherTimeReport') . ' ' . api_get_local_time();
+    $fileName = get_lang('TeacherTimeReport').' '.api_get_local_time();
 
     switch ($_GET['export']) {
         case 'pdf':

main/admin/skills_gradebook.php

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
                         array('name'=>'certificate',    'index'=>'certificate', 'width'=>'25', 'align'=>'left', 'sortable'=>'false'),
                         array('name'=>'skills',         'index'=>'skills',      'width'=>'300', 'align'=>'left', 'sortable'=>'false'),
                         array('name'=>'actions',        'index'=>'actions',     'width'=>'30', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false')
-                       );
+                        );
 //Autowidth
 $extra_params['autowidth'] = 'true';
 //height auto

Spacing +11 added lines, -11 removed lines

@@ -25,9 +25,9 @@ 
 // setting breadcrumbs
 
 $tool_name = get_lang('SkillsAndGradebooks');
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
 if ($action == 'add_skill') {
-    $interbreadcrumb[]=array('url' => 'skills_gradebook.php','name' => get_lang('SkillsAndGradebooks'));
+    $interbreadcrumb[] = array('url' => 'skills_gradebook.php', 'name' => get_lang('SkillsAndGradebooks'));
     $tool_name = get_lang('Add');
 }
 
@@ -46,10 +46,10 @@ 
 
 //Column config
 $column_model   = array(
-                        array('name'=>'name',           'index'=>'name',        'width'=>'150', 'align'=>'left'),
-                        array('name'=>'certificate',    'index'=>'certificate', 'width'=>'25', 'align'=>'left', 'sortable'=>'false'),
-                        array('name'=>'skills',         'index'=>'skills',      'width'=>'300', 'align'=>'left', 'sortable'=>'false'),
-                        array('name'=>'actions',        'index'=>'actions',     'width'=>'30', 'align'=>'left','formatter'=>'action_formatter','sortable'=>'false')
+                        array('name'=>'name', 'index'=>'name', 'width'=>'150', 'align'=>'left'),
+                        array('name'=>'certificate', 'index'=>'certificate', 'width'=>'25', 'align'=>'left', 'sortable'=>'false'),
+                        array('name'=>'skills', 'index'=>'skills', 'width'=>'300', 'align'=>'left', 'sortable'=>'false'),
+                        array('name'=>'actions', 'index'=>'actions', 'width'=>'30', 'align'=>'left', 'formatter'=>'action_formatter', 'sortable'=>'false')
                        );
 //Autowidth
 $extra_params['autowidth'] = 'true';
@@ -60,9 +60,9 @@ 
 $action_links = 'function action_formatter(cellvalue, options, rowObject) {
                         //certificates
                         if (rowObject[4] == 1) {
-                            return \'<a href="?action=add_skill&id=\'+options.rowId+\'">'.Display::return_icon('add.png', get_lang('AddSkill'),'',ICON_SIZE_SMALL).'</a>'.'\';
+                            return \'<a href="?action=add_skill&id=\'+options.rowId+\'">'.Display::return_icon('add.png', get_lang('AddSkill'), '', ICON_SIZE_SMALL).'</a>'.'\';
                         } else {
-                            return \''.Display::return_icon('add_na.png', get_lang('YourGradebookFirstNeedsACertificateInOrderToBeLinkedToASkill'),'',ICON_SIZE_SMALL).''.'\';
+                            return \''.Display::return_icon('add_na.png', get_lang('YourGradebookFirstNeedsACertificateInOrderToBeLinkedToASkill'), '', ICON_SIZE_SMALL).''.'\';
                         }
                  }';
 ?>
@@ -70,14 +70,14 @@ 
 $(function() {
 <?php
     // grid definition see the $career->display() function
-    echo Display::grid_js('gradebooks', $url, $columns, $column_model, $extra_params, array(), $action_links,true);
+    echo Display::grid_js('gradebooks', $url, $columns, $column_model, $extra_params, array(), $action_links, true);
 ?>
 });
 </script>
 <?php
 $gradebook = new Gradebook();
 
-switch($action) {
+switch ($action) {
     case 'display':
         $gradebook->display();
         break;
@@ -85,7 +85,7 @@ 
         $id = isset($_REQUEST['id']) ? $_REQUEST['id'] : null;
         $gradebook_info = $gradebook->get($id);
         $url  = api_get_self().'?action='.$action.'&id='.$id;
-        $form =  $gradebook->show_skill_form($id, $url, $gradebook_info['name']);
+        $form = $gradebook->show_skill_form($id, $url, $gradebook_info['name']);
         if ($form->validate()) {
             $values = $form->exportValues();
             $res    = $gradebook->update_skills_to_gradebook($values['id'], $values['skill']);

main/admin/access_url_edit_users_to_url.php

Spacing +16 added lines, -16 removed lines

@@ -62,7 +62,7 @@ 
 function send() {
 	if (document.formulaire.access_url_id.value!=0) {
 		document.formulaire.form_sent.value=0;
-		document.formulaire.add_type.value=\'' . $add_type . '\';
+		document.formulaire.add_type.value=\'' . $add_type.'\';
 		document.formulaire.submit();
 	}
 }
@@ -92,23 +92,23 @@ 
     }
     if ($form_sent == 1) {
         if ($access_url_id == 0) {
-            header('Location: access_url_edit_users_to_url.php?action=show_message&message=' . get_lang('SelectURL'));
+            header('Location: access_url_edit_users_to_url.php?action=show_message&message='.get_lang('SelectURL'));
             exit;
         } elseif (is_array($UserList)) {
             $result = UrlManager::update_urls_rel_user($UserList, $access_url_id);
             $url_info = UrlManager::get_url_data_from_id($access_url_id);
             if (!empty($result)) {
-                $message .= 'URL: ' . $url_info['url'] . '<br />';
+                $message .= 'URL: '.$url_info['url'].'<br />';
             }
 
             if (!empty($result['users_added'])) {
-                $message .= '<h4>' . get_lang('UsersAdded') . ':</h4>';
+                $message .= '<h4>'.get_lang('UsersAdded').':</h4>';
                 $i = 1;
                 $user_added_list = array();
                 foreach ($result['users_added'] as $user) {
                     $user_info = api_get_user_info($user);
                     if (!empty($user_info)) {
-                        $user_added_list[] = $i . '. ' . api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, null, null, $user_info['username']);
+                        $user_added_list[] = $i.'. '.api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, null, null, $user_info['username']);
                         $i++;
                     }
                 }
@@ -118,13 +118,13 @@ 
             }
 
             if (!empty($result['users_deleted'])) {
-                $message .= '<br /><h4>' . get_lang('UsersDeleted') . ': </h4>';
+                $message .= '<br /><h4>'.get_lang('UsersDeleted').': </h4>';
                 $user_deleted_list = array();
                 $i = 1;
                 foreach ($result['users_deleted'] as $user) {
                     $user_info = api_get_user_info($user);
                     if (!empty($user_info)) {
-                        $user_deleted_list [] = $i . '. ' . api_get_person_name($user_info['firstname'], $user_info['lastname']);
+                        $user_deleted_list [] = $i.'. '.api_get_person_name($user_info['firstname'], $user_info['lastname']);
                         $i++;
                     }
                 }
@@ -143,7 +143,7 @@ 
 }
 
 echo '<div class="actions">';
-echo Display::url(Display::return_icon('view_more_stats.gif', get_lang('AddUserToURL'), ''), api_get_path(WEB_CODE_PATH) . 'admin/access_url_add_users_to_url.php');
+echo Display::url(Display::return_icon('view_more_stats.gif', get_lang('AddUserToURL'), ''), api_get_path(WEB_CODE_PATH).'admin/access_url_add_users_to_url.php');
 echo '</div>';
 
 api_display_tool_title($tool_name);
@@ -171,7 +171,7 @@ 
     }
 
     $sql = "SELECT u.user_id, lastname, firstname, username
-	  	  	FROM $tbl_user u WHERE status <> " . ANONYMOUS . " " .
+	  	  	FROM $tbl_user u WHERE status <> ".ANONYMOUS." ".
             $order_clause;
     $result = Database::query($sql);
     $Users = Database::store_result($result);
@@ -184,11 +184,11 @@ 
 }
 
 if ($add_type == 'multiple') {
-    $link_add_type_unique = '<a href="' . api_get_self() . '?add_type=unique&access_url_id=' . $access_url_id . '">' . get_lang('SessionAddTypeUnique') . '</a>';
+    $link_add_type_unique = '<a href="'.api_get_self().'?add_type=unique&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeUnique').'</a>';
     $link_add_type_multiple = get_lang('SessionAddTypeMultiple');
 } else {
     $link_add_type_unique = get_lang('SessionAddTypeUnique');
-    $link_add_type_multiple = '<a href="' . api_get_self() . '?add_type=multiple&access_url_id=' . $access_url_id . '">' . get_lang('SessionAddTypeMultiple') . '</a>';
+    $link_add_type_multiple = '<a href="'.api_get_self().'?add_type=multiple&access_url_id='.$access_url_id.'">'.get_lang('SessionAddTypeMultiple').'</a>';
 }
 $url_list = UrlManager::get_url_data();
 ?>
@@ -200,7 +200,7 @@ 
 <form name="formulaire" method="post" action="<?php echo api_get_self(); ?>" style="margin:0px;" <?php if ($ajax_search) {
     echo ' onsubmit="valide();"';
 } ?> >
-    <?php echo get_lang('SelectUrl') . ' : '; ?>
+    <?php echo get_lang('SelectUrl').' : '; ?>
 <select name="access_url_id" onchange="javascript:send();">
 <option value="0"> <?php echo get_lang('SelectUrl') ?></option>
         <?php
@@ -236,7 +236,7 @@ 
     <td>
     <h3>
     <?php
-        $total_users = count($nosessionUsersList) +  count($sessionUsersList);
+        $total_users = count($nosessionUsersList) + count($sessionUsersList);
         echo get_lang('TotalAvailableUsers').' '.$total_users;
     ?>
     </h3>
@@ -246,7 +246,7 @@ 
   <td align="center"><b><?php echo get_lang('UserListInPlatform') ?> : <?php echo count($nosessionUsersList); ?></b>
   </td>
   <td></td>
-  <td align="center"><b><?php echo get_lang('UserListIn') . ' ' . $url_selected; ?> : <?php echo count($sessionUsersList); ?></b></td>
+  <td align="center"><b><?php echo get_lang('UserListIn').' '.$url_selected; ?> : <?php echo count($sessionUsersList); ?></b></td>
 </tr>
 <tr>
   <td align="center">
@@ -306,9 +306,9 @@ 
 		<br />
         <?php
         if (isset($_GET['add'])) {
-            echo '<button class="save" type="button" onclick="valide()" >' . get_lang('AddUsersToURL') . '</button>';
+            echo '<button class="save" type="button" onclick="valide()" >'.get_lang('AddUsersToURL').'</button>';
         } else {
-            echo '<button class="save" type="button" onclick="valide()" >' . get_lang('EditUsersToURL') . '</button>';
+            echo '<button class="save" type="button" onclick="valide()" >'.get_lang('EditUsersToURL').'</button>';
         }
         ?>
 	</td>

Indentation +1 added lines, -1 removed lines

@@ -261,7 +261,7 @@
     ?>
     <option value="<?php echo $enreg['user_id']; ?>"><?php echo $enreg['username'].' - '.api_get_person_name($enreg['firstname'], $enreg['lastname']); ?></option>
     <?php
-     }
+        }
     unset($nosessionUsersList);
     ?>
     </select>

main/admin/add_sessions_to_promotion.php

Indentation +12 added lines, -12 removed lines

@@ -197,7 +197,7 @@ 
       <option value = "%">--</option>
       <?php
         echo Display :: get_alphabet_options();
-      ?>
+        ?>
      </select>
 </td>
 <td align="center">&nbsp;</td>
@@ -207,31 +207,31 @@ 
   <td align="center">
   <div id="content_source">
       <?php
-      if (!($add_type=='multiple')) {
+        if (!($add_type=='multiple')) {
         ?>
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
         <div id="ajax_list_users_single"></div>
         <?php
-      } else {
-      ?>
+        } else {
+        ?>
       <div id="ajax_list_multiple">
         <?php echo Display::select('session_not_in_promotion_name',$session_not_in_promotion, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_not_in_promotion','size'=>'15px'),false); ?>
       </div>
     <?php
-      }
-     ?>
+        }
+        ?>
   </div>
   </td>
   <td width="10%" valign="middle" align="center">
   <?php
-  if ($ajax_search) {
-  ?>
+    if ($ajax_search) {
+    ?>
     <button class="btn btn-default" type="button" onclick="remove_item(document.getElementById('session_in_promotion'))" >
         <em class="fa fa-arrow-left"></em>
     </button>
   <?php
-  } else {
-  ?>
+    } else {
+    ?>
     <button class="btn btn-default" type="button" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))" onclick="moveItem(document.getElementById('session_not_in_promotion'), document.getElementById('session_in_promotion'))">
         <em class="fa fa-arrow-right"></em>
     </button>
@@ -240,8 +240,8 @@ 
         <em class="fa fa-arrow-left"></em>
     </button>
     <?php
-  }
-  ?>
+    }
+    ?>
     <br /><br /><br /><br /><br /><br />
   </td>
   <td align="center">

Spacing +17 added lines, -17 removed lines

@@ -10,7 +10,7 @@ 
 require_once '../inc/global.inc.php';
 
 $xajax = new xajax();
-$xajax->registerFunction ('search_sessions');
+$xajax->registerFunction('search_sessions');
 
 // setting the section (for the tabs)
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -19,13 +19,13 @@ 
 api_protect_admin_script(true);
 
 // setting breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'career_dashboard.php', 'name' => get_lang('CareersAndPromotions'));
 
 // Setting the name of the tool
 $tool_name = get_lang('SubscribeSessionsToPromotions');
 $add_type = 'multiple';
-if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
+if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
     $add_type = Security::remove_XSS($_REQUEST['add_type']);
 }
 
@@ -67,14 +67,14 @@ 
 
 $form_sent  = 0;
 $errorMsg   = '';
-$users      =$sessions=array();
+$users      = $sessions = array();
 $promotion = new Promotion();
 $id = intval($_GET['id']);
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
     $form_sent = $_POST['form_sent'];
     $session_in_promotion_posted = $_POST['session_in_promotion_name'];
     if (!is_array($session_in_promotion_posted)) {
-        $session_in_promotion_posted=array();
+        $session_in_promotion_posted = array();
     }
     if ($form_sent == 1) {
         // Added a parameter to send emails when registering a user
@@ -86,7 +86,7 @@ 
 
 $promotion_data = $promotion->get($id);
 $session_list = SessionManager::get_sessions_list(array(), array('name'));
-$session_not_in_promotion = $session_in_promotion= array();
+$session_not_in_promotion = $session_in_promotion = array();
 
 if (!empty($session_list)) {
     foreach ($session_list as $session) {
@@ -122,7 +122,7 @@ 
             }
         }
         $return .= '</select>';
-        $xajax_response -> addAssign('ajax_list_multiple','innerHTML',api_utf8_encode($return));
+        $xajax_response -> addAssign('ajax_list_multiple', 'innerHTML', api_utf8_encode($return));
     }
 
     return $xajax_response;
@@ -140,14 +140,14 @@ 
 }
 
 echo '<div class="actions">';
-echo '<a href="promotions.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
+echo '<a href="promotions.php">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
 echo '</div>';
 ?>
 
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if (!empty($_GET['add'])) echo '&add=true'; ?>" style="margin:0px;" <?php if ($ajax_search) {echo ' onsubmit="valide();"'; }?>>
 <?php echo '<legend>'.$tool_name.' '.$promotion_data['name'].'</legend>';
 
-if ($add_type=='multiple') {
+if ($add_type == 'multiple') {
     if (is_array($extra_field_list)) {
         if (is_array($new_field_list) && count($new_field_list) > 0) {
             echo '<h3>'.get_lang('FilterUsers').'</h3>';
@@ -157,9 +157,9 @@ 
                 echo '&nbsp;<select name="'.$varname.'">';
                 echo '<option value="0">--'.get_lang('Select').'--</option>';
                 foreach ($new_field['data'] as $option) {
-                    $checked='';
+                    $checked = '';
                     if (isset($_POST[$varname])) {
-                        if ($_POST[$varname]==$option[1]) {
+                        if ($_POST[$varname] == $option[1]) {
                             $checked = 'selected="true"';
                         }
                     }
@@ -189,7 +189,7 @@ 
   <td align="center"><b><?php echo get_lang('SessionsInPromotion') ?> :</b></td>
 </tr>
 
-<?php if ($add_type=='multiple') { ?>
+<?php if ($add_type == 'multiple') { ?>
 <tr>
 <td align="center">
 <?php echo get_lang('FirstLetterSessions'); ?> :
@@ -207,7 +207,7 @@ 
   <td align="center">
   <div id="content_source">
       <?php
-      if (!($add_type=='multiple')) {
+      if (!($add_type == 'multiple')) {
         ?>
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
         <div id="ajax_list_users_single"></div>
@@ -215,7 +215,7 @@ 
       } else {
       ?>
       <div id="ajax_list_multiple">
-        <?php echo Display::select('session_not_in_promotion_name',$session_not_in_promotion, '',array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_not_in_promotion','size'=>'15px'),false); ?>
+        <?php echo Display::select('session_not_in_promotion_name', $session_not_in_promotion, '', array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'session_not_in_promotion', 'size'=>'15px'), false); ?>
       </div>
     <?php
       }
@@ -250,7 +250,7 @@ 
         'session_in_promotion_name[]',
         $session_in_promotion,
         '',
-        array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_in_promotion','size'=>'15px'),
+        array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'session_in_promotion', 'size'=>'15px'),
         false
     );
     unset($sessionUsersList);

Braces +4 added lines, -1 removed lines

@@ -144,7 +144,10 @@
 echo '</div>';
 ?>
 
-<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) echo '&add=true' ; ?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
+<form name="formulaire" method="post" action="<?php echo api_get_self(); ?>?id=<?php echo $id; if(!empty($_GET['add'])) {
+    echo '&add=true' ;
+}
+?>" style="margin:0px;" <?php if($ajax_search){echo ' onsubmit="valide();"';}?>>
 <?php echo '<legend>'.$tool_name.' '.$promotion_data['name'].'</legend>';
 
 if ($add_type=='multiple') {

main/admin/skill_badge_list.php

Spacing +3 added lines, -3 removed lines

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

main/admin/course_edit.php

Spacing +23 added lines, -23 removed lines

@@ -42,7 +42,7 @@ 
         WHERE
             course_user.status='1' AND
             course_user.user_id=user.user_id AND
-            course_user.c_id ='" . $courseId . "'" .
+            course_user.c_id ='".$courseId."'".
         $order_clause;
 $res = Database::query($sql);
 $course_teachers = array();
@@ -58,18 +58,18 @@ 
             INNER JOIN $access_url_rel_user_table url_rel_user
             ON (u.user_id=url_rel_user.user_id)
             WHERE
-                url_rel_user.access_url_id=" . api_get_current_access_url_id() . " AND
+                url_rel_user.access_url_id=".api_get_current_access_url_id()." AND
                 status=1" . $order_clause;
 } else {
     $sql = "SELECT user_id, lastname, firstname
-            FROM $table_user WHERE status='1'" . $order_clause;
+            FROM $table_user WHERE status='1'".$order_clause;
 }
 $courseInfo['tutor_name'] = null;
 
 $res = Database::query($sql);
 $teachers = array();
 $allTeachers = array();
-$platform_teachers[0] = '-- ' . get_lang('NoManager') . ' --';
+$platform_teachers[0] = '-- '.get_lang('NoManager').' --';
 while ($obj = Database::fetch_object($res)) {
     $allTeachers[$obj->user_id] = api_get_person_name($obj->firstname, $obj->lastname);
     if (!array_key_exists($obj->user_id, $course_teachers)) {
@@ -87,7 +87,7 @@ 
 
 // Case where there is no teacher in the course
 if (count($course_teachers) == 0) {
-    $sql = 'SELECT tutor_name FROM ' . $course_table . ' WHERE code="' . $course_code . '"';
+    $sql = 'SELECT tutor_name FROM '.$course_table.' WHERE code="'.$course_code.'"';
     $res = Database::query($sql);
     $tutor_name = Database::result($res, 0, 0);
     $courseInfo['tutor_name'] = array_search($tutor_name, $platform_teachers);
@@ -95,7 +95,7 @@ 
 
 // Build the form
 $form = new FormValidator('update_course', 'post', api_get_self().'?id='.$courseId);
-$form->addElement('header', get_lang('Course') . '  #' . $courseInfo['real_id'] . ' ' . $course_code);
+$form->addElement('header', get_lang('Course').'  #'.$courseInfo['real_id'].' '.$course_code);
 $form->addElement('hidden', 'code', $course_code);
 
 //title
@@ -151,20 +151,20 @@ 
             }
         }
 
-        $groupName = 'session_coaches[' . $sessionId . ']';
-        $platformTeacherId = 'platform_teachers_by_session_' . $sessionId;
-        $coachId = 'coaches_by_session_' . $sessionId;
+        $groupName = 'session_coaches['.$sessionId.']';
+        $platformTeacherId = 'platform_teachers_by_session_'.$sessionId;
+        $coachId = 'coaches_by_session_'.$sessionId;
 
         $platformTeacherName = 'platform_teachers_by_session';
         $coachName = 'coaches_by_session';
 
-        $sessionUrl = api_get_path(WEB_CODE_PATH) . 'session/resume_session.php?id_session=' . $sessionId;
+        $sessionUrl = api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.$sessionId;
         $form->addElement(
             'advmultiselect',
             $groupName,
             Display::url(
                 $session['name'], $sessionUrl, array('target' => '_blank')
-            ) . ' - ' . get_lang('Coaches'),
+            ).' - '.get_lang('Coaches'),
             $allTeachers
         );
         $courseInfo[$groupName] = $sessionTeachers;
@@ -172,7 +172,7 @@ 
 }
 
 // Category code
-$url = api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?a=search_category';
+$url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=search_category';
 
 $categorySelect = $form->addElement(
     'select_ajax',
@@ -200,11 +200,11 @@ 
 $form->applyFilter('select_language', 'html_filter');
 
 $group = array();
-$group[]= $form->createElement('radio', 'visibility', get_lang("CourseAccess"), get_lang('OpenToTheWorld'), COURSE_VISIBILITY_OPEN_WORLD);
-$group[]= $form->createElement('radio', 'visibility', null, get_lang('OpenToThePlatform'), COURSE_VISIBILITY_OPEN_PLATFORM);
-$group[]= $form->createElement('radio', 'visibility', null, get_lang('Private'), COURSE_VISIBILITY_REGISTERED);
-$group[]= $form->createElement('radio', 'visibility', null, get_lang('CourseVisibilityClosed'), COURSE_VISIBILITY_CLOSED);
-$group[]= $form->createElement('radio', 'visibility', null, get_lang('CourseVisibilityHidden'), COURSE_VISIBILITY_HIDDEN);
+$group[] = $form->createElement('radio', 'visibility', get_lang("CourseAccess"), get_lang('OpenToTheWorld'), COURSE_VISIBILITY_OPEN_WORLD);
+$group[] = $form->createElement('radio', 'visibility', null, get_lang('OpenToThePlatform'), COURSE_VISIBILITY_OPEN_PLATFORM);
+$group[] = $form->createElement('radio', 'visibility', null, get_lang('Private'), COURSE_VISIBILITY_REGISTERED);
+$group[] = $form->createElement('radio', 'visibility', null, get_lang('CourseVisibilityClosed'), COURSE_VISIBILITY_CLOSED);
+$group[] = $form->createElement('radio', 'visibility', null, get_lang('CourseVisibilityHidden'), COURSE_VISIBILITY_HIDDEN);
 $form->addGroup($group, '', get_lang('CourseAccess'), '<br />');
 
 $group = array();
@@ -256,7 +256,7 @@ 
 $htmlHeadXtra[] = '
 <script>
 $(function() {
-    ' . $extra['jquery_ready_content'] . '
+    ' . $extra['jquery_ready_content'].'
 });
 </script>';
 
@@ -291,7 +291,7 @@ 
 
                 api_set_failure(get_lang('PortalActiveCoursesLimitReached'));
 
-                header('Location: course_list.php?action=show_msg&warn=' . urlencode(get_lang('PortalActiveCoursesLimitReached')));
+                header('Location: course_list.php?action=show_msg&warn='.urlencode(get_lang('PortalActiveCoursesLimitReached')));
                 exit;
             }
         }
@@ -309,7 +309,7 @@ 
         foreach ($list as $course_temp) {
             if ($course_temp['code'] != $course_code) {
                 $visual_code_is_used = true;
-                $warn .= ' ' . $course_temp['title'] . ' (' . $course_temp['code'] . '),';
+                $warn .= ' '.$course_temp['title'].' ('.$course_temp['code'].'),';
             }
         }
         $warn = substr($warn, 0, -1);
@@ -329,7 +329,7 @@ 
     $course['course_code'] = $course_code;
 
     if (!stristr($department_url, 'http://')) {
-        $department_url = 'http://' . $department_url;
+        $department_url = 'http://'.$department_url;
     }
 
     Database::query($sql);
@@ -394,7 +394,7 @@ 
     if (array_key_exists('add_teachers_to_sessions_courses', $courseInfo)) {
         $sql = "UPDATE $course_table SET
                 add_teachers_to_sessions_courses = '$addTeacherToSessionCourses'
-                WHERE id = " . $courseInfo['real_id'];
+                WHERE id = ".$courseInfo['real_id'];
         Database::query($sql);
     }
 
@@ -403,7 +403,7 @@ 
     Display::addFlash(Display::return_message(get_lang('ItemUpdated')));
 
     if ($visual_code_is_used) {
-        header('Location: course_list.php?action=show_msg&warn=' . urlencode($warn));
+        header('Location: course_list.php?action=show_msg&warn='.urlencode($warn));
     } else {
         header('Location: course_list.php');
     }