Completed
Pull Request — 1.11.x (#1628)
by José
97:30 queued 69:06
created
main/exercise/tests_category.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 {
198 198
     $action = Security::remove_XSS($action);
199 199
     // initiate the object
200
-    $form = new FormValidator('note', 'post', api_get_self() . '?action=' . $action.'&'.api_get_cidreq());
200
+    $form = new FormValidator('note', 'post', api_get_self().'?action='.$action.'&'.api_get_cidreq());
201 201
     // Setting the form elements
202 202
     $form->addElement('header', get_lang('AddACategory'));
203 203
     $form->addElement('text', 'category_name', get_lang('CategoryName'), array('size' => '95'));
@@ -237,23 +237,23 @@  discard block
 block discarded – undo
237 237
 function displayActionBar()
238 238
 {
239 239
     echo '<div class="actions">';
240
-    echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise.php?' . api_get_cidreq() . '">' .
241
-            Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM) . '</a>';
240
+    echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.api_get_cidreq().'">'.
241
+            Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
242 242
 
243
-    echo '<a href="' . api_get_self() . '?action=addcategory&'.api_get_cidreq().'">' .
244
-        Display::return_icon('question_category.gif', get_lang('AddACategory')) . '</a>';
243
+    echo '<a href="'.api_get_self().'?action=addcategory&'.api_get_cidreq().'">'.
244
+        Display::return_icon('question_category.gif', get_lang('AddACategory')).'</a>';
245 245
 
246 246
     echo Display::url(
247 247
         Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], ICON_SIZE_MEDIUM),
248
-        api_get_self() . '?action=export_category&'.api_get_cidreq()
248
+        api_get_self().'?action=export_category&'.api_get_cidreq()
249 249
     );
250 250
 
251 251
     echo Display::url(
252 252
         Display::return_icon('import_csv.png', get_lang('ImportAsCSV'), [], ICON_SIZE_MEDIUM),
253
-        api_get_self() . '?action=import_category&'.api_get_cidreq()
253
+        api_get_self().'?action=import_category&'.api_get_cidreq()
254 254
     );
255 255
 
256 256
     echo '</div>';
257 257
     echo "<br/>";
258
-    echo "<fieldset><legend>" . get_lang('QuestionCategory') . "</legend></fieldset>";
258
+    echo "<fieldset><legend>".get_lang('QuestionCategory')."</legend></fieldset>";
259 259
 }
Please login to merge, or discard this patch.
main/gradebook/lib/fe/dataform.class.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -41,13 +41,13 @@  discard block
 block discarded – undo
41 41
 
42 42
     protected function build_pdf_export_form()
