chamilo / chamilo-lms

main/inc/lib/notebook.lib.php

Spacing +25 added lines, -25 removed lines

@@ -29,7 +29,7 @@ 
         return "<script>
 				function confirmation (name)
 				{
-					if (confirm(\" " . get_lang("NoteConfirmDelete") . " \"+ name + \" ?\"))
+					if (confirm(\" " . get_lang("NoteConfirmDelete")." \"+ name + \" ?\"))
 						{return true;}
 					else
 						{return false;}
@@ -107,7 +107,7 @@ 
                 description 		AS note_comment,
                 session_id			AS session_id
                FROM $t_notebook
-               WHERE c_id = $course_id AND notebook_id = '" . intval($notebook_id) . "' ";
+               WHERE c_id = $course_id AND notebook_id = '".intval($notebook_id)."' ";
         $result = Database::query($sql);
         if (Database::num_rows($result) != 1) {
             return array();
@@ -181,8 +181,8 @@ 
         $sql = "DELETE FROM $t_notebook
                 WHERE
                     c_id = $course_id AND
-                    notebook_id='" . intval($notebook_id) . "' AND
-                    user_id = '" . api_get_user_id() . "'";
+                    notebook_id='".intval($notebook_id)."' AND
+                    user_id = '" . api_get_user_id()."'";
         $result = Database::query($sql);
         $affected_rows = Database::affected_rows($result);
         if ($affected_rows != 1) {
@@ -220,22 +220,22 @@ 
         echo '<div class="actions">';
         if (!api_is_anonymous()) {
             if (api_get_session_id() == 0)
-                echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' .
-                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
+                echo '<a href="index.php?'.api_get_cidreq().'&action=addnote">'.
+                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
             elseif (api_is_allowed_to_session_edit(false, true)) {
-                echo '<a href="index.php?' . api_get_cidreq() . '&action=addnote">' .
-                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
+                echo '<a href="index.php?'.api_get_cidreq().'&action=addnote">'.
+                    Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
             }
         } else {
-            echo '<a href="javascript:void(0)">' . Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32') . '</a>';
+            echo '<a href="javascript:void(0)">'.Display::return_icon('new_note.png', get_lang('NoteAddNew'), '', '32').'</a>';
         }
 
-        echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=creation_date&direction=' . $link_sort_direction . '">' .
-            Display::return_icon('notes_order_by_date_new.png', get_lang('OrderByCreationDate'), '', '32') . '</a>';
-        echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=update_date&direction=' . $link_sort_direction . '">' .
-            Display::return_icon('notes_order_by_date_mod.png', get_lang('OrderByModificationDate'), '', '32') . '</a>';
-        echo '<a href="index.php?' . api_get_cidreq() . '&action=changeview&view=title&direction=' . $link_sort_direction . '">' .
-            Display::return_icon('notes_order_by_title.png', get_lang('OrderByTitle'), '', '32') . '</a>';
+        echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=creation_date&direction='.$link_sort_direction.'">'.
+            Display::return_icon('notes_order_by_date_new.png', get_lang('OrderByCreationDate'), '', '32').'</a>';
+        echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=update_date&direction='.$link_sort_direction.'">'.
+            Display::return_icon('notes_order_by_date_mod.png', get_lang('OrderByModificationDate'), '', '32').'</a>';
+        echo '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=title&direction='.$link_sort_direction.'">'.
+            Display::return_icon('notes_order_by_title.png', get_lang('OrderByTitle'), '', '32').'</a>';
         echo '</div>';
 
         if (!isset($_SESSION['notebook_view']) || !in_array($_SESSION['notebook_view'], array('creation_date', 'update_date', 'title'))) {
@@ -246,9 +246,9 @@ 
         $t_notebook = Database :: get_course_table(TABLE_NOTEBOOK);
         $order_by = "";
         if ($_SESSION['notebook_view'] == 'creation_date' || $_SESSION['notebook_view'] == 'update_date') {
-            $order_by = " ORDER BY " . $_SESSION['notebook_view'] . " $sort_direction ";
+            $order_by = " ORDER BY ".$_SESSION['notebook_view']." $sort_direction ";
         } else {
-            $order_by = " ORDER BY " . $_SESSION['notebook_view'] . " $sort_direction ";
+            $order_by = " ORDER BY ".$_SESSION['notebook_view']." $sort_direction ";
         }
 
         //condition for the session
@@ -261,7 +261,7 @@ 
         $sql = "SELECT * FROM $t_notebook
                 WHERE
                     c_id = $course_id AND
-                    user_id = '" . api_get_user_id() . "'
+                    user_id = '".api_get_user_id()."'
                     $condition_session
                     $cond_extra $order_by
                 ";
@@ -274,18 +274,18 @@ 
 
             $updateValue = '';
             if ($row['update_date'] <> $row['creation_date']) {
-                $updateValue = ', ' . get_lang('UpdateDate') . ': ' . date_to_str_ago($update_date) . '&nbsp;&nbsp;<span class="dropbox_date">' . $update_date . '</span>';
+                $updateValue = ', '.get_lang('UpdateDate').': '.date_to_str_ago($update_date).'&nbsp;&nbsp;<span class="dropbox_date">'.$update_date.'</span>';
             }
 
-            $actions = '<a href="' . api_get_self() . '?action=editnote&notebook_id=' . $row['notebook_id'] . '">' .
-                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL) . '</a>';
-            $actions .= '<a href="' . api_get_self() . '?action=deletenote&notebook_id=' . $row['notebook_id'] . '" onclick="return confirmation(\'' . $row['title'] . '\');">' .
-                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL) . '</a>';
+            $actions = '<a href="'.api_get_self().'?action=editnote&notebook_id='.$row['notebook_id'].'">'.
+                Display::return_icon('edit.png', get_lang('Edit'), '', ICON_SIZE_SMALL).'</a>';
+            $actions .= '<a href="'.api_get_self().'?action=deletenote&notebook_id='.$row['notebook_id'].'" onclick="return confirmation(\''.$row['title'].'\');">'.
+                Display::return_icon('delete.png', get_lang('Delete'), '', ICON_SIZE_SMALL).'</a>';
 
             echo Display::panel(
                 $row['description'],
-                $row['title'] . $session_img.' <div class="pull-right">'.$actions.'</div>',
-                get_lang('CreationDate') . ': ' . date_to_str_ago($creation_date) . '&nbsp;&nbsp;<span class="dropbox_date">' . $creation_date . $updateValue."</span>"
+                $row['title'].$session_img.' <div class="pull-right">'.$actions.'</div>',
+                get_lang('CreationDate').': '.date_to_str_ago($creation_date).'&nbsp;&nbsp;<span class="dropbox_date">'.$creation_date.$updateValue."</span>"
             );
         }
     }

main/inc/lib/legal.lib.php

Spacing +20 added lines, -20 removed lines

@@ -44,7 +44,7 @@ 
             Database::insert($legal_table, $params);
 
             return true;
-        } elseif($last['type'] != $type && $language==$last['language_id']) {
+        } elseif ($last['type'] != $type && $language == $last['language_id']) {
             //update
             $id = $last['legal_id'];
             $params = [
@@ -77,7 +77,7 @@ 
 	public static function get_last_condition_version($language)
     {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
+		$language = Database::escape_string($language);
 		$sql = "SELECT version FROM $legal_conditions_table
 		        WHERE language_id = '".$language."'
 		        ORDER BY legal_id DESC LIMIT 1 ";
@@ -97,10 +97,10 @@ 
 	 * @param int $language language id
 	 * @return array all the info of a Term and condition
 	 */
-	public static function get_last_condition ($language)
+	public static function get_last_condition($language)
     {
 		$legal_conditions_table = Database::get_main_table(TABLE_MAIN_LEGAL);
-		$language= Database::escape_string($language);
+		$language = Database::escape_string($language);
 		$sql = "SELECT * FROM $legal_conditions_table
                 WHERE language_id = '".$language."'
                 ORDER BY version DESC
@@ -124,9 +124,9 @@ 
                 ORDER BY version DESC
                 LIMIT 1 ";
         $result = Database::query($sql);
-        if (Database::num_rows($result)>0){
+        if (Database::num_rows($result) > 0) {
             $version = Database::fetch_array($result);
-            $version = explode(':',$version[0]);
+            $version = explode(':', $version[0]);
 
             return $version[0];
         } else {
@@ -153,7 +153,7 @@ 
                 break;
                 // Page link
             case 1:
-                $preview ='<fieldset>
+                $preview = '<fieldset>
                              <legend>'.get_lang('TermsAndConditions').'</legend>';
                 $preview .= '<div id="legal-accept-wrapper" class="form-item">
                 <label class="option" for="legal-accept">
@@ -185,25 +185,25 @@ 
 		$number_of_items = intval($number_of_items);
 		$column = intval($column);
 
- 		$sql  = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
+ 		$sql = "SELECT version, original_name as language, content, changes, type, FROM_UNIXTIME(date)
 				FROM $legal_conditions_table inner join $lang_table l on(language_id = l.id) ";
 		$sql .= "ORDER BY language, version ASC ";
 		$sql .= "LIMIT $from, $number_of_items ";
 
 		$result = Database::query($sql);
-		$legals = array ();
-		$versions = array ();
+		$legals = array();
+		$versions = array();
 		while ($legal = Database::fetch_array($result)) {
 			// max 2000 chars
 			//echo strlen($legal[1]); echo '<br>';
-			$versions[]=$legal[0];
-			$languages[]=$legal[1];
-			if (strlen($legal[2])>2000)
-				$legal[2]= substr($legal[2],0,2000).' ... ';
-			if ($legal[4]==0)
-				$legal[4]= get_lang('HTMLText');
-			elseif($legal[4]==1)
-				$legal[4]=get_lang('PageLink');
+			$versions[] = $legal[0];
+			$languages[] = $legal[1];
+			if (strlen($legal[2]) > 2000)
+				$legal[2] = substr($legal[2], 0, 2000).' ... ';
+			if ($legal[4] == 0)
+				$legal[4] = get_lang('HTMLText');
+			elseif ($legal[4] == 1)
+				$legal[4] = get_lang('PageLink');
 			$legals[] = $legal;
 		}
 		return $legals;
@@ -220,7 +220,7 @@ 
 		        FROM $legal_conditions_table
 		        ORDER BY legal_id DESC ";
 		$result = Database::query($sql);
-		$url = Database::fetch_array($result,'ASSOC');
+		$url = Database::fetch_array($result, 'ASSOC');
 		$result = $url['count_result'];
 
 		return $result;
@@ -241,6 +241,6 @@ 
 		        WHERE legal_id="'.$legal_id.'" AND language_id="'.$language_id.'"';
 		$rs = Database::query($sql);
 
-		return Database::result($rs,0,'type');
+		return Database::result($rs, 0, 'type');
 	}
 }

main/inc/lib/plugin.class.php

Spacing +8 added lines, -8 removed lines

@@ -60,7 +60,7 @@ 
         $this->fields = $settings;
 
         global $language_files;
-        $language_files[] = 'plugin_' . $this->get_name();
+        $language_files[] = 'plugin_'.$this->get_name();
     }
 
     /**
@@ -266,7 +266,7 @@ 
     {
         $settings = $this->get_settings();
         foreach ($settings as $setting) {
-            if ($setting['variable'] == ($this->get_name() . '_' . $name)) {
+            if ($setting['variable'] == ($this->get_name().'_'.$name)) {
                 return $setting['selected_value'];
             }
         }
@@ -321,7 +321,7 @@ 
 
             $interfaceLanguageId = api_get_language_id($language_interface);
             $interfaceLanguageInfo = api_get_language_info($interfaceLanguageId);
-            $languageParentId = (!empty($interfaceLanguageInfo['parent_id'])?intval($interfaceLanguageInfo['parent_id']):0);
+            $languageParentId = (!empty($interfaceLanguageInfo['parent_id']) ? intval($interfaceLanguageInfo['parent_id']) : 0);
 
             //1. Loading english if exists
             $english_path = $root.$plugin_name."/lang/english.php";
@@ -399,7 +399,7 @@ 
         if (!empty($this->course_settings)) {
             foreach ($this->course_settings as $setting) {
                 $variable = $setting['name'];
-                $value ='';
+                $value = '';
                 if (isset($setting['init_value'])) {
                     $value = ($setting['init_value']);
                 }
@@ -611,7 +611,7 @@ 
 
         //Avoid Tab Name Spaces
         $tabNameNoSpaces = preg_replace('/\s+/', '', $tabName);
-        $subkeytext = "Tabs" . $tabNameNoSpaces;
+        $subkeytext = "Tabs".$tabNameNoSpaces;
 
         //Check if it is already added
         $checkCondition = array(
@@ -627,7 +627,7 @@ 
             return false;
         }
         //End Check
-        $subkey = 'custom_tab_' . $tabNum;
+        $subkey = 'custom_tab_'.$tabNum;
         $attributes = array(
             'variable' => 'show_tabs',
             'subkey' => $subkey,
@@ -645,7 +645,7 @@ 
 
         //Save the id
         $settings = $this->get_settings();
-        $setData = array (
+        $setData = array(
             'comment' => $subkey
         );
         $whereCondition = array(
@@ -686,7 +686,7 @@ 
                 $i = 1;
                 foreach ($tabs as $row) {
                     $attributes = array(
-                        'subkey' => 'custom_tab_' . $i
+                        'subkey' => 'custom_tab_'.$i
                     );
                     $this->updateTab($row['subkey'], $attributes);
                     $i++;

main/inc/lib/events.lib.php

Spacing +10 added lines, -12 removed lines

@@ -78,9 +78,7 @@ 
         Database::query($sql);
 
         // Auto subscribe
-        $user_status = $userInfo['status']  == SESSIONADMIN ? 'sessionadmin' :
-            $userInfo['status'] == COURSEMANAGER ? 'teacher' :
-                $userInfo['status'] == DRH ? 'DRH' : 'student';
+        $user_status = $userInfo['status'] == SESSIONADMIN ? 'sessionadmin' : $userInfo['status'] == COURSEMANAGER ? 'teacher' : $userInfo['status'] == DRH ? 'DRH' : 'student';
         $autoSubscribe = api_get_setting($user_status.'_autosubscribe');
         if ($autoSubscribe) {
             $autoSubscribe = explode('|', $autoSubscribe);
@@ -334,7 +332,7 @@ 
         global $debug;
 
         if ($debug) error_log('Called to update_event_exercice');
-        if ($debug) error_log('duration:' . $duration);
+        if ($debug) error_log('duration:'.$duration);
 
         if ($exeid != '') {
             /*
@@ -382,7 +380,7 @@ 
         		   status = '".$status."',
         		   questions_to_check = '".$remind_list."',
         		   data_tracking = '".implode(',', $question_list)."',
-                   user_ip = '" . Database::escape_string(api_get_real_ip()) . "'
+                   user_ip = '" . Database::escape_string(api_get_real_ip())."'
         		 WHERE exe_id = '".Database::escape_string($exeid)."'";
             $res = Database::query($sql);
 
@@ -1036,15 +1034,15 @@ 
 
         if (!empty($exe_list) && is_array($exe_list) && count($exe_list) > 0) {
             $sql = "DELETE FROM $track_e_exercises
-                WHERE exe_id IN (" . implode(',', $exe_list) . ")";
+                WHERE exe_id IN (".implode(',', $exe_list).")";
             Database::query($sql);
 
             $sql = "DELETE FROM $track_attempts
-                WHERE exe_id IN (" . implode(',', $exe_list) . ")";
+                WHERE exe_id IN (".implode(',', $exe_list).")";
             Database::query($sql);
 
             $sql = "DELETE FROM $recording_table
-                WHERE exe_id IN (" . implode(',', $exe_list) . ")";
+                WHERE exe_id IN (".implode(',', $exe_list).")";
             Database::query($sql);
         }
 
@@ -1086,7 +1084,7 @@ 
             Event::addEvent(
                 LOG_EXERCISE_RESULT_DELETE,
                 LOG_EXERCISE_AND_USER_ID,
-                $exercise_id . '-' . $user_id,
+                $exercise_id.'-'.$user_id,
                 null,
                 null,
                 $course_id,
@@ -1458,7 +1456,7 @@ 
         $res = Database::query($sql);
         $list = array();
         while ($row = Database::fetch_array($res, 'ASSOC')) {
-            $list[$row['exe_id']] = $row;  /*
+            $list[$row['exe_id']] = $row; /*
               $sql = "SELECT * FROM $table_track_attempt WHERE exe_id = {$row['exe_id']}";
               $res_question = Database::query($sql);
               while($row_q = Database::fetch_array($res_question,'ASSOC')) {
@@ -1684,7 +1682,7 @@ 
         Event::addEvent(
             LOG_QUESTION_RESULT_DELETE,
             LOG_EXERCISE_ATTEMPT_QUESTION_ID,
-            $exe_id . '-' . $question_id,
+            $exe_id.'-'.$question_id,
             null,
             null,
             $courseId,
@@ -1720,7 +1718,7 @@ 
         Event::addEvent(
             LOG_QUESTION_RESULT_DELETE,
             LOG_EXERCISE_ATTEMPT_QUESTION_ID,
-            $exe_id . '-' . $question_id,
+            $exe_id.'-'.$question_id,
             null,
             null,
             $courseId,

main/inc/lib/access_url_edit_courses_to_url_functions.lib.php

Spacing +3 added lines, -3 removed lines

@@ -44,17 +44,17 @@
                    ' ORDER BY title, code '.
                    ' LIMIT 11';
             $rs = Database::query($sql);
-            $i=0;
+            $i = 0;
             while ($course = Database :: fetch_array($rs)) {
                 $i++;
-                if ($i<=10) {
+                if ($i <= 10) {
                      $return .= '<a href="javascript: void(0);" onclick="javascript: add_user_to_url(\''.addslashes($course['code']).'\',\''.addslashes($course['title']).' ('.addslashes($course['code']).')'.'\')">'.$course['title'].' ('.$course['code'].')</a><br />';
                 } else {
                     $return .= '...<br />';
                 }
             }
         }
-        $xajax_response -> addAssign('ajax_list_courses','innerHTML',api_utf8_encode($return));
+        $xajax_response -> addAssign('ajax_list_courses', 'innerHTML', api_utf8_encode($return));
         return $xajax_response;
     }
 }

main/inc/lib/course_description.lib.php

Spacing +5 added lines, -5 removed lines

@@ -176,7 +176,7 @@ 
 
         $sql = "SELECT MAX(description_type) as MAX
                 FROM $tbl_course_description
-		        WHERE c_id = $course_id AND session_id='" . $this->session_id . "'";
+		        WHERE c_id = $course_id AND session_id='".$this->session_id."'";
         $rs = Database::query($sql);
         $max = Database::fetch_array($rs);
         $description_type = $max['MAX'] + 1;
@@ -211,7 +211,7 @@ 
             'session_id' => $this->session_id
         ];
 
-        $last_id  = Database::insert($table, $params);
+        $last_id = Database::insert($table, $params);
 
         if ($last_id > 0) {
             $sql = "UPDATE $table SET id = iid WHERE iid = $last_id";
@@ -319,8 +319,8 @@ 
         $sql = "DELETE FROM $tbl_course_description
 			 	WHERE
 			 	    c_id = $course_id AND
-			 	    id = '" . intval($this->id) . "' AND
-			 	    session_id = '" . intval($this->session_id) . "'";
+			 	    id = '".intval($this->id)."' AND
+			 	    session_id = '" . intval($this->session_id)."'";
         $result = Database::query($sql);
         $affected_rows = Database::affected_rows($result);
         if ($this->id > 0) {
@@ -349,7 +349,7 @@ 
         $course_id = api_get_course_int_id();
 
         $sql = "SELECT id FROM $tbl_course_description
-		        WHERE c_id = $course_id AND description_type = '" . intval($description_type) . "'";
+		        WHERE c_id = $course_id AND description_type = '".intval($description_type)."'";
         $rs = Database::query($sql);
         $row = Database::fetch_array($rs);
         $description_id = $row['id'];

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);
 }