Completed
Pull Request — 1.11.x (#1628)
by José
97:30 queued 69:06
created
main/exercise/hotspot.class.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	 * @param FormValidator $form
33 33
 	 * @param int $fck_config
34 34
 	 */
35
-	public function createForm (&$form, $fck_config=0)
35
+	public function createForm(&$form, $fck_config = 0)
36 36
 	{
37 37
 		parent::createForm($form, $fck_config);
38 38
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 			// Saving a question
51 51
 			$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
52 52
 			//$form->addButtonSave(get_lang('GoToQuestion'), 'submitQuestion');
53
-			$form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array ('jpg', 'jpeg', 'png', 'gif'));
53
+			$form->addRule('imageUpload', get_lang('OnlyImagesAllowed'), 'filetype', array('jpg', 'jpeg', 'png', 'gif'));
54 54
 			$form->addRule('imageUpload', get_lang('NoImage'), 'uploadedfile');
55 55
 		} else {
56 56
 			// setting the save button here and not in the question class.php
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 		$_course = api_get_course_info();
71 71
 		parent::processCreation($form, $objExercise);
72 72
 
73
-		if(!empty($file_info['tmp_name'])) {
73
+		if (!empty($file_info['tmp_name'])) {
74 74
 			$this->uploadPicture($file_info['tmp_name'], $file_info['name']);
75 75
 			$documentPath  = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
76 76
 			$picturePath   = $documentPath.'/images';
@@ -114,25 +114,25 @@  discard block
 block discarded – undo
114 114
 
115 115
 	}
116 116
 
117
-	function createForm(&$form, $fck_config=0)
117
+	function createForm(&$form, $fck_config = 0)
118 118
 	{
119
-		parent::createForm ($form, $fck_config);
119
+		parent::createForm($form, $fck_config);
120 120
 	}
121 121
 
122
-	function processCreation ($form, $objExercise = null)
122
+	function processCreation($form, $objExercise = null)
123 123
 	{
124 124
 		$file_info = $form -> getSubmitValue('imageUpload');
125
-		parent::processCreation ($form, $objExercise);
125
+		parent::processCreation($form, $objExercise);
126 126
 	}
127 127
 
128
-	function createAnswersForm ($form)
128
+	function createAnswersForm($form)
129 129
 	{
130
-		parent::createAnswersForm ($form);
130
+		parent::createAnswersForm($form);
131 131
 	}
132 132
 
133
-	function processAnswersCreation ($form)
133
+	function processAnswersCreation($form)
134 134
 	{
135
-		parent::processAnswersCreation ($form);
135
+		parent::processAnswersCreation($form);
136 136
 	}
137 137
 }
138 138
 
Please login to merge, or discard this patch.
main/attendance/attendance_add.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 
13 13
 // error messages
14 14
 if (isset($error)) {
15
-    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
15
+    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
16 16
 }
17 17
 
18 18
 if (!isset($error)) {
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 $form->addElement('hidden', 'sec_token', $token);
29 29
 
30 30
 $form->addText('title', get_lang('Title'), true);
31
-$form->applyFilter('title','html_filter');
31
+$form->applyFilter('title', 'html_filter');
32 32
 $form->addHtmlEditor(
33 33
     'description',
34 34
     get_lang('Description'),
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 if ((api_get_session_id() != 0 && Gradebook::is_active()) || api_get_session_id() == 0) {
42 42
     $form->addButtonAdvancedSettings('id_qualify');
43 43
 
44
-    $form->addElement('html','<div id="id_qualify_options" style="display:none">');
44
+    $form->addElement('html', '<div id="id_qualify_options" style="display:none">');
45 45
 
46 46
     // Qualify Attendance for gradebook option
47 47
     $form->addElement(
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
         get_lang('QualifyAttendanceGradebook'),
52 52
         'onclick="javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"'
53 53
     );
54
-    $form->addElement('html','<div id="options_field" style="display:none">');
54
+    $form->addElement('html', '<div id="options_field" style="display:none">');
55 55
 
56 56
     GradebookUtils::load_gradebook_select_in_tool($form);
57 57
 
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
         'value="0.00" Style="width:40px" onfocus="javascript: this.select();"'
65 65
     );
66 66
     $form->applyFilter('attendance_weight', 'html_filter');
67
-    $form->addElement('html','</div>');
68
-    $form->addElement('html','</div>');
67
+    $form->addElement('html', '</div>');
68
+    $form->addElement('html', '</div>');
69 69
 }
70 70
 $form->addButtonCreate(get_lang('Save'));
71 71
 $form->display();
Please login to merge, or discard this patch.
main/attendance/attendance_edit.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 
13 13
 // error messages
14 14
 if (isset($error)) {
15
-    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
15
+    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
16 16
 }
17 17
 
18 18
 if (!isset($error)) {
@@ -49,18 +49,18 @@  discard block
 block discarded – undo
49 49
 if (Gradebook::is_active()) {
50 50
     if (!empty($attendance_qualify_title) || !empty($attendance_weight)) {
51 51
         $form->addButtonAdvancedSettings('id_qualify');
52
-        $form->addElement('html','<div id="id_qualify_options" style="display:block">');
52
+        $form->addElement('html', '<div id="id_qualify_options" style="display:block">');
53 53
         $form->addElement(
54 54
             'checkbox',
55 55
             'attendance_qualify_gradebook',
56 56
             '',
57 57
             get_lang('QualifyAttendanceGradebook'),
58
-            array('checked'=>'true','onclick'=>'javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}')
58
+            array('checked'=>'true', 'onclick'=>'javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}')
59 59
         );
60
-        $form->addElement('html','<div id="options_field" style="display:block">');
60
+        $form->addElement('html', '<div id="options_field" style="display:block">');
61 61
     } else {
62 62
         $form->addButtonAdvancedSettings('id_qualify');
63
-        $form->addElement('html','<div id="id_qualify_options" style="display:none">');
63
+        $form->addElement('html', '<div id="id_qualify_options" style="display:none">');
64 64
         $form->addElement(
65 65
             'checkbox',
66 66
             'attendance_qualify_gradebook',
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
             get_lang('QualifyAttendanceGradebook'),
69 69
             'onclick="javascript: if(this.checked){document.getElementById(\'options_field\').style.display = \'block\';}else{document.getElementById(\'options_field\').style.display = \'none\';}"'
70 70
         );
71
-        $form->addElement('html','<div id="options_field" style="display:none">');
71
+        $form->addElement('html', '<div id="options_field" style="display:none">');
72 72
     }
73 73
     GradebookUtils::load_gradebook_select_in_tool($form);
74 74
     $form->addElement('text', 'attendance_qualify_title', get_lang('TitleColumnGradebook'));
Please login to merge, or discard this patch.
main/attendance/attendance_sheet.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
     $form = new FormValidator(
25 25
             'filter',
26 26
             'post',
27
-            'index.php?action=attendance_sheet_list&' . api_get_cidreq().'&attendance_id=' . $attendance_id,
27
+            'index.php?action=attendance_sheet_list&'.api_get_cidreq().'&attendance_id='.$attendance_id,
28 28
             null,
29 29
             array(),
30 30
             'inline'
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
                             <th width="100px"><?php echo get_lang('AttendancesFaults')?></th>
216 216
                         </tr>
217 217
                         <tr class="tableFloatingHeaderOriginal" >
218
-                            <th width="10px"><?php echo '#';?></th>
218
+                            <th width="10px"><?php echo '#'; ?></th>
219 219
                             <th width="10px"><?php echo get_lang('Photo')?></th>
220 220
                             <th width="150px"><?php echo get_lang('LastName')?></th>
221 221
                             <th width="140px"><?php echo get_lang('FirstName')?></th>
@@ -229,9 +229,9 @@  discard block
 block discarded – undo
229 229
                         foreach ($users_in_course as $data) {
230 230
                             $faults = 0;
231 231
                             if ($i % 2 == 0) {
232
-                                $class='row_odd';
232
+                                $class = 'row_odd';
233 233
                             } else {
234
-                                $class='row_even';
234
+                                $class = 'row_even';
235 235
                             }
236 236
                             $username = api_htmlentities(sprintf(get_lang('LoginX'), $data['username']), ENT_QUOTES);
237 237
                             ?>
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
                                 <td><span title="<?php echo $username ?>"><?php echo $data['lastname'] ?></span></td>
242 242
                                 <td><?php echo $data['firstname'] ?></td>
243 243
                                 <td>
244
-                                    <div class="attendance-faults-bar" style="background-color:<?php echo (!empty($data['result_color_bar'])?$data['result_color_bar']:'none') ?>">
244
+                                    <div class="attendance-faults-bar" style="background-color:<?php echo (!empty($data['result_color_bar']) ? $data['result_color_bar'] : 'none') ?>">
245 245
                                         <?php echo $data['attendance_result'] ?>
246 246
                                     </div>
247 247
                                 </td>
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
263 263
                     foreach ($attendant_calendar as $calendar) {
264 264
                         $date = $calendar['date'];
265 265
                         $time = $calendar['time'];
266
-                        $datetime = '<div class="grey">'. $date . ' - ' . $time . '</div>';
266
+                        $datetime = '<div class="grey">'.$date.' - '.$time.'</div>';
267 267
 
268 268
                         $img_lock = Display::return_icon(
269 269
                             'lock-closed.png',
@@ -272,21 +272,21 @@  discard block
 block discarded – undo
272 272
                         );
273 273
 
274 274
                         if (!empty($calendar['done_attendance'])) {
275
-                            $datetime = '<div class="blue">' . $date . ' - ' . $time . '</div>';
275
+                            $datetime = '<div class="blue">'.$date.' - '.$time.'</div>';
276 276
                         }
277 277
                         $disabled_check = 'disabled = "true"';
278 278
                         $input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="" disabled />';
279 279
                         if ($next_attendance_calendar_id == $calendar['id']) {
280 280
                             $input_hidden = '<input type="hidden" id="hidden_input_'.$calendar['id'].'" name="hidden_input[]" value="'.$calendar['id'].'" />';
281 281
                             $disabled_check = '';
282
-                            $img_lock = Display::return_icon('lock-closed.png',get_lang('DateLock'),array('class'=>'img_unlock','id'=>'datetime_column_'.$calendar['id']));
282
+                            $img_lock = Display::return_icon('lock-closed.png', get_lang('DateLock'), array('class'=>'img_unlock', 'id'=>'datetime_column_'.$calendar['id']));
283 283
                         }
284 284
 
285 285
                         $result .= '<th>';
286 286
                         $result .= '<div class="date-attendance">'.$datetime.'&nbsp;';
287 287
 
288 288
                         if (api_is_allowed_to_edit(null, true)) {
289
-                            $result .= '<span id="attendance_lock" style="cursor:pointer">'.(!$is_locked_attendance || api_is_platform_admin()?$img_lock:'').'</span>';
289
+                            $result .= '<span id="attendance_lock" style="cursor:pointer">'.(!$is_locked_attendance || api_is_platform_admin() ? $img_lock : '').'</span>';
290 290
                         }
291 291
 
292 292
                         if ($is_locked_attendance == false) {
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
                     }
298 298
                 } else {
299 299
                     $result  = '<th width="2000px"><span><a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendance_id.'">';
300
-                    $result .= Display::return_icon('attendance_calendar.png',get_lang('AttendanceCalendar'),'',ICON_SIZE_MEDIUM).' '.get_lang('GoToAttendanceCalendar').'</a></span></th>';
300
+                    $result .= Display::return_icon('attendance_calendar.png', get_lang('AttendanceCalendar'), '', ICON_SIZE_MEDIUM).' '.get_lang('GoToAttendanceCalendar').'</a></span></th>';
301 301
                 }
302 302
 
303 303
                 echo '<tr class="tableFloatingHeader row_odd" style="position: absolute; top: 0px; left: 0px; visibility: hidden; margin:0px;padding:0px">';
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
                 $i = 0;
312 312
                 foreach ($users_in_course as $user) {
313 313
                     $class = '';
314
-                    if ($i%2 == 0) {
314
+                    if ($i % 2 == 0) {
315 315
                         $class = 'row_even';
316 316
                     } else {
317 317
                         $class = 'row_odd';
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
                                     echo '<input type="checkbox" name="check_presence['.$calendar['id'].'][]" value="'.$user['user_id'].'" '.$disabled.' '.$checked.' />';
359 359
                                     echo '<span class="anchor_'.$calendar['id'].'"></span>';
360 360
                                 } else {
361
-                                    echo $presence ? Display::return_icon('checkbox_on.gif',get_lang('Presence')) : Display::return_icon('checkbox_off.gif',get_lang('Presence'));
361
+                                    echo $presence ? Display::return_icon('checkbox_on.gif', get_lang('Presence')) : Display::return_icon('checkbox_off.gif', get_lang('Presence'));
362 362
                                 }
363 363
                             } else {
364 364
                                 switch ($presence) {
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
                         </td>';
390 390
                     }
391 391
                     echo '</tr>';
392
-                    $i++ ;
392
+                    $i++;
393 393
                 }
394 394
                 echo '</tbody></table>';
395 395
                 echo '</div></div>';
@@ -417,13 +417,13 @@  discard block
 block discarded – undo
417 417
     echo Display::page_header(get_lang('AttendanceSheetReport'));
418 418
     // View for students
419 419
     ?>
420
-    <?php if(!empty($users_presence)) { ?>
420
+    <?php if (!empty($users_presence)) { ?>
421 421
         <div>
422 422
             <table width="250px;">
423 423
                 <tr>
424 424
                     <td><?php echo get_lang('ToAttend').': ' ?></td>
425 425
                     <td>
426
-                        <center><div class="attendance-faults-bar" style="background-color:<?php echo (!empty($faults['color_bar'])?$faults['color_bar']:'none') ?>">
426
+                        <center><div class="attendance-faults-bar" style="background-color:<?php echo (!empty($faults['color_bar']) ? $faults['color_bar'] : 'none') ?>">
427 427
                         <?php echo $faults['faults'].'/'.$faults['total'].' ('.$faults['faults_porcent'].'%)' ?></div></center>
428 428
                     </td>
429 429
                 </tr>
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
                 ?>
449 449
                 <tr class="<?php echo $class ?>">
450 450
                     <td>
451
-                        <?php echo $presence['presence'] ? Display::return_icon('checkbox_on.gif',get_lang('Presence')) : Display::return_icon('checkbox_off.gif',get_lang('Presence')) ?>
451
+                        <?php echo $presence['presence'] ? Display::return_icon('checkbox_on.gif', get_lang('Presence')) : Display::return_icon('checkbox_off.gif', get_lang('Presence')) ?>
452 452
                         <?php echo "&nbsp; ".$presence['date_time'] ?>
453 453
                     </td>
454 454
                 </tr>
Please login to merge, or discard this patch.
main/inc/lib/glossary.lib.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -47,9 +47,9 @@  discard block
 block discarded – undo
47 47
      *
48 48
      * @return string The glossary description
49 49
      */
50
-    public static function get_glossary_term_by_glossary_id ($glossary_id)
50
+    public static function get_glossary_term_by_glossary_id($glossary_id)
51 51
     {
52
-        $glossary_table  = Database::get_course_table(TABLE_GLOSSARY);
52
+        $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
53 53
         $course_id = api_get_course_int_id();
54 54
         $sql = "SELECT description FROM $glossary_table
55 55
                 WHERE c_id = $course_id  AND glossary_id =".intval($glossary_id);
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
      */
73 73
     public static function get_glossary_term_by_glossary_name($glossary_name)
74 74
     {
75
-        $glossary_table  = Database::get_course_table(TABLE_GLOSSARY);
75
+        $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
76 76
         $session_id = api_get_session_id();
77 77
         $course_id = api_get_course_int_id();
78 78
         $sql_filter = api_get_session_condition($session_id);
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
         $get_max = "SELECT MAX(display_order) FROM $t_glossary
226 226
                     WHERE c_id = $course_id ";
227 227
         $res_max = Database::query($get_max);
228
-        if (Database::num_rows($res_max)==0) {
228
+        if (Database::num_rows($res_max) == 0) {
229 229
             return 0;
230 230
         }
231 231
         $row = Database::fetch_array($res_max);
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
                 WHERE
255 255
                     c_id = $course_id AND
256 256
                     name = '".Database::escape_string($term)."'";
257
-        if ($not_id<>'') {
257
+        if ($not_id <> '') {
258 258
             $sql .= " AND glossary_id <> '".intval($not_id)."'";
259 259
         }
260 260
         $result = Database::query($sql);
@@ -378,25 +378,25 @@  discard block
 block discarded – undo
378 378
         $actionsLeft = '';
379 379
         if (api_is_allowed_to_edit(null, true)) {
380 380
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=addglossary&msg=add?'.api_get_cidreq().'">'.
381
-                Display::return_icon('new_glossary_term.png',get_lang('TermAddNew'), '', ICON_SIZE_MEDIUM).'</a>';
381
+                Display::return_icon('new_glossary_term.png', get_lang('TermAddNew'), '', ICON_SIZE_MEDIUM).'</a>';
382 382
         }
383 383
 
384 384
         $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=export">'.
385
-            Display::return_icon('export_csv.png',get_lang('ExportGlossaryAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
385
+            Display::return_icon('export_csv.png', get_lang('ExportGlossaryAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
386 386
         if (api_is_allowed_to_edit(null, true)) {
387 387
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=import">'.
388
-                Display::return_icon('import_csv.png',get_lang('ImportGlossary'), '', ICON_SIZE_MEDIUM).'</a>';
388
+                Display::return_icon('import_csv.png', get_lang('ImportGlossary'), '', ICON_SIZE_MEDIUM).'</a>';
389 389
         }
390 390
 
391 391
         $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf">'.
392
-            Display::return_icon('pdf.png',get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
392
+            Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
393 393
 
394 394
         if (($view == 'table') || (!isset($view))) {
395 395
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=list">'.
396
-                Display::return_icon('view_detailed.png',get_lang('ListView'), '', ICON_SIZE_MEDIUM).'</a>';
396
+                Display::return_icon('view_detailed.png', get_lang('ListView'), '', ICON_SIZE_MEDIUM).'</a>';
397 397
         } else {
398 398
             $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=table">'.
399
-                Display::return_icon('view_text.png',get_lang('TableView'), '', ICON_SIZE_MEDIUM).'</a>';
399
+                Display::return_icon('view_text.png', get_lang('TableView'), '', ICON_SIZE_MEDIUM).'</a>';
400 400
         }
401 401
 
402 402
         /* BUILD SEARCH FORM */
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
             $table->set_header(1, get_lang('TermDefinition'), true);
434 434
             if (api_is_allowed_to_edit(null, true)) {
435 435
                 $table->set_header(2, get_lang('Actions'), false, 'width=90px', array('class' => 'td_actions'));
436
-                $table->set_column_filter(2, array('GlossaryManager','actions_filter'));
436
+                $table->set_column_filter(2, array('GlossaryManager', 'actions_filter'));
437 437
             }
438 438
             $content .= $table->return_table();
439 439
         }
@@ -455,8 +455,8 @@  discard block
 block discarded – undo
455 455
         $content = '';
456 456
         foreach ($glossary_data as $key => $glossary_item) {
457 457
             $actions = '';
458
-            if (api_is_allowed_to_edit(null,true)) {
459
-                $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '',$glossary_item).'</div>';
458
+            if (api_is_allowed_to_edit(null, true)) {
459
+                $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '', $glossary_item).'</div>';
460 460
             }
461 461
             $content .= Display::panel($glossary_item[1], $glossary_item[0].' '.$actions);
462 462
         }
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
      * @return integer Count of glossary terms
470 470
      *
471 471
      */
472
-    public static function get_number_glossary_terms($session_id=0)
472
+    public static function get_number_glossary_terms($session_id = 0)
473 473
     {
474 474
         // Database table definition
475 475
         $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
         while ($data = Database::fetch_array($res)) {
564 564
             // Validation when belongs to a session
565 565
             $session_img = api_get_session_image($data['session_id'], $_user['status']);
566
-            $array[0] = $data[0] . $session_img;
566
+            $array[0] = $data[0].$session_img;
567 567
 
568 568
             if (!$view || $view === 'table') {
569 569
                 $array[1] = str_replace(array('<p>', '</p>'), array('', '<br />'), $data[1]);
@@ -593,13 +593,13 @@  discard block
 block discarded – undo
593 593
     {
594 594
         $glossary_id = $row[2];
595 595
         $return = '<a href="'.api_get_self().'?action=edit_glossary&glossary_id='.$glossary_id.'&'.api_get_cidreq().'&msg=edit">'.
596
-            Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>';
596
+            Display::return_icon('edit.png', get_lang('Edit'), '', 22).'</a>';
597 597
         $glossary_data = GlossaryManager::get_glossary_information($glossary_id);
598 598
         $glossary_term = $glossary_data['name'];
599 599
         if (api_is_allowed_to_edit(null, true)) {
600 600
             if ($glossary_data['session_id'] == api_get_session_id()) {
601 601
                 $return .= '<a href="'.api_get_self().'?action=delete_glossary&glossary_id='.$glossary_id.'&'.api_get_cidreq().'" onclick="return confirmation(\''.$glossary_term.'\');">'.
602
-                    Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>';
602
+                    Display::return_icon('delete.png', get_lang('Delete'), '', 22).'</a>';
603 603
             } else {
604 604
                 $return = get_lang('EditionNotAvailableFromSession');
605 605
             }
Please login to merge, or discard this patch.
main/inc/lib/lp_item.lib.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 
37 37
     public function __construct($in_c_id = 0, $in_id = 0)
38 38
     {
39
-        if ($in_c_id > 0 && $in_id >0) {
39
+        if ($in_c_id > 0 && $in_id > 0) {
40 40
             $item_view_table = Database::get_course_table(TABLE_LP_ITEM);
41 41
             $sql = "SELECT * FROM $item_view_table
42 42
                     WHERE
Please login to merge, or discard this patch.
main/install/index.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 \Patchwork\Utf8\Bootup::initAll();
106 106
 
107 107
 // Page encoding initialization.
108
-header('Content-Type: text/html; charset='. $charset);
108
+header('Content-Type: text/html; charset='.$charset);
109 109
 
110 110
 // Setting the error reporting levels.
111 111
 error_reporting(E_ALL);
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
     // This is the main configuration file of the system before the upgrade.
216 216
     // Old configuration file.
217 217
     // Don't change to include_once
218
-    $oldConfigPath = api_get_path(SYS_CODE_PATH) . 'inc/conf/configuration.php';
218
+    $oldConfigPath = api_get_path(SYS_CODE_PATH).'inc/conf/configuration.php';
219 219
     if (file_exists($oldConfigPath)) {
220 220
         include $oldConfigPath;
221 221
     }
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
             //Blocking step6 button
346 346
             $("#button_step6").click(function() {
347 347
                 $("#button_step6").hide();
348
-                $("#button_please_wait").html('<?php echo addslashes(get_lang('PleaseWait'));?>');
348
+                $("#button_please_wait").html('<?php echo addslashes(get_lang('PleaseWait')); ?>');
349 349
                 $("#button_please_wait").show();
350 350
                 $("#button_please_wait").attr('disabled', true);
351 351
                 $("#is_executable").attr("value",'step6');
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 
413 413
 $instalation_type_label = '';
414 414
 if ($installType == 'new') {
415
-    $instalation_type_label  = get_lang('NewInstallation');
415
+    $instalation_type_label = get_lang('NewInstallation');
416 416
 } elseif ($installType == 'update') {
417 417
     $update_from_version = isset($update_from_version) ? $update_from_version : null;
418 418
     $instalation_type_label = get_lang('UpdateFromLMSVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : '');
@@ -582,8 +582,8 @@  discard block
 block discarded – undo
582 582
 
583 583
     <?php
584 584
     if ($installType == 'new') {
585
-        echo get_lang('AdminLogin') . ' : <strong>' . $loginForm . '</strong><br />';
586
-        echo get_lang('AdminPass') . ' : <strong>' . $passForm . '</strong><br /><br />'; /* TODO: Maybe this password should be hidden too? */
585
+        echo get_lang('AdminLogin').' : <strong>'.$loginForm.'</strong><br />';
586
+        echo get_lang('AdminPass').' : <strong>'.$passForm.'</strong><br /><br />'; /* TODO: Maybe this password should be hidden too? */
587 587
     }
588 588
     $allowSelfRegistrationLiteral = ($allowSelfReg == 'true') ? get_lang('Yes') : ($allowSelfReg == 'approval' ? get_lang('Approval') : get_lang('No'));
589 589
     echo get_lang('AdminFirstName').' : '.$adminFirstName, '<br />', get_lang('AdminLastName').' : '.$adminLastName, '<br />';
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
     <?php echo get_lang('DBLogin').' : '.$dbUsernameForm; ?><br />
596 596
     <?php echo get_lang('DBPassword').' : '.str_repeat('*', api_strlen($dbPassForm)); ?><br />
597 597
     <?php echo get_lang('MainDB').' : <strong>'.$dbNameForm; ?></strong><br />
598
-    <?php echo get_lang('AllowSelfReg').' : '. $allowSelfRegistrationLiteral; ?><br />
598
+    <?php echo get_lang('AllowSelfReg').' : '.$allowSelfRegistrationLiteral; ?><br />
599 599
     <?php echo get_lang('EncryptMethodUserPass').' : ';
600 600
     echo $encryptPassForm;
601 601
     ?>
Please login to merge, or discard this patch.
main/install/update-configuration.inc.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -10,11 +10,11 @@  discard block
 block discarded – undo
10 10
  */
11 11
 if (defined('SYSTEM_INSTALLATION')) {
12 12
 
13
-    error_log("Starting " . basename(__FILE__));
13
+    error_log("Starting ".basename(__FILE__));
14 14
     $perm = api_get_permissions_for_new_files();
15 15
 
16
-    $oldConfFile = api_get_path(SYS_CODE_PATH) . 'inc/conf/configuration.php';
17
-    $newConfFile = api_get_path(CONFIGURATION_PATH) . 'configuration.php';
16
+    $oldConfFile = api_get_path(SYS_CODE_PATH).'inc/conf/configuration.php';
17
+    $newConfFile = api_get_path(CONFIGURATION_PATH).'configuration.php';
18 18
 
19 19
     if (file_exists($oldConfFile)) {
20 20
         copy($oldConfFile, $newConfFile);
@@ -37,18 +37,18 @@  discard block
 block discarded – undo
37 37
         $ignore = false;
38 38
         if (stripos($line, '$_configuration[\'system_version\']') !== false) {
39 39
             $found_version = true;
40
-            $line = '$_configuration[\'system_version\'] = \'' . $GLOBALS['new_version'] . '\';' . "\r\n";
40
+            $line = '$_configuration[\'system_version\'] = \''.$GLOBALS['new_version'].'\';'."\r\n";
41 41
        } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
42 42
             $found_stable = true;
43
-            $line = '$_configuration[\'system_stable\'] = ' . ($GLOBALS['new_version_stable'] ? 'true' : 'false') . ';' . "\r\n";
43
+            $line = '$_configuration[\'system_stable\'] = '.($GLOBALS['new_version_stable'] ? 'true' : 'false').';'."\r\n";
44 44
         } elseif (stripos($line, '$_configuration[\'software_name\']') !== false) {
45 45
             $found_software_name = true;
46
-            $line = '$_configuration[\'software_name\'] = \'' . $GLOBALS['software_name'] . '\';' . "\r\n";
46
+            $line = '$_configuration[\'software_name\'] = \''.$GLOBALS['software_name'].'\';'."\r\n";
47 47
         } elseif (stripos($line, '$_configuration[\'software_url\']') !== false) {
48 48
             $found_software_url = true;
49
-            $line = '$_configuration[\'software_url\'] = \'' . $GLOBALS['software_url'] . '\';' . "\r\n";
49
+            $line = '$_configuration[\'software_url\'] = \''.$GLOBALS['software_url'].'\';'."\r\n";
50 50
         } elseif (stripos($line, '$userPasswordCrypted') !== false) {
51
-            $line = '$_configuration[\'password_encryption\'] = \'' .$userPasswordCrypted.'\';' . "\r\n";
51
+            $line = '$_configuration[\'password_encryption\'] = \''.$userPasswordCrypted.'\';'."\r\n";
52 52
         } elseif (stripos($line, '?>') !== false) {
53 53
             $ignore = true;
54 54
         }
@@ -58,21 +58,21 @@  discard block
 block discarded – undo
58 58
     }
59 59
 
60 60
     if (!$found_version) {
61
-        fwrite($fh, '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n");
61
+        fwrite($fh, '$_configuration[\'system_version\'] = \''.$new_version.'\';'."\r\n");
62 62
     }
63 63
     if (!$found_stable) {
64
-        fwrite($fh, '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n");
64
+        fwrite($fh, '$_configuration[\'system_stable\'] = '.($new_version_stable ? 'true' : 'false').';'."\r\n");
65 65
     }
66 66
     if (!$found_software_name) {
67
-        fwrite($fh, '$_configuration[\'software_name\'] = \'' . $software_name . '\';' . "\r\n");
67
+        fwrite($fh, '$_configuration[\'software_name\'] = \''.$software_name.'\';'."\r\n");
68 68
     }
69 69
     if (!$found_software_url) {
70
-        fwrite($fh, '$_configuration[\'software_url\'] = \'' . $software_url . '\';' . "\r\n");
70
+        fwrite($fh, '$_configuration[\'software_url\'] = \''.$software_url.'\';'."\r\n");
71 71
     }
72 72
     fwrite($fh, '?>');
73 73
     fclose($fh);
74 74
 
75 75
     error_log("configuration.php file updated.");
76 76
 } else {
77
-    echo 'You are not allowed here !'. __FILE__;
77
+    echo 'You are not allowed here !'.__FILE__;
78 78
 }
Please login to merge, or discard this patch.
main/calendar/ical_export.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -46,9 +46,9 @@
 block discarded – undo
46 46
 	define('ICAL_LANG', api_get_language_isocode());
47 47
 
48 48
     $ical = new vcalendar();
49
-    $ical->setConfig('unique_id',api_get_path(WEB_PATH));
50
-    $ical->setProperty( 'method', 'PUBLISH' );
51
-    $ical->setConfig('url',api_get_path(WEB_PATH));
49
+    $ical->setConfig('unique_id', api_get_path(WEB_PATH));
50
+    $ical->setProperty('method', 'PUBLISH');
51
+    $ical->setConfig('url', api_get_path(WEB_PATH));
52 52
     $vevent = new vevent();
53 53
 
54 54
     switch ($_GET['class']) {
Please login to merge, or discard this patch.