chamilo / chamilo-lms

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

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/learnpath_processor.class.php

Spacing +7 added lines, -7 removed lines

@@ -8,9 +8,9 @@ 
 /**
  * Code
  */
-include_once dirname(__FILE__) . '/../../../global.inc.php';
-require_once dirname(__FILE__) . '/search_processor.class.php';
-require_once dirname(__FILE__) . '/../IndexableChunk.class.php';
+include_once dirname(__FILE__).'/../../../global.inc.php';
+require_once dirname(__FILE__).'/search_processor.class.php';
+require_once dirname(__FILE__).'/../IndexableChunk.class.php';
 
 /**
  * Process learning paths before pass it to search listing scripts
@@ -52,7 +52,7 @@ 
                     $visibility = api_get_item_visibility(api_get_course_info($courseid), TOOL_LEARNPATH, $lp_id);
                     if ($visibility) {
                         list($thumbnail, $image, $name, $author) = $this->get_information($courseid, $lp_id, $lp['has_document_id']);
-                        $url = api_get_path(WEB_PATH) . 'main/newscorm/lp_controller.php?cidReq=%s&action=view&lp_id=%s';
+                        $url = api_get_path(WEB_PATH).'main/newscorm/lp_controller.php?cidReq=%s&action=view&lp_id=%s';
                         $url = sprintf($url, $courseid, $lp_id);
                         $result = array(
                             'toolid' => TOOL_LEARNPATH,
@@ -128,16 +128,16 @@ 
             $name = '';
             if ($row = Database::fetch_array($dk_result)) {
                 // Get the image path
-                $img_location = api_get_path(WEB_COURSE_PATH) . $course_path . "/document/";
+                $img_location = api_get_path(WEB_COURSE_PATH).$course_path."/document/";
                 $thumbnail_path = str_replace('.png.html', '_thumb.png', $row['path']);
                 $big_img_path = str_replace('.png.html', '.png', $row['path']);
                 $thumbnail = '';
                 if (!empty($thumbnail_path)) {
-                    $thumbnail = $img_location . $thumbnail_path;
+                    $thumbnail = $img_location.$thumbnail_path;
                 }
                 $image = '';
                 if (!empty($big_img_path)) {
-                    $image = $img_location . $big_img_path;
+                    $image = $img_location.$big_img_path;
                 }
                 $name = $row['name'];
             }

main/inc/lib/baker.lib.php

Spacing +18 added lines, -18 removed lines

@@ -51,7 +51,7 @@ 
             foreach (array_keys($this->_chunks[$type]) as $typekey) {
                 list($key, $data) = explode("\0", $this->_chunks[$type][$typekey]);
                 if (strcmp($key, $check) == 0) {
-                    echo 'Key "' . $check . '" already exists in "' . $type . '" chunk.';
+                    echo 'Key "'.$check.'" already exists in "'.$type.'" chunk.';
                     return false;
                 }
             }
@@ -70,11 +70,11 @@ 
      */
     public function addChunk($chunkType, $key, $value) {
         
-        $chunkData = $key . "\0" . $value;
-        $crc = pack("N", crc32($chunkType . $chunkData));
+        $chunkData = $key."\0".$value;
+        $crc = pack("N", crc32($chunkType.$chunkData));
         $len = pack("N", strlen($chunkData));
         
-        $newChunk = $len . $chunkType . $chunkData . $crc;
+        $newChunk = $len.$chunkType.$chunkData.$crc;
         $result = substr($this->_contents, 0, $this->_size - 12)
                 . $newChunk
                 . substr($this->_contents, $this->_size - 12, 12);
@@ -92,30 +92,30 @@ 
      */
     public function removeChunks($chunkType, $key, $png) {
         // Read the magic bytes and verify
-        $retval = substr($png,0,8);
+        $retval = substr($png, 0, 8);
         $ipos = 8;
         if ($retval != "\x89PNG\x0d\x0a\x1a\x0a")
             throw new Exception('Is not a valid PNG image');
         // Loop through the chunks. Byte 0-3 is length, Byte 4-7 is type
-        $chunkHeader = substr($png,$ipos,8);
+        $chunkHeader = substr($png, $ipos, 8);
         $ipos = $ipos + 8;
         while ($chunkHeader) {
             // Extract length and type from binary data
             $chunk = @unpack('Nsize/a4type', $chunkHeader);
             $skip = false;
-            if ( $chunk['type'] == $chunkType ) {
-                $data = substr($png,$ipos,$chunk['size']);
+            if ($chunk['type'] == $chunkType) {
+                $data = substr($png, $ipos, $chunk['size']);
                 $sections = explode("\0", $data);
                 print_r($sections);
-                if ( $sections[0] == $key ) $skip = true;
+                if ($sections[0] == $key) $skip = true;
             }
             // Extract the data and the CRC
-            $data = substr($png,$ipos,$chunk['size']+4);
+            $data = substr($png, $ipos, $chunk['size'] + 4);
             $ipos = $ipos + $chunk['size'] + 4;
             // Add in the header, data, and CRC
-            if ( ! $skip ) $retval = $retval . $chunkHeader . $data;
+            if (!$skip) $retval = $retval.$chunkHeader.$data;
             // Read next chunk header
-            $chunkHeader = substr($png,$ipos,8);
+            $chunkHeader = substr($png, $ipos, 8);
             $ipos = $ipos + 8;
         }
         return $retval;
@@ -131,34 +131,34 @@ 
      * If there is PNG information that matches the key an array is returned
      * 
      */
-    public function extractBadgeInfo($png, $key='openbadges') {
+    public function extractBadgeInfo($png, $key = 'openbadges') {
         // Read the magic bytes and verify
-        $retval = substr($png,0,8);
+        $retval = substr($png, 0, 8);
         $ipos = 8;
         if ($retval != "\x89PNG\x0d\x0a\x1a\x0a") {
             return false;
         }
 
         // Loop through the chunks. Byte 0-3 is length, Byte 4-7 is type
-        $chunkHeader = substr($png,$ipos,8);
+        $chunkHeader = substr($png, $ipos, 8);
         $ipos = $ipos + 8;
         while ($chunkHeader) {
             // Extract length and type from binary data
             $chunk = @unpack('Nsize/a4type', $chunkHeader);
             $skip = false;
             if ($chunk['type'] == 'tEXt') {
-                $data = substr($png,$ipos,$chunk['size']);
+                $data = substr($png, $ipos, $chunk['size']);
                 $sections = explode("\0", $data);
                 if ($sections[0] == $key) {
                    return $sections;
                 }
             }
             // Extract the data and the CRC
-            $data = substr($png,$ipos,$chunk['size']+4);
+            $data = substr($png, $ipos, $chunk['size'] + 4);
             $ipos = $ipos + $chunk['size'] + 4;
 
             // Read next chunk header
-            $chunkHeader = substr($png,$ipos,8);
+            $chunkHeader = substr($png, $ipos, 8);
             $ipos = $ipos + 8;
         }
     }