Completed
Push — 1.11.x ( 69878b...1da93a )
by José
64:32 queued 39:16
created
main/inc/lib/search/tool_processors/link_processor.class.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -8,8 +8,8 @@  discard block
 block discarded – undo
8 8
 /**
9 9
  * Code
10 10
  */
11
-include_once dirname(__FILE__) . '/../../../global.inc.php';
12
-require_once dirname(__FILE__) . '/search_processor.class.php';
11
+include_once dirname(__FILE__).'/../../../global.inc.php';
12
+require_once dirname(__FILE__).'/search_processor.class.php';
13 13
 
14 14
 /**
15 15
  * Process links before pass it to search listing scripts
@@ -104,11 +104,11 @@  discard block
 block discarded – undo
104 104
 
105 105
             $link_id = intval($link_id);
106 106
             $sql = "SELECT insert_user_id FROM $item_property_table
107
-              		WHERE ref = $link_id AND tool = '" . TOOL_LINK . "' AND c_id = $course_id
107
+              		WHERE ref = $link_id AND tool = '".TOOL_LINK."' AND c_id = $course_id
108 108
               		LIMIT 1";
109 109
 
110 110
             $name = get_lang('Links');
111
-            $url = api_get_path(WEB_PATH) . 'main/link/link.php?cidReq=%s';
111
+            $url = api_get_path(WEB_PATH).'main/link/link.php?cidReq=%s';
112 112
             $url = sprintf($url, $course_id_alpha);
113 113
             // Get the image path
114 114
             $thumbnail = Display::returnIconPath('link.png');
Please login to merge, or discard this patch.
main/inc/lib/search/tool_processors/document_processor.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,8 +8,8 @@  discard block
 block discarded – undo
8 8
 /**
9 9
  * Code
10 10
  */
11
-include_once dirname(__FILE__) . '/../../../global.inc.php';
12
-require_once dirname(__FILE__) . '/search_processor.class.php';
11
+include_once dirname(__FILE__).'/../../../global.inc.php';
12
+require_once dirname(__FILE__).'/search_processor.class.php';
13 13
 
