chamilo / chamilo-lms

main/auth/shibboleth/lib/store.class.php

Spacing +3 added lines, -3 removed lines

@@ -246,9 +246,9 @@ 
 
         $db_name = $this->get_db_name($object);
         $sql = "INSERT INTO `{$db_name}`.`{$this->table_name}` ";
-        $sql .= ' (' . join(', ', $keys) . ') ';
+        $sql .= ' ('.join(', ', $keys).') ';
         $sql .= 'VALUES';
-        $sql .= ' (' . join(', ', $values) . ') ';
+        $sql .= ' ('.join(', ', $values).') ';
 
         $result = $this->execute($sql);
         if ($result)
@@ -295,7 +295,7 @@ 
         $items = array();
         foreach ($args as $key => $val)
         {
-            $items[] = $key . ' = ' . $this->format_value($val);
+            $items[] = $key.' = '.$this->format_value($val);
         }
         return implode(' AND ', $items);
     }

Braces +8 added lines, -16 removed lines

@@ -107,8 +107,7 @@ 
         if ($this->is_new($object))
         {
             $result = $this->insert($object);
-        }
-        else
+        } else
         {
             $result = $this->update($object);
         }
@@ -257,8 +256,7 @@ 
             $object->{$this->id_name} = $id;
             $object->{db_name} = $db_name;
             return $id;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -278,16 +276,13 @@ 
                     return '';
                 }
                 $args = array($this->pk_name, $arg);
-            }
-            else if (is_string($arg))
+            } else if (is_string($arg))
             {
                 return $arg;
-            }
-            else if (is_array($arg))
+            } else if (is_array($arg))
             {
                 $args = $arg;
-            }
-            else
+            } else
             {
                 return $arg;
             }
@@ -309,17 +304,14 @@ 
         if (is_bool($var))
         {
             return $value ? '1' : '0';
-        }
-        else if (is_numeric($value))
+        } else if (is_numeric($value))
         {
             return empty($value) ? '0' : $value;
-        }
-        else if (is_string($value))
+        } else if (is_string($value))
         {
             $value = mysql_escape_string($value);
             return "'$value'";
-        }
-        else
+        } else
         {
             return $value;
         }

main/badge/assertion.php

Spacing +2 added lines, -2 removed lines

@@ -41,10 +41,10 @@
         'identity' => $user['email']
     ),
     'issuedOn' => strtotime($userSkill['acquired_skill_at']),
-    'badge' => api_get_path(WEB_CODE_PATH) . "badge/class.php?id=$skillId",
+    'badge' => api_get_path(WEB_CODE_PATH)."badge/class.php?id=$skillId",
     'verify' => array(
         'type' => 'hosted',
-        'url' => api_get_path(WEB_CODE_PATH) . "badge/assertion.php?" . http_build_query(array(
+        'url' => api_get_path(WEB_CODE_PATH)."badge/assertion.php?".http_build_query(array(
             'user' => $userId,
             'skill' => $skillId,
             'course' => $courseId,

main/badge/class.php

Spacing +3 added lines, -3 removed lines

@@ -17,9 +17,9 @@
 $json = array(
     'name' => $skill['name'],
     'description' => $skill['description'],
-    'image' => api_get_path(WEB_UPLOAD_PATH) . "badges/{$skill['icon']}",
-    'criteria' => api_get_path(WEB_CODE_PATH) . "badge/criteria.php?id=$skillId",
-    'issuer' => api_get_path(WEB_CODE_PATH) . "badge/issuer.php",
+    'image' => api_get_path(WEB_UPLOAD_PATH)."badges/{$skill['icon']}",
+    'criteria' => api_get_path(WEB_CODE_PATH)."badge/criteria.php?id=$skillId",
+    'issuer' => api_get_path(WEB_CODE_PATH)."badge/issuer.php",
 );
 
 echo json_encode($json);

main/badge/criteria.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
         Display::return_message(get_lang('SkillNotFound'), 'error')
     );
 
-    header('Location: ' . api_get_path(WEB_PATH));
+    header('Location: '.api_get_path(WEB_PATH));
     exit;
 }
 

main/help/allowed_html_tags.php

Indentation +4 added lines, -4 removed lines

@@ -53,10 +53,10 @@
 $table_header[] = array('tag', true);
 $table_header[] = array('attributes', false);
 foreach ($tags as $tag => & $attributes) {
-	$row = array();
-	$row[] = '<kbd>'.$tag.'</kbd>';
-	$row[] = '<kbd>&nbsp;'.implode(', ', array_keys($attributes)).'</kbd>';
-	$table_data[] = $row;
+    $row = array();
+    $row[] = '<kbd>'.$tag.'</kbd>';
+    $row[] = '<kbd>&nbsp;'.implode(', ', array_keys($attributes)).'</kbd>';
+    $table_data[] = $row;
 }
 Display::display_sortable_table($table_header, $table_data, array(), array(), array('fullpage' => intval($_GET['fullpage'])));
 ?>

main/help/faq.php

Indentation +3 added lines, -3 removed lines

@@ -41,9 +41,9 @@
         $form->display();
     }
 } else {
-	$faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file);
-	$faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content)));
-	echo $faq_content;
+    $faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file);
+    $faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content)));
+    echo $faq_content;
 }
 
 Display::display_footer();

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
     $form = new FormValidator('set_faq', 'post', 'faq.php?edit=true');
     $form->addHtmlEditor('faq_content', null, false, false, array('ToolbarSet' => 'FAQ', 'Width' => '100%', 'Height' => '300'));
     $form->addButtonSave(get_lang('Ok'), 'faq_submit');
