chamilo / chamilo-lms

main/inc/lib/search/tool_processors/document_processor.class.php

Spacing +3 added lines, -3 removed lines

@@ -8,8 +8,8 @@ 
 /**
  * Code
  */
-include_once dirname(__FILE__) . '/../../../global.inc.php';
-require_once dirname(__FILE__) . '/search_processor.class.php';
+include_once dirname(__FILE__).'/../../../global.inc.php';
+require_once dirname(__FILE__).'/search_processor.class.php';
 
 /**
  * Process documents before pass it to search listing scripts
@@ -82,7 +82,7 @@ 
             $dk_result = Database::query($sql);
 
             $sql = "SELECT insert_user_id FROM       $item_property_table
-                    WHERE   ref = $doc_id AND tool = '" . TOOL_DOCUMENT . "' AND c_id = $course_id
+                    WHERE   ref = $doc_id AND tool = '".TOOL_DOCUMENT."' AND c_id = $course_id
                     LIMIT 1";
             $name = '';
             if ($row = Database::fetch_array($dk_result)) {

main/admin/specific_fields.php

Spacing +14 added lines, -14 removed lines

@@ -15,36 +15,36 @@ 
 api_protect_admin_script();
 
 // Breadcrumb
-$interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
-$interbreadcrumb[] = array ('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings'));
+$interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdmin'));
+$interbreadcrumb[] = array('url' => 'settings.php?category=Search', 'name' => get_lang('PlatformConfigSettings'));
 
 $libpath = api_get_path(LIBRARY_PATH);
 
 include_once $libpath.'specific_fields_manager.lib.php';
 
 // Create an add-field box
-$form = new FormValidator('add_field','post','','',null,false);
-$renderer =& $form->defaultRenderer();
+$form = new FormValidator('add_field', 'post', '', '', null, false);
+$renderer = & $form->defaultRenderer();
 $renderer->setCustomElementTemplate('<span>{element}</span> ');
-$form->addElement('static','search_advanced_link',null,'<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
+$form->addElement('static', 'search_advanced_link', null, '<a href="specific_fields_add.php">'.Display::return_icon('fieldadd.gif').get_lang('AddSpecificSearchField').'</a>');
 
 // Create a sortable table with specific fields data
-$column_show = array(1,1,1);
-$column_order = array(3,2,1);
+$column_show = array(1, 1, 1);
+$column_order = array(3, 2, 1);
 $extra_fields = get_specific_field_list();
 $number_of_extra_fields = count($extra_fields);
 
-$table = new SortableTableFromArrayConfig($extra_fields,2,50,'',$column_show,$column_order);
-$table->set_header(0, '&nbsp;', false,null,'width="2%"', 'style="display:none"');
+$table = new SortableTableFromArrayConfig($extra_fields, 2, 50, '', $column_show, $column_order);
+$table->set_header(0, '&nbsp;', false, null, 'width="2%"', 'style="display:none"');
 $table->set_header(1, get_lang('Code'), TRUE, 'width="10%"');
 $table->set_header(2, get_lang('Name'));
-$table->set_header(3, get_lang('Modify'),false,'width="10%"');
+$table->set_header(3, get_lang('Modify'), false, 'width="10%"');
 $table->set_column_filter(3, 'edit_filter');
 
-function edit_filter($id,$url_params,$row) {
+function edit_filter($id, $url_params, $row) {
 	global $charset;
-	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif',get_lang('Edit')).'</a>';
-	$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>';
+	$return = '<a href="specific_fields_add.php?action=edit&field_id='.$row[0].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
+	$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>';
 	return $return;
 }
 
@@ -60,7 +60,7 @@ 
 Display::display_header(get_lang('SpecificSearchFields'));
 echo Display::display_normal_message(get_lang('SpecificSearchFieldsIntro'));
 
-if(!empty($_GET['message'])) {
+if (!empty($_GET['message'])) {
   Display::display_confirmation_message($_GET['message']);
 }
 

main/admin/specific_fields_add.php

Spacing +7 added lines, -7 removed lines

@@ -32,18 +32,18 @@ 
 // Create the form
 $form = new FormValidator('specific_fields_add');
 // Field variable name
-$form->addElement('hidden','field_id', $fieldId);
-$form->addElement('text','field_name',get_lang('FieldName'));
-$form->applyFilter('field_name','html_filter');
-$form->applyFilter('field_name','trim');
+$form->addElement('hidden', 'field_id', $fieldId);
+$form->addElement('text', 'field_name', get_lang('FieldName'));
+$form->applyFilter('field_name', 'html_filter');
+$form->applyFilter('field_name', 'trim');
 $form->addRule('field_name', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('field_name', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
-$form->addRule('field_name', '', 'maxlength',20);
+$form->addRule('field_name', '', 'maxlength', 20);
 
 // Set default values (only not empty when editing)
 $defaults = array();
 if ($fieldId) {
-    $form_information = get_specific_field_list(array( 'id' => $fieldId ));
+    $form_information = get_specific_field_list(array('id' => $fieldId));
     $defaults['field_name'] = $form_information[0]['name'];
 }
 $form->setDefaults($defaults);
@@ -54,7 +54,7 @@ 
 if ($form->validate()) {
     $field = $form->exportValues();
     $field_name = $field['field_name'];
-    if (is_numeric($field['field_id']) && $field['field_id']<>0 && !empty($field['field_id'])) {
+    if (is_numeric($field['field_id']) && $field['field_id'] <> 0 && !empty($field['field_id'])) {
         edit_specific_field($field['field_id'], $field['field_name']);
         $message = get_lang('FieldEdited');
     } else {

main/inc/lib/search/search_widget.php

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'];
     }
 

main/admin/course_category.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
     if ($action == 'delete') {
         CourseCategory::deleteNode($categoryId);
         Display::addFlash(Display::return_message(get_lang('Deleted')));
-        header('Location: ' . api_get_self() . '?category=' . Security::remove_XSS($category));
+        header('Location: '.api_get_self().'?category='.Security::remove_XSS($category));
         exit();
     } elseif (($action == 'add' || $action == 'edit') && isset($_POST['formSent']) && $_POST['formSent']) {
         if ($action == 'add') {
@@ -54,7 +54,7 @@ 
         }
     } elseif ($action == 'moveUp') {
         CourseCategory::moveNodeUp($categoryId, $_GET['tree_pos'], $category);
-        header('Location: ' . api_get_self() . '?category=' . Security::remove_XSS($category));
+        header('Location: '.api_get_self().'?category='.Security::remove_XSS($category));
         Display::addFlash(Display::return_message(get_lang('Updated')));
         exit();
     }
@@ -78,7 +78,7 @@ 
 
     $form_title = ($action == 'add') ? get_lang('AddACategory') : get_lang('EditNode');
     if (!empty($category)) {
-        $form_title .= ' ' . get_lang('Into') . ' ' . Security::remove_XSS($category);
+        $form_title .= ' '.get_lang('Into').' '.Security::remove_XSS($category);
     }
     $url = api_get_self().'?action='.Security::remove_XSS($action).'&category='.Security::remove_XSS($category).'&id='.Security::remove_XSS($categoryId);
     $form = new FormValidator('course_category', 'post', $url);

src/Chamilo/CoreBundle/Component/HTMLPurifier/Filter/AllowIframes.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
         $vimeoMatch = preg_match('#://player.vimeo.com/#i', $matches[1]);
         $googleMapsMatch = preg_match('#src="https://maps.google.com/#i', $matches[1]);
         $slideShare = preg_match('#src="(https?:)?//www.slideshare.net/#', $matches[1]);
-        $platformDomain = preg_match('#src="https?://(.+\.)?' . $hostName[1] . '#i', $matches[1]);
+        $platformDomain = preg_match('#src="https?://(.+\.)?'.$hostName[1].'#i', $matches[1]);
 
         if ($youTubeMatch || $vimeoMatch || $googleMapsMatch || $slideShare || $platformDomain) {
             $extra = ' frameborder="0"';
@@ -70,7 +70,7 @@ 
             } elseif ($vimeoMatch) {
                 $extra .= ' webkitAllowFullScreen mozallowfullscreen allowFullScreen';
             }
-            return '<iframe ' . $matches[1] . $extra . '></iframe>';
+            return '<iframe '.$matches[1].$extra.'></iframe>';
         } else {
             return '';
         }

main/inc/ajax/course.ajax.php

Spacing +7 added lines, -7 removed lines

@@ -74,7 +74,7 @@ 
                         0, //howMany
                         1, //$orderby = 1
                         'ASC',
-                        -1,  //visibility
+                        -1, //visibility
                         $_GET['q'],
                         null, //$urlId
                         true //AlsoSearchCode
@@ -96,7 +96,7 @@ 
 
                 if (!empty($course['category_code'])) {
                     $parents = CourseCategory::getParentsToString($course['category_code']);
-                    $title = $parents . $course['title'];
+                    $title = $parents.$course['title'];
                 }
 
                 $results['items'][] = array(
@@ -176,7 +176,7 @@ 
                     INNER JOIN $session_course_user r ON u.user_id = r.user_id
                     WHERE session_id = %d AND c_id =  '%s'
                     AND (u.firstname LIKE '%s' OR u.username LIKE '%s' OR u.lastname LIKE '%s')";
-            $needle = '%' . $_GET['q'] . '%';
+            $needle = '%'.$_GET['q'].'%';
             $sql_query = sprintf($sql, $_GET['session_id'], $course['real_id'], $needle, $needle, $needle);
 
             $result = Database::query($sql_query);
@@ -195,11 +195,11 @@ 
     case 'search_exercise_by_course':
         if (api_is_platform_admin()) {
             $course = api_get_course_info_by_id($_GET['course_id']);
-            $session_id = (!empty($_GET['session_id'])) ?  intval($_GET['session_id']) : 0 ;
+            $session_id = (!empty($_GET['session_id'])) ? intval($_GET['session_id']) : 0;
             $exercises = ExerciseLib::get_all_exercises($course, $session_id, false, $_GET['q'], true, 3);
 
             foreach ($exercises as $exercise) {
-                $data[] = array('id' => $exercise['id'], 'text' => html_entity_decode($exercise['title']) );
+                $data[] = array('id' => $exercise['id'], 'text' => html_entity_decode($exercise['title']));
             }
             if (!empty($data)) {
                 $data[] = array('id' => 'T', 'text' => 'TODOS');
@@ -224,11 +224,11 @@ 
                 $sql,
                 intval($_GET['course_id']),
                 intval($_GET['session_id']),
-                '%' . Database::escape_string($_GET['q']).'%'
+                '%'.Database::escape_string($_GET['q']).'%'
             );
             $result = Database::query($sql_query);
             while ($survey = Database::fetch_assoc($result)) {
-                $survey['title'] .= ($survey['anonymous'] == 1) ? ' (' . get_lang('Anonymous') . ')' : '';
+                $survey['title'] .= ($survey['anonymous'] == 1) ? ' ('.get_lang('Anonymous').')' : '';
                 $data[] = array(
                     'id' => $survey['id'],
                     'text' => strip_tags(html_entity_decode($survey['title']))

main/inc/lib/formvalidator/Element/SelectTheme.php

Spacing +4 added lines, -4 removed lines

@@ -9,16 +9,16 @@
 	/**
 	 * Class constructor
 	 */
