chamilo / chamilo-lms

main/inc/lib/message.lib.php

Spacing +21 added lines, -21 removed lines

@@ -244,7 +244,7 @@ 
                 format_file_size(api_get_setting('message_max_upload_filesize'))
             );
 
-            Display::addFlash(Display::return_message($warning , 'warning'));
+            Display::addFlash(Display::return_message($warning, 'warning'));
 
             return false;
         }
@@ -682,7 +682,7 @@ 
      * @param string $type
      * @return bool
      */
-    public static function update_message_status($user_id, $message_id,$type)
+    public static function update_message_status($user_id, $message_id, $type)
     {
         $type = intval($type);
         if ($message_id != strval(intval($message_id)) || $user_id != strval(intval($user_id))) {
@@ -996,7 +996,7 @@ 
 
         $receiverUserInfo = api_get_user_info($row['user_receiver_id']);
 
-        $message_content .='<tr>';
+        $message_content .= '<tr>';
         if (api_get_setting('allow_social_tool') == 'true') {
             if ($source == 'outbox') {
                 $message_content .= get_lang('From').': <a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user_sender_id.'">'.$name.'</a> '.
@@ -1012,7 +1012,7 @@ 
                 $message_content .= get_lang('From').':&nbsp;'.$name.'</b> '.api_strtolower(get_lang('To')).' <b>'.get_lang('Me').'</b>';
             }
         }
-        $message_content .=' '.get_lang('Date').':  '.api_get_local_time($row['send_date']).'
+        $message_content .= ' '.get_lang('Date').':  '.api_get_local_time($row['send_date']).'
 		        <br />
 		        <hr style="color:#ddd" />
 		        <table height="209px" width="100%">
@@ -1038,7 +1038,7 @@ 
         $message_content .= '<a href="inbox.php?action=deleteone&id='.$message_id.'&'.$social_link.'" >'.
             Display::return_icon('delete.png', get_lang('DeleteMessage')).'</a>&nbsp';
 
-        $message_content .='</div></td>
+        $message_content .= '</div></td>
 		      <td width=10></td>
 		    </tr>
 		</table>';
@@ -1115,7 +1115,7 @@ 
 
                 $items = $topic['count'];
                 $reply_label = ($items == 1) ? get_lang('GroupReply') : get_lang('GroupReplies');
-                $label =  Display::label($items.' '.$reply_label);
+                $label = Display::label($items.' '.$reply_label);
                 $topic['title'] = trim($topic['title']);
 
                 if (empty($topic['title'])) {
@@ -1225,7 +1225,7 @@ 
         $name = $user_sender_info['complete_name'];
 
         $topic_page_nr = isset($_GET['topics_page_nr']) ? intval($_GET['topics_page_nr']) : null;
-        $links.= '<div id="message-reply-link">';
+        $links .= '<div id="message-reply-link">';
         if (($my_group_role == GROUP_USER_PERMISSION_ADMIN ||
             $my_group_role == GROUP_USER_PERMISSION_MODERATOR) ||
             $main_message['user_sender_id'] == $current_user_id
@@ -1237,7 +1237,7 @@ 
                 'group_id' => $group_id,
                 'message_id' => $main_message['id'],
                 'action' => 'edit_message_group',
-                'anchor_topic' => 'topic_' . $main_message['id'],
+                'anchor_topic' => 'topic_'.$main_message['id'],
                 'topics_page_nr' => $topic_page_nr,
                 'items_page_nr' => $items_page_nr,
                 'topic_id' => $main_message['id']
@@ -1267,7 +1267,7 @@ 
             'group_id' => $group_id,
             'message_id' => $main_message['id'],
             'action' => 'reply_message_group',
-            'anchor_topic' => 'topic_' . $main_message['id'],
+            'anchor_topic' => 'topic_'.$main_message['id'],
             'topics_page_nr' => $topic_page_nr,
             'topic_id' => $main_message['id']
         ]);
@@ -1283,10 +1283,10 @@ 
             ]
         );
 
