chamilo / chamilo-lms

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

@@ -29,7 +29,7 @@ 
         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()) {
@@ -47,7 +47,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/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++;

main/reports/modules/quiz.php

Indentation +18 added lines, -18 removed lines

@@ -7,27 +7,27 @@
 }
 
 function reports_modules_quiz_init_forEachCourses($course_code, $course_id, $course_db) {
-	global $reports_modules;
+    global $reports_modules;
 	
-	$reports_modules_quiz_toolid = reports_getToolId(TOOL_QUIZ);
+    $reports_modules_quiz_toolid = reports_getToolId(TOOL_QUIZ);
 
-	array_push($reports_modules['quiz'], 
-	  array('keys_query' =>  
-		'select '.$course_id.' as course_id, '.
-		$reports_modules_quiz_toolid.' as tool_id, '.
-		'q.id as child_id, q.title as child_name, '.
-		"'".$course_code."'".' as course_code from '.Database::get_course_table(TABLE_QUIZ_TEST).' q ',
-		'values_query_function' => 'reports_modules_quiz_quizVal'));		
+    array_push($reports_modules['quiz'], 
+        array('keys_query' =>  
+        'select '.$course_id.' as course_id, '.
+        $reports_modules_quiz_toolid.' as tool_id, '.
+        'q.id as child_id, q.title as child_name, '.
+        "'".$course_code."'".' as course_code from '.Database::get_course_table(TABLE_QUIZ_TEST).' q ',
+        'values_query_function' => 'reports_modules_quiz_quizVal'));		
 }
 
 function reports_modules_quiz_quizVal($quiz, $key_id) {
-	$courseId = api_get_course_int_id($quiz['course_code']);
-	return array('type'=> 'sql', 'sql' => 
-			'select '.$key_id.', exe_user_id as uid, '.
-			'session_id, -1 as attempt, exe_result as score, '.
-			REPORTS_PROGRESS_COMPLETED.' as progress, '.
-			'exe_duration as time, exe_date as ts from '.
-			Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES).
-			' where c_id = ' . $courseId .
-			' and exe_exo_id='.$quiz['child_id']);
+    $courseId = api_get_course_int_id($quiz['course_code']);
+    return array('type'=> 'sql', 'sql' => 
+            'select '.$key_id.', exe_user_id as uid, '.
+            'session_id, -1 as attempt, exe_result as score, '.
+            REPORTS_PROGRESS_COMPLETED.' as progress, '.
+            'exe_duration as time, exe_date as ts from '.
+            Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES).
+            ' where c_id = ' . $courseId .
+            ' and exe_exo_id='.$quiz['child_id']);
 }

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php 
 
-$reports_modules['quiz'] = array ();
+$reports_modules['quiz'] = array();
 
 
 function reports_modules_quiz_init() {
@@ -28,6 +28,6 @@ 
 			REPORTS_PROGRESS_COMPLETED.' as progress, '.
 			'exe_duration as time, exe_date as ts from '.
 			Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES).
-			' where c_id = ' . $courseId .
+			' where c_id = '.$courseId.
 			' and exe_exo_id='.$quiz['child_id']);
 }

main/reports/modules/scorm.php

Indentation +100 added lines, -100 removed lines

