chamilo / chamilo-lms

main/inc/lib/search/search_widget.php

Doc Comments +3 added lines

@@ -187,6 +187,7 @@ 
  * Build the prefilter form.
  *
  * This type allow filter all other multiple select terms by one term in a dinamic way
+ * @param string $prefilter_prefix
  */
 function search_widget_prefilter_form($action, $show_thesaurus, $sf_terms, $op, $prefilter_prefix=NULL) {
     $thesaurus_icon = Display::return_icon('thesaurus.gif', get_lang('SearchAdvancedOptions'), array('id'=>'thesaurus-icon'));
@@ -277,6 +278,8 @@ 
 
 /**
  * Show search form
+ * @param string $action
+ * @param boolean $show_thesaurus
  */
 function display_search_form($action, $show_thesaurus, $sf_terms, $op) {
     $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal');

Spacing +68 added lines, -68 removed lines

@@ -7,7 +7,7 @@ 
 /**
  * Code
  */
-require_once dirname(__FILE__) . '/IndexableChunk.class.php';
+require_once dirname(__FILE__).'/IndexableChunk.class.php';
 require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
 /**
@@ -29,13 +29,13 @@ 
 /**
  * Get one term html select
  */
-function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr='size="7" class="sf-select-multiple"') {
+function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr = 'size="7" class="sf-select-multiple"') {
 	global $charset;
-    $multiple_select = '<select '. $extra_select_attr .' title="'. $prefix .'" id="sf-'. $prefix .'" name="sf_'. $prefix .'[]">';
+    $multiple_select = '<select '.$extra_select_attr.' title="'.$prefix.'" id="sf-'.$prefix.'" name="sf_'.$prefix.'[]">';
 
     $all_selected = '';
-    if (!empty($_REQUEST['sf_'. $prefix]) ) {
-        if (in_array('__all__', $_REQUEST['sf_'. $prefix])) {
+    if (!empty($_REQUEST['sf_'.$prefix])) {
+        if (in_array('__all__', $_REQUEST['sf_'.$prefix])) {
             $all_selected = 'selected="selected"';
         }
     }
@@ -44,17 +44,17 @@ 
     } else if ($op == 'or') {
         $all_selected_name = get_lang('Any');
     }
-    $multiple_select .= '<option value="__all__" '. $all_selected .' >-- '. $all_selected_name .' --</option>';
+    $multiple_select .= '<option value="__all__" '.$all_selected.' >-- '.$all_selected_name.' --</option>';
 
     foreach ($sf_term_array as $raw_term) {
         $term = substr($raw_term, 1);
         if (empty($term)) continue;
         $html_term = htmlspecialchars($term, ENT_QUOTES, $charset);
         $selected = '';
-        if (!empty($_REQUEST['sf_'.$prefix]) && is_array($_REQUEST['sf_'.$prefix]) && in_array($term,$_REQUEST['sf_'.$prefix])) {
+        if (!empty($_REQUEST['sf_'.$prefix]) && is_array($_REQUEST['sf_'.$prefix]) && in_array($term, $_REQUEST['sf_'.$prefix])) {
             $selected = 'selected="selected"';
         }
-        $multiple_select .= '<option value="'. $html_term .'" '.$selected.'>'. $html_term .'</option>';
+        $multiple_select .= '<option value="'.$html_term.'" '.$selected.'>'.$html_term.'</option>';
     }
     $multiple_select .= '</select>';
     return $multiple_select;
@@ -63,15 +63,15 @@ 
 /**
  * Get terms html selects
  */
-function format_specific_fields_selects($sf_terms, $op, $prefilter_prefix='') {
+function format_specific_fields_selects($sf_terms, $op, $prefilter_prefix = '') {
     // Process each prefix type term
     $i = 0;
     $max = count($sf_terms);
-    $multiple_selects ='';
+    $multiple_selects = '';
     foreach ($sf_terms as $prefix => $sf_term_array) {
         if ($prefix == $prefilter_prefix) continue;
         $multiple_select = '';
-        if ($i>0) {
+        if ($i > 0) {
             //print "+" image
             $multiple_select .= '<td><img class="sf-select-splitter" src="../img/search-big-plus.gif" alt="plus-sign-decoration"/></td>';
         }
@@ -89,9 +89,9 @@ 
 
         $sf_copy = $sf_term_array;
         // get specific field name
-        $sf_value = get_specific_field_list(array( 'code' => "'$prefix'" ));
+        $sf_value = get_specific_field_list(array('code' => "'$prefix'"));
         $sf_value = array_shift($sf_value);
-        $multiple_select .= '<td><label class="sf-select-multiple-title" for="sf_'. $prefix .'[]">' . $sf_value['name'].'</label><br />';
+        $multiple_select .= '<td><label class="sf-select-multiple-title" for="sf_'.$prefix.'[]">'.$sf_value['name'].'</label><br />';
         $multiple_select .= format_one_specific_field_select($prefix, $sf_term_array, $op, 'multiple="multiple" size="7" class="sf-select-multiple"');
         $multiple_select .= '</td>';
         $multiple_selects .= $multiple_select;
@@ -107,11 +107,11 @@ 
  */
 function search_widget_normal_form($action, $show_thesaurus, $sf_terms, $op) {
     $thesaurus_icon = Display::return_icon('thesaurus.gif', get_lang('SearchAdvancedOptions'), array('id'=>'thesaurus-icon'));
-    $advanced_options = '<a id="tags-toggle" href="#">'.  get_lang('SearchAdvancedOptions') .'</a>';
-    $display_thesaurus = ($show_thesaurus==true? 'block': 'none');
-    $help = '<h3>'. get_lang('SearchKeywordsHelpTitle') .'</h3>'. get_lang('SearchKeywordsHelpComment');
-    $mode = (!empty($_REQUEST['mode'])? htmlentities($_REQUEST['mode']): 'gallery');
-    $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal');
+    $advanced_options = '<a id="tags-toggle" href="#">'.get_lang('SearchAdvancedOptions').'</a>';
+    $display_thesaurus = ($show_thesaurus == true ? 'block' : 'none');
+    $help = '<h3>'.get_lang('SearchKeywordsHelpTitle').'</h3>'.get_lang('SearchKeywordsHelpComment');
+    $mode = (!empty($_REQUEST['mode']) ? htmlentities($_REQUEST['mode']) : 'gallery');
+    $type = (!empty($_REQUEST['type']) ? htmlentities($_REQUEST['type']) : 'normal');
 
     /**
      * POST avoid long urls, but we are using GET because
@@ -119,36 +119,36 @@ 
      * could not send a form in pagination
      */
 
-	if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) {
-		$action='index.php';
+	if (isset($_GET['action']) && strcmp(trim($_GET['action']), 'search') === 0) {
+		$action = 'index.php';
 	}
 	$navigator_info = api_get_navigator();
 
-	if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
-		$submit_button1	= '<input type="submit" id="submit" value="'. get_lang('Search') .'" />';
-		$submit_button2 = '<input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />';
-        $reset_button 	= '<input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />';
+	if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
+		$submit_button1	= '<input type="submit" id="submit" value="'.get_lang('Search').'" />';
+		$submit_button2 = '<input class="lower-submit" type="submit" value="'.get_lang('Search').'" />';
+        $reset_button = '<input type="submit" id="tags-clean" value="'.get_lang('SearchResetKeywords').'" />';
 	} else {
-		$submit_button1 = '<button class="search" type="submit" id="submit" value="'. get_lang("Search") .'" /> '. get_lang('Search') .'</button>';
-		$submit_button2 = '<button class="search" type="submit" value="'. get_lang('Search') .'" />'. get_lang('Search') .'</button>';
-        $reset_button 	= '<button class="save"   type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />'. get_lang('SearchResetKeywords') .'</button> ';
+		$submit_button1 = '<button class="search" type="submit" id="submit" value="'.get_lang("Search").'" /> '.get_lang('Search').'</button>';
+		$submit_button2 = '<button class="search" type="submit" value="'.get_lang('Search').'" />'.get_lang('Search').'</button>';
+        $reset_button = '<button class="save"   type="submit" id="tags-clean" value="'.get_lang('SearchResetKeywords').'" />'.get_lang('SearchResetKeywords').'</button> ';
 	}
 
     $query = isset($_REQUEST['query']) ? Security::remove_XSS($_REQUEST['query']) : null;
 
-    $form = '<form id="chamilo_search" action="'. $action .'" method="GET">
-            <input type="text" id="query" name="query" size="40" value="' . $query . '" />
-            <input type="hidden" name="mode" value="'. $mode .'"/>
-            <input type="hidden" name="type" value="'. $type .'"/>
+    $form = '<form id="chamilo_search" action="'.$action.'" method="GET">
+            <input type="text" id="query" name="query" size="40" value="' . $query.'" />
+            <input type="hidden" name="mode" value="'. $mode.'"/>
+            <input type="hidden" name="type" value="'. $type.'"/>
             <input type="hidden" name="tablename_page_nr" value="1" />
           	'.$submit_button1.'
             <br /><br />';
     $list = get_specific_field_list();
 
-    if(!empty($list)) {
-        $form .= '<span class="search-links-box">'. $advanced_options .'&nbsp;</span>
-            <div id="tags" class="tags" style="display:'. $display_thesaurus .';">
-                <div class="search-help-box">'. $help .'</div>
+    if (!empty($list)) {
+        $form .= '<span class="search-links-box">'.$advanced_options.'&nbsp;</span>
+            <div id="tags" class="tags" style="display:'. $display_thesaurus.';">
+                <div class="search-help-box">'. $help.'</div>
                 <table>
                 <tr>';
         $form .= format_specific_fields_selects($sf_terms, $op);
@@ -162,9 +162,9 @@ 
         $form .= '</tr>
                     <tr>
                         <td id="operator-select">
-                            '. get_lang('SearchCombineSearchWith') .':<br />
-                            <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked .'>'. api_strtoupper(get_lang('Or')) .'</input>
-                            <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked .'>'. api_strtoupper(get_lang('And')) .'</input>
+                            '. get_lang('SearchCombineSearchWith').':<br />
+                            <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked.'>'.api_strtoupper(get_lang('Or')).'</input>
+                            <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked.'>'.api_strtoupper(get_lang('And')).'</input>
                         </td>
                         <td></td>
                         <td>
@@ -176,7 +176,7 @@ 
                     </table>
                 </div>';
     }
-    $form .='</form>
+    $form .= '</form>
     <br style="clear: both;"/>';
     return $form;
 }
@@ -186,36 +186,36 @@ 
  *
  * This type allow filter all other multiple select terms by one term in a dinamic way
  */
-function search_widget_prefilter_form($action, $show_thesaurus, $sf_terms, $op, $prefilter_prefix=NULL) {
+function search_widget_prefilter_form($action, $show_thesaurus, $sf_terms, $op, $prefilter_prefix = NULL) {
     $thesaurus_icon = Display::return_icon('thesaurus.gif', get_lang('SearchAdvancedOptions'), array('id'=>'thesaurus-icon'));
-    $advanced_options = '<a id="tags-toggle" href="#">'.  get_lang('SearchAdvancedOptions') .'</a>';
-    $display_thesaurus = ($show_thesaurus==true? 'block': 'none');
-    $help = '<h3>'. get_lang('SearchKeywordsHelpTitle') .'</h3>'. get_lang('SearchKeywordsHelpComment');
-    $mode = (!empty($_REQUEST['mode'])? htmlentities($_REQUEST['mode']): 'gallery');
-    $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal');
+    $advanced_options = '<a id="tags-toggle" href="#">'.get_lang('SearchAdvancedOptions').'</a>';
+    $display_thesaurus = ($show_thesaurus == true ? 'block' : 'none');
+    $help = '<h3>'.get_lang('SearchKeywordsHelpTitle').'</h3>'.get_lang('SearchKeywordsHelpComment');
+    $mode = (!empty($_REQUEST['mode']) ? htmlentities($_REQUEST['mode']) : 'gallery');
+    $type = (!empty($_REQUEST['type']) ? htmlentities($_REQUEST['type']) : 'normal');
 
     /**
      * POST avoid long urls, but we are using GET because
      * SortableTableFromArray pagination is done with simple links, so now we
      * could not send a form in pagination
      */
-	if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) {
-		$action='index.php';
+	if (isset($_GET['action']) && strcmp(trim($_GET['action']), 'search') === 0) {
+		$action = 'index.php';
 	}
 
     $form = '
-        <form id="chamilo_search" action="'. $action .'" method="GET">
+        <form id="chamilo_search" action="'. $action.'" method="GET">
             <input type="text" id="query" name="query" size="40" />
-            <input type="hidden" name="mode" value="'. $mode .'"/>
-            <input type="hidden" name="type" value="'. $type .'"/>
+            <input type="hidden" name="mode" value="'. $mode.'"/>
+            <input type="hidden" name="type" value="'. $type.'"/>
             <input type="hidden" name="tablename_page_nr" value="1" />
-            <input type="submit" id="submit" value="'. get_lang("Search") .'" />
+            <input type="submit" id="submit" value="'. get_lang("Search").'" />
             <br /><br />';
         $list = get_specific_field_list();
-        if(!empty($list)) {
-            $form .=' <span class="search-links-box">'. $thesaurus_icon . $advanced_options .'&nbsp;</span>
-                    <div id="tags" class="tags" style="display:'. $display_thesaurus .';">
-                        <div class="search-help-box">'. $help .'</div>
+        if (!empty($list)) {
+            $form .= ' <span class="search-links-box">'.$thesaurus_icon.$advanced_options.'&nbsp;</span>
+                    <div id="tags" class="tags" style="display:'. $display_thesaurus.';">
+                        <div class="search-help-box">'. $help.'</div>
                         <table>
                         <tr>';
             if (!is_null($prefilter_prefix)) {
@@ -230,9 +230,9 @@ 
                 $sf_term_array = $temp;
 
                 // get specific field name
-                $sf_value = get_specific_field_list(array( 'code' => "'$prefilter_prefix'" ));
+                $sf_value = get_specific_field_list(array('code' => "'$prefilter_prefix'"));
                 $sf_value = array_shift($sf_value);
-                $form .= '<label class="sf-select-multiple-title" for="sf_'. $prefix .'[]">'.$icons_for_search_terms[$prefix].' '.$sf_value['name'].'</label><br />';
+                $form .= '<label class="sf-select-multiple-title" for="sf_'.$prefix.'[]">'.$icons_for_search_terms[$prefix].' '.$sf_value['name'].'</label><br />';
 
                 $form .= format_one_specific_field_select($prefilter_prefix, $sf_term_array, $op, 'id="prefilter"');
                 $form .= format_specific_fields_selects($sf_terms, $op, $prefilter_prefix);
@@ -252,15 +252,15 @@ 
                         </tr>
                         <tr>
                             <td id="operator-select">
-                                '. get_lang('SearchCombineSearchWith') .':<br />
-                                <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked .'>'. api_strtoupper(get_lang('Or')) .'</input>
-                                <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked .'>'. api_strtoupper(get_lang('And')) .'</input>
+                                '. get_lang('SearchCombineSearchWith').':<br />
+                                <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked.'>'.api_strtoupper(get_lang('Or')).'</input>
+                                <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked.'>'.api_strtoupper(get_lang('And')).'</input>
                             </td>
                             <td></td>
                             <td>
                                 <br />
-                                <input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />
-                                <input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />
+                                <input class="lower-submit" type="submit" value="'. get_lang('Search').'" />
+                                <input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords').'" />
                             </td>
                         </tr>
                         </table>
@@ -277,7 +277,7 @@ 
  * Show search form
  */
 function display_search_form($action, $show_thesaurus, $sf_terms, $op) {
-    $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal');
+    $type = (!empty($_REQUEST['type']) ? htmlentities($_REQUEST['type']) : 'normal');
 
     switch ($type) {
         case 'prefilter':
@@ -304,7 +304,7 @@ 
  * @param   string $action     Just in case your action is not
  * index.php
  */
-function search_widget_show($action='index.php')
+function search_widget_show($action = 'index.php')
 {
     require_once api_get_path(LIBRARY_PATH).'search/ChamiloQuery.php';
     // TODO: load images dinamically when they're avalaible from specific field ui to add
@@ -317,14 +317,14 @@ 
     if (($cid = api_get_course_id()) != -1) { // with cid
 
         // get search engine terms
-        $course_filter = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID . $cid);
+        $course_filter = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID.$cid);
         $dkterms = chamilo_query_simple_query('', 0, 1000, array($course_filter));
 
         //prepare specific fields names (and also get possible URL param names)
         foreach ($specific_fields as $specific_field) {
             $temp = array();
-            if (is_array($dkterms) && count($dkterms)>0) {
-            	foreach($dkterms[1] as $obj) {
+            if (is_array($dkterms) && count($dkterms) > 0) {
+            	foreach ($dkterms[1] as $obj) {
                 	$temp = array_merge($obj['sf-'.$specific_field['code']], $temp);
             	}
         	}
@@ -352,7 +352,7 @@ 
     }
 
     $op = 'or';
-    if (!empty($_REQUEST['operator']) && in_array($op,array('or','and'))) {
+    if (!empty($_REQUEST['operator']) && in_array($op, array('or', 'and'))) {
         $op = $_REQUEST['operator'];
     }
 

Indentation +21 added lines, -21 removed lines

@@ -30,7 +30,7 @@ 
  * Get one term html select
  */
 function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr='size="7" class="sf-select-multiple"') {
-	global $charset;
+    global $charset;
     $multiple_select = '<select '. $extra_select_attr .' title="'. $prefix .'" id="sf-'. $prefix .'" name="sf_'. $prefix .'[]">';
 
     $all_selected = '';
@@ -119,20 +119,20 @@ 
      * could not send a form in pagination
      */
 
-	if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) {
-		$action='index.php';
-	}
-	$navigator_info = api_get_navigator();
+    if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) {
+        $action='index.php';
+    }
+    $navigator_info = api_get_navigator();
 
-	if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
-		$submit_button1	= '<input type="submit" id="submit" value="'. get_lang('Search') .'" />';
-		$submit_button2 = '<input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />';
+    if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
+        $submit_button1	= '<input type="submit" id="submit" value="'. get_lang('Search') .'" />';
+        $submit_button2 = '<input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />';
         $reset_button 	= '<input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />';
-	} else {
-		$submit_button1 = '<button class="search" type="submit" id="submit" value="'. get_lang("Search") .'" /> '. get_lang('Search') .'</button>';
-		$submit_button2 = '<button class="search" type="submit" value="'. get_lang('Search') .'" />'. get_lang('Search') .'</button>';
+    } else {
+        $submit_button1 = '<button class="search" type="submit" id="submit" value="'. get_lang("Search") .'" /> '. get_lang('Search') .'</button>';
+        $submit_button2 = '<button class="search" type="submit" value="'. get_lang('Search') .'" />'. get_lang('Search') .'</button>';
         $reset_button 	= '<button class="save"   type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />'. get_lang('SearchResetKeywords') .'</button> ';
-	}
+    }
 
     $query = isset($_REQUEST['query']) ? Security::remove_XSS($_REQUEST['query']) : null;
 
@@ -199,9 +199,9 @@ 
      * SortableTableFromArray pagination is done with simple links, so now we
      * could not send a form in pagination
      */
-	if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) {
-		$action='index.php';
-	}
+    if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) {
+        $action='index.php';
+    }
 
     $form = '
         <form id="chamilo_search" action="'. $action .'" method="GET">
@@ -266,7 +266,7 @@ 
                         </table>
                     </div>';
         }
-       $form .= '
+        $form .= '
         </form>
         <br style="clear: both;"/>';
 
@@ -324,10 +324,10 @@ 
         foreach ($specific_fields as $specific_field) {
             $temp = array();
             if (is_array($dkterms) && count($dkterms)>0) {
-            	foreach($dkterms[1] as $obj) {
-                	$temp = array_merge($obj['sf-'.$specific_field['code']], $temp);
-            	}
-        	}
+                foreach($dkterms[1] as $obj) {
+                    $temp = array_merge($obj['sf-'.$specific_field['code']], $temp);
+                }
+            }
             $sf_terms[$specific_field['code']] = $temp;
             $url_params[] = 'sf_'.$specific_field['code'];
             unset($temp);
@@ -342,7 +342,7 @@ 
     }
     echo '<h2>'.get_lang('Search').'</h2>';
 
-	// Tool introduction
+    // Tool introduction
     // TODO: Settings for the online editor to be checked (insert an image for example). Probably this is a special case here.
     if (api_get_course_id() !== -1)
     if (!empty($groupId)) {

Braces +12 added lines, -5 removed lines

@@ -48,7 +48,9 @@ 
 
     foreach ($sf_term_array as $raw_term) {
         $term = substr($raw_term, 1);
-        if (empty($term)) continue;
+        if (empty($term)) {
+            continue;
+        }
         $html_term = htmlspecialchars($term, ENT_QUOTES, $charset);
         $selected = '';
         if (!empty($_REQUEST['sf_'.$prefix]) && is_array($_REQUEST['sf_'.$prefix]) && in_array($term,$_REQUEST['sf_'.$prefix])) {
@@ -69,7 +71,9 @@ 
     $max = count($sf_terms);
     $multiple_selects ='';
     foreach ($sf_terms as $prefix => $sf_term_array) {
-        if ($prefix == $prefilter_prefix) continue;
+        if ($prefix == $prefilter_prefix) {
+            continue;
+        }
         $multiple_select = '';
         if ($i>0) {
             //print "+" image
@@ -344,9 +348,10 @@ 
 
 	// Tool introduction
     // TODO: Settings for the online editor to be checked (insert an image for example). Probably this is a special case here.
-    if (api_get_course_id() !== -1)
-    if (!empty($groupId)) {
+    if (api_get_course_id() !== -1) {
+        if (!empty($groupId)) {
         Display::display_introduction_section(TOOL_SEARCH.$groupId);
+    }
     } else {
         Display::display_introduction_section(TOOL_SEARCH);
     }
@@ -368,7 +373,9 @@ 
                     break;
                 }
             }
-            if ($thesaurus_decided) break;
+            if ($thesaurus_decided) {
+                break;
+            }
         }
     }
 

src/Chamilo/CoreBundle/Entity/Course.php

Doc Comments +3 added lines, -3 removed lines

@@ -392,7 +392,7 @@ 
     }
 
     /**
-     * @return ArrayCollection
+     * @return CTool[]
      */
     public function getTools()
     {
@@ -427,7 +427,7 @@ 
     }
 
     /**
-     * @param $urls
+     * @param ArrayCollection $urls
      */
     public function setUrls($urls)
     {
@@ -1244,7 +1244,7 @@ 
     }
 
     /**
-     * @return array
+     * @return string[]
      */
     public static function getStatusList()
     {

Spacing +3 added lines, -3 removed lines

@@ -1191,7 +1191,7 @@ 
      */
     public function hasPicture()
     {
-        return file_exists(api_get_path(SYS_COURSE_PATH) . $this->directory . '/course-pic85x85.png');
+        return file_exists(api_get_path(SYS_COURSE_PATH).$this->directory.'/course-pic85x85.png');
     }
 
     /**
@@ -1206,9 +1206,9 @@ 
         }
 
         if ($fullSize) {
-            return api_get_path(WEB_COURSE_PATH) . $this->directory . '/course-pic.png';
+            return api_get_path(WEB_COURSE_PATH).$this->directory.'/course-pic.png';
         }
 
-        return api_get_path(WEB_COURSE_PATH) . $this->directory . '/course-pic85x85.png';
+        return api_get_path(WEB_COURSE_PATH).$this->directory.'/course-pic85x85.png';
     }
 }

src/Chamilo/ThemeBundle/EventListener/SidebarSetupMenuDemoListener.php

Doc Comments +3 added lines

@@ -43,6 +43,9 @@
 
     }
 
+    /**
+     * @param MenuItemModel[] $items
+     */
     protected function activateByRoute($route, $items) {
 
         foreach($items as $item) { /** @var $item MenuItemModel */

Spacing +3 added lines, -3 removed lines

@@ -45,12 +45,12 @@
 
     protected function activateByRoute($route, $items) {
 
-        foreach($items as $item) { /** @var $item MenuItemModel */
-            if($item->hasChildren()) {
+        foreach ($items as $item) { /** @var $item MenuItemModel */
+            if ($item->hasChildren()) {
                 $this->activateByRoute($route, $item->getChildren());
             }
             else {
-                if($item->getRoute() == $route) {
+                if ($item->getRoute() == $route) {
                     $item->setIsActive(true);
                 }
             }

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
         foreach($items as $item) { /** @var $item MenuItemModel */
             if($item->hasChildren()) {
                 $this->activateByRoute($route, $item->getChildren());
-            }
-            else {
+            } else {
                 if($item->getRoute() == $route) {
                     $item->setIsActive(true);
                 }

src/Chamilo/ThemeBundle/Model/MenuItemModel.php

Doc Comments +5 added lines

@@ -60,6 +60,11 @@
      */
     protected $parent = null;
 
+    /**
+     * @param string $id
+     * @param string $label
+     * @param string $route
+     */
     function __construct(
         $id,
         $label,

src/Chamilo/ThemeBundle/Model/MessageModel.php

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
      *
      * @param UserInterface $from
      * @param string        $subject
-     * @param null          $sentAt
+     * @param \DateTime          $sentAt
      * @param UserInterface $to
      */
     function __construct(UserInterface $from = null, $subject= '', $sentAt = null, UserInterface $to = null)

Spacing +2 added lines, -2 removed lines

@@ -51,11 +51,11 @@
      * @param null          $sentAt
      * @param UserInterface $to
      */
-    function __construct(UserInterface $from = null, $subject= '', $sentAt = null, UserInterface $to = null)
+    function __construct(UserInterface $from = null, $subject = '', $sentAt = null, UserInterface $to = null)
     {
         $this->to      = $to;
         $this->subject = $subject;
-        $this->sentAt  = $sentAt ? : new \DateTime();
+        $this->sentAt  = $sentAt ?: new \DateTime();
         $this->from    = $from;
     }
 

src/Chamilo/ThemeBundle/Model/NotificationModel.php

Doc Comments +3 added lines

@@ -18,6 +18,9 @@
 
     protected $icon;
 
+    /**
+     * @param string $message
+     */
     function __construct($message = null, $type = 'info', $icon = 'fa fa-warning')
     {
         $this->message = $message;

src/Chamilo/ThemeBundle/Model/TaskModel.php

Doc Comments +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
     protected $title;
 
     /**
-     * @param null   $title
+     * @param string   $title
      * @param int    $progress
      * @param string $color
      */
@@ -93,7 +93,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return integer
      */
     public function getProgress()
     {

Spacing +3 added lines, -3 removed lines

@@ -19,15 +19,15 @@
     /**
      *
      */
-    const COLOR_AQUA   = 'aqua';
+    const COLOR_AQUA = 'aqua';
     /**
      *
      */
-    const COLOR_GREEN  = 'green';
+    const COLOR_GREEN = 'green';
     /**
      *
      */
-    const COLOR_RED    = 'red';
+    const COLOR_RED = 'red';
     /**
      *
      */

src/Chamilo/ThemeBundle/Theme/ThemeManager.php

Doc Comments +4 added lines

@@ -52,6 +52,10 @@
 
     }
 
+    /**
+     * @param string $id
+     * @param string $src
+     */
     public function registerStyle($id, $src, $deps = array()) {
         if(!isset($this->stylesheets[$id])) {
             $this->stylesheets[$id] = array(

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
     function __construct($container, $resolverClass = null)
     {
         $this->container     = $container;
-        $this->resolverClass = $resolverClass?: 'Chamilo\ThemeBundle\Util\DependencyResolver';
+        $this->resolverClass = $resolverClass ?: 'Chamilo\ThemeBundle\Util\DependencyResolver';
     }
 
     public function registerScript($id, $src, $deps = array(), $location = "bottom")
@@ -53,7 +53,7 @@ 
     }
 
     public function registerStyle($id, $src, $deps = array()) {
-        if(!isset($this->stylesheets[$id])) {
+        if (!isset($this->stylesheets[$id])) {
             $this->stylesheets[$id] = array(
                 'src'      => $src,
                 'deps'     => $deps,
@@ -64,14 +64,14 @@ 
     public function getScripts($location = 'bottom') {
 
         $unsorted = array(); $srcList = array(); $assetList = array();
-        foreach($this->javascripts as $id => $scriptDefinition) {
-            if($scriptDefinition['location'] == $location) {
+        foreach ($this->javascripts as $id => $scriptDefinition) {
+            if ($scriptDefinition['location'] == $location) {
                 $unsorted[$id] = $scriptDefinition;
             }
         }
 
         $queue = $this->getResolver()->register($unsorted)->resolveAll();
-        foreach($queue as $def){
+        foreach ($queue as $def) {
             $srcList[] = $def['src'];
         }
         return $srcList;
@@ -80,7 +80,7 @@ 
     public function getStyles() {
         $srcList = array();
         $queue = $this->getResolver()->register($this->stylesheets)->resolveAll();
-        foreach($queue as $def){
+        foreach ($queue as $def) {
             $srcList[] = $def['src'];
         }
         return $srcList;

src/Chamilo/ThemeBundle/Form/FormDemoModelType.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
-class FormDemoModelType extends AbstractType{
+class FormDemoModelType extends AbstractType {
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -33,7 +33,7 @@ 
                 ->add('someChoices', 'choice', array('choices' => $choices, 'expanded' => true, 'multiple' => true))
                 ->add('username')
                 ->add('email')
-                ->add('termsAccepted','checkbox')
+                ->add('termsAccepted', 'checkbox')
                 ->add('message', 'textarea')
                 ->add('price')
                 ->add('date', 'date', array('widget' => 'single_text'))