-    $faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/faq.html');
+    $faq_content = @(string) file_get_contents(api_get_path(SYS_APP_PATH).'home/faq.html');
     $faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content)));
     $form->setDefaults(array('faq_content' => $faq_content));
     if ($form->validate()) {
@@ -41,7 +41,7 @@ 
         $form->display();
     }
 } else {
-	$faq_content = @(string)file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file);
+	$faq_content = @(string) file_get_contents(api_get_path(SYS_APP_PATH).'home/'.$faq_file);
 	$faq_content = api_to_system_encoding($faq_content, api_detect_encoding(strip_tags($faq_content)));
 	echo $faq_content;
 }

main/reports/reports.lib.php

Indentation +10 added lines, -10 removed lines

@@ -14,9 +14,9 @@ 
 
 // load templates 
 function reports_loadTemplates() {
-	global $reports_enabled_templates, $reports_template;
-	foreach ($reports_enabled_templates as $t)
-		require_once 'templates/'.$t.'.reports.php';
+    global $reports_enabled_templates, $reports_template;
+    foreach ($reports_enabled_templates as $t)
+        require_once 'templates/'.$t.'.reports.php';
 }
 
 
@@ -149,18 +149,18 @@ 
  */
 // return tools ID (parametre is a constant from main_api
 function reports_getToolId($tool) {
-	$tools = array_flip(api_get_tools_lists());
-	if (array_key_exists($tool, $tools)) 
-		return $tools[$tool];
-	else
-		return null;
+    $tools = array_flip(api_get_tools_lists());
+    if (array_key_exists($tool, $tools)) 
+        return $tools[$tool];
+    else
+        return null;
 }
 
 // return a sql clause returning triplet of (course, $session, $uid) the
 // current user is authorized to reed
 function reports_getVisibilitySQL () {
-	return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru';
-	// fixme sessions
+    return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru';
+    // fixme sessions
 }
 
 // this function execute keys_query (SQL statement)

Spacing +3 added lines, -3 removed lines

@@ -3,11 +3,11 @@ 
 require_once '../inc/global.inc.php';
 
 
-define ('REPORTS_PROGRESS_COMPLETED', 1);
+define('REPORTS_PROGRESS_COMPLETED', 1);
 
 $reports_modules = array();
 
-$reports_enabled_modules = array('quiz','course','scorm');
+$reports_enabled_modules = array('quiz', 'course', 'scorm');
 
 $reports_enabled_templates = array('exercicesMultiCourses', 'courseTime', 'courseArticulate');
 
@@ -158,7 +158,7 @@ 
 
 // return a sql clause returning triplet of (course, $session, $uid) the
 // current user is authorized to reed
-function reports_getVisibilitySQL () {
+function reports_getVisibilitySQL() {
 	return "select cru.user_id from ".Database::get_main_table(TABLE_MAIN_COURSE_USER).' cru';
 	// fixme sessions
 }

Braces +10 added lines, -8 removed lines

@@ -15,9 +15,10 @@ 
 // load templates 
 function reports_loadTemplates() {
 	global $reports_enabled_templates, $reports_template;
-	foreach ($reports_enabled_templates as $t)
-		require_once 'templates/'.$t.'.reports.php';
-}
+	foreach ($reports_enabled_templates as $t) {
+			require_once 'templates/'.$t.'.reports.php';
+	}
+	}
 
 
 // clear all reporting data
@@ -150,11 +151,12 @@ 
 // return tools ID (parametre is a constant from main_api
 function reports_getToolId($tool) {
 	$tools = array_flip(api_get_tools_lists());
-	if (array_key_exists($tool, $tools)) 
-		return $tools[$tool];
-	else
-		return null;
-}
+	if (array_key_exists($tool, $tools)) {
+			return $tools[$tool];
+	} else {
+			return null;
+	}
+	}
 
 // return a sql clause returning triplet of (course, $session, $uid) the
 // current user is authorized to reed