@@ -7,117 +7,117 @@
 }
 
 function reports_modules_scorm_init_forEachCourses($course_code, $course_id, $course_db) {
-	global $reports_modules;
+    global $reports_modules;
 	
-	$reports_modules_scorm_toolid = reports_getToolId(TOOL_LEARNPATH);
+    $reports_modules_scorm_toolid = reports_getToolId(TOOL_LEARNPATH);
 
-	// package level
-	array_push($reports_modules['scorm'], 
-	  array('keys_query' =>  
-		'select '.$course_id.' as course_id, '.
-		$reports_modules_scorm_toolid.' as tool_id, '.
-		'lp.id as child_id, lp.name as child_name, '.
-		"'".$course_db."'".' as course_db from '.
-		Database::get_course_table(TABLE_LP_MAIN).' lp',
-		'values_query_function' => 'reports_modules_scorm_packageVal'));		
+    // package level
+    array_push($reports_modules['scorm'], 
+        array('keys_query' =>  
+        'select '.$course_id.' as course_id, '.
+        $reports_modules_scorm_toolid.' as tool_id, '.
+        'lp.id as child_id, lp.name as child_name, '.
+        "'".$course_db."'".' as course_db from '.
+        Database::get_course_table(TABLE_LP_MAIN).' lp',
+        'values_query_function' => 'reports_modules_scorm_packageVal'));		
 
-	// sco level
-	array_push($reports_modules['scorm'], 
-	  array('keys_query' =>  
-		'select '.$course_id.' as course_id, '.
-		$reports_modules_scorm_toolid.' as tool_id, '.
-		'lp.id as child_id, lp.name as child_name, '.
-		'lpi.id as subchild_id, lpi.title as subchild_name, '.
-		"'".$course_db."'".' as course_db from '.
-		Database::get_course_table(TABLE_LP_MAIN, $course_db).
-		' lp,'.
-		Database::get_course_table(TABLE_LP_ITEM, $course_db).
-		' lpi where lp.id = lpi.lp_id',
-		'values_query_function' => 'reports_modules_scorm_scoVal'));		
+    // sco level
+    array_push($reports_modules['scorm'], 
+        array('keys_query' =>  
+        'select '.$course_id.' as course_id, '.
+        $reports_modules_scorm_toolid.' as tool_id, '.
+        'lp.id as child_id, lp.name as child_name, '.
+        'lpi.id as subchild_id, lpi.title as subchild_name, '.
+        "'".$course_db."'".' as course_db from '.
+        Database::get_course_table(TABLE_LP_MAIN, $course_db).
+        ' lp,'.
+        Database::get_course_table(TABLE_LP_ITEM, $course_db).
+        ' lpi where lp.id = lpi.lp_id',
+        'values_query_function' => 'reports_modules_scorm_scoVal'));		
 
-	// objectives level
-	array_push($reports_modules['scorm'], 
-	  array('keys_query' =>  
-		'select distinct '.$course_id.' as course_id, '.
-		$reports_modules_scorm_toolid.' as tool_id, '.
-		'lp.id as child_id, lp.name as child_name, '.
-		'lpi.id as subchild_id, '.
-		'lpi.title as subchild_name, '.
-		'null as subsubchild_id, '.
-		'lpivo.objective_id as subsubchild_name, '.
-		"'".$course_db."'".' as course_db from '.
-		Database::get_course_table(TABLE_LP_MAIN, $course_db).
-		' lp,'.
-		Database::get_course_table(TABLE_LP_ITEM, $course_db).
-		' lpi, '.
-		Database::get_course_table(TABLE_LP_ITEM_VIEW, $course_db).
-		' lpiv, '.
-		Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $course_db).
-		' lpivo '.
-		'where lp.id = lpi.lp_id '.
-		'and lpi.id = lpiv.lp_item_id '.
-		'and lpiv.id = lpivo.lp_iv_id ',
-		'values_query_function' => 'reports_modules_scorm_objVal'));		
+    // objectives level
+    array_push($reports_modules['scorm'], 
+        array('keys_query' =>  
+        'select distinct '.$course_id.' as course_id, '.
+        $reports_modules_scorm_toolid.' as tool_id, '.
+        'lp.id as child_id, lp.name as child_name, '.
+        'lpi.id as subchild_id, '.
+        'lpi.title as subchild_name, '.
+        'null as subsubchild_id, '.
+        'lpivo.objective_id as subsubchild_name, '.
+        "'".$course_db."'".' as course_db from '.
+        Database::get_course_table(TABLE_LP_MAIN, $course_db).
+        ' lp,'.
+        Database::get_course_table(TABLE_LP_ITEM, $course_db).
+        ' lpi, '.
+        Database::get_course_table(TABLE_LP_ITEM_VIEW, $course_db).
+        ' lpiv, '.
+        Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $course_db).
+        ' lpivo '.
+        'where lp.id = lpi.lp_id '.
+        'and lpi.id = lpiv.lp_item_id '.
+        'and lpiv.id = lpivo.lp_iv_id ',
+        'values_query_function' => 'reports_modules_scorm_objVal'));		
 }
 
 function reports_modules_scorm_packageVal($scorm, $key_id) {
-	return array('type'=> 'sql', 'sql' => 
-			'select '.$key_id.', user_id as uid, '.
-			'session_id, view_count as attempt, null as score, '.
-			'progress as progress, '.
-			'null as time, null as ts from '.
-			Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
-			' where lp_id = '.$scorm['child_id']);
+    return array('type'=> 'sql', 'sql' => 
+            'select '.$key_id.', user_id as uid, '.
+            'session_id, view_count as attempt, null as score, '.
+            'progress as progress, '.
+            'null as time, null as ts from '.
+            Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
+            ' where lp_id = '.$scorm['child_id']);
 }
 
 function reports_modules_scorm_scoVal($scorm, $key_id) {
-	return array('type'=> 'sql', 'sql' => 
-			'select '.$key_id.', lpv.user_id as uid, '.
-			'lpv.session_id, lpiv.view_count as attempt, '.
-			'lpiv.score as score, '.
-			'(case lpiv.status '.
-				'when "incomplete" then 0 '.
-				'when "completed" then 1 '.
-				'when "passed" then 2 '.
-				'when "failed" then 3 '.
-				'when "browsed" then 4 '.
-				'when "not attempted" then 5 '.
-				'else 6 '.
-			'end) as progress, '.
-			'lpiv.total_time as time, null as ts from '.
-			Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
-			' lpv, '.
-			Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']).
-			' lpiv '.
-			' where lpv.lp_id = '.$scorm['child_id'].
-			' and lpiv.lp_item_id = '.$scorm['subchild_id'].
-			' and lpiv.lp_view_id = lpv.id');
+    return array('type'=> 'sql', 'sql' => 
+            'select '.$key_id.', lpv.user_id as uid, '.
+            'lpv.session_id, lpiv.view_count as attempt, '.
+            'lpiv.score as score, '.
+            '(case lpiv.status '.
+                'when "incomplete" then 0 '.
+                'when "completed" then 1 '.
+                'when "passed" then 2 '.
+                'when "failed" then 3 '.
+                'when "browsed" then 4 '.
+                'when "not attempted" then 5 '.
+                'else 6 '.
+            'end) as progress, '.
+            'lpiv.total_time as time, null as ts from '.
+            Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
+            ' lpv, '.
+            Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']).
+            ' lpiv '.
+            ' where lpv.lp_id = '.$scorm['child_id'].
+            ' and lpiv.lp_item_id = '.$scorm['subchild_id'].
+            ' and lpiv.lp_view_id = lpv.id');
 }
 
 function reports_modules_scorm_objVal($scorm, $key_id) {
-	return array('type'=> 'sql', 'sql' => 
-			'select '.$key_id.', lpv.user_id as uid, '.
-			'lpv.session_id, lpiv.view_count as attempt, '.
-			'lpivo.score_raw as score, '.
-			'(case lpivo.status '.
-				'when "incomplete" then 0 '.
-				'when "completed" then 1 '.
-				'when "passed" then 2 '.
-				'when "failed" then 3 '.
-				'when "browsed" then 4 '.
-				'when "not attempted" then 5 '.
-				'else 6 '.
-			'end) as progress, '.
-			'null as time, null as ts from '.
-			Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
-			' lpv, '.
-			Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']).
-			' lpiv, '.
-			Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $scorm['course_db']).
-			' lpivo '.
-			' where lpv.lp_id = '.$scorm['child_id'].
-			' and lpiv.lp_item_id = '.$scorm['subchild_id'].
-			' and lpivo.objective_id = "'.$scorm['subsubchild_name'].'" '.
-			' and lpiv.lp_view_id = lpv.id'.
-			' and lpivo.lp_iv_id=lpiv.id');
+    return array('type'=> 'sql', 'sql' => 
+            'select '.$key_id.', lpv.user_id as uid, '.
+            'lpv.session_id, lpiv.view_count as attempt, '.
+            'lpivo.score_raw as score, '.
+            '(case lpivo.status '.
+                'when "incomplete" then 0 '.
+                'when "completed" then 1 '.
+                'when "passed" then 2 '.
+                'when "failed" then 3 '.
+                'when "browsed" then 4 '.
+                'when "not attempted" then 5 '.
+                'else 6 '.
+            'end) as progress, '.
+            'null as time, null as ts from '.
+            Database::get_course_table(TABLE_LP_VIEW, $scorm['course_db']).
+            ' lpv, '.
+            Database::get_course_table(TABLE_LP_ITEM_VIEW, $scorm['course_db']).
+            ' lpiv, '.
+            Database::get_course_table(TABLE_LP_IV_OBJECTIVE, $scorm['course_db']).
+            ' lpivo '.
+            ' where lpv.lp_id = '.$scorm['child_id'].
+            ' and lpiv.lp_item_id = '.$scorm['subchild_id'].
+            ' and lpivo.objective_id = "'.$scorm['subsubchild_name'].'" '.
+            ' and lpiv.lp_view_id = lpv.id'.
+            ' and lpivo.lp_iv_id=lpiv.id');
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php 
 