-	public function __construct($elementName=null, $elementLabel=null, $options=null, $attributes=null)
+	public function __construct($elementName = null, $elementLabel = null, $options = null, $attributes = null)
 	{
 		parent::__construct($elementName, $elementLabel, $options, $attributes);
 		// Get all languages
 		$themes = api_get_themes();
 		$this->_options = array();
 		$this->_values = array();
-		$this->addOption('--',''); // no theme select
-		for ($i=0; $i< count($themes[0]); $i++) {
-			$this->addOption($themes[1][$i],$themes[0][$i]);
+		$this->addOption('--', ''); // no theme select
+		for ($i = 0; $i < count($themes[0]); $i++) {
+			$this->addOption($themes[1][$i], $themes[0][$i]);
 		}
 	}
 }

main/gradebook/lib/fe/scoredisplayform.class.php

Spacing +27 added lines, -27 removed lines

@@ -14,28 +14,28 @@ 
 	 * @param $form_name
 	 * @param null $action
 	 */
-	public function __construct($form_name, $action= null)
+	public function __construct($form_name, $action = null)
 	{
 		parent :: __construct($form_name, 'post', $action);
 		$displayscore = ScoreDisplay :: instance();
 		$customdisplays = $displayscore->get_custom_score_display_settings();
 
-		$nr_items = (count($customdisplays)!='0') ? count($customdisplays) : '1';
-		$this->setDefaults(array (
+		$nr_items = (count($customdisplays) != '0') ? count($customdisplays) : '1';
+		$this->setDefaults(array(
             'scorecolpercent' => $displayscore->get_color_split_value()
 		));
 
 		$this->addElement('hidden', 'maxvalue', '100');
 		$this->addElement('hidden', 'minvalue', '0');
-		$counter= 1;
+		$counter = 1;
 
 		//setting the default values
 
-		if(is_array($customdisplays)) {
+		if (is_array($customdisplays)) {
 			foreach ($customdisplays as $customdisplay) {
-				$this->setDefaults(array (
-					'endscore[' . $counter . ']' => $customdisplay['score'],
-					'displaytext[' . $counter . ']' => $customdisplay['display']
+				$this->setDefaults(array(
+					'endscore['.$counter.']' => $customdisplay['score'],
+					'displaytext['.$counter.']' => $customdisplay['display']
 				));
 				$counter++;
 			}
@@ -46,7 +46,7 @@ 
 		$this->addElement('header', get_lang('ScoreEdit'));
 
         if ($displayscore->is_coloring_enabled()) {
-            $this->addElement('html', '<b>' . get_lang('ScoreColor') . '</b>');
+            $this->addElement('html', '<b>'.get_lang('ScoreColor').'</b>');
             $this->addElement('text', 'scorecolpercent', array(get_lang('Below'), get_lang('WillColorRed'), '%'), array(
                 'size' => 5,
                 'maxlength' => 5,
@@ -58,14 +58,14 @@ 
             }
 
             $this->addRule('scorecolpercent', get_lang('OnlyNumbers'), 'numeric');
-            $this->addRule(array('scorecolpercent','maxvalue'), get_lang('Over100'), 'compare', '<=');
-            $this->addRule(array('scorecolpercent','minvalue'), get_lang('UnderMin'), 'compare', '>');
+            $this->addRule(array('scorecolpercent', 'maxvalue'), get_lang('Over100'), 'compare', '<=');
+            $this->addRule(array('scorecolpercent', 'minvalue'), get_lang('UnderMin'), 'compare', '>');
         }
 
 		//Settings for the scoring system
 
 		if ($displayscore->is_custom()) {
-            $this->addElement('html', '<br /><b>' . get_lang('ScoringSystem') . '</b>');
+            $this->addElement('html', '<br /><b>'.get_lang('ScoringSystem').'</b>');
 			$this->addElement('static', null, null, get_lang('ScoreInfo'));
 			$this->setDefaults(array(
 				'beginscore' => '0'
@@ -77,10 +77,10 @@ 
 				'input-size' => 2
 			));
 
-			for ($counter= 1; $counter <= 20; $counter++) {
-				$renderer =& $this->defaultRenderer();
+			for ($counter = 1; $counter <= 20; $counter++) {
+				$renderer = & $this->defaultRenderer();
 				$elementTemplateTwoLabel =
-				'<div id=' . $counter . ' style="display: '.(($counter<=$nr_items)?'inline':'none').';">
+				'<div id='.$counter.' style="display: '.(($counter <= $nr_items) ? 'inline' : 'none').';">
 
 				<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->
 
@@ -105,39 +105,39 @@ 
 
 				';
 
-				$elementTemplateTwoLabel2 ='
+				$elementTemplateTwoLabel2 = '
 				<div class="col-sm-2">
 					<!-- BEGIN error --><span class="form_error">{error}</span>
 					<!-- END error -->
 					{element}
 				</div>
 				<div class="col-sm-1">
-                    <a href="javascript:plusItem(' . ($counter+1) . ')">
-                    <img style="display: '.(($counter>=$nr_items)?'inline':'none').';" id="plus-' . ($counter+1) . '" src="'.Display::returnIconPath('add.png').'" alt="'.get_lang('Add').'" title="'.get_lang('Add').'"></a>
-        			<a href="javascript:minItem(' . ($counter) . ')">
-        			<img style="display: '.(($counter>=$nr_items && $counter!=1)?'inline':'none').';" id="min-' . $counter . '" src="'.Display::returnIconPath('delete.png').'" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></a>
+                    <a href="javascript:plusItem(' . ($counter + 1).')">
+                    <img style="display: '.(($counter >= $nr_items) ? 'inline' : 'none').';" id="plus-'.($counter + 1).'" src="'.Display::returnIconPath('add.png').'" alt="'.get_lang('Add').'" title="'.get_lang('Add').'"></a>
+        			<a href="javascript:minItem(' . ($counter).')">
+        			<img style="display: '.(($counter >= $nr_items && $counter != 1) ? 'inline' : 'none').';" id="min-'.$counter.'" src="'.Display::returnIconPath('delete.png').'" alt="'.get_lang('Delete').'" title="'.get_lang('Delete').'"></a>
 				</div>
 				</div>
 				</div>';
 
 				$scorebetw = array();
-				$this->addElement('text', 'endscore[' . $counter . ']', null, array (
+				$this->addElement('text', 'endscore['.$counter.']', null, array(
 					'size' => 5,
 					'maxlength' => 5,
 					'id' => 'txta-'.$counter,
 					'input-size' => 2
 				));
 
-				$this->addElement('text', 'displaytext[' . $counter . ']', null,array (
+				$this->addElement('text', 'displaytext['.$counter.']', null, array(
 					'size' => 40,
 					'maxlength' => 40,
 					'id' => 'txtb-'.$counter
 				));
-				$renderer->setElementTemplate($elementTemplateTwoLabel, 'endscore[' . $counter . ']');
-				$renderer->setElementTemplate($elementTemplateTwoLabel2, 'displaytext[' . $counter . ']');
-				$this->addRule('endscore[' . $counter . ']', get_lang('OnlyNumbers'), 'numeric');
-				$this->addRule(array ('endscore[' . $counter . ']', 'maxvalue'), get_lang('Over100'), 'compare', '<=');
-				$this->addRule(array ('endscore[' . $counter . ']', 'minvalue'), get_lang('UnderMin'), 'compare', '>');
+				$renderer->setElementTemplate($elementTemplateTwoLabel, 'endscore['.$counter.']');
+				$renderer->setElementTemplate($elementTemplateTwoLabel2, 'displaytext['.$counter.']');
+				$this->addRule('endscore['.$counter.']', get_lang('OnlyNumbers'), 'numeric');
+				$this->addRule(array('endscore['.$counter.']', 'maxvalue'), get_lang('Over100'), 'compare', '<=');
+				$this->addRule(array('endscore['.$counter.']', 'minvalue'), get_lang('UnderMin'), 'compare', '>');
 			}
 		}