14 14
 /**
15 15
  * Process documents before pass it to search listing scripts
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
             $dk_result = Database::query($sql);
83 83
 
84 84
             $sql = "SELECT insert_user_id FROM       $item_property_table
85
-                    WHERE   ref = $doc_id AND tool = '" . TOOL_DOCUMENT . "' AND c_id = $course_id
85
+                    WHERE   ref = $doc_id AND tool = '".TOOL_DOCUMENT."' AND c_id = $course_id
86 86
                     LIMIT 1";
87 87
             $name = '';
88 88
             if ($row = Database::fetch_array($dk_result)) {
Please login to merge, or discard this patch.
main/admin/specific_fields.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -15,36 +15,36 @@  discard block
 block discarded – undo
15 15
 api_protect_admin_script();
16 16
 
17 17
 // Breadcrumb
18
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
19
-$interbreadcrumb[] = array ('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings'));
18
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
19
+$interbreadcrumb[] = array('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings'));
20 20
 
21 21
 $libpath = api_get_path(LIBRARY_PATH);
22 22
 
23 23
 include_once $libpath.'specific_fields_manager.lib.php';
24 24
 
25 25
 // Create an add-field box
26
-$form = new FormValidator('add_field','post','','',null,false);
27
-$renderer =& $form->defaultRenderer();
26
+$form = new FormValidator('add_field', 'post', '', '', null, false);
27
+$renderer = & $form->defaultRenderer();
28 28
 $renderer->setCustomElementTemplate('<span>{element}</span> ');
29
-$form->addElement('static','search_advanced_link',null,'<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
29
+$form->addElement('static', 'search_advanced_link', null, '<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
30 30
 
31 31
 // Create a sortable table with specific fields data
32
-$column_show = array(1,1,1);
33
-$column_order = array(3,2,1);
32
+$column_show = array(1, 1, 1);
33
+$column_order = array(3, 2, 1);
34 34
 $extra_fields = get_specific_field_list();
35 35
 $number_of_extra_fields = count($extra_fields);
36 36
 
37
-$table = new SortableTableFromArrayConfig($extra_fields,2,50,'',$column_show,$column_order);
38
-$table->set_header(0, '&nbsp;', false,null,'width="2%"', 'style="display:none"');
37
+$table = new SortableTableFromArrayConfig($extra_fields, 2, 50, '', $column_show, $column_order);
38
+$table->set_header(0, '&nbsp;', false, null, 'width="2%"', 'style="display:none"');
39 39
 $table->set_header(1, get_lang('Code'), TRUE, 'width="10%"');
40 40
 $table->set_header(2, get_lang('Name'));
41
-$table->set_header(3, get_lang('Modify'),false,'width="10%"');
41
+$table->set_header(3, get_lang('Modify'), false, 'width="10%"');
42 42
 $table->set_column_filter(3, 'edit_filter');
43 43
 
44
-function edit_filter($id,$url_params,$row) {
44
+function edit_filter($id, $url_params, $row) {
45 45
 	global $charset;
46
-	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>';
47
-	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."'".')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a>';
46
+	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
47
+	$return .= ' <a href="'.api_get_self().'?action=delete&field_id='.$row[0].'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset))."'".')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
48 48
 	return $return;
49 49
 }
50 50
 
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 Display::display_header(get_lang('SpecificSearchFields'));
61 61
 echo Display::display_normal_message(get_lang('SpecificSearchFieldsIntro'));
62 62
 
63
-if(!empty($_GET['message'])) {
63
+if (!empty($_GET['message'])) {
64 64
   Display::display_confirmation_message($_GET['message']);
65 65
 }
66 66
 
Please login to merge, or discard this patch.
main/admin/specific_fields_add.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -32,18 +32,18 @@  discard block
 block discarded – undo
32 32
 // Create the form
33 33
 $form = new FormValidator('specific_fields_add');
34 34
 // Field variable name
35
-$form->addElement('hidden','field_id', $fieldId);
36
-$form->addElement('text','field_name',get_lang('FieldName'));
37
-$form->applyFilter('field_name','html_filter');
38
-$form->applyFilter('field_name','trim');
35
+$form->addElement('hidden', 'field_id', $fieldId);
36
+$form->addElement('text', 'field_name', get_lang('FieldName'));
37
+$form->applyFilter('field_name', 'html_filter');
38
+$form->applyFilter('field_name', 'trim');
39 39
 $form->addRule('field_name', get_lang('ThisFieldIsRequired'), 'required');
40 40
 $form->addRule('field_name', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
41
-$form->addRule('field_name', '', 'maxlength',20);
41
+$form->addRule('field_name', '', 'maxlength', 20);
42 42
 
43 43
 // Set default values (only not empty when editing)
44 44
 $defaults = array();
45 45
 if ($fieldId) {
46
-    $form_information = get_specific_field_list(array( 'id' => $fieldId ));
46
+    $form_information = get_specific_field_list(array('id' => $fieldId));
47 47
     $defaults['field_name'] = $form_information[0]['name'];
48 48
 }
49 49
 $form->setDefaults($defaults);
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 if ($form->validate()) {
55 55
     $field = $form->exportValues();
56 56
     $field_name = $field['field_name'];
57
-    if (is_numeric($field['field_id']) && $field['field_id']<>0 && !empty($field['field_id'])) {
57
+    if (is_numeric($field['field_id']) && $field['field_id'] <> 0 && !empty($field['field_id'])) {
58 58
         edit_specific_field($field['field_id'], $field['field_name']);
59 59
         $message = get_lang('FieldEdited');
60 60
     } else {
Please login to merge, or discard this patch.
main/inc/lib/search/search_widget.php 1 patch
Spacing   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 /**
8 8
  * Code
9 9
  */
10
-require_once dirname(__FILE__) . '/IndexableChunk.class.php';
10
+require_once dirname(__FILE__).'/IndexableChunk.class.php';
11 11
 require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
12 12
 
13 13
 /**
@@ -29,13 +29,13 @@  discard block
 block discarded – undo
29 29
 /**
30 30
  * Get one term html select
31 31
  */
