Completed
Pull Request — 1.11.x (#1599)
by José
28:19
created
main/admin/course_create_content.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,16 +7,16 @@
 block discarded – undo
7 7
  * @package chamilo.admin
8 8
  */
9 9
 include ('../inc/global.inc.php');
10
-$this_section=SECTION_PLATFORM_ADMIN;
10
+$this_section = SECTION_PLATFORM_ADMIN;
11 11
 
12 12
 api_protect_admin_script();
13 13
 $tool_name = get_lang('DummyCourseCreator');
14
-$interbreadcrumb[] = array ("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
14
+$interbreadcrumb[] = array("url" => 'index.php', "name" => get_lang('PlatformAdmin'));
15 15
 Display::display_header($tool_name);
16 16
 //api_display_tool_title($tool_name);
17 17
 if (api_get_setting('server_type') != 'test') {
18 18
 	echo get_lang('DummyCourseOnlyOnTestServer');
19
-} elseif( isset($_POST['action'])) {
19
+} elseif (isset($_POST['action'])) {
20 20
 	require_once('../coursecopy/classes/DummyCourseCreator.class.php');
21 21
 	$dcc = new DummyCourseCreator();
22 22
 	$dcc->create_dummy_course($_POST['course_code']);
Please login to merge, or discard this patch.
main/admin/statistics.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,13 +5,13 @@
 block discarded – undo
5 5
 *   @package chamilo.admin
6 6
 */
7 7
 
8
-$cidReset=true;
8
+$cidReset = true;
9 9
 require_once '../inc/global.inc.php';
10 10
 $this_section = SECTION_PLATFORM_ADMIN;
11 11
 
12 12
 api_protect_admin_script();
13 13
 
14
-$interbreadcrumb[]=array('url' => 'index.php',"name" => get_lang('PlatformAdmin'));
14
+$interbreadcrumb[] = array('url' => 'index.php', "name" => get_lang('PlatformAdmin'));
15 15
 $tool_name = get_lang('Statistics');
16 16
 Display::display_header($tool_name);
17 17
 Display::display_footer();
Please login to merge, or discard this patch.
main/admin/career_dashboard.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -18,12 +18,12 @@  discard block
 block discarded – undo
18 18
 $htmlHeadXtra[] = api_get_jqgrid_js();
19 19
 
20 20
 // setting breadcrumbs
21
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
22
-$interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions'));
21
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
22
+$interbreadcrumb[] = array('url' => 'career_dashboard.php', 'name' => get_lang('CareersAndPromotions'));
23 23
 
24 24
 Display :: display_header(null);
25 25
 
26
-$form = new FormValidator('filter_form','GET', api_get_self());
26
+$form = new FormValidator('filter_form', 'GET', api_get_self());
27 27
 
28 28
 $career = new Career();
29 29
 
@@ -54,11 +54,11 @@  discard block
 block discarded – undo
54 54
 // action links
55 55
 echo '<div class="actions" style="margin-bottom:20px">';
56 56
     echo  '<a href="../admin/index.php">'.
57
-            Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'',ICON_SIZE_MEDIUM).'</a>';
57
+            Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'), '', ICON_SIZE_MEDIUM).'</a>';
58 58
     echo '<a href="careers.php">'.
59
-            Display::return_icon('career.png',get_lang('Careers'),'',ICON_SIZE_MEDIUM).'</a>';
59
+            Display::return_icon('career.png', get_lang('Careers'), '', ICON_SIZE_MEDIUM).'</a>';
60 60
     echo '<a href="promotions.php">'.
61
-            Display::return_icon('promotion.png',get_lang('Promotions'),'',ICON_SIZE_MEDIUM).'</a>';
61
+            Display::return_icon('promotion.png', get_lang('Promotions'), '', ICON_SIZE_MEDIUM).'</a>';
62 62
 echo '</div>';
63 63
 
64 64
 $form->display();
@@ -119,22 +119,22 @@  discard block
 block discarded – undo
119 119
     foreach ($career_array as $career_id => $data) {
120 120
         $career = $data['name'];
121 121
         $promotions = $data['promotions'];
122
-        $career = Display::url($career, 'careers.php?action=edit&id=' . $career_id);
122
+        $career = Display::url($career, 'careers.php?action=edit&id='.$career_id);
123 123
         $career = Display::tag('h4', $career);
124
-        echo '<tr><td style="background-color:#ECF0F1" colspan="3">' . $career . '</td></tr>';
124
+        echo '<tr><td style="background-color:#ECF0F1" colspan="3">'.$career.'</td></tr>';
125 125
         if (!empty($promotions)) {
126 126
             foreach ($promotions as $promotion_id => $promotion) {
127 127
                 $promotion_name = $promotion['name'];
128
-                $promotion_url = Display::url($promotion_name, 'promotions.php?action=edit&id=' . $promotion_id);
128
+                $promotion_url = Display::url($promotion_name, 'promotions.php?action=edit&id='.$promotion_id);
129 129
                 $sessions = $promotion['sessions'];
130 130
                 echo '<tr>';
131 131
                 $count = count($sessions);
132 132
                 $rowspan = '';
133 133
                 if (!empty($count)) {
134 134
                     $count++;
135
-                    $rowspan = 'rowspan="' . $count . '"';
135
+                    $rowspan = 'rowspan="'.$count.'"';
136 136
                 }
137
-                echo '<td ' . $rowspan . '>';
137
+                echo '<td '.$rowspan.'>';
138 138
                 echo Display::tag('h5', $promotion_url);
139 139
                 echo '</td>';
140 140
                 echo '</tr>';
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
                         $course_list = $session['courses'];
145 145
 
146 146
                         $url = Display::url($session['data']['name'],
147
-                            '../session/resume_session.php?id_session=' . $session['data']['id']);
147
+                            '../session/resume_session.php?id_session='.$session['data']['id']);
148 148
                         echo '<tr>';
149 149
                         //Session name
150 150
                         echo Display::tag('td', $url);
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 
158 158
                                 $url = Display::url(
159 159
                                     $course['title'],
160
-                                    api_get_path(WEB_COURSE_PATH) . $course['directory'] . '/index.php?id_session=' . $session['data']['id']
160
+                                    api_get_path(WEB_COURSE_PATH).$course['directory'].'/index.php?id_session='.$session['data']['id']
161 161
                                 );
162 162
                                 echo Display::tag('td', $url);
163 163
                                 echo '</tr>';
Please login to merge, or discard this patch.
main/admin/access_url_check_user_session.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,18 +15,18 @@  discard block
 block discarded – undo
15 15
 
16 16
 $tool_name = get_lang('SessionOverview');
17 17
 
18
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
19
-$interbreadcrumb[]=array('url' => 'session_list.php','name' => get_lang('SessionList'));
18
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
19
+$interbreadcrumb[] = array('url' => 'session_list.php', 'name' => get_lang('SessionList'));
20 20
 
21 21
 // Database Table Definitions
22
-$tbl_user							= Database::get_main_table(TABLE_MAIN_USER);
23
-$tbl_session_rel_user				= Database::get_main_table(TABLE_MAIN_SESSION_USER);
22
+$tbl_user = Database::get_main_table(TABLE_MAIN_USER);
23
+$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
24 24
 $table_access_url_user              = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
25 25
 $url_id                             = api_get_current_access_url_id();
26 26
 
27 27
 $action = $_GET['action'];
28 28
 
29
-switch($action) {
29
+switch ($action) {
30 30
     case 'add_user_to_url':
31 31
         $user_id = $_REQUEST['user_id'];
32 32
         $result = UrlManager::add_user_to_url($user_id, $url_id);
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 }
59 59
 
60 60
 
61
-foreach($session_list  as $session_item) {
61
+foreach ($session_list  as $session_item) {
62 62
     $session_id = $session_item['id'];
63 63
     $html .= '<h3>'.$session_item['name'].'</h3>';
64 64
 
Please login to merge, or discard this patch.
main/admin/course_import.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,13 +12,13 @@
 block discarded – undo
12 12
  */
13 13
 function validate_data($courses)
14 14
 {
15
-    $errors = array ();
16
-    $coursecodes = array ();
15
+    $errors = array();
16
+    $coursecodes = array();
17 17
     foreach ($courses as $index => $course) {
18
-        $course['line'] = $index +1;
18
+        $course['line'] = $index + 1;
19 19
 
20 20
         // 1. Check whether mandatory fields are set.
21
-        $mandatory_fields = array ('Code', 'Title', 'CourseCategory');
21
+        $mandatory_fields = array('Code', 'Title', 'CourseCategory');
22 22
         foreach ($mandatory_fields as $field) {
23 23
             if (!isset($course[$field]) || strlen($course[$field]) == 0) {
24 24
                 $course['error'] = get_lang($field.'Mandatory');
Please login to merge, or discard this patch.
main/admin/teacher_time_report.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -295,7 +295,7 @@
 block discarded – undo
295 295
 if (isset($_GET['export'])) {
296 296
     $dataToExport = $timeReport->prepareDataToExport($withFilter);
297 297
 
298
-    $fileName = get_lang('TeacherTimeReport') . ' ' . api_get_local_time();
298
+    $fileName = get_lang('TeacherTimeReport').' '.api_get_local_time();
299 299
 
300 300
     switch ($_GET['export']) {
301 301
         case 'pdf':
Please login to merge, or discard this patch.
main/admin/add_sessions_to_promotion.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 require_once '../inc/global.inc.php';
11 11
 
12 12
 $xajax = new xajax();
13
-$xajax->registerFunction ('search_sessions');
13
+$xajax->registerFunction('search_sessions');
14 14
 
15 15
 // setting the section (for the tabs)
16 16
 $this_section = SECTION_PLATFORM_ADMIN;
@@ -19,13 +19,13 @@  discard block
 block discarded – undo
19 19
 api_protect_admin_script(true);
20 20
 
21 21
 // setting breadcrumbs
22
-$interbreadcrumb[]=array('url' => 'index.php','name' => get_lang('PlatformAdmin'));
23
-$interbreadcrumb[]=array('url' => 'career_dashboard.php','name' => get_lang('CareersAndPromotions'));
22
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
23
+$interbreadcrumb[] = array('url' => 'career_dashboard.php', 'name' => get_lang('CareersAndPromotions'));
24 24
 
25 25
 // Setting the name of the tool
26 26
 $tool_name = get_lang('SubscribeSessionsToPromotions');
27 27
 $add_type = 'multiple';
28
-if (isset($_REQUEST['add_type']) && $_REQUEST['add_type']!=''){
28
+if (isset($_REQUEST['add_type']) && $_REQUEST['add_type'] != '') {
29 29
     $add_type = Security::remove_XSS($_REQUEST['add_type']);
30 30
 }
31 31
 
@@ -67,14 +67,14 @@  discard block
 block discarded – undo
67 67
 
68 68
 $form_sent  = 0;
69 69
 $errorMsg   = '';
70
-$users      =$sessions=array();
70
+$users      = $sessions = array();
71 71
 $promotion = new Promotion();
72 72
 $id = intval($_GET['id']);
73 73
 if (isset($_POST['form_sent']) && $_POST['form_sent']) {
74 74
     $form_sent = $_POST['form_sent'];
75 75
     $session_in_promotion_posted = $_POST['session_in_promotion_name'];
76 76
     if (!is_array($session_in_promotion_posted)) {
77
-        $session_in_promotion_posted=array();
77
+        $session_in_promotion_posted = array();
78 78
     }
79 79
     if ($form_sent == 1) {
80 80
         // Added a parameter to send emails when registering a user
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 
87 87
 $promotion_data = $promotion->get($id);
88 88
 $session_list = SessionManager::get_sessions_list(array(), array('name'));
89
-$session_not_in_promotion = $session_in_promotion= array();
89
+$session_not_in_promotion = $session_in_promotion = array();
90 90
 
91 91
 if (!empty($session_list)) {
92 92
     foreach ($session_list as $session) {
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
             }
123 123
         }
124 124
         $return .= '</select>';
125
-        $xajax_response -> addAssign('ajax_list_multiple','innerHTML',api_utf8_encode($return));
125
+        $xajax_response -> addAssign('ajax_list_multiple', 'innerHTML', api_utf8_encode($return));
126 126
     }
127 127
 
128 128
     return $xajax_response;
@@ -140,14 +140,14 @@  discard block
 block discarded – undo
140 140
 }
141 141
 
142 142
 echo '<div class="actions">';
143
-echo '<a href="promotions.php">'.Display::return_icon('back.png',get_lang('Back'),'',ICON_SIZE_MEDIUM).'</a>';
143
+echo '<a href="promotions.php">'.Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
144 144
 echo '</div>';
145 145
 ?>
146 146
 
147
-<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();"';}?>>
147
+<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();"'; }?>>
148 148
 <?php echo '<legend>'.$tool_name.' '.$promotion_data['name'].'</legend>';
149 149
 
150
-if ($add_type=='multiple') {
150
+if ($add_type == 'multiple') {
151 151
     if (is_array($extra_field_list)) {
152 152
         if (is_array($new_field_list) && count($new_field_list) > 0) {
153 153
             echo '<h3>'.get_lang('FilterUsers').'</h3>';
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
157 157
                 echo '&nbsp;<select name="'.$varname.'">';
158 158
                 echo '<option value="0">--'.get_lang('Select').'--</option>';
159 159
                 foreach ($new_field['data'] as $option) {
160
-                    $checked='';
160
+                    $checked = '';
161 161
                     if (isset($_POST[$varname])) {
162
-                        if ($_POST[$varname]==$option[1]) {
162
+                        if ($_POST[$varname] == $option[1]) {
163 163
                             $checked = 'selected="true"';
164 164
                         }
165 165
                     }
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
   <td align="center"><b><?php echo get_lang('SessionsInPromotion') ?> :</b></td>
190 190
 </tr>
191 191
 
192
-<?php if ($add_type=='multiple') { ?>
192
+<?php if ($add_type == 'multiple') { ?>
193 193
 <tr>
194 194
 <td align="center">
195 195
 <?php echo get_lang('FirstLetterSessions'); ?> :
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
   <td align="center">
208 208
   <div id="content_source">
209 209
       <?php
210
-      if (!($add_type=='multiple')) {
210
+      if (!($add_type == 'multiple')) {
211 211
         ?>
212 212
         <input type="text" id="user_to_add" onkeyup="xajax_search_users(this.value,'single')" />
213 213
         <div id="ajax_list_users_single"></div>
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
       } else {
216 216
       ?>
217 217
       <div id="ajax_list_multiple">
218
-        <?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); ?>
218
+        <?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); ?>
219 219
       </div>
220 220
     <?php
221 221
       }
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
         'session_in_promotion_name[]',
251 251
         $session_in_promotion,
252 252
         '',
253
-        array('style'=>'width:360px', 'multiple'=>'multiple','id'=>'session_in_promotion','size'=>'15px'),
253
+        array('style'=>'width:360px', 'multiple'=>'multiple', 'id'=>'session_in_promotion', 'size'=>'15px'),
254 254
         false
255 255
     );
256 256
     unset($sessionUsersList);
Please login to merge, or discard this patch.
main/admin/skill_badge_list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,18 +29,18 @@
 block discarded – undo
29 29
 
30 30
 $interbreadcrumb = array(
31 31
     array(
32
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/index.php',
32
+        'url' => api_get_path(WEB_CODE_PATH).'admin/index.php',
33 33
         'name' => get_lang('Administration')
34 34
     ),
35 35
     array(
36
-        'url' => api_get_path(WEB_CODE_PATH) . 'admin/skill_badge.php',
36
+        'url' => api_get_path(WEB_CODE_PATH).'admin/skill_badge.php',
37 37
         'name' => get_lang('Badges')
38 38
     )
39 39
 );
40 40
 
41 41
 $toolbar = Display::toolbarButton(
42 42
     get_lang('ManageSkills'),
43
-    api_get_path(WEB_CODE_PATH) . 'admin/skill_list.php',
43
+    api_get_path(WEB_CODE_PATH).'admin/skill_list.php',
44 44
     'list',
45 45
     'primary',
46 46
     ['title' => get_lang('ManageSkills')]
Please login to merge, or discard this patch.
main/admin/skills_wheel.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 $url = api_get_path(WEB_AJAX_PATH)."skill.ajax.php?a=get_skills_tree_json&load_user=$load_user";
38 38
 $tpl->assign('wheel_url', $url);
39 39
 
40
-$url  = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1';
40
+$url = api_get_path(WEB_AJAX_PATH).'skill.ajax.php?1=1';
41 41
 $tpl->assign('url', $url);
42 42
 $tpl->assign('isAdministration', true);
43 43
 
Please login to merge, or discard this patch.