main/reports/index.php

Indentation +2 added lines, -2 removed lines

@@ -134,14 +134,14 @@
                         <select class="input_field_12em link required" name="type" id="type">
 <?php
 foreach ($reports_template as $key => $value) {
-	echo '<option value="'.$key.'">'.$value['description'].'</option>';
+    echo '<option value="'.$key.'">'.$value['description'].'</option>';
 }
 ?>
                         </select><br />
                     </span>
 <?php
 foreach ($reports_template as $key => $value) {
-	echo $value['wizard'];
+    echo $value['wizard'];
 }
 ?>
                     <span id="format" class="step submit_step">

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 $this_section = SECTION_REPORTS;
 
 // setting the name of the tool
-$tool_name=get_lang('Reports');
+$tool_name = get_lang('Reports');
 
 // Displaying the header
 foreach (array('jquery.ba-bbq.min.js', 'jquery.validate.js', 'jquery.form.js', 'jquery.form.wizard.js', 'jquery.dataTables.min.js') as $js)

Braces +2 added lines, -1 removed lines

@@ -25,8 +25,9 @@
 $tool_name=get_lang('Reports');
 
 // Displaying the header
-foreach (array('jquery.ba-bbq.min.js', 'jquery.validate.js', 'jquery.form.js', 'jquery.form.wizard.js', 'jquery.dataTables.min.js') as $js)
+foreach (array('jquery.ba-bbq.min.js', 'jquery.validate.js', 'jquery.form.js', 'jquery.form.wizard.js', 'jquery.dataTables.min.js') as $js) {
     $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/'.$js.'" type="text/javascript" language="javascript"></script>'."\n";
+}
 
 // FIXME
 $htmlHeadXtra[] = '    <style type="text/css">

main/reports/multiquery.lib.php

Indentation +46 added lines, -46 removed lines

@@ -2,62 +2,62 @@
 
 // get fields informations
 function multiquery_query($array) {
-	$result = array();
-	$field = 0;
-	for ($i = 0; $i <sizeof($array); $i++) {
-		// mysql handler
-		$result[$i]['mysql'] = mysql_query($array[$i]);
-
-		if (! $result[$i]['mysql'])
-			die("error in query $i : ".$array[$i]);
-
-		// fields
-		$result[$i]['num_fields'] = mysql_num_fields($result[$i]['mysql']);
-		for ($j = 0; $j < $result[$i]['num_fields']; $j++) {
-			$name = mysql_field_name($result[$i]['mysql'], $j);
-			$result['field'][$field]['query']=$i;
-			$result['field'][$field]['name']=$name;
-			$result['field'][$field]['id']=$j;
-			$result['field_assoc'][$name][$field];
-			$field++;
-		}
-	}
-	$result['num_queries'] = sizeof($array);
-	// rows
-	$numberOfResult = mysql_num_rows($result[0]['mysql']);
-	for ($i = 1; $i <$result['num_queries']; $i++) 
-		if ($numberOfResult != mysql_num_rows($result[$i]['mysql']))
-			die("wrong number of row: $numberOfResult vs ".
-				mysql_num_rows($result[$i]['mysql'])." on query $i");
-
-	$result['num_rows'] = $numberOfResult;
-	$result['num_fields'] = $field;
-
-	return $result;
+    $result = array();
+    $field = 0;
+    for ($i = 0; $i <sizeof($array); $i++) {
+        // mysql handler
+        $result[$i]['mysql'] = mysql_query($array[$i]);
+
+        if (! $result[$i]['mysql'])
+            die("error in query $i : ".$array[$i]);
+
+        // fields
+        $result[$i]['num_fields'] = mysql_num_fields($result[$i]['mysql']);
+        for ($j = 0; $j < $result[$i]['num_fields']; $j++) {
+            $name = mysql_field_name($result[$i]['mysql'], $j);
+            $result['field'][$field]['query']=$i;
+            $result['field'][$field]['name']=$name;
+            $result['field'][$field]['id']=$j;
+            $result['field_assoc'][$name][$field];
+            $field++;
+        }
+    }
+    $result['num_queries'] = sizeof($array);
+    // rows
+    $numberOfResult = mysql_num_rows($result[0]['mysql']);
+    for ($i = 1; $i <$result['num_queries']; $i++) 
+        if ($numberOfResult != mysql_num_rows($result[$i]['mysql']))
+            die("wrong number of row: $numberOfResult vs ".
+                mysql_num_rows($result[$i]['mysql'])." on query $i");
+
+    $result['num_rows'] = $numberOfResult;
+    $result['num_fields'] = $field;
+
+    return $result;
 }
 
 function multiquery_num_rows(&$mq_h) {
-	return $mq_h['num_rows'];
+    return $mq_h['num_rows'];
 }
 
 function multiquery_num_fields(&$mq_h) {
-	return $mq_h['num_fields'];
+    return $mq_h['num_fields'];
 }
 
 function multiquery_field_name(&$mq_h, $id) {
-	return $mq_h['field'][$id]['name'];
+    return $mq_h['field'][$id]['name'];
 }
 
 function multiquery_fetch_row(&$mq_h) {
-	$result = array();
-	$pos = 0;
-	for ($i = 0; $i < $mq_h['num_queries']; $i++) {
-		$row = mysql_fetch_row($mq_h[$i]['mysql']);
-		if (!$row) return false; // last line
-		for ($j = 0; $j < sizeof($row); $j++) {
-			$result[$pos] = $row[$j];
-			$pos++;
-		}
-	}
-	return $result;
+    $result = array();
+    $pos = 0;
+    for ($i = 0; $i < $mq_h['num_queries']; $i++) {
+        $row = mysql_fetch_row($mq_h[$i]['mysql']);
+        if (!$row) return false; // last line
+        for ($j = 0; $j < sizeof($row); $j++) {
+            $result[$pos] = $row[$j];
+            $pos++;
+        }
+    }
+    return $result;
 }