-        $links.= '</div>';
+        $links .= '</div>';
 
         $userPicture = $user_sender_info['avatar'];
-        $main_content.= '<div class="message-group-author">
+        $main_content .= '<div class="message-group-author">
                          <img src="'.$userPicture.'" alt="'.$name.'"  width="32" height="32" title="'.$name.'" /></div>';
         $user_link = '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$main_message['user_sender_id'].'">'.$name.'&nbsp;</a>';
 
@@ -1299,7 +1299,7 @@ 
             $date = '<div class="message-group-date"> '.get_lang('Created').' '.date_to_str_ago($main_message['send_date']).'</div>';
         }
         $attachment = '<div class="message-attach">'.(!empty($files_attachments) ? implode('<br />', $files_attachments) : '').'</div>';
-        $main_content.= '<div class="message-group-content">'.$links.$user_link.' '.$date.$main_message['content'].$attachment.'</div>';
+        $main_content .= '<div class="message-group-content">'.$links.$user_link.' '.$date.$main_message['content'].$attachment.'</div>';
         $main_content = Security::remove_XSS($main_content, STUDENT, true);
 
         $html .= Display::div(Display::div(Display::div($main_content, array('class' => 'group_social_sub_item', 'style' => 'background-color:#fff;')), array('class' => 'group_social_item')), array('class' => 'group_social_grid'));
@@ -1320,18 +1320,18 @@ 
                 $files_attachments = self::get_links_message_attachment_files($topic['id']);
                 $name = $user_sender_info['complete_name'];
 
-                $links.= '<div id="message-reply-link">';
+                $links .= '<div id="message-reply-link">';
                 if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $topic['user_sender_id'] == $current_user_id) {
-                    $links.= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Edit').'" title="'.get_lang('Edit').'">'.
+                    $links .= '<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Edit').'" title="'.get_lang('Edit').'">'.
                         Display :: return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
                 }
-                $links.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Reply').'" title="'.get_lang('Reply').'">';
-                $links.= Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
-                $links.= '</div>';
+                $links .= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?height=400&width=800&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic_id.'&topics_page_nr='.$topic_page_nr.'&items_page_nr='.$items_page_nr.'&topic_id='.$topic_id.'" class="ajax btn" data-size="lg" data-title="'.get_lang('Reply').'" title="'.get_lang('Reply').'">';
+                $links .= Display :: return_icon('talk.png', get_lang('Reply')).'</a>';
+                $links .= '</div>';
 
                 $userPicture = $user_sender_info['avatar'];
 
-                $html_items.= '<div class="message-group-author"><img src="'.$userPicture.'" alt="'.$name.'"  width="32" height="32" title="'.$name.'" /></div>';
+                $html_items .= '<div class="message-group-author"><img src="'.$userPicture.'" alt="'.$name.'"  width="32" height="32" title="'.$name.'" /></div>';
                 $user_link = '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$topic['user_sender_id'].'">'.$name.'&nbsp;</a>';
 
                 $date = '';
@@ -1343,7 +1343,7 @@ 
                     $date = '<div class="message-group-date"> '.get_lang('Created').' '.date_to_str_ago($topic['send_date']).'</div>';
                 }
                 $attachment = '<div class="message-attach">'.(!empty($files_attachments) ? implode('<br />', $files_attachments) : '').'</div>';
-                $html_items.= '<div class="message-group-content">'.$links.$user_link.' '.$date.Security::remove_XSS($topic['content'], STUDENT, true).$attachment.'</div>';
+                $html_items .= '<div class="message-group-content">'.$links.$user_link.' '.$date.Security::remove_XSS($topic['content'], STUDENT, true).$attachment.'</div>';
 
                 $base_padding = 20;
 
@@ -1618,7 +1618,7 @@ 
                     break;
                 case 'deleteone' :
                     MessageManager::delete_message_by_user_receiver(api_get_user_id(), $_GET['id']);
