Completed
Push — 1.11.x ( c69862...ecc799 )
by José
207:40 queued 172:00
created
main/admin/event_type.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
 
46 46
 $languages = api_get_languages();
47 47
 
48
-$ajaxPath = api_get_path(WEB_CODE_PATH) . 'inc/ajax/events.ajax.php';
48
+$ajaxPath = api_get_path(WEB_CODE_PATH).'inc/ajax/events.ajax.php';
49 49
 
50
-$action_array = array(array('url' =>'event_controller.php?action=listing' , 'content' => Display::return_icon('view_text.png', get_lang('ListView'), array(), ICON_SIZE_MEDIUM)));
50
+$action_array = array(array('url' =>'event_controller.php?action=listing', 'content' => Display::return_icon('view_text.png', get_lang('ListView'), array(), ICON_SIZE_MEDIUM)));
51 51
 
52 52
 $key_lang = get_lang('YouHaveSomeUnsavedChanges');
53 53
 $users = UserManager::get_user_list(array(), array('firstname'));
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
         <select class="col-md-6" multiple="1" id="eventList" onchange="confirmMessage(this.name); return false;" name="eventList">
312 312
         <?php
313 313
         foreach ($event_config as $key => $config) {
314
-            echo '<option value="' . $key . '">' . $config['name_lang_var'] . '</option>';
314
+            echo '<option value="'.$key.'">'.$config['name_lang_var'].'</option>';
315 315
         }
316 316
         ?>
317 317
         </select>
Please login to merge, or discard this patch.
main/admin/extra_fields.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 $obj->setupBreadcrumb($interbreadcrumb, $action);
37 37
 
38 38
 //jqgrid will use this URL to do the selects
39
-$url = api_get_path(WEB_AJAX_PATH) . 'model.ajax.php?a=get_extra_fields&type=' . $extraFieldType;
39
+$url = api_get_path(WEB_AJAX_PATH).'model.ajax.php?a=get_extra_fields&type='.$extraFieldType;
40 40
 
41 41
 //The order is important you need to check the the $column variable in the model.ajax.php file
42 42
 $columns = $obj->getJqgridColumnNames();
@@ -64,43 +64,43 @@  discard block
 block discarded – undo
64 64
         array(),
65 65
         $action_links,
66 66
         true
67
-    ). '
67
+    ).'
68 68
 
69 69
     $("#field_type").on("change", function() {
70 70
         id = $(this).val();
71 71
         switch(id) {
72 72
             case "1":
73
-                $("#example").html("' . addslashes(Display::return_icon('userfield_text.png')) . '");
73
+                $("#example").html("' . addslashes(Display::return_icon('userfield_text.png')).'");
74 74
                 break;
75 75
             case "2":
76
-                $("#example").html("' . addslashes(Display::return_icon('userfield_text_area.png')) . '");
76
+                $("#example").html("' . addslashes(Display::return_icon('userfield_text_area.png')).'");
77 77
                 break;
78 78
             case "3":
79
-                $("#example").html("' . addslashes(Display::return_icon('add_user_field_howto.png')) . '");
79
+                $("#example").html("' . addslashes(Display::return_icon('add_user_field_howto.png')).'");
80 80
                 break;
81 81
             case "4":
82
-                $("#example").html("' . addslashes(Display::return_icon('userfield_drop_down.png')) . '");
82
+                $("#example").html("' . addslashes(Display::return_icon('userfield_drop_down.png')).'");
83 83
                 break;
84 84
             case "5":
85
-                $("#example").html("' . addslashes(Display::return_icon('userfield_multidropdown.png')) . '");
85
+                $("#example").html("' . addslashes(Display::return_icon('userfield_multidropdown.png')).'");
86 86
                 break;
87 87
             case "6":
88
-                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')) . '");
88
+                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')).'");
89 89
                 break;
90 90
             case "7":
91
-                $("#example").html("' . addslashes(Display::return_icon('userfield_date_time.png')) . '");
91
+                $("#example").html("' . addslashes(Display::return_icon('userfield_date_time.png')).'");
92 92
                 break;
93 93
             case "8":
94
-                $("#example").html("' . addslashes(Display::return_icon('userfield_doubleselect.png')) . '");
94
+                $("#example").html("' . addslashes(Display::return_icon('userfield_doubleselect.png')).'");
95 95
                 break;
96 96
             case "9":
97
-                $("#example").html("' . addslashes(Display::return_icon('userfield_divider.png')) . '");
97
+                $("#example").html("' . addslashes(Display::return_icon('userfield_divider.png')).'");
98 98
                 break;
99 99
             case "10":
100
-                $("#example").html("' . addslashes(Display::return_icon('userfield_user_tag.png')) . '");
100
+                $("#example").html("' . addslashes(Display::return_icon('userfield_user_tag.png')).'");
101 101
                 break;
102 102
             case "11":
103
-                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')) . '");
103
+                $("#example").html("' . addslashes(Display::return_icon('userfield_data.png')).'");
104 104
                 break;
105 105
         }
106 106
     });
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
         ) {
120 120
             api_not_allowed();
121 121
         }
