Completed
Push — master ( cc3037...815120 )
by Julito
29:55
created
main/inc/lib/course_home.lib.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
     /**
219 219
      * Displays the tools of a certain category.
220 220
      *
221
-     * @return void
221
+     * @return string
222 222
      * @param string $course_tool_category	contains the category of tools to display:
223 223
      * "Public", "PublicButHide", "courseAdmin", "claroAdmin"
224 224
      */
@@ -1014,6 +1014,7 @@  discard block
 block discarded – undo
1014 1014
      * Shows the general data for a particular meeting
1015 1015
      *
1016 1016
      * @param id	session id
1017
+     * @param integer $id_session
1017 1018
      * @return string	session data
1018 1019
      */
1019 1020
     public static function show_session_data($id_session)
@@ -1517,7 +1518,7 @@  discard block
 block discarded – undo
1517 1518
 
1518 1519
     /**
1519 1520
      * Available tools
1520
-     * @return array
1521
+     * @return string[]
1521 1522
      */
1522 1523
     public static function availableTools()
1523 1524
     {
Please login to merge, or discard this patch.
main/inc/lib/display.lib.php 2 patches
Doc Comments   +27 added lines, -19 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
     }
35 35
 
36 36
     /**
37
-     * @return array
37
+     * @return string[]
38 38
      */
39 39
     public static function toolList()
