Completed
Push — 1.11.x ( 7ffd51...902ebd )
by José
50:21 queued 21:28
created
main/tracking/lp_results_by_user.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
 
101 101
         $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=teacher">'.get_lang('TeacherInterface').'</a>';
102 102
         if (api_is_platform_admin()) {
103
-          $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=admin">'.get_lang('AdminInterface').'</a>';
103
+            $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=admin">'.get_lang('AdminInterface').'</a>';
104 104
         } else {
105 105
             $menu_items[] = '<a href="'.api_get_path(WEB_CODE_PATH).'mySpace/?view=coach">'.get_lang('AdminInterface').'</a>';
106 106
         }
Please login to merge, or discard this patch.
main/webservices/cm_webservice.php 1 patch
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,6 +42,8 @@  discard block
 block discarded – undo
42 42
      *
43 43
      * @param int Error code
44 44
      * @param string Error message
45
+     * @param integer $code
46
+     * @param string $message
45 47
      */
46 48
     public function __construct($code, $message)
47 49
     {
@@ -91,6 +93,7 @@  discard block
 block discarded – undo
91 93
      * Handle method
92 94
      *
93 95
      * @param WSError $error Error
96
+     * @return void
94 97
      */
95 98
     public function handle($error);
96 99
 }
@@ -119,7 +122,7 @@  discard block
 block discarded – undo
119 122
      * Verifies the API key
120 123
      *
121 124
      * @param string $secret_key Secret key
122
-     * @return mixed WSError in case of failure, null in case of success
125
+     * @return WSCMError|null WSError in case of failure, null in case of success
123 126
      */
124 127
     protected function verifyKey($secret_key)