-                    $html .=Display::return_message(api_xml_http_response_encode($success), 'normal', false);
+                    $html .= Display::return_message(api_xml_http_response_encode($success), 'normal', false);
                     $html .= '<br/>';
                     break;
             }
@@ -1710,7 +1710,7 @@ 
                 ON m.user_sender_id = u.user_id
                 WHERE
                     m.user_receiver_id = $userId AND
-                    m.msg_status = " . MESSAGE_STATUS_UNREAD . "
+                    m.msg_status = ".MESSAGE_STATUS_UNREAD."
                     AND m.id > $lastId
                 ORDER BY m.send_date DESC";
 

main/inc/lib/skill.lib.php

Spacing +11 added lines, -11 removed lines

@@ -734,7 +734,7 @@ 
     {
         $skill_rel_skill = new SkillRelSkill();
         $skills = $skill_rel_skill->get_direct_parents($skill_id, true);
-        foreach($skills as &$skill) {
+        foreach ($skills as &$skill) {
             $skill['data'] = self::get($skill['skill_id']);
             $skill_info2 = $skill_rel_skill->get_skill_info($skill['skill_id']);
             $skill['data']['parent_id'] = $skill_info2['parent_id'];
@@ -772,7 +772,7 @@ 
                     $attributes = array(
                         'skill_id'      => $skill_id,
                         'parent_id'     => $parent_id,
-                        'relation_type' => (isset($params['relation_type'])?$params['relation_type']:0),
+                        'relation_type' => (isset($params['relation_type']) ? $params['relation_type'] : 0),
                         //'level'         => $params['level'],
                     );
                     $skill_rel_skill->save($attributes);
@@ -969,8 +969,8 @@ 
                     // 2nd node
                     $skills[$skill_id] = $skill_info;
                     // Uncomment code below to hide the searched skill
-                    $skills[$skill_id]['data']['parent_id'] =  $skill_info['extra']['parent_id'];
-                    $skills[$skill_id]['parent_id'] =  1;
+                    $skills[$skill_id]['data']['parent_id'] = $skill_info['extra']['parent_id'];
+                    $skills[$skill_id]['parent_id'] = 1;
                 }
             }
         }
@@ -1033,7 +1033,7 @@ 
                     $skill['data']['skill_has_gradebook'] = true;
                 }
                 $refs[$skill['id']] = &$skill;
-                $flat_array[$skill['id']] =  &$skill;
+                $flat_array[$skill['id']] = &$skill;
             }
 
             // Checking family value
@@ -1054,7 +1054,7 @@ 
                 $refs['root']['children'][0] = $skills[1];
                 $skills[$skill_id]['data']['family_id'] = 1;
                 $refs['root']['children'][0]['children'][0] = $skills[$skill_id];
-                $flat_array[$skill_id] =  $skills[$skill_id];
+                $flat_array[$skill_id] = $skills[$skill_id];
             } else {
                 // Moving node to the children index of their parents
 
@@ -1063,7 +1063,7 @@ 
                         $skill['data']['family_id'] = $new_family_array[$skill['id']];
                     }
                     $refs[$skill['parent_id']]['children'][] = &$skill;
-                    $flat_array[$my_skill_id] =  $skill;
+                    $flat_array[$my_skill_id] = $skill;
                 }
             }
 
@@ -1161,7 +1161,7 @@ 
                 INNER JOIN {$this->table_skill_rel_user} su
                 ON (s.id = su.skill_id)
                 WHERE user_id = $user_id";