-$reports_modules['scorm'] = array ();
+$reports_modules['scorm'] = array();
 
 
 function reports_modules_scorm_init() {

main/reports/modules/course.php

Indentation +13 added lines, -13 removed lines

@@ -7,23 +7,23 @@
 }
 
 function reports_modules_course_init_forEachCourses($course_code, $course_id, $course_db) {
-	global $reports_modules;
+    global $reports_modules;
 
 //	$reports_modules_course_toolid = reports_getToolId(TOOL_QUIZ);
 
-	array_push($reports_modules['course'],
-	  array('keys_query' =>
-		'select '.$course_id.' as course_id, "'.$course_code.'" as course_code',
-		'values_query_function' => 'reports_modules_course_val'));
+    array_push($reports_modules['course'],
+        array('keys_query' =>
+        'select '.$course_id.' as course_id, "'.$course_code.'" as course_code',
+        'values_query_function' => 'reports_modules_course_val'));
 }
 
 function reports_modules_course_val($course, $key_id) {
-	return array('type'=> 'sql', 'sql' =>
-			'select '.$key_id.', user_id as uid, '.
-			'-1 as session_id, -1 as attempt, null as score, '.
-			'NULL as progress, '.
-			'(sum(logout_course_date) - sum(login_course_date)) as time, null as ts from '.
-			Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS).
-			' where c_id = ' . $course['real_id'] .
-			' group by user_id');
+    return array('type'=> 'sql', 'sql' =>
+            'select '.$key_id.', user_id as uid, '.
+            '-1 as session_id, -1 as attempt, null as score, '.
+            'NULL as progress, '.
+            '(sum(logout_course_date) - sum(login_course_date)) as time, null as ts from '.
+            Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS).
+            ' where c_id = ' . $course['real_id'] .
+            ' group by user_id');
 }

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-$reports_modules['course'] = array ();
+$reports_modules['course'] = array();
 
 
 function reports_modules_course_init() {
@@ -24,6 +24,6 @@ 
 			'NULL as progress, '.
 			'(sum(logout_course_date) - sum(login_course_date)) as time, null as ts from '.
 			Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS).