125 128
     {
@@ -145,7 +148,7 @@  discard block
 block discarded – undo
145 148
      * @param string $username of the user in chamilo
146 149
      * @param string $pass of the same user (in MD5 of SHA)
147 150
      *
148
-     * @return mixed "valid" if username e password are correct! Else, return a message error
151
+     * @return string "valid" if username e password are correct! Else, return a message error
149 152
      */
150 153
     public function verifyUserPass($username, $pass)
151 154
     {
Please login to merge, or discard this patch.
main/inc/lib/career.lib.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
                                     $pos = strpos($explode[0], 'G');
348 348
                                     if (is_numeric($pos)) {
349 349
                                         // group_123 id
350
-                                        $groupValueId = (int)str_replace(
350
+                                        $groupValueId = (int) str_replace(
351 351
                                             'G',
352 352
                                             '',
353 353
                                             $explode[0]
@@ -362,14 +362,14 @@  discard block
 block discarded – undo
362 362
                                     }
363 363
                                 } else {
364 364
                                     // subgroup__123 id
365
-                                    $firstConnection = 'subgroup_'.(int)str_replace('SG', '', $explode[0]);
365
+                                    $firstConnection = 'subgroup_'.(int) str_replace('SG', '', $explode[0]);
366 366
                                 }
367 367
 
368 368
                                 $pos = strpos($explode[1], 'SG');
369 369
                                 if ($pos === false) {
370 370
                                     $pos = strpos($explode[1], 'G');
371 371
                                     if (is_numeric($pos)) {
372
-                                        $groupValueId = (int)str_replace(
372
+                                        $groupValueId = (int) str_replace(
373 373
                                             'G',
374 374
                                             '',
375 375
                                             $explode[1]
@@ -383,7 +383,7 @@  discard block
 block discarded – undo
383 383
                                         }
384 384
                                     }
385 385
                                 } else {
386
-                                    $secondConnection = 'subgroup_'.(int)str_replace('SG', '', $explode[1]);
386
+                                    $secondConnection = 'subgroup_'.(int) str_replace('SG', '', $explode[1]);
387 387
                                 }
388 388
 
389 389
                                 if (!empty($firstConnection) && !empty($firstConnection)) {
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
                         if ($subGroup == '' || empty($subGroup)) {
488 488
                             $defaultSubGroup = 0;
489 489
                         } else {
490
-                            $defaultSubGroup = (int)$subGroup;
490
+                            $defaultSubGroup = (int) $subGroup;
491 491
                         }
492 492
                     }
493 493
                     $newRowList[$i + 1][$defaultSubGroup][] = $vertex;
Please login to merge, or discard this patch.
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     }
90 90
 
91 91
     /**
92
-     * @return array
92
+     * @return string[]
93 93
      */
94 94
     public function get_status_list()
95 95
     {
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
      * @param int $group
428 428
      * @param bool $showGroupLine
429 429
      * @param array $subGroupList
430
-     * @param $widthGroup
430
+     * @param integer $widthGroup
431 431
      * @return string
432 432
      */
433 433
     public static function parseSubGroups(
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
     /**
591 591
      * @param string $source
592 592
      * @param string $target
593
-     * @param array $anchor
593
+     * @param string[] $anchor
594 594
      * @return string
595 595
      */
596 596
     public static function createConnection($source, $target, $anchor = [])
Please login to merge, or discard this patch.
main/inc/lib/statistics.lib.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
565 565
                     WHERE 
566 566
                         login_date BETWEEN '$startDate' AND '$endDate'
567 567
                         $where_url";
568
-             $sqlList[$label] = $sql;
568
+                $sqlList[$label] = $sql;
569 569
         }
570 570
         $sqlList[get_lang('Total')] = "SELECT count($field) AS number FROM $table $table_url WHERE 1=1 $where_url";
571 571
 
@@ -724,7 +724,7 @@  discard block
 block discarded – undo
724 724
         $res = Database::query($sql);
725 725
         $count1 = Database::fetch_object($res);
726 726
         $sql = "SELECT COUNT(*) AS n FROM $user_table as u $table ".
727
-               "WHERE LENGTH(picture_uri) > 0 $url_condition2";
727
+                "WHERE LENGTH(picture_uri) > 0 $url_condition2";
728 728
         $res = Database::query($sql);
729 729
         $count2 = Database::fetch_object($res);
730 730
         // #users without picture
Please login to merge, or discard this patch.
main/inc/lib/exercise_show_functions.lib.php 3 patches
Doc Comments   +30 added lines, -6 removed lines patch added patch discarded remove patch
@@ -72,6 +72,11 @@  discard block
 block discarded – undo
72 72
      * @param string    Answer text
73 73
      * @param int       Exercise ID
74 74
      * @param int       Question ID
75
+     * @param integer $feedback_type
76
+     * @param string $answer
77
+     * @param integer $id
78
+     * @param integer $questionId
79
+     * @param boolean|string $showTotalScoreAndUserChoices
75 80
      * @return void
76 81
      */
77 82
     public static function display_calculated_answer(
@@ -111,6 +116,9 @@  discard block
 block discarded – undo
111 116
      * @param string    Answer text
112 117
      * @param int       Exercise ID
113 118
      * @param int       Question ID
119
+     * @param integer $feedback_type
120
+     * @param integer $exe_id
121
+     * @param integer $questionId
114 122
      * @return void
115 123
      */
116 124
     public static function display_free_answer(
@@ -140,10 +148,10 @@  discard block
 block discarded – undo
140 148
     }
141 149
 
142 150
     /**
143
-     * @param $feedback_type
151
+     * @param integer $feedback_type
144 152
      * @param $answer
145
-     * @param $id
146
-     * @param $questionId
153
+     * @param integer $id
154
+     * @param integer $questionId
147 155
      * @param null $fileUrl
148 156
      * @param int $results_disabled
149 157
      * @param int $questionScore
@@ -385,6 +393,14 @@  discard block
 block discarded – undo
385 393
      * @param integer Exercise ID
386 394
      * @param integer Question ID
387 395
      * @param boolean Whether to show the answer comment or not
396
+     * @param integer $feedback_type
397
+     * @param integer $answerType
398
+     * @param string $answer
399
+     * @param string $answerComment
400
+     * @param integer $answerCorrect
401
+     * @param integer $id
402
+     * @param integer $questionId
403
+     * @param boolean $showTotalScoreAndUserChoices
388 404
      * @return void
389 405
      */
390 406
     public static function display_multiple_answer_true_false(
@@ -489,6 +505,14 @@  discard block
 block discarded – undo
489 505
      * @param integer Exercise ID
490 506
      * @param integer Question ID
491 507
      * @param boolean Whether to show the answer comment or not
508
+     * @param integer $feedback_type
509
+     * @param integer $answerType
510
+     * @param string $answer
511
+     * @param string $answerComment
512
+     * @param integer $answerCorrect
513
+     * @param integer $id
514
+     * @param integer $questionId
515
+     * @param boolean $showTotalScoreAndUserChoices
492 516
      * @return void
493 517
      */
494 518
     public static function display_multiple_answer_combination_true_false(
@@ -578,9 +602,9 @@  discard block
 block discarded – undo
578 602
     }
579 603
 
580 604
     /**
581
-    * @param $feedback_type
582
-    * @param $exe_id
583
-    * @param $questionId
605
+    * @param integer $feedback_type
606
+    * @param integer $exe_id
607
+    * @param integer $questionId
584 608
     * @param null $questionScore
585 609
     * @param int $results_disabled
586 610
     */
Please login to merge, or discard this patch.
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -478,19 +478,19 @@  discard block
 block discarded – undo
478 478
         <?php
479 479
     }
480 480
 
481
-     /**
482
-     * Display the answers to a multiple choice question
483
-     *
484
-     * @param integer Answer type
485
-     * @param integer Student choice
486
-     * @param string  Textual answer
487
-     * @param string  Comment on answer
488
-     * @param string  Correct answer comment
489
-     * @param integer Exercise ID
490
-     * @param integer Question ID
491
-     * @param boolean Whether to show the answer comment or not
492
-     * @return void
493
-     */
481
+        /**
482
+         * Display the answers to a multiple choice question
483
+         *
484
+         * @param integer Answer type
485
+         * @param integer Student choice
486
+         * @param string  Textual answer
487
+         * @param string  Comment on answer
488
+         * @param string  Correct answer comment
489
+         * @param integer Exercise ID
490
+         * @param integer Question ID
491
+         * @param boolean Whether to show the answer comment or not
492
+         * @return void
493
+         */
494 494
     public static function display_multiple_answer_combination_true_false(
495 495
         $feedback_type,
496 496
         $answerType,
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
             <?php
557 557
             //@todo replace this harcoded value
558 558
             if ($studentChoice) {
559
-                 $color = "black";
559
+                    $color = "black";
560 560
                 if ($studentChoice == $answerCorrect) {
561 561
                     $color = "green";
562 562
                 }
@@ -578,12 +578,12 @@  discard block
 block discarded – undo
578 578
     }
579 579
 
580 580
     /**
581
-    * @param $feedback_type
582
-    * @param $exe_id
583
-    * @param $questionId
584
-    * @param null $questionScore
585
-    * @param int $results_disabled
586
-    */
581
+     * @param $feedback_type
582
+     * @param $exe_id
583
+     * @param $questionId
584
+     * @param null $questionScore
585
+     * @param int $results_disabled
586
+     */
587 587
     public static function displayAnnotationAnswer(
588 588
         $feedback_type,
589 589
         $exe_id,
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -156,8 +156,7 @@
 block discarded – undo
156 156
         $fileUrl = null,
157 157
         $results_disabled = 0,
158 158
         $questionScore = 0
159
-    )
160
-    {
159
+    ) {
161 160
         if (isset($fileUrl)) {
162 161
             echo '
163 162
                 <tr>
Please login to merge, or discard this patch.
main/session/index.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -550,7 +550,7 @@
 block discarded – undo
550 550
         }
551 551
     }
552 552
 <?php
553
-     //Displays js code to use a jqgrid
553
+        //Displays js code to use a jqgrid
554 554
     echo Display::grid_js(
555 555
         'courses',
556 556
         '',
Please login to merge, or discard this patch.
main/session/session_category_edit.php 1 patch
Braces   +354 added lines, -88 removed lines patch added patch discarded remove patch
@@ -85,7 +85,12 @@  discard block
 block discarded – undo
85 85
         <div class="form-group">
86 86
             <label class="col-sm-3 control-label"><?php echo get_lang('Name') ?></label>
87 87
             <div class="col-sm-6">
88
-                <input class="form-control" type="text" name="name" size="50" maxlength="50" value="<?php if ($formSent) echo api_htmlentities($name, ENT_QUOTES, $charset); else echo api_htmlentities($infos['name'], ENT_QUOTES, $charset); ?>">
88
+                <input class="form-control" type="text" name="name" size="50" maxlength="50" value="<?php if ($formSent) {
89
+    echo api_htmlentities($name, ENT_QUOTES, $charset);
90
+} else {
91
+    echo api_htmlentities($infos['name'], ENT_QUOTES, $charset);
92
+}
93
+?>">
89 94
             </div>
90 95
             <div class="col-sm-3"></div>
91 96
         </div>
@@ -101,58 +106,184 @@  discard block
 block discarded – undo
101 106
                 <div class="col-sm-6">
102 107
                     <select name="day_start">
103 108
                         <option value="1">01</option>
104
-                        <option value="2" <?php if ($day_start == 2) echo 'selected="selected"'; ?> >02</option>
105
-                        <option value="3" <?php if ($day_start == 3) echo 'selected="selected"'; ?> >03</option>
106
-                        <option value="4" <?php if ($day_start == 4) echo 'selected="selected"'; ?> >04</option>
107
-                        <option value="5" <?php if ($day_start == 5) echo 'selected="selected"'; ?> >05</option>
108
-                        <option value="6" <?php if ($day_start == 6) echo 'selected="selected"'; ?> >06</option>
109
-                        <option value="7" <?php if ($day_start == 7) echo 'selected="selected"'; ?> >07</option>
110
-                        <option value="8" <?php if ($day_start == 8) echo 'selected="selected"'; ?> >08</option>
111
-                        <option value="9" <?php if ($day_start == 9) echo 'selected="selected"'; ?> >09</option>
112
-                        <option value="10" <?php if ($day_start == 10) echo 'selected="selected"'; ?> >10</option>
113
-                        <option value="11" <?php if ($day_start == 11) echo 'selected="selected"'; ?> >11</option>
114
-                        <option value="12" <?php if ($day_start == 12) echo 'selected="selected"'; ?> >12</option>
115
-                        <option value="13" <?php if ($day_start == 13) echo 'selected="selected"'; ?> >13</option>
116
-                        <option value="14" <?php if ($day_start == 14) echo 'selected="selected"'; ?> >14</option>
117
-                        <option value="15" <?php if ($day_start == 15) echo 'selected="selected"'; ?> >15</option>
118
-                        <option value="16" <?php if ($day_start == 16) echo 'selected="selected"'; ?> >16</option>
119
-                        <option value="17" <?php if ($day_start == 17) echo 'selected="selected"'; ?> >17</option>
120
-                        <option value="18" <?php if ($day_start == 18) echo 'selected="selected"'; ?> >18</option>
121
-                        <option value="19" <?php if ($day_start == 19) echo 'selected="selected"'; ?> >19</option>
122
-                        <option value="20" <?php if ($day_start == 20) echo 'selected="selected"'; ?> >20</option>
123
-                        <option value="21" <?php if ($day_start == 21) echo 'selected="selected"'; ?> >21</option>
124
-                        <option value="22" <?php if ($day_start == 22) echo 'selected="selected"'; ?> >22</option>
125
-                        <option value="23" <?php if ($day_start == 23) echo 'selected="selected"'; ?> >23</option>
126
-                        <option value="24" <?php if ($day_start == 24) echo 'selected="selected"'; ?> >24</option>
127
-                        <option value="25" <?php if ($day_start == 25) echo 'selected="selected"'; ?> >25</option>
128
-                        <option value="26" <?php if ($day_start == 26) echo 'selected="selected"'; ?> >26</option>
129
-                        <option value="27" <?php if ($day_start == 27) echo 'selected="selected"'; ?> >27</option>
130
-                        <option value="28" <?php if ($day_start == 28) echo 'selected="selected"'; ?> >28</option>
131
-                        <option value="29" <?php if ($day_start == 29) echo 'selected="selected"'; ?> >29</option>
132
-                        <option value="30" <?php if ($day_start == 30) echo 'selected="selected"'; ?> >30</option>
133
-                        <option value="31" <?php if ($day_start == 31) echo 'selected="selected"'; ?> >31</option>
109
+                        <option value="2" <?php if ($day_start == 2) {
110
+    echo 'selected="selected"';
111
+}
112
+?> >02</option>
113
+                        <option value="3" <?php if ($day_start == 3) {
114
+    echo 'selected="selected"';
115
+}
116
+?> >03</option>
117
+                        <option value="4" <?php if ($day_start == 4) {
118
+    echo 'selected="selected"';
119
+}
120
+?> >04</option>
121
+                        <option value="5" <?php if ($day_start == 5) {
122
+    echo 'selected="selected"';
123
+}
124
+?> >05</option>
125
+                        <option value="6" <?php if ($day_start == 6) {
126
+    echo 'selected="selected"';
127
+}
128
+?> >06</option>
129
+                        <option value="7" <?php if ($day_start == 7) {
130
+    echo 'selected="selected"';
131
+}
132
+?> >07</option>
133
+                        <option value="8" <?php if ($day_start == 8) {
134
+    echo 'selected="selected"';
135
+}
136
+?> >08</option>
137
+                        <option value="9" <?php if ($day_start == 9) {
138
+    echo 'selected="selected"';
139
+}
140
+?> >09</option>
141
+                        <option value="10" <?php if ($day_start == 10) {
142
+    echo 'selected="selected"';
143
+}
144
+?> >10</option>
145
+                        <option value="11" <?php if ($day_start == 11) {
146
+    echo 'selected="selected"';
147
+}
148
+?> >11</option>
149
+                        <option value="12" <?php if ($day_start == 12) {
150
+    echo 'selected="selected"';
151
+}
152
+?> >12</option>
153
+                        <option value="13" <?php if ($day_start == 13) {
154
+    echo 'selected="selected"';
155
+}
156
+?> >13</option>
157
+                        <option value="14" <?php if ($day_start == 14) {
158
+    echo 'selected="selected"';
159
+}
160
+?> >14</option>
161
+                        <option value="15" <?php if ($day_start == 15) {
162
+    echo 'selected="selected"';
163
+}
164
+?> >15</option>
165
+                        <option value="16" <?php if ($day_start == 16) {
166
+    echo 'selected="selected"';
167
+}
168
+?> >16</option>
169
+                        <option value="17" <?php if ($day_start == 17) {
170
+    echo 'selected="selected"';
171
+}
172
+?> >17</option>
173
+                        <option value="18" <?php if ($day_start == 18) {
174
+    echo 'selected="selected"';
175
+}
176
+?> >18</option>
177
+                        <option value="19" <?php if ($day_start == 19) {
178
+    echo 'selected="selected"';
179
+}
180
+?> >19</option>
181
+                        <option value="20" <?php if ($day_start == 20) {
182
+    echo 'selected="selected"';
183
+}
184
+?> >20</option>
185
+                        <option value="21" <?php if ($day_start == 21) {
186
+    echo 'selected="selected"';
187
+}
188
+?> >21</option>
189
+                        <option value="22" <?php if ($day_start == 22) {
190
+    echo 'selected="selected"';
191
+}
192
+?> >22</option>
193
+                        <option value="23" <?php if ($day_start == 23) {
194
+    echo 'selected="selected"';
195
+}
196
+?> >23</option>
197
+                        <option value="24" <?php if ($day_start == 24) {
198
+    echo 'selected="selected"';
199
+}
200
+?> >24</option>
201
+                        <option value="25" <?php if ($day_start == 25) {
202
+    echo 'selected="selected"';
203
+}
204
+?> >25</option>
205
+                        <option value="26" <?php if ($day_start == 26) {
206
+    echo 'selected="selected"';
207
+}
208
+?> >26</option>
209
+                        <option value="27" <?php if ($day_start == 27) {
210
+    echo 'selected="selected"';
211
+}
212
+?> >27</option>
213
+                        <option value="28" <?php if ($day_start == 28) {
214
+    echo 'selected="selected"';
215
+}
216
+?> >28</option>
217
+                        <option value="29" <?php if ($day_start == 29) {
218
+    echo 'selected="selected"';
219
+}
220
+?> >29</option>
221
+                        <option value="30" <?php if ($day_start == 30) {
222
+    echo 'selected="selected"';
223
+}
224
+?> >30</option>
225
+                        <option value="31" <?php if ($day_start == 31) {
226
+    echo 'selected="selected"';
227
+}
228
+?> >31</option>
134 229
                   </select>
135 230
                   /
136 231
                   <select name="month_start">
137 232
                         <option value="1">01</option>
138
-                        <option value="2" <?php if ($month_start == 2) echo 'selected="selected"'; ?> >02</option>
139
-                        <option value="3" <?php if ($month_start == 3) echo 'selected="selected"'; ?> >03</option>
140
-                        <option value="4" <?php if ($month_start == 4) echo 'selected="selected"'; ?> >04</option>
141
-                        <option value="5" <?php if ($month_start == 5) echo 'selected="selected"'; ?> >05</option>
142
-                        <option value="6" <?php if ($month_start == 6) echo 'selected="selected"'; ?> >06</option>
143
-                        <option value="7" <?php if ($month_start == 7) echo 'selected="selected"'; ?> >07</option>
144
-                        <option value="8" <?php if ($month_start == 8) echo 'selected="selected"'; ?> >08</option>
145
-                        <option value="9" <?php if ($month_start == 9) echo 'selected="selected"'; ?> >09</option>
146
-                        <option value="10" <?php if ($month_start == 10) echo 'selected="selected"'; ?> >10</option>
147
-                        <option value="11" <?php if ($month_start == 11) echo 'selected="selected"'; ?> >11</option>
148
-                        <option value="12" <?php if ($month_start == 12) echo 'selected="selected"'; ?> >12</option>
233
+                        <option value="2" <?php if ($month_start == 2) {
234
+    echo 'selected="selected"';
235
+}
236
+?> >02</option>
237
+                        <option value="3" <?php if ($month_start == 3) {
238
+    echo 'selected="selected"';
239
+}
240
+?> >03</option>
241
+                        <option value="4" <?php if ($month_start == 4) {
242
+    echo 'selected="selected"';
243
+}
244
+?> >04</option>
245
+                        <option value="5" <?php if ($month_start == 5) {
246
+    echo 'selected="selected"';
247
+}
248
+?> >05</option>
249
+                        <option value="6" <?php if ($month_start == 6) {
250
+    echo 'selected="selected"';
251
+}
252
+?> >06</option>
253
+                        <option value="7" <?php if ($month_start == 7) {
254
+    echo 'selected="selected"';
255
+}
256
+?> >07</option>
257
+                        <option value="8" <?php if ($month_start == 8) {
258
+    echo 'selected="selected"';
259
+}
260
+?> >08</option>
261
+                        <option value="9" <?php if ($month_start == 9) {
262
+    echo 'selected="selected"';
263
+}
264
+?> >09</option>
265
+                        <option value="10" <?php if ($month_start == 10) {
266
+    echo 'selected="selected"';
267
+}
268
+?> >10</option>
269
+                        <option value="11" <?php if ($month_start == 11) {
270
+    echo 'selected="selected"';
271
+}
272
+?> >11</option>
273
+                        <option value="12" <?php if ($month_start == 12) {
274
+    echo 'selected="selected"';
275
+}
276
+?> >12</option>
149 277
                   </select>
150 278
                   /
151 279
                 <select name="year_start">
152 280
                         <?php
153 281
                         for ($i = $thisYear - 5; $i <= ($thisYear + 5); $i++)
154 282
                         { ?>
155
-                                <option value="<?php echo $i; ?>" <?php if ($year_start == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
283
+                                <option value="<?php echo $i; ?>" <?php if ($year_start == $i) {
284
+    echo 'selected="selected"';
285
+}
286
+?> ><?php echo $i; ?></option>
156 287
                         <?php
157 288
                         } ?>
158 289
                 </select>
@@ -164,53 +295,182 @@  discard block
 block discarded – undo
164 295
                 <div class="col-sm-6">
165 296
                     <select name="day_end">
166 297
                         <option value="0">--</option>
167
-                        <option value="1" <?php if ($day_end == 1) echo 'selected="selected"'; ?> >01</option>
168
-                        <option value="2" <?php if ($day_end == 2) echo 'selected="selected"'; ?> >02</option>
169
-                        <option value="3" <?php if ($day_end == 3) echo 'selected="selected"'; ?> >03</option>
170
-                        <option value="4" <?php if ($day_end == 4) echo 'selected="selected"'; ?> >04</option>
171
-                        <option value="5" <?php if ($day_end == 5) echo 'selected="selected"'; ?> >05</option>
172
-                        <option value="6" <?php if ($day_end == 6) echo 'selected="selected"'; ?> >06</option>
173
-                        <option value="7" <?php if ($day_end == 7) echo 'selected="selected"'; ?> >07</option>
174
-                        <option value="8" <?php if ($day_end == 8) echo 'selected="selected"'; ?> >08</option>
175
-                        <option value="9" <?php if ($day_end == 9) echo 'selected="selected"'; ?> >09</option>
176
-                        <option value="10" <?php if ($day_end == 10) echo 'selected="selected"'; ?> >10</option>
177
-                        <option value="11" <?php if ($day_end == 11) echo 'selected="selected"'; ?> >11</option>
178
-                        <option value="12" <?php if ($day_end == 12) echo 'selected="selected"'; ?> >12</option>
179
-                        <option value="13" <?php if ($day_end == 13) echo 'selected="selected"'; ?> >13</option>
180
-                        <option value="14" <?php if ($day_end == 14) echo 'selected="selected"'; ?> >14</option>
181
-                        <option value="15" <?php if ($day_end == 15) echo 'selected="selected"'; ?> >15</option>
182
-                        <option value="16" <?php if ($day_end == 16) echo 'selected="selected"'; ?> >16</option>
183
-                        <option value="17" <?php if ($day_end == 17) echo 'selected="selected"'; ?> >17</option>
184
-                        <option value="18" <?php if ($day_end == 18) echo 'selected="selected"'; ?> >18</option>
185
-                        <option value="19" <?php if ($day_end == 19) echo 'selected="selected"'; ?> >19</option>
186
-                        <option value="20" <?php if ($day_end == 20) echo 'selected="selected"'; ?> >20</option>
187
-                        <option value="21" <?php if ($day_end == 21) echo 'selected="selected"'; ?> >21</option>
188
-                        <option value="22" <?php if ($day_end == 22) echo 'selected="selected"'; ?> >22</option>
189
-                        <option value="23" <?php if ($day_end == 23) echo 'selected="selected"'; ?> >23</option>
190
-                        <option value="24" <?php if ($day_end == 24) echo 'selected="selected"'; ?> >24</option>
191
-                        <option value="25" <?php if ($day_end == 25) echo 'selected="selected"'; ?> >25</option>
192
-                        <option value="26" <?php if ($day_end == 26) echo 'selected="selected"'; ?> >26</option>
193
-                        <option value="27" <?php if ($day_end == 27) echo 'selected="selected"'; ?> >27</option>
194
-                        <option value="28" <?php if ($day_end == 28) echo 'selected="selected"'; ?> >28</option>
195
-                        <option value="29" <?php if ($day_end == 29) echo 'selected="selected"'; ?> >29</option>
196
-                        <option value="30" <?php if ($day_end == 30) echo 'selected="selected"'; ?> >30</option>
197
-                        <option value="31" <?php if ($day_end == 31) echo 'selected="selected"'; ?> >31</option>
298
+                        <option value="1" <?php if ($day_end == 1) {
299
+    echo 'selected="selected"';
300
+}
301
+?> >01</option>
302
+                        <option value="2" <?php if ($day_end == 2) {
303
+    echo 'selected="selected"';
304
+}
305
+?> >02</option>
306
+                        <option value="3" <?php if ($day_end == 3) {
307
+    echo 'selected="selected"';
308
+}
309
+?> >03</option>
310
+                        <option value="4" <?php if ($day_end == 4) {
311
+    echo 'selected="selected"';
312
+}
313
+?> >04</option>
314
+                        <option value="5" <?php if ($day_end == 5) {
315
+    echo 'selected="selected"';
316
+}
317
+?> >05</option>
318
+                        <option value="6" <?php if ($day_end == 6) {
319
+    echo 'selected="selected"';
320
+}
321
+?> >06</option>
322
+                        <option value="7" <?php if ($day_end == 7) {
323
+    echo 'selected="selected"';
324
+}
325
+?> >07</option>
326
+                        <option value="8" <?php if ($day_end == 8) {
327
+    echo 'selected="selected"';
328
+}
329
+?> >08</option>
330
+                        <option value="9" <?php if ($day_end == 9) {
331
+    echo 'selected="selected"';
332
+}
333
+?> >09</option>
334
+                        <option value="10" <?php if ($day_end == 10) {
335
+    echo 'selected="selected"';
336
+}
337
+?> >10</option>
338
+                        <option value="11" <?php if ($day_end == 11) {
339
+    echo 'selected="selected"';
340
+}
341
+?> >11</option>
342
+                        <option value="12" <?php if ($day_end == 12) {
343
+    echo 'selected="selected"';
344
+}
345
+?> >12</option>
346
+                        <option value="13" <?php if ($day_end == 13) {
347
+    echo 'selected="selected"';
348
+}
349
+?> >13</option>
350
+                        <option value="14" <?php if ($day_end == 14) {
351
+    echo 'selected="selected"';
352
+}
353
+?> >14</option>
354
+                        <option value="15" <?php if ($day_end == 15) {
355
+    echo 'selected="selected"';
356
+}
357
+?> >15</option>
358
+                        <option value="16" <?php if ($day_end == 16) {
359
+    echo 'selected="selected"';
360
+}
361
+?> >16</option>
362
+                        <option value="17" <?php if ($day_end == 17) {
363
+    echo 'selected="selected"';
364
+}
365
+?> >17</option>
366
+                        <option value="18" <?php if ($day_end == 18) {
367
+    echo 'selected="selected"';
368
+}
369
+?> >18</option>
370
+                        <option value="19" <?php if ($day_end == 19) {
371
+    echo 'selected="selected"';
372
+}
373
+?> >19</option>
374
+                        <option value="20" <?php if ($day_end == 20) {
375
+    echo 'selected="selected"';
376
+}
377
+?> >20</option>
378
+                        <option value="21" <?php if ($day_end == 21) {
379
+    echo 'selected="selected"';
380
+}
381
+?> >21</option>
382
+                        <option value="22" <?php if ($day_end == 22) {
383
+    echo 'selected="selected"';
384
+}
385
+?> >22</option>
386
+                        <option value="23" <?php if ($day_end == 23) {
387
+    echo 'selected="selected"';
388
+}
389
+?> >23</option>
390
+                        <option value="24" <?php if ($day_end == 24) {
391
+    echo 'selected="selected"';
392
+}
393
+?> >24</option>
394
+                        <option value="25" <?php if ($day_end == 25) {
395
+    echo 'selected="selected"';
396
+}
397
+?> >25</option>
398
+                        <option value="26" <?php if ($day_end == 26) {
399
+    echo 'selected="selected"';
400
+}
401
+?> >26</option>
402
+                        <option value="27" <?php if ($day_end == 27) {
403
+    echo 'selected="selected"';
404
+}
405
+?> >27</option>
406
+                        <option value="28" <?php if ($day_end == 28) {
407
+    echo 'selected="selected"';
408
+}
409
+?> >28</option>
410
+                        <option value="29" <?php if ($day_end == 29) {
411
+    echo 'selected="selected"';
412
+}
413
+?> >29</option>
414
+                        <option value="30" <?php if ($day_end == 30) {
415
+    echo 'selected="selected"';
416
+}
417
+?> >30</option>
418
+                        <option value="31" <?php if ($day_end == 31) {
419
+    echo 'selected="selected"';
420
+}
421
+?> >31</option>
198 422
                   </select>
199 423
                   /
200 424
                   <select name="month_end">
201 425
                         <option value="0">--</option>
202
-                        <option value="1" <?php if ($month_end == 1) echo 'selected="selected"'; ?> >01</option>
203
-                        <option value="2" <?php if ($month_end == 2) echo 'selected="selected"'; ?> >02</option>
204
-                        <option value="3" <?php if ($month_end == 3) echo 'selected="selected"'; ?> >03</option>
205
-                        <option value="4" <?php if ($month_end == 4) echo 'selected="selected"'; ?> >04</option>
206
-                        <option value="5" <?php if ($month_end == 5) echo 'selected="selected"'; ?> >05</option>
207
-                        <option value="6" <?php if ($month_end == 6) echo 'selected="selected"'; ?> >06</option>
208
-                        <option value="7" <?php if ($month_end == 7) echo 'selected="selected"'; ?> >07</option>
209
-                        <option value="8" <?php if ($month_end == 8) echo 'selected="selected"'; ?> >08</option>
210
-                        <option value="9" <?php if ($month_end == 9) echo 'selected="selected"'; ?> >09</option>
211
-                        <option value="10" <?php if ($month_end == 10) echo 'selected="selected"'; ?> >10</option>
212
-                        <option value="11" <?php if ($month_end == 11) echo 'selected="selected"'; ?> >11</option>
213
-                        <option value="12" <?php if ($month_end == 12) echo 'selected="selected"'; ?> >12</option>
426
+                        <option value="1" <?php if ($month_end == 1) {
427
+    echo 'selected="selected"';
428
+}
429
+?> >01</option>
430
+                        <option value="2" <?php if ($month_end == 2) {
431
+    echo 'selected="selected"';
432
+}
433
+?> >02</option>
434
+                        <option value="3" <?php if ($month_end == 3) {
435
+    echo 'selected="selected"';
436
+}
437
+?> >03</option>
438
+                        <option value="4" <?php if ($month_end == 4) {
439
+    echo 'selected="selected"';
440
+}
441
+?> >04</option>
442
+                        <option value="5" <?php if ($month_end == 5) {
443
+    echo 'selected="selected"';
444
+}
445
+?> >05</option>
446
+                        <option value="6" <?php if ($month_end == 6) {
447
+    echo 'selected="selected"';
448
+}
449
+?> >06</option>
450
+                        <option value="7" <?php if ($month_end == 7) {
451
+    echo 'selected="selected"';
452
+}
453
+?> >07</option>
454
+                        <option value="8" <?php if ($month_end == 8) {
455
+    echo 'selected="selected"';
456
+}
457
+?> >08</option>
458
+                        <option value="9" <?php if ($month_end == 9) {
459
+    echo 'selected="selected"';
460
+}
461
+?> >09</option>
462
+                        <option value="10" <?php if ($month_end == 10) {
463
+    echo 'selected="selected"';
464
+}
465
+?> >10</option>
466
+                        <option value="11" <?php if ($month_end == 11) {
467
+    echo 'selected="selected"';
468
+}
469
+?> >11</option>
470
+                        <option value="12" <?php if ($month_end == 12) {
471
+    echo 'selected="selected"';
472
+}
473
+?> >12</option>
214 474
                   </select>
215 475
                   /
216 476
                   <select name="year_end">
@@ -218,7 +478,10 @@  discard block
 block discarded – undo
218 478
                         <?php
219 479
                         for ($i = $thisYear - 5; $i <= ($thisYear + 5); $i++)
220 480
                         { ?>
221
-                         <option value="<?php echo $i; ?>" <?php if ($year_end == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
481
+                         <option value="<?php echo $i; ?>" <?php if ($year_end == $i) {
482
+    echo 'selected="selected"';
483
+}
484
+?> ><?php echo $i; ?></option>
222 485
                         <?php
223 486
                         } ?>
224 487
                  </select>
@@ -239,7 +502,10 @@  discard block
 block discarded – undo
239 502
 
240 503
 
241 504
 <script>
242
-<?php if ($year_start == "0000") echo "setDisable(document.form.nolimit);\r\n"; ?>
505
+<?php if ($year_start == "0000") {
506
+    echo "setDisable(document.form.nolimit);\r\n";
507
+}
508
+?>
243 509
 function setDisable(select){
244 510
 	document.form.day_start.disabled = (select.checked) ? true : false;
245 511
 	document.form.month_start.disabled = (select.checked) ? true : false;
Please login to merge, or discard this patch.
main/inc/lib/message.lib.php 4 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -226,8 +226,8 @@
 block discarded – undo
226 226
     {
227 227
         if (!empty($aboutUserInfo)) {
228 228
             $criteria = [
229
-              'userReceiverId' => $aboutUserInfo['id'],
230
-              'msgStatus' => MESSAGE_STATUS_CONVERSATION
229
+                'userReceiverId' => $aboutUserInfo['id'],
230
+                'msgStatus' => MESSAGE_STATUS_CONVERSATION
231 231
             ];
232 232
             $repo = Database::getManager()->getRepository('ChamiloCoreBundle:Message');
233 233
             $messages = $repo->findBy($criteria, ['sendDate' => 'DESC']);
Please login to merge, or discard this patch.
Doc Comments   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -700,6 +700,8 @@  discard block
 block discarded – undo
700 700
      * @param  int    message id
701 701
      * @param  int    message user id (receiver user id or sender user id)
702 702
      * @param  int    group id (optional)
703
+     * @param integer $message_id
704
+     * @param integer $message_uid
703 705
      */
704 706
     public static function delete_message_attachment_file(
705 707
         $message_id,
@@ -747,7 +749,7 @@  discard block
 block discarded – undo
747 749
      * update messages by user id and message id
748 750
      * @param  int $user_id
749 751
      * @param  int $message_id
750
-     * @return resource
752
+     * @return false|null
751 753
      */
752 754
     public static function update_message($user_id, $message_id)
753 755
     {
@@ -768,7 +770,7 @@  discard block
 block discarded – undo
768 770
      * @param int $user_id
769 771
      * @param int $message_id
770 772
      * @param string $type
771
-     * @return bool
773
+     * @return false|null
772 774
      */
773 775
     public static function update_message_status($user_id, $message_id, $type)
774 776
     {
@@ -1592,7 +1594,7 @@  discard block
 block discarded – undo
1592 1594
      * Sort date by desc from a multi-dimensional array
1593 1595
      * @param array $array1 first array to compare
1594 1596
      * @param array $array2 second array to compare
1595
-     * @return bool
1597
+     * @return integer
1596 1598
      */
1597 1599
     public function order_desc_date($array1, $array2)
1598 1600
     {
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -173,13 +173,13 @@
 block discarded – undo
173 173
                 Display::url(
174 174
                     Display::returnFontAwesomeIcon('reply', 2),
175 175
                     $newMessageLink.'?re_id='.$result[0].$link,
176
-                    ['title' => get_lang('ReplyToMessage') ]
176
+                    ['title' => get_lang('ReplyToMessage')]
177 177
                 ).
178 178
                 '&nbsp;&nbsp;'.
179 179
                 Display::url(
180 180
                     Display::returnFontAwesomeIcon('share', 2),
181 181
                     $newMessageLink.'?forward_id='.$result[0].$link,
182
-                    ['title' => get_lang('ForwardMessage') ]
182
+                    ['title' => get_lang('ForwardMessage')]
183 183
                 ).
184 184
                 '&nbsp;&nbsp;<a title="'.addslashes(get_lang('DeleteMessage')).'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmDeleteMessage')))."'".')) return false;" href="inbox.php?action=deleteone&id='.$result[0].$link.'">'.
185 185
                 Display::returnFontAwesomeIcon('trash', 2).'</a>';
Please login to merge, or discard this patch.
Upper-Lower-Casing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
         $row = Database::fetch_array($result);
581 581
 
582 582
         // update parent_id for other user receiver
583
-        $sql = "UPDATE $table_message SET parent_id = ".$row['id']."
583
+        $sql = "update $table_message SET parent_id = ".$row['id']."
584 584
                 WHERE id = $message_id";
585 585
         Database::query($sql);
586 586
     }
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
             // delete attachment file
607 607
             self::delete_message_attachment_file($id, $user_receiver_id);
608 608
             // delete message
609
-            $query = "UPDATE $table_message 
609
+            $query = "update $table_message 
610 610
                       SET msg_status = ".MESSAGE_STATUS_DELETED."
611 611
                       WHERE 
612 612
                         user_receiver_id=".$user_receiver_id." AND 
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
             // delete attachment file
645 645
             self::delete_message_attachment_file($id, $user_sender_id);
646 646
             // delete message
647
-            $sql = "UPDATE $table_message 
647
+            $sql = "update $table_message 
648 648
                     SET msg_status = ".MESSAGE_STATUS_DELETED."
649 649
                     WHERE user_sender_id='$user_sender_id' AND id='$id'";
650 650
             Database::query($sql);
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
764 764
             $path_message_attach = $path_user_info['dir'].'message_attachments/';
765 765
             if (is_file($path_message_attach.$path)) {
766 766
                 if (rename($path_message_attach.$path, $path_message_attach.$new_path)) {
767
-                    $sql = "UPDATE $table_message_attach set path='$new_path'
767
+                    $sql = "update $table_message_attach set path='$new_path'
768 768
                             WHERE id ='$attach_id'";
769 769
                     Database::query($sql);
770 770
                 }
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
785 785
         }
786 786
 
787 787
         $table_message = Database::get_main_table(TABLE_MESSAGE);
788
-        $sql = "UPDATE $table_message SET 
788
+        $sql = "update $table_message SET 
789 789
                     msg_status = '".MESSAGE_STATUS_NEW."'
790 790
                 WHERE
791 791
                     msg_status <> ".MESSAGE_STATUS_OUTBOX." AND
@@ -807,7 +807,7 @@  discard block
 block discarded – undo
807 807
             return false;
808 808
         }
809 809
         $table_message = Database::get_main_table(TABLE_MESSAGE);
810
-        $sql = "UPDATE $table_message SET
810
+        $sql = "update $table_message SET
811 811
                     msg_status = '$type'
812 812
                 WHERE
813 813
                     user_receiver_id=".intval($user_id)." AND
@@ -1104,7 +1104,7 @@  discard block
 block discarded – undo
1104 1104
             }
1105 1105
         } else {
1106 1106
             if (is_numeric($message_id) && !empty($message_id)) {
1107
-                $query = "UPDATE $table_message SET
1107
+                $query = "update $table_message SET
1108 1108
                           msg_status = '".MESSAGE_STATUS_NEW."'
1109 1109
                           WHERE
1110 1110
                             user_receiver_id=" . api_get_user_id()." AND
Please login to merge, or discard this patch.
main/inc/lib/CourseChatUtils.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 
218 218
     /**
219 219
      * Disconnect a user from course chats
220
-     * @param $userId
220
+     * @param integer $userId
221 221
      */
222 222
     public static function exitChat($userId)
223 223
     {
@@ -1388,7 +1388,7 @@  discard block
 block discarded – undo
1388 1388
 
1389 1389
     /**
1390 1390
      * Get the emoji list to include in chat
1391
-     * @return array
1391
+     * @return string[]
1392 1392
      */
1393 1393
     public static function getEmojisToInclude()
1394 1394
     {
@@ -1693,7 +1693,7 @@  discard block
 block discarded – undo
1693 1693
 
1694 1694
     /**
1695 1695
      * Get the number of users connected in chat
1696
-     * @return mixed
1696
+     * @return integer
1697 1697
      */
1698 1698
     public function countUsersOnline()
1699 1699
     {
Please login to merge, or discard this patch.