-        $result  = Database::query($sql);
+        $result = Database::query($sql);
         if (Database::num_rows($result)) {
             $result = Database::fetch_row($result);
             return $result[0];
@@ -1203,7 +1203,7 @@ 
      */
     public function get_user_list_skill_ranking_count()
     {
-        $sql    = "SELECT count(*) FROM (
+        $sql = "SELECT count(*) FROM (
                         SELECT count(distinct 1)
                         FROM {$this->table} s
                         INNER JOIN {$this->table_skill_rel_user} su
@@ -1256,7 +1256,7 @@ 
                 ON c.code = g.course_code
                 WHERE sg.skill_id = $skill_id
                 AND (g.session_id IS NULL OR g.session_id = 0)";
-        $result   = Database::query($sql);
+        $result = Database::query($sql);
 
         return Database::store_result($result, 'ASSOC');
     }
@@ -1443,7 +1443,7 @@ 
                 WHERE sg.skill_id = $skillId
                 AND g.session_id > 0";
 
-        $result   = Database::query($sql);
+        $result = Database::query($sql);
 
         return Database::store_result($result, 'ASSOC');
     }

main/inc/lib/search/xapian/XapianIndexer.class.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
  */
 
 require_once 'xapian.php';
-require_once dirname(__FILE__) . '/../IndexableChunk.class.php';
+require_once dirname(__FILE__).'/../IndexableChunk.class.php';
 
 /**
  * Abstract helper class
@@ -130,7 +130,7 @@ 
                     if (!empty($chunk->terms)) {
                         foreach ($chunk->terms as $term) {
                             /* FIXME: think of getting weight */
-                            $doc->add_term($term['flag'] . $term['name'], 1);
+                            $doc->add_term($term['flag'].$term['name'], 1);
                         }
                     }
 
@@ -215,7 +215,7 @@ 
         $doc->clear_terms();
         foreach ($terms as $term) {
             //add directly
-            $doc->add_term($prefix . $term, 1);
+            $doc->add_term($prefix.$term, 1);
         }
         $this->db->replace_document($did, $doc);
         $this->db->flush();

main/inc/lib/search/xapian/XapianQuery.php

Spacing +5 added lines, -5 removed lines

@@ -8,11 +8,11 @@ 
  * Code
  */
 require_once 'xapian.php';
-require_once dirname(__FILE__) . '/../IndexableChunk.class.php';
+require_once dirname(__FILE__).'/../IndexableChunk.class.php';
 //TODO: think another way without including specific fields here
-require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
 
-define('XAPIAN_DB', api_get_path(SYS_UPLOAD_PATH) . 'plugins/xapian/searchdb/');
+define('XAPIAN_DB', api_get_path(SYS_UPLOAD_PATH).'plugins/xapian/searchdb/');
 
 /**
  * Queries the database.
@@ -95,7 +95,7 @@ 
 
                 // process each specific field prefix
                 foreach ($specific_fields as $specific_field) {
-                    $results[$count]['sf-' . $specific_field['code']] = xapian_get_doc_terms($document, $specific_field['code']);
+                    $results[$count]['sf-'.$specific_field['code']] = xapian_get_doc_terms($document, $specific_field['code']);
                 }
 
                 // rest of data
@@ -261,6 +261,6 @@ 
     } else {
         $message_error = get_lang('SearchOtherXapianError');
     }
-    $display_message = get_lang('Error') . ' : ' . $message_error;
+    $display_message = get_lang('Error').' : '.$message_error;
     Display::display_error_message($display_message);
 }

main/inc/lib/search/search_widget.php

Spacing +67 added lines, -67 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 .'[]">'.$icons_for_search_terms[$prefix].' '.$sf_value['name'].'</label><br />';
+        $multiple_select .= '<td><label class="sf-select-multiple-title" for="sf_'.$prefix.'[]">'.$icons_for_search_terms[$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,34 +119,34 @@ 
      * 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> ';
 	}
 
-    $form = '<form id="chamilo_search" action="'. $action .'" method="GET">
+    $form = '<form id="chamilo_search" action="'.$action.'" method="GET">
             <input type="text" id="query" name="query" size="40" value="'.stripslashes(Security::remove_XSS($_REQUEST['query'])).'" />
-            <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" />
           	'.$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);
@@ -160,9 +160,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>
@@ -174,7 +174,7 @@ 
                     </table>
                 </div>';
     }
-    $form .='</form>
+    $form .= '</form>
     <br style="clear: both;"/>';
     return $form;
 }
@@ -184,36 +184,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)) {
@@ -228,9 +228,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);
@@ -250,15 +250,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>
@@ -275,7 +275,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':
@@ -302,7 +302,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
@@ -315,14 +315,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);
             	}
         	}
@@ -350,7 +350,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/inc/lib/search/ChamiloIndexer.class.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
 /**
  * code
  */