-			' where c_id = ' . $course['real_id'] .
+			' where c_id = '.$course['real_id'].
 			' group by user_id');
 }

main/reports/templates/courseArticulate.reports.php

Indentation +91 added lines, -91 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
 $reports_template['CourseArticulate'] = array(
-	'description' => 'CourseArticulate',
-	'getSQL' => 'reports_template_CourseArticulate_getSQL',
-	'wizard' =>
+    'description' => 'CourseArticulate',
+    'getSQL' => 'reports_template_CourseArticulate_getSQL',
+    'wizard' =>
 '
 <span id="CourseArticulate" class="step">
 	<span class="font_normal_07em_black">This report does not need any particular settings</span><br />
@@ -12,113 +12,113 @@ 
 ');
 
 function reports_template_CourseArticulate_getSQL() {
-	// settings
+    // settings
 
 
-	// Nom, prenom
-	$query = 'select u.lastname as "Last name", u.firstname as "First name" ';
-	$query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-	$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
-	$query .= ' order by u.user_id ';
-	$queries[0] = $query;
-	$extraFieldType = \Chamilo\CoreBundle\Entity\ExtraField::USER_FIELD_TYPE;
-	// Custom Field
-	foreach (array("tags" => "tags") as $k => $v) { // FIXME
-		$query = 'select ufv.value  as "'.$v.'" ';
-		$query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-		$query .= 'left join'.Database::get_main_table(TABLE_EXTRA_FIELD).' uf ';
-		$query .= ' on uf.variable ="'.$k.'" ';
-		$query .= 'left outer join '.Database::get_main_table(TABLE_EXTRA_FIELD_VALUES).' ufv ';
-		$query .= ' on ufv.item_id = u.user_id and ufv.field_id = uf.id ';
-		$query .= 'where ufv.extra_field_type = '.$extraFieldType.' AND u.user_id in ('.reports_getVisibilitySQL().') ';
-		$query .= ' order by u.user_id ';
-		$queries[] = $query;
-	}
+    // Nom, prenom
+    $query = 'select u.lastname as "Last name", u.firstname as "First name" ';
+    $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+    $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
+    $query .= ' order by u.user_id ';
+    $queries[0] = $query;
+    $extraFieldType = \Chamilo\CoreBundle\Entity\ExtraField::USER_FIELD_TYPE;
+    // Custom Field
+    foreach (array("tags" => "tags") as $k => $v) { // FIXME
+        $query = 'select ufv.value  as "'.$v.'" ';
+        $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+        $query .= 'left join'.Database::get_main_table(TABLE_EXTRA_FIELD).' uf ';
+        $query .= ' on uf.variable ="'.$k.'" ';
+        $query .= 'left outer join '.Database::get_main_table(TABLE_EXTRA_FIELD_VALUES).' ufv ';
+        $query .= ' on ufv.item_id = u.user_id and ufv.field_id = uf.id ';
+        $query .= 'where ufv.extra_field_type = '.$extraFieldType.' AND u.user_id in ('.reports_getVisibilitySQL().') ';
+        $query .= ' order by u.user_id ';
+        $queries[] = $query;
+    }
 
 
-	// Stored Value
-	$sv = array();
-	foreach ($sv as $k => $v) {
+    // Stored Value
+    $sv = array();
+    foreach ($sv as $k => $v) {
         if (!isset($v['sql']))
                 $v['sql'] = 'FIELD';
         $sqlField = str_replace('FIELD', 'sv.sv_value', $v['sql']);
         $query = 'select '.$sqlField.' as "'.$v['title'].'" ';
 //		$query = 'select sec_to_time(sv.sv_value) as "'.$v.'" ';
-		$query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-		$query .= ' left outer join '.Database::get_main_table(TABLE_TRACK_STORED_VALUES).' sv ';
-		$query .= 'on sv.user_id = u.user_id and sv_key = "'.$k.'" ';
-		$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
-		$query .= ' group by u.user_id ';
-		$query .= ' order by u.user_id ';
-		$queries[] = $query;
-	}
+        $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+        $query .= ' left outer join '.Database::get_main_table(TABLE_TRACK_STORED_VALUES).' sv ';
+        $query .= 'on sv.user_id = u.user_id and sv_key = "'.$k.'" ';
+        $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
+        $query .= ' group by u.user_id ';
+        $query .= ' order by u.user_id ';
+        $queries[] = $query;
+    }
 
-	// first and last connection
-	$query = 'select min(tel.login_date) as "First connection", max(tel.logout_date) as "Latest connection"  ';
-	$query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-	$query .= 'left outer join '.Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN).' tel ';
-	$query .= ' on tel.login_user_id = u.user_id ';
-	$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
-	$query .= ' group by u.user_id ';
-	$query .= ' order by u.user_id ';
-	$queries[] = $query;
+    // first and last connection
+    $query = 'select min(tel.login_date) as "First connection", max(tel.logout_date) as "Latest connection"  ';
+    $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
+    $query .= 'left outer join '.Database::get_main_table(TABLE_STATISTIC_TRACK_E_LOGIN).' tel ';
+    $query .= ' on tel.login_user_id = u.user_id ';
+    $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
+    $query .= ' group by u.user_id ';
+    $query .= ' order by u.user_id ';
+    $queries[] = $query;
 
-	// SCORM Data
-	$scormData = array();
+    // SCORM Data
+    $scormData = array();
     $course_list = CourseManager::get_courses_list();
-	foreach ($course_list as $code => $details) {
-		$courseId = $details['id'];
-		$list = Database::query('SELECT l.id as lid, l.name as lname, li.id as liid, li.title as lititle '.
-					' FROM '.Database::get_course_table(TABLE_LP_MAIN).' l, '.Database::get_course_table(TABLE_LP_ITEM).' li '.
-					' WHERE l.c_id = '.$courseId.' AND li.c_id = '.$courseId.' AND l.id = li.lp_id');
-		while ($lpItem = Database::fetch_assoc($list)) {
-			$scormData[] = array(
-						//'coursedb' => $details['db_name'],
-						'lid' => $lpItem['lid'],
-						'liid' => $lpItem['liid'],
-						'target_view_count' => 1,
-						'target_indicator' => 'score',
-						'title' => $details['title'].'/'.$lpItem['lname'].'/'.$lpItem['lititle'].'/1/score',
-						'sql' => 'FIELD');
-			$scormData[] = array(
-						//'coursedb' => $details['db_name'],
-						'lid' => $lpItem['lid'],
-						'liid' => $lpItem['liid'],
-						'target_view_count' => 2,
-						'target_indicator' => 'score',
-						'title' => $details['title'].'/'.$lpItem['lname'].'/'.$lpItem['lititle'].'/2/score',
-						'sql' => 'FIELD');
-			$scormData[] = array(
-						//'coursedb' => $details['db_name'],
-						'lid' => $lpItem['lid'],
-						'liid' => $lpItem['liid'],
-						'target_view_count' => null,
-						'target_indicator' => 'score',
-						'title' => $details['title'].'/'.$lpItem['lname'].'/'.$lpItem['lititle'].'/all/score',
-						'sql' => 'avg(FIELD)');
-		}
-	}
+    foreach ($course_list as $code => $details) {
+        $courseId = $details['id'];
+        $list = Database::query('SELECT l.id as lid, l.name as lname, li.id as liid, li.title as lititle '.
+                    ' FROM '.Database::get_course_table(TABLE_LP_MAIN).' l, '.Database::get_course_table(TABLE_LP_ITEM).' li '.
+                    ' WHERE l.c_id = '.$courseId.' AND li.c_id = '.$courseId.' AND l.id = li.lp_id');
+        while ($lpItem = Database::fetch_assoc($list)) {
+            $scormData[] = array(
+                        //'coursedb' => $details['db_name'],
+                        'lid' => $lpItem['lid'],
+                        'liid' => $lpItem['liid'],
+                        'target_view_count' => 1,
+                        'target_indicator' => 'score',
+                        'title' => $details['title'].'/'.$lpItem['lname'].'/'.$lpItem['lititle'].'/1/score',
+                        'sql' => 'FIELD');
+            $scormData[] = array(
+                        //'coursedb' => $details['db_name'],
+                        'lid' => $lpItem['lid'],
+                        'liid' => $lpItem['liid'],
+                        'target_view_count' => 2,
+                        'target_indicator' => 'score',
+                        'title' => $details['title'].'/'.$lpItem['lname'].'/'.$lpItem['lititle'].'/2/score',
+                        'sql' => 'FIELD');
+            $scormData[] = array(
+                        //'coursedb' => $details['db_name'],
+                        'lid' => $lpItem['lid'],
+                        'liid' => $lpItem['liid'],
+                        'target_view_count' => null,
+                        'target_indicator' => 'score',
+                        'title' => $details['title'].'/'.$lpItem['lname'].'/'.$lpItem['lititle'].'/all/score',
+                        'sql' => 'avg(FIELD)');
+        }
+    }
 
-	foreach ($scormData as $v) {
+    foreach ($scormData as $v) {
         if (!isset($v['sql'])) {
             $v['sql'] = 'FIELD';
         }
         $sqlField = str_replace('FIELD', $v['target_indicator'], $v['sql']);
         $query = 'select '.$sqlField.' as "'.$v['title'].'" ';
         $query .= 'from '.Database::get_main_table(TABLE_MAIN_USER).' u ';
-		$query .= 'left outer join '.Database::get_course_table(TABLE_LP_VIEW).' lv ';
-		$query .= ' on u.user_id = lv.user_id and lv.lp_id = '.$v['lid'];
-		$query .= ' left outer join '.Database::get_course_table(TABLE_LP_ITEM_VIEW).' liv ';
-		$query .= ' on lv.id = liv.lp_view_id ';
-		if ($v['target_view_count'])
-			$query .= ' and liv.view_count = '.$v['target_view_count'];
-		$query .= ' and liv.lp_item_id = '.$v['liid'].' ';
-		$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
-		$query .= ' group by u.user_id ';
-		$query .= ' order by u.user_id ';
-		$queries[] = $query;
-	}
+        $query .= 'left outer join '.Database::get_course_table(TABLE_LP_VIEW).' lv ';
+        $query .= ' on u.user_id = lv.user_id and lv.lp_id = '.$v['lid'];
+        $query .= ' left outer join '.Database::get_course_table(TABLE_LP_ITEM_VIEW).' liv ';
+        $query .= ' on lv.id = liv.lp_view_id ';
+        if ($v['target_view_count'])
+            $query .= ' and liv.view_count = '.$v['target_view_count'];
+        $query .= ' and liv.lp_item_id = '.$v['liid'].' ';
+        $query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
+        $query .= ' group by u.user_id ';
+        $query .= ' order by u.user_id ';
+        $queries[] = $query;
+    }
 
-	return $queries;
+    return $queries;
 }
 