43 43
     {
44
-        $renderer =& $this->defaultRenderer();
44
+        $renderer = & $this->defaultRenderer();
45 45
         $renderer->setCustomElementTemplate('<span>{element}</span>');
46 46
         $this->addElement('header', get_lang('ChooseOrientation'));
47 47
         $this->addElement('radio', 'orientation', null, get_lang('Portrait'), 'portrait');
48 48
         $this->addElement('radio', 'orientation', null, get_lang('Landscape'), 'landscape');
49 49
         $this->addButtonExport(get_lang('Export'));
50
-        $this->setDefaults(array (
50
+        $this->setDefaults(array(
51 51
             'orientation' => 'portrait'
52 52
         ));
53 53
     }
@@ -59,12 +59,12 @@  discard block
 block discarded – undo
59 59
         $this->addElement('radio', 'file_type', null, 'XML (Extensible Markup Language)', 'xml');
60 60
         $this->addElement('radio', 'file_type', null, 'PDF (Portable Document Format)', 'pdf');
61 61
         $this->addButtonExport(get_lang('Export'));
62
-        $this->setDefaults(array (
62
+        $this->setDefaults(array(
63 63
             'file_type' => 'csv'
64 64
         ));
65 65
     }
66 66
 
67
-    protected function build_export_form_option($show_pdf=true)
67
+    protected function build_export_form_option($show_pdf = true)
68 68
     {
69 69
         $this->addElement('header', get_lang('ChooseFormat'));
70 70
         $this->addElement('radio', 'file_type', get_lang('OutputFileType'), 'CSV (Comma-Separated Values)', 'csv');
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
             array('disabled')
79 79
         );
80 80
         $this->addButtonExport(get_lang('Export'));
81
-        $this->setDefaults(array (
81
+        $this->setDefaults(array(
82 82
             'file_type' => 'csv'
83 83
         ));
84 84
     }
@@ -87,14 +87,14 @@  discard block
 block discarded – undo
87 87
     {
88 88
         $this->addElement('hidden', 'formSent');
89 89
         $this->addElement('header', get_lang('ImportFileLocation'));
90
-        $this->addElement('file', 'import_file',get_lang('Location'));
91
-        $allowed_file_types = array (
90
+        $this->addElement('file', 'import_file', get_lang('Location'));
91
+        $allowed_file_types = array(
92 92
             'xml',
93 93
             'csv'
94 94
         );
95 95
         //$this->addRule('file', get_lang('InvalidExtension') . ' (' . implode(',', $allowed_file_types) . ')', 'filetype', $allowed_file_types);
96
-        $this->addElement('radio', 'file_type', get_lang('FileType'), 'CSV (<a href="docs/example_csv.html" target="_blank">' . get_lang('ExampleCSVFile') . '</a>)', 'csv');
97
-        $this->addElement('radio', 'file_type', null, 'XML (<a href="docs/example_xml.html" target="_blank">' . get_lang('ExampleXMLFile') . '</a>)', 'xml');
96
+        $this->addElement('radio', 'file_type', get_lang('FileType'), 'CSV (<a href="docs/example_csv.html" target="_blank">'.get_lang('ExampleCSVFile').'</a>)', 'csv');
97
+        $this->addElement('radio', 'file_type', null, 'XML (<a href="docs/example_xml.html" target="_blank">'.get_lang('ExampleXMLFile').'</a>)', 'xml');
98 98
         $this->addElement('checkbox', 'overwrite', null, get_lang('OverwriteScores'));
99 99
         $this->addElement('checkbox', 'ignoreerrors', null, get_lang('IgnoreErrors'));
100 100
         $this->addButtonImport(get_lang('Ok'));
Please login to merge, or discard this patch.
main/lp/lp_view.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 $this_section = SECTION_COURSES;
21 21
 
22 22
 if ($lp_controller_touched != 1) {
23
-    header('location: lp_controller.php?action=view&item_id=' . intval($_REQUEST['item_id']));
23
+    header('location: lp_controller.php?action=view&item_id='.intval($_REQUEST['item_id']));
24 24
     exit;
25 25
 }
26 26
 
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 //Impress js
119 119
 if ($_SESSION['oLP']->mode == 'impress') {
120 120
     $lp_id = $_SESSION['oLP']->get_id();
121
-    $url = api_get_path(WEB_CODE_PATH) . "lp/lp_impress.php?lp_id=$lp_id&" . api_get_cidreq();
121
+    $url = api_get_path(WEB_CODE_PATH)."lp/lp_impress.php?lp_id=$lp_id&".api_get_cidreq();
122 122
     header("Location: $url");
123 123
     exit;
124 124
 }
@@ -136,15 +136,15 @@  discard block
 block discarded – undo
136 136
 
137 137
 // additional APIs
138 138
 $htmlHeadXtra[] = '<script>
139
-chamilo_courseCode = "' . $course_code . '";
139
+chamilo_courseCode = "' . $course_code.'";
140 140
 </script>';
141 141
 // Document API
142 142
 $htmlHeadXtra[] = '<script src="js/documentapi.js" type="text/javascript" language="javascript"></script>';
143 143
 // Storage API
144 144
 $htmlHeadXtra[] = '<script>
145
-var sv_user = \'' . api_get_user_id() . '\';
145
+var sv_user = \'' . api_get_user_id().'\';
146 146
 var sv_course = chamilo_courseCode;
147
-var sv_sco = \'' . $lp_id . '\';
147
+var sv_sco = \'' . $lp_id.'\';
148 148
 </script>'; // FIXME fetch sco and userid from a more reliable source directly in sotrageapi.js
149 149
 $htmlHeadXtra[] = '<script type="text/javascript" src="js/storageapi.js"></script>';
150 150
 
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
         case 3:
217 217
             // aicc
218 218
             $_SESSION['oLP']->stop_previous_item(); // save status manually if asset
219
-            $htmlHeadXtra[] = '<script src="' . $_SESSION['oLP']->get_js_lib().'" type="text/javascript" language="javascript"></script>';
219
+            $htmlHeadXtra[] = '<script src="'.$_SESSION['oLP']->get_js_lib().'" type="text/javascript" language="javascript"></script>';
220 220
             $preReqCheck = $_SESSION['oLP']->prerequisites_match($lp_item_id);
221 221
             if ($preReqCheck === true) {
222 222
                 $src = $_SESSION['oLP']->get_link(
@@ -238,10 +238,10 @@  discard block
 block discarded – undo
238 238
 // Update status, total_time from lp_item_view table when you finish the exercises in learning path.
239 239
 
240 240
 if ($debug) {
241
-    error_log('$type_quiz: ' . $type_quiz);
242
-    error_log('$_REQUEST[exeId]: ' . intval($_REQUEST['exeId']));
243
-    error_log('$lp_id: ' . $lp_id);
244
-    error_log('$_GET[lp_item_id]: ' . intval($_GET['lp_item_id']));
241
+    error_log('$type_quiz: '.$type_quiz);
242
+    error_log('$_REQUEST[exeId]: '.intval($_REQUEST['exeId']));
243
+    error_log('$lp_id: '.$lp_id);
244
+    error_log('$_GET[lp_item_id]: '.intval($_GET['lp_item_id']));
245 245
 }
246 246
 
247 247
 if (
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
         $safe_item_id == strval(intval($safe_item_id))
265 265
     ) {
266 266
         $sql = 'SELECT start_date, exe_date, exe_result, exe_weighting, exe_exo_id
267
-                FROM ' . $TBL_TRACK_EXERCICES . '
267
+                FROM ' . $TBL_TRACK_EXERCICES.'
268 268
                 WHERE exe_id = ' . $safe_exe_id;
269 269
         $res = Database::query($sql);
270 270
         $row_dates = Database::fetch_array($res);
@@ -278,14 +278,14 @@  discard block
 block discarded – undo
278 278
 
279 279
         $sql = "UPDATE $TBL_LP_ITEM SET
280 280
                     max_score = '$max_score'
281
-                WHERE c_id = $course_id AND id = '" . $safe_item_id . "'";
281
+                WHERE c_id = $course_id AND id = '".$safe_item_id."'";
282 282
         Database::query($sql);
283 283
 
284 284
         $sql = "SELECT id FROM $TBL_LP_ITEM_VIEW
285 285
                 WHERE
286 286
                     c_id = $course_id AND
287 287
                     lp_item_id = '$safe_item_id' AND
288
-                    lp_view_id = '" . $_SESSION['oLP']->lp_view_id . "'
288
+                    lp_view_id = '".$_SESSION['oLP']->lp_view_id."'
289 289
                 ORDER BY id DESC
290 290
                 LIMIT 1";
291 291
         $res_last_attempt = Database::query($sql);
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
                         status = '$status',
315 315
                         score = $score,
316 316
                         total_time = $mytime
317
-                    WHERE id='" . $lp_item_view_id . "' AND c_id = $course_id ";
317
+                    WHERE id='".$lp_item_view_id."' AND c_id = $course_id ";
318 318
 
319 319
             if ($debug) {
320 320
                 error_log($sql);
@@ -324,17 +324,17 @@  discard block
 block discarded – undo
324 324
 
325 325
             $sql = "UPDATE $TBL_TRACK_EXERCICES SET
326 326
                         orig_lp_item_view_id = $lp_item_view_id
327
-                    WHERE exe_id = " . $safe_exe_id;
327
+                    WHERE exe_id = ".$safe_exe_id;
328 328
             Database::query($sql);
329 329
         }
330 330
     }
331 331
     if (intval($_GET['fb_type']) > 0) {
332 332
         $src = 'blank.php?msg=exerciseFinished';
333 333
     } else {
334
-        $src = api_get_path(WEB_CODE_PATH) . 'exercise/result.php?origin=learnpath&id=' . $safe_exe_id.'&'.api_get_cidreq();
334
+        $src = api_get_path(WEB_CODE_PATH).'exercise/result.php?origin=learnpath&id='.$safe_exe_id.'&'.api_get_cidreq();
335 335
 
336 336
         if ($debug) {
337
-            error_log('Calling URL: ' . $src);
337
+            error_log('Calling URL: '.$src);
338 338
         }
339 339
     }
340 340
     $autostart = 'false';
@@ -392,8 +392,8 @@  discard block
 block discarded – undo
392 392
 $tbl_lp_item = Database::get_course_table(TABLE_LP_ITEM);
393 393
 $show_audioplayer = false;
394 394
 // Getting all the information about the item.
395
-$sql = "SELECT audio FROM " . $tbl_lp_item . "
396
-        WHERE c_id = $course_id AND lp_id = '" . $_SESSION['oLP']->lp_id . "'";
395
+$sql = "SELECT audio FROM ".$tbl_lp_item."
396
+        WHERE c_id = $course_id AND lp_id = '".$_SESSION['oLP']->lp_id."'";
397 397
 $res_media = Database::query($sql);
398 398
 
399 399
 if (Database::num_rows($res_media) > 0) {
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
         'name' => get_lang('LearningPaths')
415 415
     );
416 416
     $interbreadcrumb[] = array(
417
-        'url' => api_get_self() . "?action=add_item&type=step&lp_id={$_SESSION['oLP']->lp_id}&isStudentView=false&".api_get_cidreq(true, true, 'course'),
417
+        'url' => api_get_self()."?action=add_item&type=step&lp_id={$_SESSION['oLP']->lp_id}&isStudentView=false&".api_get_cidreq(true, true, 'course'),
418 418
         'name' => $_SESSION['oLP']->get_name()
419 419
     );
420 420
 
@@ -426,12 +426,12 @@  discard block
 block discarded – undo
426 426
 
427 427
 // Return to course home.
428 428
 if ($is_allowed_to_edit) {
429
-    $buttonHomeUrl = 'lp_controller.php?' . api_get_cidreq(true, true, 'course') . '&' . http_build_query([
429
+    $buttonHomeUrl = 'lp_controller.php?'.api_get_cidreq(true, true, 'course').'&'.http_build_query([
430 430
         'isStudentView' => 'false',
431 431
         'action' => 'return_to_course_homepage'
432 432
     ]);
433 433
 } else {
434
-    $buttonHomeUrl = 'lp_controller.php?' . api_get_cidreq(true, true, 'course') . '&' . http_build_query([
434
+    $buttonHomeUrl = 'lp_controller.php?'.api_get_cidreq(true, true, 'course').'&'.http_build_query([
435 435
         'action' => 'return_to_course_homepage'
436 436
     ]);
437 437
 }
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
 
534 534
 $template->assign('lp_author', $_SESSION['oLP']->get_author());
535 535
 $template->assign('lp_mode', $_SESSION['oLP']->mode);
536
-$template->assign('lp_title_scorm',$_SESSION['oLP']->name);
536
+$template->assign('lp_title_scorm', $_SESSION['oLP']->name);
537 537
 $template->assign(
538 538
     'lp_html_toc',
539 539
     $_SESSION['oLP']->get_html_toc($get_toc_list)
Please login to merge, or discard this patch.
main/ticket/tickets.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
     $.ajax({
20 20
         contentType: "application/x-www-form-urlencoded",
21 21
         beforeSend: function(object) {
22
-        $("div#"+div_course).html("<img src=\'' . $webLibPath . 'javascript/indicator.gif\' />"); },
22
+        $("div#"+div_course).html("<img src=\'' . $webLibPath.'javascript/indicator.gif\' />"); },
23 23
         type: "POST",
24 24
         url: "ticket_assign_log.php",
25 25
         data: "ticket_id="+ticket_id,
@@ -42,10 +42,10 @@  discard block
 block discarded – undo
42 42
 function display_advanced_search_form() {
43 43
     if ($("#advanced_search_form").css("display") == "none") {
44 44
         $("#advanced_search_form").css("display","block");
45
-        $("#img_plus_and_minus").html(\'&nbsp;' . Display::return_icon('div_hide.gif', get_lang('Hide'), array('style' => 'vertical-align:middle')) . '&nbsp;' . get_lang('AdvancedSearch') . '\');
45
+        $("#img_plus_and_minus").html(\'&nbsp;' . Display::return_icon('div_hide.gif', get_lang('Hide'), array('style' => 'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedSearch').'\');
46 46
     } else {
47 47
         $("#advanced_search_form").css("display","none");
48
-        $("#img_plus_and_minus").html(\'&nbsp;' . Display::return_icon('div_show.gif', get_lang('Show'), array('style' => 'vertical-align:middle')) . '&nbsp;' . get_lang('AdvancedSearch') . '\');
48
+        $("#img_plus_and_minus").html(\'&nbsp;' . Display::return_icon('div_show.gif', get_lang('Show'), array('style' => 'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedSearch').'\');
49 49
     }
50 50
 }
51 51
 </script>';
@@ -219,21 +219,21 @@  discard block
 block discarded – undo
219 219
         null,
220 220
         '<a href="javascript://" class = "advanced-parameters" onclick="display_advanced_search_form();">'
221 221
         . '<span id="img_plus_and_minus">&nbsp;'
222
-        . Display::return_icon('div_show.gif', get_lang('Show')) . ' '
223
-        . get_lang('AdvancedSearch') . '</span></a>'
222
+        . Display::return_icon('div_show.gif', get_lang('Show')).' '
223
+        . get_lang('AdvancedSearch').'</span></a>'
224 224
     );
225 225
 
226 226
     echo '<div class="actions" >';
227 227
     if (api_is_platform_admin()) {
228
-        echo '<span class="left">' .
229
-                '<a href="' . api_get_path(WEB_CODE_PATH) . 'ticket/new_ticket.php?project_id='.$projectId.'">' .
230
-                    Display::return_icon('add.png', get_lang('Add'), '', ICON_SIZE_MEDIUM) . '</a>' .
231
-                '<a href="' . api_get_self() . '?action=export' . $get_parameter . $get_parameter2 . '&project_id='.$projectId.'">' .
232
-                    Display::return_icon('export_excel.png', get_lang('Export'), '', ICON_SIZE_MEDIUM) . '</a>';
228
+        echo '<span class="left">'.
229
+                '<a href="'.api_get_path(WEB_CODE_PATH).'ticket/new_ticket.php?project_id='.$projectId.'">'.
230
+                    Display::return_icon('add.png', get_lang('Add'), '', ICON_SIZE_MEDIUM).'</a>'.
231
+                '<a href="'.api_get_self().'?action=export'.$get_parameter.$get_parameter2.'&project_id='.$projectId.'">'.
232
+                    Display::return_icon('export_excel.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';
233 233
 
234 234
         echo Display::url(
235 235
             Display::return_icon('settings.png', get_lang('Categories')),
236
-            api_get_path(WEB_CODE_PATH) . 'ticket/settings.php'
236
+            api_get_path(WEB_CODE_PATH).'ticket/settings.php'
237 237
         );
238 238
         echo '</span>';
239 239
     }
@@ -287,8 +287,8 @@  discard block
 block discarded – undo
287 287
 } else {
288 288
     if (api_get_setting('ticket_allow_student_add') === 'true') {
289 289
         echo '<div class="actions" >';
290
-        echo '<a href="' . api_get_path(WEB_CODE_PATH) . 'ticket/new_ticket.php?project_id='.$projectId.'">' .
291
-                Display::return_icon('add.png', get_lang('Add'), '', '32') .
290
+        echo '<a href="'.api_get_path(WEB_CODE_PATH).'ticket/new_ticket.php?project_id='.$projectId.'">'.
291
+                Display::return_icon('add.png', get_lang('Add'), '', '32').
292 292
              '</a>';
293 293
         echo '</div>';
294 294
     }
@@ -320,8 +320,8 @@  discard block
 block discarded – undo
320 320
     $table->set_header(6, get_lang('AssignedTo'), true);
321 321
     $table->set_header(7, get_lang('Message'), true);
322 322
 } else {
323
-    echo '<center><h1>' . get_lang('MyTickets') . '</h1></center>';
324
-    echo '<center><p>' . get_lang('TicketMsgWelcome') . '</p></center>';
323
+    echo '<center><h1>'.get_lang('MyTickets').'</h1></center>';
324
+    echo '<center><p>'.get_lang('TicketMsgWelcome').'</p></center>';
325 325
     $table->set_header(0, '#', true);
326 326
     $table->set_header(1, get_lang('Status'), false);
327 327
     $table->set_header(2, get_lang('Date'), true);
Please login to merge, or discard this patch.
main/inc/lib/internationalization.lib.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -633,10 +633,10 @@  discard block
 block discarded – undo
633 633
         $date_format = str_replace(
634 634
             array('%A', '%a', '%B', '%b'),
635 635
             array(
636
-                $translated['days_long'][(int)strftime('%w', $time)],
637
-                $translated['days_short'][(int)strftime('%w', $time)],
638
-                $translated['months_long'][(int)strftime('%m', $time) - 1],
639
-                $translated['months_short'][(int)strftime('%m', $time) - 1],
636
+                $translated['days_long'][(int) strftime('%w', $time)],
637
+                $translated['days_short'][(int) strftime('%w', $time)],
638
+                $translated['months_long'][(int) strftime('%m', $time) - 1],
639
+                $translated['months_short'][(int) strftime('%m', $time) - 1],
640 640
             ),
641 641
             $date_format
642 642
         );
@@ -1583,7 +1583,7 @@  discard block
 block discarded – undo
1583 1583
  * @return string					Returns the encoding identificator modified in suitable for comparison way.
1584 1584
  */
1585 1585
 function api_refine_encoding_id($encoding) {
1586
-    if (is_array($encoding)){
1586
+    if (is_array($encoding)) {
1587 1587
         return array_map('api_refine_encoding_id', $encoding);
1588 1588
     }
1589 1589
     return strtoupper(str_replace('_', '-', $encoding));
Please login to merge, or discard this patch.
main/ticket/new_ticket.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 require_once __DIR__.'/../inc/global.inc.php';
9 9
 
10 10
 if (!api_is_platform_admin() && api_get_setting('ticket_allow_student_add') != 'true') {
11
-    header('location:' . api_get_path(WEB_CODE_PATH).'ticket/tickets.php');
11
+    header('location:'.api_get_path(WEB_CODE_PATH).'ticket/tickets.php');
12 12
     exit;
13 13
 }
14 14
 
@@ -84,15 +84,15 @@  discard block
 block discarded – undo
84 84
     var selected = document.getElementById("category_id").selectedIndex;
85 85
     var id = document.getElementById("category_id").options[selected].value;
86 86
     if(parseInt(course_required[id]) == 1 && document.getElementById("course_id").value == 0) {
87
-        alert("' . addslashes(get_lang("ValidCourse")) . '");
87
+        alert("' . addslashes(get_lang("ValidCourse")).'");
88 88
         return false;
89 89
     } else if(id != "CUR" && parseInt(course_required[id]) != 1  && !re.test(document.getElementById("personal_email").value)) {
90 90
         if (document.getElementById("personal_email").value != "") {
91
-            alert("' . addslashes(get_lang("PleaseEnterValidEmail")) . '");
91
+            alert("' . addslashes(get_lang("PleaseEnterValidEmail")).'");
92 92
             return false;
93 93
         }
94 94
     } else if(fckEditor1val == "") {
95
-        alert("' . addslashes(get_lang("Filled")) . '");
95
+        alert("' . addslashes(get_lang("Filled")).'");
96 96
         return false;
97 97
     }
98 98
 }
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
     });
136 136
 
137 137
     img_remove = $("<img/>", {
138
-        src: "' . Display::returnIconPath('delete.png') . '"
138
+        src: "' . Display::returnIconPath('delete.png').'"
139 139
     });
140 140
 
141 141
     new_filepath_id = $("#filepath_" + counter_image);
@@ -167,10 +167,10 @@  discard block
 block discarded – undo
167 167
 
168 168
 $types = TicketManager::get_all_tickets_categories($projectId, 'category.name ASC');
169 169
 $htmlHeadXtra[] = '<script language="javascript">
170
-    var projects = ' . js_array($types, 'projects', 'project_id') . '
171
-    var course_required = ' . js_array($types, 'course_required', 'course_required') . '
172
-    var other_area = ' . js_array($types, 'other_area', 'other_area') . '
173
-    var email = ' . js_array($types, 'email', 'email') .
170
+    var projects = ' . js_array($types, 'projects', 'project_id').'
171
+    var course_required = ' . js_array($types, 'course_required', 'course_required').'
172
+    var other_area = ' . js_array($types, 'other_area', 'other_area').'
173
+    var email = ' . js_array($types, 'email', 'email').
174 174
 '</script>';
175 175
 
176 176
 /**
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
  */
180 180
 function js_str($s)
181 181
 {
182
-    return '"' . addcslashes($s, "\0..\37\"\\") . '"';
182
+    return '"'.addcslashes($s, "\0..\37\"\\").'"';
183 183
 }
184 184
 
185 185
 /**
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 {
193 193
     $return = "new Array(); ";
194 194
     foreach ($array as $value) {
195
-        $return .= $name . "['" . $value['category_id'] . "'] ='" . $value[$key] . "'; ";
195
+        $return .= $name."['".$value['category_id']."'] ='".$value[$key]."'; ";
196 196
     }
197 197
 
198 198
     return $return;
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
     $form->addElement(
381 381
         'text',
382 382
         'phone',
383
-        get_lang('Phone') . ' (' . get_lang('Optional') . ')',
383
+        get_lang('Phone').' ('.get_lang('Optional').')',
384 384
         array(
385 385
             'id' => 'phone'
386 386
         )
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 
420 420
     $form->addLabel('',
421 421
         '<span id="link-more-attach">
422
-         <span class="btn btn-success" onclick="return add_image_form()">' . get_lang('AddOneMoreFile') . '</span>
422
+         <span class="btn btn-success" onclick="return add_image_form()">' . get_lang('AddOneMoreFile').'</span>
423 423
          </span>
424 424
          ('.sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize'))).')
425 425
     ');
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
     $category_id = $_POST['category_id'];
454 454
     $content = $_POST['content'];
455 455
     if ($_POST['phone'] != '') {
456
-        $content .= '<p style="color:red">&nbsp;' . get_lang('Phone') . ': ' . Security::remove_XSS($_POST['phone']). '</p>';
456
+        $content .= '<p style="color:red">&nbsp;'.get_lang('Phone').': '.Security::remove_XSS($_POST['phone']).'</p>';
457 457
     }
458 458
     $course_id = isset($_POST['course_id']) ? $_POST['course_id'] : '';
459 459
     $sessionId = isset($_POST['session_id']) ? $_POST['session_id'] : '';
@@ -485,7 +485,7 @@  discard block
 block discarded – undo
485 485
         $status,
486 486
         $user_id
487 487
     )) {
488
-        header('Location:' . api_get_path(WEB_CODE_PATH).'ticket/tickets.php');
488
+        header('Location:'.api_get_path(WEB_CODE_PATH).'ticket/tickets.php');
489 489
         exit;
490 490
     } else {
491 491
         Display::display_header(get_lang('ComposeMessage'));
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
     $sql = "SELECT COUNT(u.user_id) AS total_number_of_items FROM $user_table u";
505 505
     if ((api_is_platform_admin() || api_is_session_admin()) && api_get_multiple_access_url()) {
506 506
         $access_url_rel_user_table = Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
507
-        $sql.= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
507
+        $sql .= " INNER JOIN $access_url_rel_user_table url_rel_user ON (u.user_id=url_rel_user.user_id)";
508 508
     }
509 509
     if (isset($_GET['keyword'])) {
510 510
         $keyword = Database::escape_string(trim($_GET['keyword']));
@@ -581,7 +581,7 @@  discard block
 block discarded – undo
581 581
     while ($user = Database::fetch_row($res)) {
582 582
         $user_id = $user[0];
583 583
         $userPicture = UserManager::getUserPicture($user_id);
584
-        $photo = '<img src="' . $userPicture. '" alt="' . api_get_person_name($user[2], $user[3]) . '" title="' . api_get_person_name($user[2], $user[3]) . '" />';
584
+        $photo = '<img src="'.$userPicture.'" alt="'.api_get_person_name($user[2], $user[3]).'" title="'.api_get_person_name($user[2], $user[3]).'" />';
585 585
         $users[] = array(
586 586
             $photo,
587 587
             $user_id,
Please login to merge, or discard this patch.
main/messages/new_message.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 $nameTools = api_xml_http_response_encode(get_lang('Messages'));
25 25
 /*	Constants and variables */
26 26
 
27
-$htmlHeadXtra[]='
27
+$htmlHeadXtra[] = '
28 28
 <script>
29 29
 function validate(form, list) {
30 30
 	if(list.selectedIndex<0) {
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
               FROM $table_message
83 83
 			  WHERE user_receiver_id = ".intval($receiver_id)." AND id='".intval($message_id)."';";
84 84
 	$result = Database::query($query);
85
-	$row = Database::fetch_array($result,'ASSOC');
85
+	$row = Database::fetch_array($result, 'ASSOC');
86 86
 	if (!isset($row['user_sender_id'])) {
87 87
 		$html = get_lang('InvalidMessageId');
88 88
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     return $html;
96 96
 }
97 97
 
98
-function show_compose_to_user ($receiver_id)
98
+function show_compose_to_user($receiver_id)
99 99
 {
100 100
     $userInfo = api_get_user_info($receiver_id);
101 101
 	$html = get_lang('To').':&nbsp;<strong>'.$userInfo['complete_name'].'</strong>';
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 function manage_form($default, $select_from_user_list = null, $sent_to = null)
110 110
 {
111 111
     $group_id = isset($_REQUEST['group_id']) ? intval($_REQUEST['group_id']) : null;
112
-    $message_id = isset($_GET['message_id'])  ?  intval($_GET['message_id']) : null;
112
+    $message_id = isset($_GET['message_id']) ? intval($_GET['message_id']) : null;
113 113
     $param_f = isset($_GET['f']) && $_GET['f'] == 'social' ? 'social' : null;
114 114
 
115 115
     $form = new FormValidator(
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
             );
134 134
             $form->addRule('id_text_name', get_lang('ThisFieldIsRequired'), 'required');
135 135
             $form->addElement('html', '<div id="id_div_search" style="padding:0px" class="message-select-box" >&nbsp;</div>');
136
-            $form->addElement('hidden','user_list', 0, array('id'=>'user_list'));
136
+            $form->addElement('hidden', 'user_list', 0, array('id'=>'user_list'));
137 137
         } else {
138 138
             if (!empty($sent_to)) {
139 139
                 $form->addLabel(get_lang('SendMessageTo'), $sent_to);
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
                     array(),
148 148
                     [
149 149
                         'multiple' => 'multiple',
150
-                        'url' => api_get_path(WEB_AJAX_PATH) . 'message.ajax.php?a=find_users'
150
+                        'url' => api_get_path(WEB_AJAX_PATH).'message.ajax.php?a=find_users'
151 151
                     ]
152 152
                 );
153 153
             } else {
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 
212 212
         $form->addLabel(
213 213
             '',
214
-            '<span id="link-more-attach"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a></span>&nbsp;('.sprintf(get_lang('MaximunFileSizeX'),format_file_size(api_get_setting('message_max_upload_filesize'))).')'
214
+            '<span id="link-more-attach"><a href="javascript://" onclick="return add_image_form()">'.get_lang('AddOneMoreFile').'</a></span>&nbsp;('.sprintf(get_lang('MaximunFileSizeX'), format_file_size(api_get_setting('message_max_upload_filesize'))).')'
215 215
         );
216 216
     }
217 217
 
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
             $content = $default['content'];
234 234
             $group_id = isset($default['group_id']) ? $default['group_id'] : null;
235 235
             $parent_id = isset($default['parent_id']) ? $default['parent_id'] : null;
236
-            if (is_array($user_list) && count($user_list)> 0) {
236
+            if (is_array($user_list) && count($user_list) > 0) {
237 237
                 //all is well, send the message
238 238
                 foreach ($user_list as $userId) {
239 239
                     $res = MessageManager::send_message(
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
                     if ($res) {
249 249
                         $userInfo = api_get_user_info($userId);
250 250
                         Display::addFlash(Display::return_message(
251
-                            get_lang('MessageSentTo') ."&nbsp;<b>" .$userInfo['complete_name'] ."</b>",
251
+                            get_lang('MessageSentTo')."&nbsp;<b>".$userInfo['complete_name']."</b>",
252 252
                             'confirmation',
253 253
                             false
254 254
                         ));
@@ -291,9 +291,9 @@  discard block
 block discarded – undo
291 291
 if ($group_id != 0) {
292 292
 	$social_right_content .= '<div class=actions>';
293 293
 	$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/social/group_view.php?id='.$group_id.'">'.
294
-		Display::return_icon('back.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
294
+		Display::return_icon('back.png', api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
295 295
 	$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.
296
-		Display::return_icon('message_new.png',api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
296
+		Display::return_icon('message_new.png', api_xml_http_response_encode(get_lang('ComposeMessage'))).'</a>';
297 297
 	$social_right_content .= '</div>';
298 298
 } else {
299 299
 	if ($socialToolIsActive) {
@@ -305,11 +305,11 @@  discard block
 block discarded – undo
305 305
 		}
306 306
 		if (api_get_setting('allow_message_tool') === 'true') {
307 307
 			$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
308
-                Display::return_icon('message_new.png',get_lang('ComposeMessage')).'</a>';
308
+                Display::return_icon('message_new.png', get_lang('ComposeMessage')).'</a>';
309 309
 			$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
310
-                Display::return_icon('inbox.png',get_lang('Inbox')).'</a>';
310
+                Display::return_icon('inbox.png', get_lang('Inbox')).'</a>';
311 311
             $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
312
-                Display::return_icon('outbox.png',get_lang('Outbox')).'</a>';
312
+                Display::return_icon('outbox.png', get_lang('Outbox')).'</a>';
313 313
 		}
314 314
 		$social_right_content .= '</div>';
315 315
 	}
@@ -323,21 +323,21 @@  discard block
 block discarded – undo
323 323
     $social_right_content .= '<div class="row">';
324 324
     $social_right_content .= '<div class="col-md-12">';
325 325
     $social_right_content .= '<div class="actions">';
326
-    $social_right_content .=  '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.
326
+    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.
327 327
         Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>';
328
-    $social_right_content .=  '</div>';
329
-    $social_right_content .=  '</div>';
328
+    $social_right_content .= '</div>';
329
+    $social_right_content .= '</div>';
330 330
     $social_right_content .= '<div class="col-md-12">';
331 331
 }
332 332
 
333 333
 // MAIN CONTENT
334 334
 if (!isset($_POST['compose'])) {
335
-    if(isset($_GET['re_id'])) {
335
+    if (isset($_GET['re_id'])) {
336 336
         $social_right_content .= show_compose_reply_to_message(
337 337
             $_GET['re_id'],
338 338
             api_get_user_id()
339 339
         );
340
-    } elseif(isset($_GET['send_to_user'])) {
340
+    } elseif (isset($_GET['send_to_user'])) {
341 341
         $social_right_content .= show_compose_to_user($_GET['send_to_user']);
342 342
     } else {
343 343
         $social_right_content .= show_compose_to_any(api_get_user_id());
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
         $restrict = true;
349 349
     } elseif (isset($_POST['group_id'])) {
350 350
         $restrict = true;
351
-    } elseif(isset($_POST['hidden_user'])) {
351
+    } elseif (isset($_POST['hidden_user'])) {
352 352
         $restrict = true;
353 353
     }
354 354
 
@@ -371,13 +371,13 @@  discard block
 block discarded – undo
371 371
             }
372 372
             $social_right_content .= manage_form($default);
373 373
         } else {
374
-            $social_right_content .= Display::return_message(get_lang('ErrorSendingMessage'),'error');
374
+            $social_right_content .= Display::return_message(get_lang('ErrorSendingMessage'), 'error');
375 375
         }
376 376
     }
377 377
 }
378 378
 if (api_get_setting('allow_social_tool') === 'true') {
379
-    $social_right_content .=  '</div>';
380
-    $social_right_content .=  '</div>';
379
+    $social_right_content .= '</div>';
380
+    $social_right_content .= '</div>';
381 381
 }
382 382
 
383 383
 $tpl = new Template(get_lang('ComposeMessage'));
Please login to merge, or discard this patch.
main/mySpace/users.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -20,14 +20,14 @@  discard block
 block discarded – undo
20 20
 
21 21
 $this_section = SECTION_TRACKING;
22 22
 
23
-$interbreadcrumb[] = array ("url" => "index.php", "name" => get_lang('MySpace'));
23
+$interbreadcrumb[] = array("url" => "index.php", "name" => get_lang('MySpace'));
24 24
 
25 25
 if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && !isset($_GET["type"])) {
26
-    $interbreadcrumb[] = array ("url" => "teachers.php", "name" => get_lang('Teachers'));
26
+    $interbreadcrumb[] = array("url" => "teachers.php", "name" => get_lang('Teachers'));
27 27
 }
28 28
 
29
-if (isset($_GET["user_id"]) && $_GET["user_id"]!="" && isset($_GET["type"]) && $_GET["type"] == "coach") {
30
-    $interbreadcrumb[] = array ("url" => "coaches.php", "name" => get_lang('Tutors'));
29
+if (isset($_GET["user_id"]) && $_GET["user_id"] != "" && isset($_GET["type"]) && $_GET["type"] == "coach") {
30
+    $interbreadcrumb[] = array("url" => "coaches.php", "name" => get_lang('Tutors'));
31 31
 }
32 32
 
33 33
 function get_count_users()
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
             $detailsLink = '<a href="myStudents.php?student='.$student_id.'&id_coach='.$coach_id.'&id_session='.$sessionId.'">
164 164
 				            '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>';
165 165
         } else {
166
-            $detailsLink =  '<a href="myStudents.php?student='.$student_id.'">
166
+            $detailsLink = '<a href="myStudents.php?student='.$student_id.'">
167 167
 				            '.Display::return_icon('2rightarrow.png', get_lang('Details')).'</a>';
168 168
         }
169 169
         $row[] = $detailsLink;
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 
185 185
 if (api_is_drh()) {
186 186
     $menu_items = array(
187
-        Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php" ),
187
+        Display::url(Display::return_icon('stats.png', get_lang('MyStats'), '', ICON_SIZE_MEDIUM), api_get_path(WEB_CODE_PATH)."auth/my_progress.php"),
188 188
         Display::url(Display::return_icon('user_na.png', get_lang('Students'), array(), ICON_SIZE_MEDIUM), '#'),
189 189
         Display::url(Display::return_icon('teacher.png', get_lang('Trainers'), array(), ICON_SIZE_MEDIUM), 'teachers.php'),
190 190
         Display::url(Display::return_icon('course.png', get_lang('Courses'), array(), ICON_SIZE_MEDIUM), 'course.php'),
@@ -240,14 +240,14 @@  discard block
 block discarded – undo
240 240
 
241 241
 if ($export_csv) {
242 242
     if ($is_western_name_order) {
243
-        $csv_header[] = array (
243
+        $csv_header[] = array(
244 244
             get_lang('FirstName'),
245 245
             get_lang('LastName'),
246 246
             get_lang('FirstLogin'),
247 247
             get_lang('LastConnexion')
248 248
         );
249 249
     } else {
250
-        $csv_header[] = array (
250
+        $csv_header[] = array(
251 251
             get_lang('LastName'),
252 252
             get_lang('FirstName'),
253 253
             get_lang('FirstLogin'),
Please login to merge, or discard this patch.
main/forum/newthread.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -54,12 +54,12 @@  discard block
 block discarded – undo
54 54
 
55 55
 /* Breadcrumbs */
56 56
 
57
-if (isset($_SESSION['gradebook'])){
57
+if (isset($_SESSION['gradebook'])) {
58 58
     $gradebook = Security::remove_XSS($_SESSION['gradebook']);
59 59
 }
60 60
 
61 61
 if (!empty($gradebook) && $gradebook == 'view') {
62
-    $interbreadcrumb[] = array (
62
+    $interbreadcrumb[] = array(
63 63
         'url' => '../gradebook/'.Security::remove_XSS($_SESSION['gradebook_dest']),
64 64
         'name' => get_lang('ToolGradebook')
65 65
     );
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'group/group.php?'.$cidreq, 'name' => get_lang('Groups'));
118 118
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'group/group_space.php?'.$cidreq, 'name' => get_lang('GroupSpace').' '.$groupProperties['name']);
119 119
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/viewforum.php?'.$cidreq.'&forum='.intval($_GET['forum']), 'name' => $current_forum['forum_title']);
120
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/newthread.php?'.$cidreq.'&forum='.intval($_GET['forum']),'name' => get_lang('NewTopic'));
120
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/newthread.php?'.$cidreq.'&forum='.intval($_GET['forum']), 'name' => get_lang('NewTopic'));
121 121
 } else {
122 122
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/index.php?'.$cidreq, 'name' => $nameTools);
123 123
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'forum/viewforumcategory.php?'.$cidreq.'&forumcategory='.$current_forum_category['cat_id'], 'name' => $current_forum_category['cat_title']);
Please login to merge, or discard this patch.