-require_once dirname(__FILE__) . '/../../global.inc.php';
+require_once dirname(__FILE__).'/../../global.inc.php';
 include_once 'xapian/XapianIndexer.class.php';
 
 /**
@@ -39,7 +39,7 @@ 
         if ((count(array_diff($terms, $stored_terms)) == 0) && (count(array_diff($stored_terms, $terms)) == 0))
             return FALSE;
 
-        require_once api_get_path(LIBRARY_PATH) . 'search/xapian/XapianQuery.php';
+        require_once api_get_path(LIBRARY_PATH).'search/xapian/XapianQuery.php';
 
         // compare terms
         $doc = $this->get_document($search_did);
@@ -55,10 +55,10 @@ 
 
         // save it to search engine
         foreach ($missing_terms as $term) {
-            $this->add_term_to_doc($prefix . $term, $doc);
+            $this->add_term_to_doc($prefix.$term, $doc);
         }
         foreach ($deprecated_terms as $term) {
-            $this->remove_term_from_doc($prefix . $term, $doc);
+            $this->remove_term_from_doc($prefix.$term, $doc);
         }
 
         // don't do anything if no change
@@ -74,7 +74,7 @@ 
      * @return  array Array of terms
      */
     function get_terms_on_db($prefix, $course_code, $tool_id, $ref_id) {
-        require_once api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php';
+        require_once api_get_path(LIBRARY_PATH).'specific_fields_manager.lib.php';
         $terms = get_specific_field_values_list_by_prefix($prefix, $course_code, $tool_id, $ref_id);
         $prefix_terms = array();
         foreach ($terms as $term) {

main/inc/lib/search/ChamiloQuery.php

Spacing +6 added lines, -6 removed lines

@@ -18,12 +18,12 @@ 
  * @param   array     extra           Extra queries to join with. Optional
  * @return  array
  */
-function chamilo_query_query($query_string, $offset=0, $length=10, $extra=NULL) {
+function chamilo_query_query($query_string, $offset = 0, $length = 10, $extra = NULL) {
     list($count, $results) = xapian_query($query_string, NULL, $offset, $length, $extra);
     return chamilo_preprocess_results($results);
 }
 
-function chamilo_query_simple_query($query_string, $offset=0, $length=10, $extra=NULL) {
+function chamilo_query_simple_query($query_string, $offset = 0, $length = 10, $extra = NULL) {
     return xapian_query($query_string, NULL, $offset, $length, $extra);
 }
 
@@ -42,7 +42,7 @@ 
 function chamilo_preprocess_results($results) {
     // group by toolid
     $results_by_tool = array();
-    if (count($results)>0) {
+    if (count($results) > 0) {
 
 	    foreach ($results as $key => $row) {
 	        $results_by_tool[$row['toolid']][] = $row;
@@ -50,8 +50,8 @@ 
 
 	    $processed_results = array();
 	    foreach ($results_by_tool as $toolid => $rows) {
-	        $tool_processor_class = $toolid .'_processor';
-	        $tool_processor_path = api_get_path(LIBRARY_PATH) .'search/tool_processors/'. $tool_processor_class .'.class.php';
+	        $tool_processor_class = $toolid.'_processor';
+	        $tool_processor_path = api_get_path(LIBRARY_PATH).'search/tool_processors/'.$tool_processor_class.'.class.php';
 	        if (file_exists($tool_processor_path)) {
 	            require_once($tool_processor_path);
 	            $tool_processor = new $tool_processor_class($rows);
@@ -71,6 +71,6 @@ 
  * @param string $op
  * @return XapianQuery query joined
  */
-function chamilo_join_queries($query1, $query2=NULL, $op='or') {
+function chamilo_join_queries($query1, $query2 = NULL, $op = 'or') {
 	return xapian_join_queries($query1, $query2, $op);
 }

main/inc/lib/search/get_terms.php

Spacing +6 added lines, -6 removed lines

@@ -17,8 +17,8 @@ 
     return;
 }
 
-require_once dirname(__FILE__) . '../../../global.inc.php';
-require_once api_get_path(LIBRARY_PATH) . 'search/ChamiloQuery.php';
+require_once dirname(__FILE__).'../../../global.inc.php';
+require_once api_get_path(LIBRARY_PATH).'search/ChamiloQuery.php';
 
 /**
  * search with filter and build base array avoding repeated terms
@@ -33,7 +33,7 @@ 
     if (is_array($dkterms) && is_array($dkterms[1])) {
         foreach ($specific_fields as $specific_field) {
             foreach ($dkterms[1] as $obj) {
-                foreach ($obj['sf-' . $specific_field['code']] as $raw_term) {
+                foreach ($obj['sf-'.$specific_field['code']] as $raw_term) {
                     if (count($raw_term['name']) > 1) {
                         $normal_term = substr($raw_term['name'], 1);
                         $sf_terms[$specific_field['code']][$normal_term] = $normal_term;
@@ -54,10 +54,10 @@ 
 
 if (($cid = api_get_course_id()) != -1) { // with cid
     // course filter
-    $filter[] = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID . $cid);
+    $filter[] = chamilo_get_boolean_query(XAPIAN_PREFIX_COURSEID.$cid);
     // term filter
     if ($term != '__all__') {
-        $filter[] = chamilo_get_boolean_query($prefix . $term);
+        $filter[] = chamilo_get_boolean_query($prefix.$term);
         // always and between term and courseid
         $filter = chamilo_join_queries($filter, null, 'and');
     }
@@ -65,7 +65,7 @@ 
     $sf_terms = get_usual_sf_terms($filter, $specific_fields);
 } else { // without cid
     if ($term != '__all__') {
-        $filter[] = chamilo_get_boolean_query($prefix . $term);
+        $filter[] = chamilo_get_boolean_query($prefix.$term);
 
         $sf_terms = get_usual_sf_terms($filter, $specific_fields);
     } else { // no cid and all/any terms

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

Spacing +4 added lines, -4 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 exercises before pass it to search listing scripts
@@ -70,7 +70,7 @@ 
                     $visibility = api_get_item_visibility(api_get_course_info($courseid), TOOL_QUIZ, $exercise_id);
                     if ($visibility) {
                         list($thumbnail, $image, $name, $author) = $this->get_information($courseid, $exercise_id);
-                        $url = api_get_path(WEB_PATH) . 'main/exercice/exercise_submit.php?cidReq=%s&exerciseId=%s';
+                        $url = api_get_path(WEB_PATH).'main/exercice/exercise_submit.php?cidReq=%s&exerciseId=%s';
                         $url = sprintf($url, $courseid, $exercise_id);
                         $result = array(
                             'toolid' => TOOL_QUIZ,
@@ -127,7 +127,7 @@ 
             $name = '';
             if ($row = Database::fetch_array($dk_result)) {
                 // Get the image path
-                $thumbnail = api_get_path(WEB_PATH) . 'main/img/quiz.gif';
+                $thumbnail = api_get_path(WEB_PATH).'main/img/quiz.gif';
                 $image = $thumbnail; //FIXME: use big images
                 $name = $row['title'];
                 // get author