40 40
     {
@@ -176,8 +176,7 @@  discard block
 block discarded – undo
176 176
 
177 177
     /**
178 178
      * @param string $tool
179
-     * @param array $editor_config
180
-     * @return null
179
+     * @return string|null
181 180
      */
182 181
     public static function return_introduction_section($tool, $toolList = null)
183 182
     {
@@ -465,7 +464,6 @@  discard block
 block discarded – undo
465 464
      * 					'page_nr' = The page to display
466 465
      * 					'hide_navigation' =  true to hide the navigation
467 466
      * @param array $query_vars Additional variables to add in the query-string
468
-     * @param array $form actions Additional variables to add in the query-string
469 467
      * @param mixed An array with bool values to know which columns show.
470 468
      * i.e: $visibility_options= array(true, false) we will only show the first column
471 469
      * 				Can be also only a bool value. TRUE: show all columns, FALSE: show nothing
@@ -506,7 +504,6 @@  discard block
 block discarded – undo
506 504
      * 					'page_nr' = The page to display
507 505
      * 					'hide_navigation' =  true to hide the navigation
508 506
      * @param array $query_vars Additional variables to add in the query-string
509
-     * @param array $form actions Additional variables to add in the query-string
510 507
      * @param mixed An array with bool values to know which columns show. i.e:
511 508
      *  $visibility_options= array(true, false) we will only show the first column
512 509
      * 	Can be also only a bool value. TRUE: show all columns, FALSE: show nothing
@@ -563,10 +560,11 @@  discard block
 block discarded – undo
563 560
      * 					'per_page' = number of items to show per page
564 561
      * 					'page_nr' = The page to display
565 562
      * @param array $query_vars Additional variables to add in the query-string
566
-     * @param array $column_show Array of binaries 1= show columns 0. hide a column
563
+     * @param integer[] $column_show Array of binaries 1= show columns 0. hide a column
567 564
      * @param array $column_order An array of integers that let us decide how the columns are going to be sort.
568 565
      * 						      i.e:  $column_order=array('1''4','3','4'); The 2nd column will be order like the 4th column
569 566
      * @param array $form_actions Set optional forms actions
567
+     * @param string $table_name
570 568
      *
571 569
      * @author Julio Montoya
572 570
      */
@@ -621,7 +619,7 @@  discard block
 block discarded – undo
621 619
      *
622 620
      * @deprecated use Display::addFlash with Display::return_message($message, 'normal');
623 621
      *
624
-     * @return void
622
+     * @return string|null
625 623
      */
626 624
     public static function display_normal_message($message, $filter = true, $returnValue = false)
627 625
     {
@@ -653,7 +651,7 @@  discard block
 block discarded – undo
653 651
      * Displays an confirmation message. Use this if something has been done successfully
654 652
      * @param bool	Filter (true) or not (false)
655 653
      * @deprecated use Display::addFlash with Display::return_message
656
-     * @return void
654
+     * @return string|null
657 655
      */
658 656
     public static function display_confirmation_message ($message, $filter = true, $returnValue = false)
659 657
     {
@@ -672,7 +670,7 @@  discard block
 block discarded – undo
672 670
      * @param bool	Filter (true) or not (false)
673 671
      * @deprecated use Display::addFlash with Display::return_message
674 672
      *
675
-     * @return void
673
+     * @return string|null
676 674
      */
677 675
     public static function display_error_message ($message, $filter = true, $returnValue = false)
678 676
     {
@@ -853,6 +851,7 @@  discard block
 block discarded – undo
853 851
      * @param string   The alt text (probably a language variable)
854 852
      * @param array    additional attributes (for instance height, width, onclick, ...)
855 853
      * @param integer  The wanted width of the icon (to be looked for in the corresponding img/icons/ folder)
854
+     * @param string $image
856 855
      * @return void
857 856
     */
858 857
     public static function display_icon(
@@ -1024,6 +1023,7 @@  discard block
 block discarded – undo
1024 1023
     /**
1025 1024
      * Displays an HTML input tag
1026 1025
      *
1026
+     * @param string $type
1027 1027
      */
1028 1028
     public static function input($type, $name, $value, $attributes = array())
1029 1029
     {
@@ -1040,8 +1040,8 @@  discard block
 block discarded – undo
1040 1040
     }
1041 1041
 
1042 1042
     /**
1043
-     * @param $name
1044
-     * @param $value
1043
+     * @param string $name
1044
+     * @param string $value
1045 1045
      * @param array $attributes
1046 1046
      * @return string
1047 1047
      */
@@ -1056,6 +1056,7 @@  discard block
 block discarded – undo
1056 1056
     /**
1057 1057
      * Displays an HTML select tag
1058 1058
      *
1059
+     * @param string $blank_item_text
1059 1060
      */
1060 1061
     public static function select(
1061 1062
         $name,
@@ -1122,8 +1123,8 @@  discard block
 block discarded – undo
1122 1123
                         $( "#tabs" ).tabs();
1123 1124
                     });
1124 1125
                 </script>
1125
-     * @param   array   $headers list of the tab titles
1126
-     * @param   array   $items
1126
+     * @param   string[]   $headers list of the tab titles
1127
+     * @param   string[]   $items
1127 1128
      * @param   string  $id id of the container of the tab in the example "tabs"
1128 1129
      * @param   array   $attributes for the ul
1129 1130
      * @param array $ul_attributes
@@ -1177,7 +1178,7 @@  discard block
 block discarded – undo
1177 1178
 
1178 1179
     /**
1179 1180
      * @param $headers
1180
-     * @param null $selected
1181
+     * @param integer $selected
1181 1182
      *
1182 1183
      * @return string
1183 1184
      */
@@ -1215,6 +1216,7 @@  discard block
 block discarded – undo
1215 1216
      * As you can see both function use the same "my_grid_name" this is very important otherwise nothing will work
1216 1217
      *
1217 1218
      * @param   string  the div id, this value must be the same with the first parameter of Display::grid_js()
1219
+     * @param string $div_id
1218 1220
      * @return  string  html
1219 1221
      *
1220 1222
      */
@@ -1775,6 +1777,8 @@  discard block
 block discarded – undo
1775 1777
      * @param  string  url that will be added (for jquery see hot_courses.tpl)
1776 1778
 	 * @param	string	point info array see function CourseManager::get_course_ranking()
1777 1779
 	 * @param	bool	add a div wrapper
1780
+	 * @param string $id
1781
+	 * @param string $url
1778 1782
 	 * @todo	use     templates
1779 1783
      **/
1780 1784
     public static function return_rating_system($id, $url, $point_info = array(), $add_div_wrapper = true)
@@ -1865,6 +1869,9 @@  discard block
 block discarded – undo
1865 1869
         return '<'.$size.'>'.Security::remove_XSS($title).'</'.$size.'>';
1866 1870
     }
1867 1871
 
1872
+    /**
1873
+     * @param string $title
1874
+     */
1868 1875
     public static function page_subheader2($title, $second_title = null)
1869 1876
     {
1870 1877
         return self::page_header($title, $second_title, 'h4');
@@ -2097,6 +2104,7 @@  discard block
 block discarded – undo
2097 2104
 
2098 2105
     /**
2099 2106
      * @todo use twig
2107
+     * @param string $title
2100 2108
      */
2101 2109
     public static function group_button($title, $elements)
2102 2110
     {
@@ -2467,9 +2475,9 @@  discard block
 block discarded – undo
2467 2475
 
2468 2476
     /**
2469 2477
      * @param int $id
2470
-     * @param array $content
2478
+     * @param string[] $content
2471 2479
      * @param int $col
2472
-     * @param bool|true $right
2480
+     * @param boolean $right
2473 2481
      * @return string
2474 2482
      */
2475 2483
     public static function toolbarAction($id, $content = array(), $col = 2, $right = true)
@@ -2553,10 +2561,10 @@  discard block
 block discarded – undo
2553 2561
     /**
2554 2562
      * @param string $title
2555 2563
      * @param string $content
2556
-     * @param null $id
2564
+     * @param string $id
2557 2565
      * @param array $params
2558
-     * @param null $idAccordion
2559
-     * @param null $idCollapse
2566
+     * @param string $idAccordion
2567
+     * @param string $idCollapse
2560 2568
      * @param bool|true $open
2561 2569
      * @param bool|false $fullClickable
2562 2570
      * @return null|string
Please login to merge, or discard this patch.
Spacing   +82 added lines, -82 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
      * @param string Optional help file name
61 61
      * @param string $page_header
62 62
      */
63
-    public static function display_header($tool_name ='', $help = null, $page_header = null)
63
+    public static function display_header($tool_name = '', $help = null, $page_header = null)
64 64
     {
65 65
         return '';
66 66
         $origin = api_get_origin();
@@ -225,15 +225,15 @@  discard block
 block discarded – undo
225 225
                 $thematic->setCourseIntId(api_get_course_int_id());
226 226
                 if (api_get_course_setting('display_info_advance_inside_homecourse') == '1') {
227 227
                     $information_title = get_lang('InfoAboutLastDoneAdvance');
228
-                    $last_done_advance =  $thematic->get_last_done_thematic_advance();
228
+                    $last_done_advance = $thematic->get_last_done_thematic_advance();
229 229
                     $thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
230
-                } else if(api_get_course_setting('display_info_advance_inside_homecourse') == '2') {
230
+                } else if (api_get_course_setting('display_info_advance_inside_homecourse') == '2') {
231 231
                     $information_title = get_lang('InfoAboutNextAdvanceNotDone');
232 232
                     $next_advance_not_done = $thematic->get_next_thematic_advance_not_done();
233 233
                     $thematic_advance_info = $thematic->get_thematic_advance_list($next_advance_not_done);
234
-                } else if(api_get_course_setting('display_info_advance_inside_homecourse') == '3') {
234
+                } else if (api_get_course_setting('display_info_advance_inside_homecourse') == '3') {
235 235
                     $information_title = get_lang('InfoAboutLastDoneAdvanceAndNextAdvanceNotDone');
236
-                    $last_done_advance =  $thematic->get_last_done_thematic_advance();
236
+                    $last_done_advance = $thematic->get_last_done_thematic_advance();
237 237
                     $next_advance_not_done = $thematic->get_next_thematic_advance_not_done();
238 238
                     $thematic_advance_info = $thematic->get_thematic_advance_list($last_done_advance);
239 239
                     $thematic_advance_info2 = $thematic->get_thematic_advance_list($next_advance_not_done);
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
                     $thematicDescription .= '<div>'.$thematic_advance_info['content'].'</div>';
256 256
                     $thematicDescription .= '<div>'.get_lang('DurationInHours').' : '.$thematic_advance_info['duration'].'</div>';
257 257
 
258
-                    if (!empty($thematic_advance_info2)){
258
+                    if (!empty($thematic_advance_info2)) {
259 259
                         $thematic_info2 = $thematic->get_thematic_list($thematic_advance_info2['thematic_id']);
260 260
                         $thematic_advance_info2['start_date'] = api_get_local_time($thematic_advance_info2['start_date']);
261 261
                         $thematic_advance_info2['start_date'] = api_format_date($thematic_advance_info2['start_date'], DATE_TIME_FORMAT_LONG);
@@ -273,17 +273,17 @@  discard block
 block discarded – undo
273 273
             }
274 274
 
275 275
             $introduction_section .= '<div id="introduction_block" class="row"><div class="col-md-12">';
276
-            $introduction_section .=  $thematicDescription;
276
+            $introduction_section .= $thematicDescription;
277 277
 
278 278
             if (!empty($introContent)) {
279
-                $introduction_section .=  $introContent;
279
+                $introduction_section .= $introContent;
280 280
             }
281
-            $introduction_section .=  '</div>';
281
+            $introduction_section .= '</div>';
282 282
 
283 283
             if ($displayIntro) {
284 284
                 if (empty($introContent)) {
285 285
                     // Displays "Add intro" commands
286
-                    $introduction_section .=  '<div id="introduction_block_action" class="col-md-2 col-md-offset-10">';
286
+                    $introduction_section .= '<div id="introduction_block_action" class="col-md-2 col-md-offset-10">';
287 287
 
288 288
                     $em = Database::getManager();
289 289
                     $criteria = [
@@ -313,15 +313,15 @@  discard block
 block discarded – undo
313 313
                         );
314 314
                     }
315 315
 
316
-                    $introduction_section .=  "<a href=\"".$url."?".api_get_cidreq()."\">";
317
-                    $introduction_section .=  Display::return_icon('introduction_add.gif', get_lang('AddIntro')).' ';
318
-                    $introduction_section .=  "</a>";
316
+                    $introduction_section .= "<a href=\"".$url."?".api_get_cidreq()."\">";
317
+                    $introduction_section .= Display::return_icon('introduction_add.gif', get_lang('AddIntro')).' ';
318
+                    $introduction_section .= "</a>";
319 319
 
320 320
                     $introduction_section .= "</div>";
321 321
 
322 322
                 } else {
323 323
                     // Displays "edit intro && delete intro" commands
324
-                    $introduction_section .=  '<div id="introduction_block_action" class="col-md-2 col-md-offset-10">';
324
+                    $introduction_section .= '<div id="introduction_block_action" class="col-md-2 col-md-offset-10">';
325 325
                     $url = $urlGenerator->generate(
326 326
                         'chamilo_course_ctoolintro_update',
327 327
                         array(
@@ -331,22 +331,22 @@  discard block
 block discarded – undo
331 331
                         )
332 332
                     );
333 333
 
334
-                    $introduction_section .=  "<a href=\"".$url."?".api_get_cidreq()."\">";
335
-                    $introduction_section .=  Display::return_icon('edit.png', get_lang('Modify')).' ';
336
-                    $introduction_section .=  "</a>";
334
+                    $introduction_section .= "<a href=\"".$url."?".api_get_cidreq()."\">";
335
+                    $introduction_section .= Display::return_icon('edit.png', get_lang('Modify')).' ';
336
+                    $introduction_section .= "</a>";
337 337
 
338 338
                     $url = $urlGenerator->generate(
339 339
                         'chamilo_course_ctoolintro_delete',
340 340
                         array('iid' => $toolId, 'course' => api_get_course_id())
341 341
                     );
342 342
 
343
-                    $introduction_section .=  "<a onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice')))."')) return false;\" href=\"".$url."?".api_get_cidreq()."\">";
344
-                    $introduction_section .=  Display::return_icon('delete.png', get_lang('AddIntro')).' ';
345
-                    $introduction_section .=  "</a>";
346
-                    $introduction_section .=  "</div>";
343
+                    $introduction_section .= "<a onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice')))."')) return false;\" href=\"".$url."?".api_get_cidreq()."\">";
344
+                    $introduction_section .= Display::return_icon('delete.png', get_lang('AddIntro')).' ';
345
+                    $introduction_section .= "</a>";
346
+                    $introduction_section .= "</div>";
347 347
                 }
348 348
             }
349
-            $introduction_section .=  '</div>';
349
+            $introduction_section .= '</div>';
350 350
         }
351 351
 
352 352
         return $introduction_section;
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
         $grid_class = array(),
527 527
         $elementCount = 0
528 528
     ) {
529
-        $column =  0;
529
+        $column = 0;
530 530
         $default_items_per_page = isset($paging_options['per_page']) ? $paging_options['per_page'] : 20;
531 531
 
532 532
         $table = new SortableTableFromArray($content, $column, $default_items_per_page, $name);
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
      * @deprecated use Display::addFlash with Display::return_message
656 656
      * @return void
657 657
      */
658
-    public static function display_confirmation_message ($message, $filter = true, $returnValue = false)
658
+    public static function display_confirmation_message($message, $filter = true, $returnValue = false)
659 659
     {
660 660
         $message = self::return_message($message, 'confirm', $filter);
661 661
         if ($returnValue) {
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
      *
675 675
      * @return void
676 676
      */
677
-    public static function display_error_message ($message, $filter = true, $returnValue = false)
677
+    public static function display_error_message($message, $filter = true, $returnValue = false)
678 678
     {
679 679
         $message = self::return_message($message, 'error', $filter);
680 680
         if ($returnValue) {
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
689 689
      * @param string $type
690 690
      * @param bool $filter
691 691
      */
692
-    public static function return_message_and_translate($message, $type='normal', $filter = true)
692
+    public static function return_message_and_translate($message, $type = 'normal', $filter = true)
693 693
     {
694 694
         $message = get_lang($message);
695 695
         echo self::return_message($message, $type, $filter);
@@ -756,14 +756,14 @@  discard block
 block discarded – undo
756 756
         }
757 757
         // Encrypt email
758 758
         $hmail = '';
759
-        for ($i = 0; $i < strlen($email); $i ++) {
759
+        for ($i = 0; $i < strlen($email); $i++) {
760 760
             $hmail .= '&#'.ord($email {
761 761
             $i }).';';
762 762
         }
763 763
         $hclickable_text = null;
764 764
         // Encrypt clickable text if @ is present
765 765
         if (strpos($clickable_text, '@')) {
766
-            for ($i = 0; $i < strlen($clickable_text); $i ++) {
766
+            for ($i = 0; $i < strlen($clickable_text); $i++) {
767 767
                 $hclickable_text .= '&#'.ord($clickable_text {
768 768
                 $i }).';';
769 769
             }
@@ -795,7 +795,7 @@  discard block
 block discarded – undo
795 795
         }
796 796
         // Encrypt email
797 797
         $hmail = '';
798
-        for ($i = 0; $i < strlen($email); $i ++) {
798
+        for ($i = 0; $i < strlen($email); $i++) {
799 799
             $hmail .= '&#'.ord($email {
800 800
             $i }).';';
801 801
         }
@@ -815,7 +815,7 @@  discard block
 block discarded – undo
815 815
     public static function get_alphabet_options($selected_letter = '')
816 816
     {
817 817
         $result = '';
818
-        for ($i = 65; $i <= 90; $i ++) {
818
+        for ($i = 65; $i <= 90; $i++) {
819 819
             $letter = chr($i);
820 820
             $result .= '<option value="'.$letter.'"';
821 821
             if ($selected_letter == $letter) {
@@ -836,7 +836,7 @@  discard block
 block discarded – undo
836 836
     public static function get_numeric_options($min, $max, $selected_num = 0)
837 837
     {
838 838
         $result = '';
839
-        for ($i = $min; $i <= $max; $i ++) {
839
+        for ($i = $min; $i <= $max; $i++) {
840 840
             $result .= '<option value="'.$i.'"';
841 841
             if (is_int($selected_num))
842 842
                 if ($selected_num == $i) {
@@ -903,7 +903,7 @@  discard block
 block discarded – undo
903 903
         $image = trim($image);
904 904
         $size_extra = '';
905 905
         if (isset($size)) {
906
-            $size_extra = $size . '/';
906
+            $size_extra = $size.'/';
907 907
         }
908 908
 
909 909
         $icon = 'img/icons/'.$size_extra.$image;
@@ -975,7 +975,7 @@  discard block
 block discarded – undo
975 975
             }
976 976
         }
977 977
         //some tags don't have this </XXX>
978
-        if (in_array($tag, array('img','input','br'))) {
978
+        if (in_array($tag, array('img', 'input', 'br'))) {
979 979
             $return_value = '<'.$tag.' '.$attribute_list.' />';
980 980
         } else {
981 981
             $return_value = '<'.$tag.' '.$attribute_list.' >'.$content.'</'.$tag.'>';
@@ -1028,13 +1028,13 @@  discard block
 block discarded – undo
1028 1028
     public static function input($type, $name, $value, $attributes = array())
1029 1029
     {
1030 1030
          if (isset($type)) {
1031
-             $attributes['type']= $type;
1031
+             $attributes['type'] = $type;
1032 1032
          }
1033 1033
          if (isset($name)) {
1034
-             $attributes['name']= $name;
1034
+             $attributes['name'] = $name;
1035 1035
          }
1036 1036
          if (isset($value)) {
1037
-             $attributes['value']= $value;
1037
+             $attributes['value'] = $value;
1038 1038
         }
1039 1039
         return self::tag('input', '', $attributes);
1040 1040
     }
@@ -1067,14 +1067,14 @@  discard block
 block discarded – undo
1067 1067
     ) {
1068 1068
         $html = '';
1069 1069
         $extra = '';
1070
-        $default_id = 'id="' . $name . '" ';
1070
+        $default_id = 'id="'.$name.'" ';
1071 1071
         foreach ($extra_attributes as $key => $parameter) {
1072 1072
             if ($key == 'id') {
1073 1073
                 $default_id = '';
1074 1074
             }
1075
-            $extra .= $key . '="' . $parameter . '" ';
1075
+            $extra .= $key.'="'.$parameter.'" ';
1076 1076
         }
1077
-        $html .= '<select name="' . $name . '" ' . $default_id . ' ' . $extra . '>';
1077
+        $html .= '<select name="'.$name.'" '.$default_id.' '.$extra.'>';
1078 1078
 
1079 1079
         if ($show_blank_item) {
1080 1080
             if (empty($blank_item_text)) {
@@ -1082,14 +1082,14 @@  discard block
 block discarded – undo
1082 1082
             } else {
1083 1083
                 $blank_item_text = Security::remove_XSS($blank_item_text);
1084 1084
             }
1085
-            $html .= self::tag('option', '-- ' . $blank_item_text . ' --', array('value' => '-1'));
1085
+            $html .= self::tag('option', '-- '.$blank_item_text.' --', array('value' => '-1'));
1086 1086
         }
1087 1087
         if ($values) {
1088 1088
             foreach ($values as $key => $value) {
1089 1089
                 if (is_array($value) && isset($value['name'])) {
1090 1090
                     $value = $value['name'];
1091 1091
                 }
1092
-                $html .= '<option value="' . $key . '"';
1092
+                $html .= '<option value="'.$key.'"';
1093 1093
 
1094 1094
                 if (is_array($default)) {
1095 1095
                     foreach ($default as $item) {
@@ -1104,7 +1104,7 @@  discard block
 block discarded – undo
1104 1104
                     }
1105 1105
                 }
1106 1106
 
1107
-                $html .= '>' . $value . '</option>';
1107
+                $html .= '>'.$value.'</option>';
1108 1108
             }
1109 1109
         }
1110 1110
         $html .= '</select>';
@@ -1132,7 +1132,7 @@  discard block
 block discarded – undo
1132 1132
      */
1133 1133
     public static function tabs($headers, $items, $id = 'tabs', $attributes = array(), $ul_attributes = array())
1134 1134
     {
1135
-        if (empty($headers) || count($headers) == 0 ) {
1135
+        if (empty($headers) || count($headers) == 0) {
1136 1136
             return '';
1137 1137
         }
1138 1138
 
@@ -1143,7 +1143,7 @@  discard block
 block discarded – undo
1143 1143
             if ($i == 1) {
1144 1144
                 $active = ' active';
1145 1145
             }
1146
-            $item = self::tag('a', $item, array('href'=>'#'.$id.'-'.$i, 'role'=> 'tab', 'data-toggle' => 'tab', 'id' => $id . $i));
1146
+            $item = self::tag('a', $item, array('href'=>'#'.$id.'-'.$i, 'role'=> 'tab', 'data-toggle' => 'tab', 'id' => $id.$i));
1147 1147
             $ul_attributes['role'] = 'presentation';
1148 1148
             $ul_attributes['class'] = $active;
1149 1149
             $lis .= self::tag('li', $item, $ul_attributes);
@@ -1172,7 +1172,7 @@  discard block
 block discarded – undo
1172 1172
 
1173 1173
         $main_div = self::tag('div', $ul.self::tag('div', $divs, ['class' => 'tab-content']), $attributes);
1174 1174
 
1175
-        return $main_div ;
1175
+        return $main_div;
1176 1176
     }
1177 1177
 
1178 1178
     /**
@@ -1220,8 +1220,8 @@  discard block
 block discarded – undo
1220 1220
      */
1221 1221
     public static function grid_html($div_id)
1222 1222
     {
1223
-        $table = self::tag('table','', array('id' => $div_id));
1224
-        $table .= self::tag('div','', array('id' => $div_id.'_pager'));
1223
+        $table = self::tag('table', '', array('id' => $div_id));
1224
+        $table .= self::tag('div', '', array('id' => $div_id.'_pager'));
1225 1225
         return $table;
1226 1226
     }
1227 1227
 
@@ -1282,7 +1282,7 @@  discard block
 block discarded – undo
1282 1282
         $obj->colNames      = $column_names;
1283 1283
         $obj->colModel      = $column_model;
1284 1284
         $obj->pager         = '#'.$div_id.'_pager';
1285
-        $obj->datatype  = 'json';
1285
+        $obj->datatype = 'json';
1286 1286
         $obj->viewrecords = 'true';
1287 1287
 
1288 1288
         $all_value = 10000000;
@@ -1343,10 +1343,10 @@  discard block
 block discarded – undo
1343 1343
         // Adding static data.
1344 1344
         if (!empty($data)) {
1345 1345
             $data_var = $div_id.'_data';
1346
-            $json.=' var '.$data_var.' = '.json_encode($data).';';
1346
+            $json .= ' var '.$data_var.' = '.json_encode($data).';';
1347 1347
             $obj->data = $data_var;
1348 1348
             $obj->datatype = 'local';
1349
-            $json.="\n";
1349
+            $json .= "\n";
1350 1350
         }
1351 1351
 
1352 1352
         $obj->end = 'end';
@@ -1360,12 +1360,12 @@  discard block
 block discarded – undo
1360 1360
         }
1361 1361
 
1362 1362
         // Fixing true/false js values that doesn't need the ""
1363
-        $json_encode = str_replace(':"true"',':true',$json_encode);
1363
+        $json_encode = str_replace(':"true"', ':true', $json_encode);
1364 1364
         // wrap_cell is not a valid jqgrid attributes is a hack to wrap a text
1365 1365
         $json_encode = str_replace('"wrap_cell":true', 'cellattr : function(rowId, value, rowObject, colModel, arrData) { return \'class = "jqgrid_whitespace"\'; }', $json_encode);
1366
-        $json_encode = str_replace(':"false"',':false',$json_encode);
1366
+        $json_encode = str_replace(':"false"', ':false', $json_encode);
1367 1367
         $json_encode = str_replace('"formatter":"action_formatter"', 'formatter:action_formatter', $json_encode);
1368
-        $json_encode = str_replace(array('{"first":"first",','"end":"end"}'), '', $json_encode);
1368
+        $json_encode = str_replace(array('{"first":"first",', '"end":"end"}'), '', $json_encode);
1369 1369
 
1370 1370
         // Creating the jqgrid element.
1371 1371
         $json .= '$("#'.$div_id.'").jqGrid({';
@@ -1380,22 +1380,22 @@  discard block
 block discarded – undo
1380 1380
             $groups = '';
1381 1381
             foreach ($extra_params['groupHeaders'] as $group) {
1382 1382
                 //{ "startColumnName" : "courses", "numberOfColumns" : 1, "titleText" : "Order Info" },
1383
-                $groups .= '{ "startColumnName" : "' . $group['startColumnName'] . '", "numberOfColumns" : ' . $group['numberOfColumns'] . ', "titleText" : "' . $group['titleText']  . '" },';
1383
+                $groups .= '{ "startColumnName" : "'.$group['startColumnName'].'", "numberOfColumns" : '.$group['numberOfColumns'].', "titleText" : "'.$group['titleText'].'" },';
1384 1384
 
1385 1385
             }
1386 1386
             $json .= '$("#'.$div_id.'").jqGrid("setGroupHeaders", {
1387 1387
                 "useColSpanStyle" : false,
1388 1388
                 "groupHeaders"    : [
1389
-                    ' . $groups . '
1389
+                    ' . $groups.'
1390 1390
                 ]
1391 1391
             });';
1392 1392
         }
1393 1393
 
1394 1394
         $all_text = addslashes(get_lang('All'));
1395 1395
         $json .= '$("'.$obj->pager.' option[value='.$all_value.']").text("'.$all_text.'");';
1396
-        $json.= "\n";
1396
+        $json .= "\n";
1397 1397
         // Adding edit/delete icons.
1398
-        $json.= $formatter;
1398
+        $json .= $formatter;
1399 1399
 
1400 1400
         return $json;
1401 1401
     }
@@ -1426,7 +1426,7 @@  discard block
 block discarded – undo
1426 1426
         }
1427 1427
 
1428 1428
         if (!empty($rows)) {
1429
-	        foreach($rows as $content) {
1429
+	        foreach ($rows as $content) {
1430 1430
 	            $table->setCellContents($row, $column, $content);
1431 1431
                 $row++;
1432 1432
             }
@@ -1600,7 +1600,7 @@  discard block
 block discarded – undo
1600 1600
 
1601 1601
         // Show all tool icons where there is something new.
1602 1602
         $return = '&nbsp;';
1603
-        foreach($notifications as $notification) {
1603
+        foreach ($notifications as $notification) {
1604 1604
             $lastDate = date('d/m/Y H:i', convert_sql_date($notification['lastedit_date']));
1605 1605
             $type = $notification['lastedit_type'];
1606 1606
             $label = get_lang('TitleNotification').": ".get_lang($type)." ($lastDate)";
@@ -1643,9 +1643,9 @@  discard block
 block discarded – undo
1643 1643
             $main_user_table = Database :: get_main_table(TABLE_MAIN_USER);
1644 1644
             $tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
1645 1645
             // Request for the name of the general coach
1646
-            $sql ='SELECT tu.lastname, tu.firstname, ts.*
1646
+            $sql = 'SELECT tu.lastname, tu.firstname, ts.*
1647 1647
                     FROM '.$tbl_session.' ts
1648
-                    LEFT JOIN '.$main_user_table .' tu
1648
+                    LEFT JOIN '.$main_user_table.' tu
1649 1649
                     ON ts.id_coach = tu.user_id
1650 1650
                     WHERE ts.id = '.intval($session_id);
1651 1651
             $rs = Database::query($sql);
@@ -1657,7 +1657,7 @@  discard block
 block discarded – undo
1657 1657
             $session['title'] = $session_info['name'];
1658 1658
             $session['id_coach'] = $session_info['id_coach'];
1659 1659
             $session['coach'] = '';
1660
-            $session['dates'] =  '';
1660
+            $session['dates'] = '';
1661 1661
 
1662 1662
             if (($session_info['access_end_date'] == '0000-00-00 00:00:00' && $session_info['access_start_date'] == '0000-00-00 00:00:00') ||
1663 1663
                 ($session_info['access_end_date'] == '0000-00-00 00:00:00' && $session_info['access_start_date'] == '0000-00-00 00:00:00') ||
@@ -1729,7 +1729,7 @@  discard block
 block discarded – undo
1729 1729
                 $session['dates'] = $dates['access'];
1730 1730
 
1731 1731
 
1732
-                if (api_get_setting('show_session_coach') === 'true' ) {
1732
+                if (api_get_setting('show_session_coach') === 'true') {
1733 1733
                     $session['coach'] = api_get_person_name(
1734 1734
                         $session_info['firstname'],
1735 1735
                         $session_info['lastname']
@@ -1783,9 +1783,9 @@  discard block
 block discarded – undo
1783 1783
 		$percentage = isset($point_info['point_average']) ? $point_info['point_average'] : 0;
1784 1784
 
1785 1785
 		if (!empty($percentage)) {
1786
-            $percentage = $percentage*125/100;
1786
+            $percentage = $percentage * 125 / 100;
1787 1787
         }
1788
-		$accesses =  isset($point_info['accesses']) ? $point_info['accesses'] : 0;
1788
+		$accesses = isset($point_info['accesses']) ? $point_info['accesses'] : 0;
1789 1789
 
1790 1790
 		$star_label = sprintf(get_lang('XStarsOutOf5'), $point_info['point_average_star']);
1791 1791
 
@@ -1800,19 +1800,19 @@  discard block
 block discarded – undo
1800 1800
 
1801 1801
 		$labels = array();
1802 1802
 
1803
-		$labels[]= $number_of_users_who_voted == 1 ? $number_of_users_who_voted.' '.get_lang('Vote') : $number_of_users_who_voted.' '.get_lang('Votes');
1804
-		$labels[]= $accesses == 1 ? $accesses.' '.get_lang('Visit') : $accesses.' '.get_lang('Visits');
1803
+		$labels[] = $number_of_users_who_voted == 1 ? $number_of_users_who_voted.' '.get_lang('Vote') : $number_of_users_who_voted.' '.get_lang('Votes');
1804
+		$labels[] = $accesses == 1 ? $accesses.' '.get_lang('Visit') : $accesses.' '.get_lang('Visits');
1805 1805
 		/* if (!empty($number_of_users_who_voted)) {
1806 1806
 			$labels[]= get_lang('Average').' '.$point_info['point_average_star'].'/5';
1807 1807
 		} */
1808 1808
 
1809
-		$labels[]= $point_info['user_vote']  ? get_lang('YourVote').' ['.$point_info['user_vote'].']' : get_lang('YourVote'). ' [?] ';
1809
+		$labels[] = $point_info['user_vote'] ? get_lang('YourVote').' ['.$point_info['user_vote'].']' : get_lang('YourVote').' [?] ';
1810 1810
 
1811 1811
 		if (!$add_div_wrapper && api_is_anonymous()) {
1812
-			$labels[]= Display::tag('span', get_lang('LoginToVote'), array('class' => 'error'));
1812
+			$labels[] = Display::tag('span', get_lang('LoginToVote'), array('class' => 'error'));
1813 1813
 		}
1814 1814
 
1815
-        $html .= Display::div(implode(' | ', $labels) , array('id' =>  'vote_label_'.$id, 'class' => 'vote_label_info'));
1815
+        $html .= Display::div(implode(' | ', $labels), array('id' =>  'vote_label_'.$id, 'class' => 'vote_label_info'));
1816 1816
         $html .= ' '.Display::span(' ', array('id' =>  'vote_label2_'.$id));
1817 1817
 
1818 1818
         if ($add_div_wrapper) {
@@ -1885,8 +1885,8 @@  discard block
 block discarded – undo
1885 1885
         if (!empty($list)) {
1886 1886
             $html = '<dl class="dl-horizontal">';
1887 1887
             foreach ($list as $item) {
1888
-                $html .= '<dt>' . $item['title'] . '</dt>';
1889
-                $html .= '<dd>' . $item['content'] . '</dd>';
1888
+                $html .= '<dt>'.$item['title'].'</dt>';
1889
+                $html .= '<dd>'.$item['content'].'</dd>';
1890 1890
             }
1891 1891
             $html .= '</dl>';
1892 1892
         }
@@ -1928,7 +1928,7 @@  discard block
 block discarded – undo
1928 1928
      * @param string $type
1929 1929
      * @return null|string
1930 1930
      */
1931
-    public static function badge($count, $type ="warning")
1931
+    public static function badge($count, $type = "warning")
1932 1932
     {
1933 1933
         $class = '';
1934 1934
 
@@ -2004,7 +2004,7 @@  discard block
 block discarded – undo
2004 2004
         if (!empty($content)) {
2005 2005
             $html = '<span class="label '.$class.'">';
2006 2006
             $html .= $content;
2007
-            $html .='</span>';
2007
+            $html .= '</span>';
2008 2008
         }
2009 2009
 
2010 2010
         return $html;
@@ -2025,7 +2025,7 @@  discard block
 block discarded – undo
2025 2025
                     $class = 'class ="active"';
2026 2026
                 }
2027 2027
 
2028
-                if (basename($_SERVER['REQUEST_URI']) == basename($value['url']) ) {
2028
+                if (basename($_SERVER['REQUEST_URI']) == basename($value['url'])) {
2029 2029
                     $class = 'class ="active"';
2030 2030
                 }
2031 2031
                 $html .= "<li $class >";
@@ -2279,7 +2279,7 @@  discard block
 block discarded – undo
2279 2279
         }
2280 2280
         $label = $nextValue + $localCounter + 1;
2281 2281
         if ($isMedia) {
2282
-            $label = ($fixedValue + 1) .' '.chr(97 + $localCounter);
2282
+            $label = ($fixedValue + 1).' '.chr(97 + $localCounter);
2283 2283
             $link_to_show = $link.$fixedValue.'#questionanchor'.$itemId;
2284 2284
         }
2285 2285
         $link = Display::url($label.' ', $link_to_show, $linkAttributes);
@@ -2459,7 +2459,7 @@  discard block
 block discarded – undo
2459 2459
         $attributes['title'] = isset($attributes['title']) ? $attributes['title'] : $text;
2460 2460
 
2461 2461
         if (!$includeText) {
2462
-            $text = '<span class="sr-only">' . $text . '</span>';
2462
+            $text = '<span class="sr-only">'.$text.'</span>';
2463 2463
         }
2464 2464
 
2465 2465
         return self::url("$icon $text", $url, $attributes);
@@ -2474,9 +2474,9 @@  discard block
 block discarded – undo
2474 2474
      */
2475 2475
     public static function toolbarAction($id, $content = array(), $col = 2, $right = true)
2476 2476
     {
2477
-        $columns = 12/$col;
2477
+        $columns = 12 / $col;
2478 2478
         $html = '';
2479
-        $html .= '<div id="' . $id . '" class="actions">';
2479
+        $html .= '<div id="'.$id.'" class="actions">';
2480 2480
         $html .= '<div class="row">';
2481 2481
         if ($col > 4) {
2482 2482
             $html = '<div class="alert alert-warning" role="alert">
@@ -2484,7 +2484,7 @@  discard block
 block discarded – undo
2484 2484
             </div>';
2485 2485
         } else {
2486 2486
             for ($i = 0; $i < $col; $i++) {
2487
-                $html .= '<div class="col-md-' . $columns . '">';
2487
+                $html .= '<div class="col-md-'.$columns.'">';
2488 2488
                 if ($col == 2 && $i == 1) {
2489 2489
                     if ($right === true) {
2490 2490
                         $html .= '<div class="pull-right">';
@@ -2600,9 +2600,9 @@  discard block
 block discarded – undo
2600 2600
             $params['class'] = 'panel panel-default';
2601 2601
             $html = null;
2602 2602
             if (!empty($title)) {
2603
-                $html .= '<div class="panel-heading">'.$title.'</div>' . PHP_EOL;
2603
+                $html .= '<div class="panel-heading">'.$title.'</div>'.PHP_EOL;
2604 2604
             }
2605
-            $html.= '<div class="panel-body">'.$content.'</div>' . PHP_EOL;
2605
+            $html .= '<div class="panel-body">'.$content.'</div>'.PHP_EOL;
2606 2606
             $html = Display::div($html, $params);
2607 2607
         }
2608 2608
         return $html;
Please login to merge, or discard this patch.
main/inc/lib/thematic.lib.php 1 patch
Doc Comments   +13 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,6 +34,9 @@  discard block
 block discarded – undo
34 34
         $this->course_int_id = api_get_course_int_id();
35 35
     }
36 36
 
37
+    /**
38
+     * @param integer $course_id
39
+     */
37 40
     public function setCourseIntId($course_id)
38 41
     {
39 42
         $this->course_int_id = intval($course_id);
@@ -248,6 +251,8 @@  discard block
 block discarded – undo
248 251
     /**
249 252
      * get thematic list
250 253
      * @param	int		Thematic id (optional), get list by id
254
+     * @param string $course_code
255
+     * @param integer $session_id
251 256
      * @return	array	Thematic data
252 257
      */
253 258
     public static function get_thematic_list(
@@ -805,6 +810,7 @@  discard block
 block discarded – undo
805 810
     /**
806 811
      * delete  thematic advance
807 812
      * @param	int		Thematic advance id
813
+     * @param integer $thematic_advance_id
808 814
      * @return	int		Affected rows
809 815
      */
810 816
     public function thematic_advance_destroy($thematic_advance_id)
@@ -1122,6 +1128,7 @@  discard block
 block discarded – undo
1122 1128
     /**
1123 1129
      * update done thematic advances from thematic details interface
1124 1130
      * @param 	int		Thematic id
1131
+     * @param integer $thematic_advance_id
1125 1132
      * @return	int		Affected rows
1126 1133
      */
1127 1134
     public function update_done_thematic_advances($thematic_advance_id)
@@ -1349,6 +1356,7 @@  discard block
 block discarded – undo
1349 1356
      * Get average of advances by thematic
1350 1357
      * @param	int		Thematic id
1351 1358
      * @param	string	Course code (optional)
1359
+     * @param string $course_code
1352 1360
      * @return 	float	Average of thematic advances
1353 1361
      */
1354 1362
     public function get_average_of_advances_by_thematic($thematic_id, $course_code = null)
@@ -1413,6 +1421,7 @@  discard block
 block discarded – undo
1413 1421
      * @param	string	Content
1414 1422
      * @param	string	Date and time
1415 1423
      * @param	int		Duration in hours
1424
+     * @param integer $id
1416 1425
      * @return void
1417 1426
      */
1418 1427
     public function set_thematic_advance_attributes(
@@ -1443,7 +1452,7 @@  discard block
 block discarded – undo
1443 1452
 
1444 1453
     /**
1445 1454
      * get thematic id
1446
-     * @return void
1455
+     * @return integer
1447 1456
      */
1448 1457
     public function get_thematic_id()
1449 1458
     {
@@ -1452,7 +1461,7 @@  discard block
 block discarded – undo
1452 1461
 
1453 1462
     /**
1454 1463
      * Get thematic plan titles by default
1455
-     * @return array
1464
+     * @return string[]
1456 1465
      */
1457 1466
     public function get_default_thematic_plan_title()
1458 1467
     {
@@ -1469,7 +1478,7 @@  discard block
 block discarded – undo
1469 1478
 
1470 1479
     /**
1471 1480
      * Get thematic plan icons by default
1472
-     * @return array
1481
+     * @return string[]
1473 1482
      */
1474 1483
     public function get_default_thematic_plan_icon()
1475 1484
     {
@@ -1486,7 +1495,7 @@  discard block
 block discarded – undo
1486 1495
 
1487 1496
     /**
1488 1497
      * Get questions by default for help
1489
-     * @return array
1498
+     * @return string[]
1490 1499
      */
1491 1500
     public function get_default_question()
1492 1501
     {
Please login to merge, or discard this patch.
src/Chamilo/CourseBundle/Entity/CToolIntro.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,9 +43,9 @@
 block discarded – undo
43 43
         return $this->proxyCurrentLocaleTranslation($method, $arguments);
44 44
     }
45 45
 
46
-     /**
47
-     * @return string
48
-     */
46
+        /**
47
+         * @return string
48
+         */
49 49
     public function __toString()
50 50
     {
51 51
         return (string) $this->getName();
Please login to merge, or discard this patch.