Spacing +6 added lines, -6 removed lines

@@ -4,20 +4,20 @@ 
 function multiquery_query($array) {
 	$result = array();
 	$field = 0;
-	for ($i = 0; $i <sizeof($array); $i++) {
+	for ($i = 0; $i < sizeof($array); $i++) {
 		// mysql handler
 		$result[$i]['mysql'] = mysql_query($array[$i]);
 
-		if (! $result[$i]['mysql'])
+		if (!$result[$i]['mysql'])
 			die("error in query $i : ".$array[$i]);
 
 		// fields
 		$result[$i]['num_fields'] = mysql_num_fields($result[$i]['mysql']);
 		for ($j = 0; $j < $result[$i]['num_fields']; $j++) {
 			$name = mysql_field_name($result[$i]['mysql'], $j);
-			$result['field'][$field]['query']=$i;
-			$result['field'][$field]['name']=$name;
-			$result['field'][$field]['id']=$j;
+			$result['field'][$field]['query'] = $i;
+			$result['field'][$field]['name'] = $name;
+			$result['field'][$field]['id'] = $j;
 			$result['field_assoc'][$name][$field];
 			$field++;
 		}
@@ -25,7 +25,7 @@ 
 	$result['num_queries'] = sizeof($array);
 	// rows
 	$numberOfResult = mysql_num_rows($result[0]['mysql']);
-	for ($i = 1; $i <$result['num_queries']; $i++) 
+	for ($i = 1; $i < $result['num_queries']; $i++) 
 		if ($numberOfResult != mysql_num_rows($result[$i]['mysql']))
 			die("wrong number of row: $numberOfResult vs ".
 				mysql_num_rows($result[$i]['mysql'])." on query $i");

Braces +10 added lines, -5 removed lines

@@ -8,8 +8,9 @@ 
 		// mysql handler
 		$result[$i]['mysql'] = mysql_query($array[$i]);
 
-		if (! $result[$i]['mysql'])
-			die("error in query $i : ".$array[$i]);
+		if (! $result[$i]['mysql']) {
+					die("error in query $i : ".$array[$i]);
+		}
 
 		// fields
 		$result[$i]['num_fields'] = mysql_num_fields($result[$i]['mysql']);
@@ -25,10 +26,11 @@ 
 	$result['num_queries'] = sizeof($array);
 	// rows
 	$numberOfResult = mysql_num_rows($result[0]['mysql']);
-	for ($i = 1; $i <$result['num_queries']; $i++) 
-		if ($numberOfResult != mysql_num_rows($result[$i]['mysql']))
+	for ($i = 1; $i <$result['num_queries']; $i++) {
+			if ($numberOfResult != mysql_num_rows($result[$i]['mysql']))
 			die("wrong number of row: $numberOfResult vs ".
 				mysql_num_rows($result[$i]['mysql'])." on query $i");
+	}
 
 	$result['num_rows'] = $numberOfResult;
 	$result['num_fields'] = $field;
@@ -53,7 +55,10 @@ 
 	$pos = 0;
 	for ($i = 0; $i < $mq_h['num_queries']; $i++) {
 		$row = mysql_fetch_row($mq_h[$i]['mysql']);
-		if (!$row) return false; // last line
+		if (!$row) {
+		    return false;
+		}
+		// last line
 		for ($j = 0; $j < sizeof($row); $j++) {
 			$result[$pos] = $row[$j];
 			$pos++;