Braces +6 added lines, -4 removed lines

@@ -39,8 +39,9 @@ 
 	// Stored Value
 	$sv = array();
 	foreach ($sv as $k => $v) {
-        if (!isset($v['sql']))
-                $v['sql'] = 'FIELD';
+        if (!isset($v['sql'])) {
+                        $v['sql'] = 'FIELD';
+        }
         $sqlField = str_replace('FIELD', 'sv.sv_value', $v['sql']);
         $query = 'select '.$sqlField.' as "'.$v['title'].'" ';
 //		$query = 'select sec_to_time(sv.sv_value) as "'.$v.'" ';
@@ -110,8 +111,9 @@ 
 		$query .= ' on u.user_id = lv.user_id and lv.lp_id = '.$v['lid'];
 		$query .= ' left outer join '.Database::get_course_table(TABLE_LP_ITEM_VIEW).' liv ';
 		$query .= ' on lv.id = liv.lp_view_id ';
-		if ($v['target_view_count'])
-			$query .= ' and liv.view_count = '.$v['target_view_count'];
+		if ($v['target_view_count']) {
+					$query .= ' and liv.view_count = '.$v['target_view_count'];
+		}
 		$query .= ' and liv.lp_item_id = '.$v['liid'].' ';
 		$query .= ' where u.user_id in ('.reports_getVisibilitySQL().') ';
 		$query .= ' group by u.user_id ';