32
-function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr='size="7" class="sf-select-multiple"') {
32
+function format_one_specific_field_select($prefix, $sf_term_array, $op, $extra_select_attr = 'size="7" class="sf-select-multiple"') {
33 33
 	global $charset;
34
-    $multiple_select = '<select '. $extra_select_attr .' title="'. $prefix .'" id="sf-'. $prefix .'" name="sf_'. $prefix .'[]">';
34
+    $multiple_select = '<select '.$extra_select_attr.' title="'.$prefix.'" id="sf-'.$prefix.'" name="sf_'.$prefix.'[]">';
35 35
 
36 36
     $all_selected = '';
37
-    if (!empty($_REQUEST['sf_'. $prefix]) ) {
38
-        if (in_array('__all__', $_REQUEST['sf_'. $prefix])) {
37
+    if (!empty($_REQUEST['sf_'.$prefix])) {
38
+        if (in_array('__all__', $_REQUEST['sf_'.$prefix])) {
39 39
             $all_selected = 'selected="selected"';
40 40
         }
41 41
     }
@@ -44,17 +44,17 @@  discard block
 block discarded – undo
44 44
     } else if ($op == 'or') {
45 45
         $all_selected_name = get_lang('Any');
46 46
     }
47
-    $multiple_select .= '<option value="__all__" '. $all_selected .' >-- '. $all_selected_name .' --</option>';
47
+    $multiple_select .= '<option value="__all__" '.$all_selected.' >-- '.$all_selected_name.' --</option>';
48 48
 
49 49
     foreach ($sf_term_array as $raw_term) {
50 50
         $term = substr($raw_term, 1);
51 51
         if (empty($term)) continue;
52 52
         $html_term = htmlspecialchars($term, ENT_QUOTES, $charset);
53 53
         $selected = '';
54
-        if (!empty($_REQUEST['sf_'.$prefix]) && is_array($_REQUEST['sf_'.$prefix]) && in_array($term,$_REQUEST['sf_'.$prefix])) {
54
+        if (!empty($_REQUEST['sf_'.$prefix]) && is_array($_REQUEST['sf_'.$prefix]) && in_array($term, $_REQUEST['sf_'.$prefix])) {
55 55
             $selected = 'selected="selected"';
56 56
         }
57
-        $multiple_select .= '<option value="'. $html_term .'" '.$selected.'>'. $html_term .'</option>';
57
+        $multiple_select .= '<option value="'.$html_term.'" '.$selected.'>'.$html_term.'</option>';
58 58
     }
59 59
     $multiple_select .= '</select>';
60 60
     return $multiple_select;
@@ -63,15 +63,15 @@  discard block
 block discarded – undo
63 63
 /**
64 64
  * Get terms html selects
65 65
  */
66
-function format_specific_fields_selects($sf_terms, $op, $prefilter_prefix='') {
66
+function format_specific_fields_selects($sf_terms, $op, $prefilter_prefix = '') {
67 67
     // Process each prefix type term
68 68
     $i = 0;
69 69
     $max = count($sf_terms);
70
-    $multiple_selects ='';
70
+    $multiple_selects = '';
71 71
     foreach ($sf_terms as $prefix => $sf_term_array) {
72 72
         if ($prefix == $prefilter_prefix) continue;
73 73
         $multiple_select = '';
74
-        if ($i>0) {
74
+        if ($i > 0) {
75 75
             //print "+" image
76 76
             $multiple_select .= '<td><img class="sf-select-splitter" src="../img/search-big-plus.gif" alt="plus-sign-decoration"/></td>';
77 77
         }
@@ -89,9 +89,9 @@  discard block
 block discarded – undo
89 89
 
90 90
         $sf_copy = $sf_term_array;
91 91
         // get specific field name
92
-        $sf_value = get_specific_field_list(array( 'code' => "'$prefix'" ));
92
+        $sf_value = get_specific_field_list(array('code' => "'$prefix'"));
93 93
         $sf_value = array_shift($sf_value);
94
-        $multiple_select .= '<td><label class="sf-select-multiple-title" for="sf_'. $prefix .'[]">' . $sf_value['name'].'</label><br />';
94
+        $multiple_select .= '<td><label class="sf-select-multiple-title" for="sf_'.$prefix.'[]">'.$sf_value['name'].'</label><br />';
95 95
         $multiple_select .= format_one_specific_field_select($prefix, $sf_term_array, $op, 'multiple="multiple" size="7" class="sf-select-multiple"');
96 96
         $multiple_select .= '</td>';
97 97
         $multiple_selects .= $multiple_select;
@@ -107,11 +107,11 @@  discard block
 block discarded – undo
107 107
  */
108 108
 function search_widget_normal_form($action, $show_thesaurus, $sf_terms, $op) {
109 109
     $thesaurus_icon = Display::return_icon('thesaurus.gif', get_lang('SearchAdvancedOptions'), array('id'=>'thesaurus-icon'));
110
-    $advanced_options = '<a id="tags-toggle" href="#">'.  get_lang('SearchAdvancedOptions') .'</a>';
111
-    $display_thesaurus = ($show_thesaurus==true? 'block': 'none');
112
-    $help = '<h3>'. get_lang('SearchKeywordsHelpTitle') .'</h3>'. get_lang('SearchKeywordsHelpComment');
113
-    $mode = (!empty($_REQUEST['mode'])? htmlentities($_REQUEST['mode']): 'gallery');
114
-    $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal');
110
+    $advanced_options = '<a id="tags-toggle" href="#">'.get_lang('SearchAdvancedOptions').'</a>';
111
+    $display_thesaurus = ($show_thesaurus == true ? 'block' : 'none');
112
+    $help = '<h3>'.get_lang('SearchKeywordsHelpTitle').'</h3>'.get_lang('SearchKeywordsHelpComment');
113
+    $mode = (!empty($_REQUEST['mode']) ? htmlentities($_REQUEST['mode']) : 'gallery');
114
+    $type = (!empty($_REQUEST['type']) ? htmlentities($_REQUEST['type']) : 'normal');
115 115
 
116 116
     /**
117 117
      * POST avoid long urls, but we are using GET because
@@ -119,36 +119,36 @@  discard block
 block discarded – undo
119 119
      * could not send a form in pagination
120 120
      */
121 121
 
122
-	if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) {
123
-		$action='index.php';
122
+	if (isset($_GET['action']) && strcmp(trim($_GET['action']), 'search') === 0) {
123
+		$action = 'index.php';
124 124
 	}
125 125
 	$navigator_info = api_get_navigator();
126 126
 
127
-	if ($navigator_info['name']=='Internet Explorer' &&  $navigator_info['version']=='6') {
128
-		$submit_button1	= '<input type="submit" id="submit" value="'. get_lang('Search') .'" />';
129
-		$submit_button2 = '<input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />';
130
-        $reset_button 	= '<input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />';
127
+	if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
128
+		$submit_button1	= '<input type="submit" id="submit" value="'.get_lang('Search').'" />';
129
+		$submit_button2 = '<input class="lower-submit" type="submit" value="'.get_lang('Search').'" />';
130
+        $reset_button = '<input type="submit" id="tags-clean" value="'.get_lang('SearchResetKeywords').'" />';
131 131
 	} else {
132
-		$submit_button1 = '<button class="search" type="submit" id="submit" value="'. get_lang("Search") .'" /> '. get_lang('Search') .'</button>';
133
-		$submit_button2 = '<button class="search" type="submit" value="'. get_lang('Search') .'" />'. get_lang('Search') .'</button>';
134
-        $reset_button 	= '<button class="save"   type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />'. get_lang('SearchResetKeywords') .'</button> ';
132
+		$submit_button1 = '<button class="search" type="submit" id="submit" value="'.get_lang("Search").'" /> '.get_lang('Search').'</button>';
133
+		$submit_button2 = '<button class="search" type="submit" value="'.get_lang('Search').'" />'.get_lang('Search').'</button>';
134
+        $reset_button = '<button class="save"   type="submit" id="tags-clean" value="'.get_lang('SearchResetKeywords').'" />'.get_lang('SearchResetKeywords').'</button> ';
135 135
 	}
136 136
 
137 137
     $query = isset($_REQUEST['query']) ? Security::remove_XSS($_REQUEST['query']) : null;
138 138
 
139
-    $form = '<form id="chamilo_search" action="'. $action .'" method="GET">
140
-            <input type="text" id="query" name="query" size="40" value="' . $query . '" />
141
-            <input type="hidden" name="mode" value="'. $mode .'"/>
142
-            <input type="hidden" name="type" value="'. $type .'"/>
139
+    $form = '<form id="chamilo_search" action="'.$action.'" method="GET">
140
+            <input type="text" id="query" name="query" size="40" value="' . $query.'" />
141
+            <input type="hidden" name="mode" value="'. $mode.'"/>
142
+            <input type="hidden" name="type" value="'. $type.'"/>
143 143
             <input type="hidden" name="tablename_page_nr" value="1" />
144 144
           	'.$submit_button1.'
145 145
             <br /><br />';
146 146
     $list = get_specific_field_list();
147 147
 
148
-    if(!empty($list)) {
149
-        $form .= '<span class="search-links-box">'. $advanced_options .'&nbsp;</span>
150
-            <div id="tags" class="tags" style="display:'. $display_thesaurus .';">
151
-                <div class="search-help-box">'. $help .'</div>
148
+    if (!empty($list)) {
149
+        $form .= '<span class="search-links-box">'.$advanced_options.'&nbsp;</span>
150
+            <div id="tags" class="tags" style="display:'. $display_thesaurus.';">
151
+                <div class="search-help-box">'. $help.'</div>
152 152
                 <table>
153 153
                 <tr>';
154 154
         $form .= format_specific_fields_selects($sf_terms, $op);
@@ -162,9 +162,9 @@  discard block
 block discarded – undo
162 162
         $form .= '</tr>
163 163
                     <tr>
164 164
                         <td id="operator-select">
165
-                            '. get_lang('SearchCombineSearchWith') .':<br />
166
-                            <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked .'>'. api_strtoupper(get_lang('Or')) .'</input>
167
-                            <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked .'>'. api_strtoupper(get_lang('And')) .'</input>
165
+                            '. get_lang('SearchCombineSearchWith').':<br />
166
+                            <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked.'>'.api_strtoupper(get_lang('Or')).'</input>
167
+                            <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked.'>'.api_strtoupper(get_lang('And')).'</input>
168 168
                         </td>
169 169
                         <td></td>
170 170
                         <td>
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
                     </table>
177 177
                 </div>';
178 178
     }
179
-    $form .='</form>
179
+    $form .= '</form>
180 180
     <br style="clear: both;"/>';
181 181
     return $form;
182 182
 }
@@ -186,36 +186,36 @@  discard block
 block discarded – undo
186 186
  *
187 187
  * This type allow filter all other multiple select terms by one term in a dinamic way
188 188
  */
189
-function search_widget_prefilter_form($action, $show_thesaurus, $sf_terms, $op, $prefilter_prefix=NULL) {
189
+function search_widget_prefilter_form($action, $show_thesaurus, $sf_terms, $op, $prefilter_prefix = NULL) {
190 190
     $thesaurus_icon = Display::return_icon('thesaurus.gif', get_lang('SearchAdvancedOptions'), array('id'=>'thesaurus-icon'));
191
-    $advanced_options = '<a id="tags-toggle" href="#">'.  get_lang('SearchAdvancedOptions') .'</a>';
192
-    $display_thesaurus = ($show_thesaurus==true? 'block': 'none');
193
-    $help = '<h3>'. get_lang('SearchKeywordsHelpTitle') .'</h3>'. get_lang('SearchKeywordsHelpComment');
194
-    $mode = (!empty($_REQUEST['mode'])? htmlentities($_REQUEST['mode']): 'gallery');
195
-    $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal');
191
+    $advanced_options = '<a id="tags-toggle" href="#">'.get_lang('SearchAdvancedOptions').'</a>';
192
+    $display_thesaurus = ($show_thesaurus == true ? 'block' : 'none');
193
+    $help = '<h3>'.get_lang('SearchKeywordsHelpTitle').'</h3>'.get_lang('SearchKeywordsHelpComment');
194
+    $mode = (!empty($_REQUEST['mode']) ? htmlentities($_REQUEST['mode']) : 'gallery');
195
+    $type = (!empty($_REQUEST['type']) ? htmlentities($_REQUEST['type']) : 'normal');
196 196
 
197 197
     /**
198 198
      * POST avoid long urls, but we are using GET because
199 199
      * SortableTableFromArray pagination is done with simple links, so now we
200 200
      * could not send a form in pagination
201 201
      */
202
-	if (isset($_GET['action']) && strcmp(trim($_GET['action']),'search')===0) {
203
-		$action='index.php';
202
+	if (isset($_GET['action']) && strcmp(trim($_GET['action']), 'search') === 0) {
203
+		$action = 'index.php';
204 204
 	}
205 205
 
206 206
     $form = '
207
-        <form id="chamilo_search" action="'. $action .'" method="GET">
207
+        <form id="chamilo_search" action="'. $action.'" method="GET">
208 208
             <input type="text" id="query" name="query" size="40" />
209
-            <input type="hidden" name="mode" value="'. $mode .'"/>
210
-            <input type="hidden" name="type" value="'. $type .'"/>
209
+            <input type="hidden" name="mode" value="'. $mode.'"/>
210
+            <input type="hidden" name="type" value="'. $type.'"/>
211 211
             <input type="hidden" name="tablename_page_nr" value="1" />
212
-            <input type="submit" id="submit" value="'. get_lang("Search") .'" />
212
+            <input type="submit" id="submit" value="'. get_lang("Search").'" />
213 213
             <br /><br />';
214 214
         $list = get_specific_field_list();
215
-        if(!empty($list)) {
216
-            $form .=' <span class="search-links-box">'. $thesaurus_icon . $advanced_options .'&nbsp;</span>
217
-                    <div id="tags" class="tags" style="display:'. $display_thesaurus .';">
218
-                        <div class="search-help-box">'. $help .'</div>
215
+        if (!empty($list)) {
216
+            $form .= ' <span class="search-links-box">'.$thesaurus_icon.$advanced_options.'&nbsp;</span>
217
+                    <div id="tags" class="tags" style="display:'. $display_thesaurus.';">
218
+                        <div class="search-help-box">'. $help.'</div>
219 219
                         <table>
220 220
                         <tr>';
221 221
             if (!is_null($prefilter_prefix)) {
@@ -230,9 +230,9 @@  discard block
 block discarded – undo
230 230
                 $sf_term_array = $temp;
231 231
 
232 232
                 // get specific field name
233
-                $sf_value = get_specific_field_list(array( 'code' => "'$prefilter_prefix'" ));
233
+                $sf_value = get_specific_field_list(array('code' => "'$prefilter_prefix'"));
234 234
                 $sf_value = array_shift($sf_value);
235
-                $form .= '<label class="sf-select-multiple-title" for="sf_'. $prefix .'[]">'.$icons_for_search_terms[$prefix].' '.$sf_value['name'].'</label><br />';
235
+                $form .= '<label class="sf-select-multiple-title" for="sf_'.$prefix.'[]">'.$icons_for_search_terms[$prefix].' '.$sf_value['name'].'</label><br />';
236 236
 
237 237
                 $form .= format_one_specific_field_select($prefilter_prefix, $sf_term_array, $op, 'id="prefilter"');
238 238
                 $form .= format_specific_fields_selects($sf_terms, $op, $prefilter_prefix);
@@ -252,15 +252,15 @@  discard block
 block discarded – undo
252 252
                         </tr>
253 253
                         <tr>
254 254
                             <td id="operator-select">
255
-                                '. get_lang('SearchCombineSearchWith') .':<br />
256
-                                <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked .'>'. api_strtoupper(get_lang('Or')) .'</input>
257
-                                <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked .'>'. api_strtoupper(get_lang('And')) .'</input>
255
+                                '. get_lang('SearchCombineSearchWith').':<br />
256
+                                <input type="radio" class="search-operator" name="operator" value="or" '. $or_checked.'>'.api_strtoupper(get_lang('Or')).'</input>
257
+                                <input type="radio" class="search-operator" name="operator" value="and" '. $and_checked.'>'.api_strtoupper(get_lang('And')).'</input>
258 258
                             </td>
259 259
                             <td></td>
260 260
                             <td>
261 261
                                 <br />
262
-                                <input class="lower-submit" type="submit" value="'. get_lang('Search') .'" />
263
-                                <input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords') .'" />
262
+                                <input class="lower-submit" type="submit" value="'. get_lang('Search').'" />
263
+                                <input type="submit" id="tags-clean" value="'. get_lang('SearchResetKeywords').'" />
264 264
                             </td>
265 265
                         </tr>
266 266
                         </table>
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
  * Show search form
278 278
  */
279 279
 function display_search_form($action, $show_thesaurus, $sf_terms, $op) {
280
-    $type = (!empty($_REQUEST['type'])? htmlentities($_REQUEST['type']): 'normal');
280
+    $type = (!empty($_REQUEST['type']) ? htmlentities($_REQUEST['type']) : 'normal');
281 281
 
282 282
     switch ($type) {
283 283
         case 'prefilter':
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
  * @param   string $action     Just in case your action is not
305 305
  * index.php
306 306
  */
307
-function search_widget_show($action='index.php')
307
+function search_widget_show($action = 'index.php')
308 308
 {
309 309
     require_once api_get_path(LIBRARY_PATH).'search/ChamiloQuery.php';
310 310
     // TODO: load images dinamically when they're avalaible from specific field ui to add
@@ -317,14 +317,14 @@  discard block
 block discarded – undo
317 317
     if (($cid = api_get_course_id()) != -1) { // with cid
318 318
 
319 319
         // get search engine terms
320
-        $course_filter = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID . $cid);
320
+        $course_filter = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID.$cid);
321 321
         $dkterms = chamilo_query_simple_query('', 0, 1000, array($course_filter));
322 322
 
323 323
         //prepare specific fields names (and also get possible URL param names)
324 324
         foreach ($specific_fields as $specific_field) {
325 325
             $temp = array();
326
-            if (is_array($dkterms) && count($dkterms)>0) {
327
-            	foreach($dkterms[1] as $obj) {
326
+            if (is_array($dkterms) && count($dkterms) > 0) {
327
+            	foreach ($dkterms[1] as $obj) {
328 328
                 	$temp = array_merge($obj['sf-'.$specific_field['code']], $temp);
329 329
             	}
330 330
         	}
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
     }
353 353
 
354 354
     $op = 'or';
355
-    if (!empty($_REQUEST['operator']) && in_array($op,array('or','and'))) {
355
+    if (!empty($_REQUEST['operator']) && in_array($op, array('or', 'and'))) {
356 356
         $op = $_REQUEST['operator'];
357 357
     }
358 358
 
Please login to merge, or discard this patch.
main/admin/course_category.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     if ($action == 'delete') {
27 27
         CourseCategory::deleteNode($categoryId);
28 28
         Display::addFlash(Display::return_message(get_lang('Deleted')));
29
-        header('Location: ' . api_get_self() . '?category=' . Security::remove_XSS($category));
29
+        header('Location: '.api_get_self().'?category='.Security::remove_XSS($category));
30 30
         exit();
31 31
     } elseif (($action == 'add' || $action == 'edit') && isset($_POST['formSent']) && $_POST['formSent']) {
32 32
         if ($action == 'add') {
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
         }
55 55
     } elseif ($action == 'moveUp') {
56 56
         CourseCategory::moveNodeUp($categoryId, $_GET['tree_pos'], $category);
57
-        header('Location: ' . api_get_self() . '?category=' . Security::remove_XSS($category));
57
+        header('Location: '.api_get_self().'?category='.Security::remove_XSS($category));
58 58
         Display::addFlash(Display::return_message(get_lang('Updated')));
59 59
         exit();
60 60
     }
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 
79 79
     $form_title = ($action == 'add') ? get_lang('AddACategory') : get_lang('EditNode');
80 80
     if (!empty($category)) {
81
-        $form_title .= ' ' . get_lang('Into') . ' ' . Security::remove_XSS($category);
81
+        $form_title .= ' '.get_lang('Into').' '.Security::remove_XSS($category);
82 82
     }
83 83
     $url = api_get_self().'?action='.Security::remove_XSS($action).'&category='.Security::remove_XSS($category).'&id='.Security::remove_XSS($categoryId);
84 84
     $form = new FormValidator('course_category', 'post', $url);
Please login to merge, or discard this patch.
src/Chamilo/CoreBundle/Component/HTMLPurifier/Filter/AllowIframes.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
         $vimeoMatch = preg_match('#://player.vimeo.com/#i', $matches[1]);
62 62
         $googleMapsMatch = preg_match('#src="https://maps.google.com/#i', $matches[1]);
63 63
         $slideShare = preg_match('#src="(https?:)?//www.slideshare.net/#', $matches[1]);
64
-        $platformDomain = preg_match('#src="https?://(.+\.)?' . $hostName[1] . '#i', $matches[1]);
64
+        $platformDomain = preg_match('#src="https?://(.+\.)?'.$hostName[1].'#i', $matches[1]);
65 65
 
66 66
         if ($youTubeMatch || $vimeoMatch || $googleMapsMatch || $slideShare || $platformDomain) {
67 67
             $extra = ' frameborder="0"';
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
             } elseif ($vimeoMatch) {
71 71
                 $extra .= ' webkitAllowFullScreen mozallowfullscreen allowFullScreen';
72 72
             }
73
-            return '<iframe ' . $matches[1] . $extra . '></iframe>';
73
+            return '<iframe '.$matches[1].$extra.'></iframe>';
74 74
         } else {
75 75
             return '';
76 76
         }
Please login to merge, or discard this patch.
main/inc/ajax/course.ajax.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
                         0, //howMany
75 75
                         1, //$orderby = 1
76 76
                         'ASC',
77
-                        -1,  //visibility
77
+                        -1, //visibility
78 78
                         $_GET['q'],
79 79
                         null, //$urlId
80 80
                         true //AlsoSearchCode
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 
97 97
                 if (!empty($course['category_code'])) {
98 98
                     $parents = CourseCategory::getParentsToString($course['category_code']);
99
-                    $title = $parents . $course['title'];
99
+                    $title = $parents.$course['title'];
100 100
                 }
101 101
 
102 102
                 $results['items'][] = array(
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
                     INNER JOIN $session_course_user r ON u.user_id = r.user_id
177 177
                     WHERE session_id = %d AND c_id =  '%s'
178 178
                     AND (u.firstname LIKE '%s' OR u.username LIKE '%s' OR u.lastname LIKE '%s')";
179
-            $needle = '%' . $_GET['q'] . '%';
179
+            $needle = '%'.$_GET['q'].'%';
180 180
             $sql_query = sprintf($sql, $_GET['session_id'], $course['real_id'], $needle, $needle, $needle);
181 181
 
182 182
             $result = Database::query($sql_query);
@@ -195,11 +195,11 @@  discard block
 block discarded – undo
195 195
     case 'search_exercise_by_course':
196 196
         if (api_is_platform_admin()) {
197 197
             $course = api_get_course_info_by_id($_GET['course_id']);
198
-            $session_id = (!empty($_GET['session_id'])) ?  intval($_GET['session_id']) : 0 ;
198
+            $session_id = (!empty($_GET['session_id'])) ? intval($_GET['session_id']) : 0;
199 199
             $exercises = ExerciseLib::get_all_exercises($course, $session_id, false, $_GET['q'], true, 3);
200 200
 
201 201
             foreach ($exercises as $exercise) {
202
-                $data[] = array('id' => $exercise['id'], 'text' => html_entity_decode($exercise['title']) );
202
+                $data[] = array('id' => $exercise['id'], 'text' => html_entity_decode($exercise['title']));
203 203
             }
204 204
             if (!empty($data)) {
205 205
                 $data[] = array('id' => 'T', 'text' => 'TODOS');
@@ -224,11 +224,11 @@  discard block
 block discarded – undo
224 224
                 $sql,
225 225
                 intval($_GET['course_id']),
226 226
                 intval($_GET['session_id']),
227
-                '%' . Database::escape_string($_GET['q']).'%'
227
+                '%'.Database::escape_string($_GET['q']).'%'
228 228
             );
229 229
             $result = Database::query($sql_query);
230 230
             while ($survey = Database::fetch_assoc($result)) {
231
-                $survey['title'] .= ($survey['anonymous'] == 1) ? ' (' . get_lang('Anonymous') . ')' : '';
231
+                $survey['title'] .= ($survey['anonymous'] == 1) ? ' ('.get_lang('Anonymous').')' : '';
232 232
                 $data[] = array(
233 233
                     'id' => $survey['id'],
234 234
                     'text' => strip_tags(html_entity_decode($survey['title']))
Please login to merge, or discard this patch.
main/inc/lib/formvalidator/Element/SelectTheme.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,16 +9,16 @@
 block discarded – undo
9 9
 	/**
10 10
 	 * Class constructor
11 11
 	 */
12
-	public function __construct($elementName=null, $elementLabel=null, $options=null, $attributes=null)
12
+	public function __construct($elementName = null, $elementLabel = null, $options = null, $attributes = null)
13 13
 	{
14 14
 		parent::__construct($elementName, $elementLabel, $options, $attributes);
15 15
 		// Get all languages
16 16
 		$themes = api_get_themes();
17 17
 		$this->_options = array();
18 18
 		$this->_values = array();
19
-		$this->addOption('--',''); // no theme select
20
-		for ($i=0; $i< count($themes[0]); $i++) {
21
-			$this->addOption($themes[1][$i],$themes[0][$i]);
19
+		$this->addOption('--', ''); // no theme select
20
+		for ($i = 0; $i < count($themes[0]); $i++) {
21
+			$this->addOption($themes[1][$i], $themes[0][$i]);
22 22
 		}
23 23
 	}
24 24
 }
Please login to merge, or discard this patch.