122
-        $url = api_get_self() . '?type=' . $obj->type . '&action=' . Security::remove_XSS($_GET['action']);
122
+        $url = api_get_self().'?type='.$obj->type.'&action='.Security::remove_XSS($_GET['action']);
123 123
         $form = $obj->return_form($url, 'add');
124 124
 
125 125
         // The validation or display
@@ -135,8 +135,8 @@  discard block
 block discarded – undo
135 135
             $obj->display();
136 136
         } else {
137 137
             echo '<div class="actions">';
138
-            echo '<a href="' . api_get_self() . '?type=' . $obj->type . '">' .
139
-            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM) . '</a>';
138
+            echo '<a href="'.api_get_self().'?type='.$obj->type.'">'.
139
+            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
140 140
             echo '</div>';
141 141
             $form->addElement('hidden', 'sec_token');
142 142
             $form->setConstants(array('sec_token' => $token));
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         break;
146 146
     case 'edit':
147 147
         // Action handling: Editing
148
-        $url = api_get_self() . '?type=' . $obj->type . '&action=' . Security::remove_XSS($_GET['action']) . '&id=' . intval($_GET['id']);
148
+        $url = api_get_self().'?type='.$obj->type.'&action='.Security::remove_XSS($_GET['action']).'&id='.intval($_GET['id']);
149 149
         $form = $obj->return_form($url, 'edit');
150 150
 
151 151
         // The validation or display
@@ -159,8 +159,8 @@  discard block
 block discarded – undo
159 159
             $obj->display();
160 160
         } else {
161 161
             echo '<div class="actions">';
162
-            echo '<a href="' . api_get_self() . '?type=' . $obj->type . '">' .
163
-            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM) . '</a>';
162
+            echo '<a href="'.api_get_self().'?type='.$obj->type.'">'.
163
+            Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
164 164
             echo '</div>';
165 165
             $form->addElement('hidden', 'sec_token');
166 166
             $form->setConstants(array('sec_token' => $token));
Please login to merge, or discard this patch.
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/settings.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
     Display::addFlash(Display::return_message(get_lang('FileDeleted')));
60 60
 }
61 61
 
62
-if (isset($_GET['action']) &&  $_GET['action'] == 'delete_grading') {
62
+if (isset($_GET['action']) && $_GET['action'] == 'delete_grading') {
63 63
     $id = intval($_GET['id']);
64 64
     api_delete_setting_option($id);
65 65
 }
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
         }
123 123
     }
124 124
 
125
-    if (isset($category) && $category== 'search_setting') {
125
+    if (isset($category) && $category == 'search_setting') {
126 126
         if (!empty($_REQUEST['search_field'])) {
127 127
             $settings = search_setting($_REQUEST['search_field']);
128 128
         }
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
         // Set true for allow_message_tool variable if social tool is actived
221 221
         foreach ($convert_byte_to_mega_list as $item) {
222 222
             if (isset($values[$item])) {
223
-                $values[$item] = round($values[$item]*1024*1024);
223
+                $values[$item] = round($values[$item] * 1024 * 1024);
224 224
             }
225 225
         }
226 226
 
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.