chamilo / chamilo-lms

main/tracking/course_log_resources.php

Spacing +6 added lines, -6 removed lines

@@ -45,8 +45,8 @@ 
 
 // Breadcrumbs.
 if (isset($_GET['origin']) && $_GET['origin'] == 'resume_session') {
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/index.php','name' => get_lang('PlatformAdmin'));
-    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/session_list.php','name' => get_lang('SessionList'));
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'admin/index.php', 'name' => get_lang('PlatformAdmin'));
+    $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/session_list.php', 'name' => get_lang('SessionList'));
     $interbreadcrumb[] = array('url' => api_get_path(WEB_CODE_PATH).'session/resume_session.php?id_session='.api_get_session_id(), 'name' => get_lang('SessionOverview'));
 }
 
@@ -76,21 +76,21 @@ 
 echo Display::return_icon('tools_na.png', get_lang('ResourcesTracking'), array(), ICON_SIZE_MEDIUM);
 echo '<span style="float:right; padding-top:0px;">';
 echo '<a href="javascript: void(0);" onclick="javascript: window.print();">'.
-    Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_MEDIUM).
+    Display::return_icon('printer.png', get_lang('Print'), '', ICON_SIZE_MEDIUM).
 '</a>';
 
 $addional_param = '';
 if (isset($_GET['additional_profile_field'])) {
-    $addional_param ='additional_profile_field='.intval($_GET['additional_profile_field']);
+    $addional_param = 'additional_profile_field='.intval($_GET['additional_profile_field']);
 }
 
 $users_tracking_per_page = '';
 if (isset($_GET['users_tracking_per_page'])) {
-    $users_tracking_per_page= '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
+    $users_tracking_per_page = '&users_tracking_per_page='.intval($_GET['users_tracking_per_page']);
 }
 
 echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&export=csv&'.$addional_param.$users_tracking_per_page.'">
-'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a>';
+'.Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), '', ICON_SIZE_MEDIUM).'</a>';
 
 echo '</span>';
 echo '</div>';

main/tracking/courseLogCSV.php

Braces +17 added lines, -9 removed lines

@@ -38,20 +38,27 @@ 
 
 $view = $_REQUEST['view'];
 
-if ($view == "0000001")
+if ($view == "0000001") {
     $nameTools = get_lang('SynthesisView');
-if ($view == "1000000")
+}
+if ($view == "1000000") {
     $nameTools = get_lang('CourseStats');
-if ($view == "0100000")
+}
+if ($view == "0100000") {
     $nameTools = get_lang('CourseAccess');
-if ($view == "0010000")
+}
+if ($view == "0010000") {
     $nameTools = get_lang('ToolsAccess');
-if ($view == "0001000")
+}
+if ($view == "0001000") {
     $nameTools = get_lang('LinksAccess');
-if ($view == "0000100")
+}
+if ($view == "0000100") {
     $nameTools = get_lang('DocumentsAccess');
-if ($view == "00000010")
+}
+if ($view == "00000010") {
     $nameTools = get_lang('ScormAccess');
+}
 
 $interbreadcrumb[] = array("url" => api_get_self() . "?view=0000000", "name" => get_lang('ToolName'));
 
@@ -79,8 +86,9 @@ 
       </div><br>
       "; */
 
-    if (!isset($view))
-        $view = "0000000";
+    if (!isset($view)) {
+            $view = "0000000";
+    }
 
 
     /* 	Reporting */

Spacing +50 added lines, -50 removed lines

@@ -53,13 +53,13 @@ 
 if ($view == "00000010")
     $nameTools = get_lang('ScormAccess');
 
-$interbreadcrumb[] = array("url" => api_get_self() . "?view=0000000", "name" => get_lang('ToolName'));
+$interbreadcrumb[] = array("url" => api_get_self()."?view=0000000", "name" => get_lang('ToolName'));
 
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || api_is_drh();
 
 /* 	MAIN CODE */
 
-$title[0] = get_lang('StatsOfCourse') . " : " . $_course['official_code'];
+$title[0] = get_lang('StatsOfCourse')." : ".$_course['official_code'];
 
 
 $courseInfo = api_get_course_info($_course['official_code']);
@@ -91,40 +91,40 @@ 
         $sql = "SELECT $TABLECOURSUSER.user_i, $table_user.lastname, $table_user.firstname
                 FROM $TABLECOURSUSER, $table_user
                 WHERE
-                    $TABLECOURSUSER.c_id = '" . api_get_course_int_id() . "' AND
+                    $TABLECOURSUSER.c_id = '".api_get_course_int_id()."' AND
                     $TABLECOURSUSER.user_id = $table_user.user_id AND
-                    $TABLECOURSUSER.relation_type<>" . COURSE_RELATION_TYPE_RRHH . "
+                    $TABLECOURSUSER.relation_type<>".COURSE_RELATION_TYPE_RRHH."
                 ORDER BY $table_user.lastname";
         $results = StatsUtils::getManyResults3Col($sql);
 
         //BUGFIX: get visual code instead of real course code. Scormpaths use the visual code... (should be fixed in future versions)
-        $sql = "SELECT visual_code FROM $TABLECOURSE WHERE code = '" . api_get_course_id() . "'";
+        $sql = "SELECT visual_code FROM $TABLECOURSE WHERE code = '".api_get_course_id()."'";
         $_course['visual_code'] = StatsUtils::getOneResult($sql);
 
         if (is_array($results)) {
             $line = '';
-            $title_line = get_lang('Name') . ";" . get_lang('FirstAccess') . ";" . get_lang('LastAccess') . ";" . get_lang('Visited') . "\n";
+            $title_line = get_lang('Name').";".get_lang('FirstAccess').";".get_lang('LastAccess').";".get_lang('Visited')."\n";
 
             for ($j = 0; $j < count($results); $j++) {
                 // BEGIN % visited
                 // sum of all items (= multiple learningpaths + SCORM imported paths)
-                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) FROM $tbl_learnpath_item_view iv " .
+                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) FROM $tbl_learnpath_item_view iv ".
                         "INNER JOIN $tbl_learnpath_view v
-                        ON iv.lp_view_id = v.id " .
+                        ON iv.lp_view_id = v.id ".
                         "WHERE
                         	v.c_id = $course_id AND
                         	iv.c_id = $course_id AND
-                		v.user_id = " . $results[$j][0];
+                		v.user_id = ".$results[$j][0];
                 $total_lpath_items = StatsUtils::getOneResult($sql);
 
                 // sum of all completed items (= multiple learningpaths + SCORM imported paths)
-                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) " .
-                        "FROM $tbl_learnpath_item_view iv " .
-                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id = v.id " .
+                $sql = "SELECT COUNT(DISTINCT(iv.lp_item_id)) ".
+                        "FROM $tbl_learnpath_item_view iv ".
+                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id = v.id ".
                         "WHERE
                         	v.c_id = $course_id AND
                         	iv.c_id = $course_id AND
-                        	v.user_id = " . $results[$j][0] . " " .
+                        	v.user_id = ".$results[$j][0]." ".
                         "AND (status = 'completed' OR status='passed')";
                 $total_lpath_items_completed = StatsUtils::getOneResult($sql);
 
@@ -135,23 +135,23 @@ 
                 // BEGIN first/last access
                 // first access
                 $sql = "SELECT access_date FROM $TABLETRACK_ACCESS_2
-                        WHERE access_user_id = '" . $results[$j][0] . "' AND c_id = '" . $courseId . "' AND access_tool = 'learnpath' AND access_session_id = '" . api_get_session_id() . "'
+                        WHERE access_user_id = '".$results[$j][0]."' AND c_id = '".$courseId."' AND access_tool = 'learnpath' AND access_session_id = '".api_get_session_id()."'
                         ORDER BY access_id ASC LIMIT 1";
                 $first_access = StatsUtils::getOneResult($sql);
                 $first_access = empty($first_access) ? "-" : date('d.m.y', strtotime($first_access));
 
                 // last access
-                $sql = "SELECT access_date FROM $TABLETRACK_ACCESS WHERE access_user_id = '" . $results[$j][0] . "' AND c_id = '" . $courseId . "' AND access_tool = 'learnpath'";
+                $sql = "SELECT access_date FROM $TABLETRACK_ACCESS WHERE access_user_id = '".$results[$j][0]."' AND c_id = '".$courseId."' AND access_tool = 'learnpath'";
                 $last_access = StatsUtils::getOneResult($sql);
                 $last_access = empty($last_access) ? "-" : date('d.m.y', strtotime($last_access));
                 // END first/last access
                 // BEGIN presentation of data
-                $line .= $results[$j][1] . " " . $results[$j][2] . ";" . $first_access . ";" . $last_access . ";" . $lpath_pct_completed . "\n";
+                $line .= $results[$j][1]." ".$results[$j][2].";".$first_access.";".$last_access.";".$lpath_pct_completed."\n";
 
                 // END presentation of data
             }
         } else {
-            $line = get_lang('NoResult') . "\n";
+            $line = get_lang('NoResult')."\n";
         }
     }
 
@@ -163,9 +163,9 @@ 
 
         $sql = "SELECT count(*)
                 FROM $TABLECOURSUSER
-                WHERE c_id = '" . api_get_course_int_id() . "' AND relation_type<>" . COURSE_RELATION_TYPE_RRHH . "";
+                WHERE c_id = '".api_get_course_int_id()."' AND relation_type<>".COURSE_RELATION_TYPE_RRHH."";
         $count = StatsUtils::getOneResult($sql);
-        $title_line = get_lang('CountUsers') . " ; " . $count . "\n";
+        $title_line = get_lang('CountUsers')." ; ".$count."\n";
     }
 
     /* 	Access to this course */
@@ -183,7 +183,7 @@ 
                     AND access_tool IS NULL";
         $count = StatsUtils::getOneResult($sql);
 
-        $line .= get_lang('CountToolAccess') . " ; " . $count . "\n";
+        $line .= get_lang('CountToolAccess')." ; ".$count."\n";
 
         // last 31 days
         $sql = "SELECT count(*)
@@ -193,7 +193,7 @@ 
                     AND access_tool IS NULL";
         $count = StatsUtils::getOneResult($sql);
 
-        $line .= get_lang('Last31days') . " ; " . $count . "\n";
+        $line .= get_lang('Last31days')." ; ".$count."\n";
 
         // last 7 days
         $sql = "SELECT count(*)
@@ -203,7 +203,7 @@ 
                     AND access_tool IS NULL";
         $count = StatsUtils::getOneResult($sql);
 
-        $line .= get_lang('Last7days') . " ; " . $count . "\n";
+        $line .= get_lang('Last7days')." ; ".$count."\n";
 
         // today
         $sql = "SELECT count(*)
@@ -212,7 +212,7 @@ 
                     AND ( access_date > CURDATE() )
                     AND access_tool IS NULL";
         $count = StatsUtils::getOneResult($sql);
-        $line .= get_lang('ThisDay') . " ; " . $count . "\n";
+        $line .= get_lang('ThisDay')." ; ".$count."\n";
     }
 
     /* 	Tools */
@@ -221,7 +221,7 @@ 
         $tempView[2] = '0';
         $title[1] = $nameTools;
         $line = '';
-        $title_line = get_lang('ToolTitleToolnameColumn') . ";" . get_lang('ToolTitleUsersColumn') . ";" . get_lang('ToolTitleCountColumn') . "\n";
+        $title_line = get_lang('ToolTitleToolnameColumn').";".get_lang('ToolTitleUsersColumn').";".get_lang('ToolTitleCountColumn')."\n";
 
         $sql = "SELECT access_tool, COUNT(DISTINCT access_user_id),count( access_tool )
                 FROM $TABLETRACK_ACCESS
@@ -233,10 +233,10 @@ 
 
         if (is_array($results)) {
             for ($j = 0; $j < count($results); $j++) {
-                $line .= $results[$j][0] . "/" . get_lang($results[$j][0]) . ";" . $results[$j][1] . ";" . $results[$j][2] . "\n";
+                $line .= $results[$j][0]."/".get_lang($results[$j][0]).";".$results[$j][1].";".$results[$j][2]."\n";
             }
         } else {
-            $line = get_lang('NoResult') . "\n";
+            $line = get_lang('NoResult')."\n";
         }
     }
 
@@ -258,14 +258,14 @@ 
 
         $title[1] = $nameTools;
         $line = '';
-        $title_line = get_lang('LinksTitleLinkColumn') . ";" . get_lang('LinksTitleUsersColumn') . ";" . get_lang('LinksTitleCountColumn') . "\n";
+        $title_line = get_lang('LinksTitleLinkColumn').";".get_lang('LinksTitleUsersColumn').";".get_lang('LinksTitleCountColumn')."\n";
 
         if (is_array($results)) {
             for ($j = 0; $j < count($results); $j++) {
-                $line .= $results[$j][1] . "'>" . $results[$j][0] . ";" . $results[$j][2] . ";" . $results[$j][3] . "\n";
+                $line .= $results[$j][1]."'>".$results[$j][0].";".$results[$j][2].";".$results[$j][3]."\n";
             }
         } else {
-            $line = get_lang('NoResult') . "\n";
+            $line = get_lang('NoResult')."\n";
         }
     }
 
@@ -284,13 +284,13 @@ 
 
         $title[1] = $nameTools;
         $line = '';
-        $title_line = get_lang('DocumentsTitleDocumentColumn') . ";" . get_lang('DocumentsTitleUsersColumn') . ";" . get_lang('DocumentsTitleCountColumn') . "\n";
+        $title_line = get_lang('DocumentsTitleDocumentColumn').";".get_lang('DocumentsTitleUsersColumn').";".get_lang('DocumentsTitleCountColumn')."\n";
         if (is_array($results)) {
             for ($j = 0; $j < count($results); $j++) {
-                $line .= $results[$j][0] . ";" . $results[$j][1] . ";" . $results[$j][2] . "\n";
+                $line .= $results[$j][0].";".$results[$j][1].";".$results[$j][2]."\n";
             }
         } else {
-            $line = get_lang('NoResult') . "\n";
+            $line = get_lang('NoResult')."\n";
         }
     }
 
@@ -318,10 +318,10 @@ 
                 //echo "<a href='".api_get_self()."?view=".$view."&scormcontopen=".$ar['id']."' class='specialLink'>$lp_title</a>";
                 if ($ar['id'] == $scormcontopen) { //have to list the students here
                     $contentId = $ar['id'];
-                    $sql2 = "SELECT u.user_id, u.lastname, u.firstname " .
-                            "FROM  $tbl_learnpath_view sd " .
-                            "INNER JOIN $table_user u " .
-                            "ON u.user_id = sd.user_id " .
+                    $sql2 = "SELECT u.user_id, u.lastname, u.firstname ".
+                            "FROM  $tbl_learnpath_view sd ".
+                            "INNER JOIN $table_user u ".
+                            "ON u.user_id = sd.user_id ".
                             "WHERE sd.c_id = $course_id AND sd.lp_id=$contentId group by u.user_id";
                     //error_log($sql2,0);
                     $result2 = Database::query($sql2);
@@ -333,28 +333,28 @@ 
                         while ($ar2 != '') {
 
                             if (isset($_REQUEST["scormstudentopen"]) && $ar2['user_id'] == $scormstudentopen) {
-                                $line .= $ar['id'] . " " . $ar2['user_id'] . " " . api_get_person_name($ar2['firstname'], $ar2['lastname']);
+                                $line .= $ar['id']." ".$ar2['user_id']." ".api_get_person_name($ar2['firstname'], $ar2['lastname']);
                             } else {
-                                $line .= $ar['id'] . " " . $ar2['user_id'] . " " . api_get_person_name($ar2['firstname'], $ar2['lastname']);
+                                $line .= $ar['id']." ".$ar2['user_id']." ".api_get_person_name($ar2['firstname'], $ar2['lastname']);
                             }
 
                             if ($ar2['user_id'] == $scormstudentopen) { //have to list the student's results
                                 $studentId = $ar2['user_id'];
-                                $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time " .
-                                        "FROM $tbl_learnpath_item i " .
-                                        "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id " .
-                                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id " .
+                                $sql3 = "SELECT iv.status, iv.score, i.title, iv.total_time ".
+                                        "FROM $tbl_learnpath_item i ".
+                                        "INNER JOIN $tbl_learnpath_item_view iv ON i.id=iv.lp_item_id ".
+                                        "INNER JOIN $tbl_learnpath_view v ON iv.lp_view_id=v.id ".
                                         "WHERE 	i.c_id = $course_id AND
                                         		iv.c_id = $course_id AND
                                         		v.c_id = $course_id AND
                                 				v.user_id=$studentId and v.lp_id=$contentId ORDER BY v.id, i.id";
                                 $result3 = Database::query($sql3);
                                 $ar3 = Database::fetch_array($result3);
-                                $title_line .= get_lang('ScormTitleColumn') . ";" . get_lang('ScormStatusColumn') . ";" . get_lang('ScormScoreColumn') . ";" . get_lang('ScormTimeColumn');
+                                $title_line .= get_lang('ScormTitleColumn').";".get_lang('ScormStatusColumn').";".get_lang('ScormScoreColumn').";".get_lang('ScormTimeColumn');
                                 while ($ar3['status'] != '') {
                                     require_once '../lp/learnpathItem.class.php';
                                     $time = learnpathItem::getScormTimeFromParameter('php', $ar3['total_time']);
-                                    $line .= $title . ";" . $ar3['status'] . ";" . $ar3['score'] . ";" . $time;
+                                    $line .= $title.";".$ar3['status'].";".$ar3['score'].";".$time;
                                     $ar3 = Database::fetch_array($result3);
                                 }
                             }
@@ -374,23 +374,23 @@ 
      * Export to a CSV file
      * Force the browser to save the file instead of opening it.
      */
-    $len = strlen($title_line . $line);
+    $len = strlen($title_line.$line);
     header('Content-type: application/octet-stream');
     //header('Content-Type: application/force-download');
-    header('Content-length: ' . $len);
-    $filename = api_html_entity_decode(str_replace(":", "", str_replace(" ", "_", $title[0] . '_' . $title[1] . '.csv')));
+    header('Content-length: '.$len);
+    $filename = api_html_entity_decode(str_replace(":", "", str_replace(" ", "_", $title[0].'_'.$title[1].'.csv')));
     $filename = api_replace_dangerous_char($filename);
     if (preg_match("/MSIE 5.5/", $_SERVER['HTTP_USER_AGENT'])) {
-        header('Content-Disposition: filename= ' . $filename);
+        header('Content-Disposition: filename= '.$filename);
     } else {
-        header('Content-Disposition: attachment; filename= ' . $filename);
+        header('Content-Disposition: attachment; filename= '.$filename);
     }
     if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE')) {
         header('Pragma: ');
         header('Cache-Control: ');
         header('Cache-Control: public'); // IE cannot download from sessions without a cache
     }
-    header('Content-Description: ' . $filename);
+    header('Content-Description: '.$filename);
     header('Content-transfer-encoding: binary');
 
     echo api_html_entity_decode($title_line, ENT_COMPAT);

main/tracking/course_session_report.php

Indentation +122 added lines, -122 removed lines

@@ -14,23 +14,23 @@ 
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin;
 
 if (!$is_allowedToTrack) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $export_to_xls = false;
 if (isset($_GET['export'])) {
-	$export_to_xls = true;
+    $export_to_xls = true;
 }
 if (api_is_platform_admin() ) {
-	$global = true;
+    $global = true;
 } else {
-	$global = false;
+    $global = false;
 }
 $global = true;
 
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
 if (empty($session_id)) {
-	$session_id  = 1;
+    $session_id  = 1;
 }
 
 $form = new FormValidator('search_simple','POST','','',null,false);
@@ -39,10 +39,10 @@ 
 $session_list = SessionManager::get_sessions_list(array(), array('name'));
 $my_session_list = array();
 foreach($session_list as $sesion_item) {
-	$my_session_list[$sesion_item['id']] = $sesion_item['name'];
+    $my_session_list[$sesion_item['id']] = $sesion_item['name'];
 }
 if (count($session_list) == 0) {
-	$my_session_list[0] = get_lang('None');
+    $my_session_list[0] = get_lang('None');
 }
 $form->addElement('select', 'session_id', get_lang('Sessions'), $my_session_list);
 $form->addButtonFilter(get_lang('Filter'));
@@ -51,32 +51,32 @@ 
 if (!empty($_REQUEST['session_id'])) $session_id = intval($_REQUEST['session_id']); else $session_id = 0;
 
 if (empty($session_id)) {
-	$session_id = key($my_session_list);
+    $session_id = key($my_session_list);
 }
 $form->setDefaults(array('session_id'=>$session_id));
 $course_list = SessionManager::get_course_list_by_session_id($session_id);
 
 if (!$export_to_xls) {
-	Display :: display_header(get_lang("MySpace"));
-	echo '<div class="actions">';
+    Display :: display_header(get_lang("MySpace"));
+    echo '<div class="actions">';
 
-	if ($global) {
-		echo MySpace::getTopMenu();
-	} else {
-		echo '<div style="float:left; clear:left">
+    if ($global) {
+        echo MySpace::getTopMenu();
+    } else {
+        echo '<div style="float:left; clear:left">
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.get_lang('StudentsTracking').'</a>&nbsp;|
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.get_lang('CourseTracking').'</a>&nbsp;';
-		echo '</div>';
-	}
-	echo '</div>';
+        echo '</div>';
+    }
+    echo '</div>';
 
-	if  (api_is_platform_admin()) {
-		echo MySpace::getAdminActions();
-	}
+    if  (api_is_platform_admin()) {
+        echo MySpace::getAdminActions();
+    }
 
-	echo '<h2>'.get_lang('LPExerciseResultsBySession').'</h2>';
-	$form->display();
-	Display::display_normal_message(get_lang('StudentScoreAverageIsCalculatedBaseInAllLPsAndAllAttempts'));
+    echo '<h2>'.get_lang('LPExerciseResultsBySession').'</h2>';
+    $form->display();
+    Display::display_normal_message(get_lang('StudentScoreAverageIsCalculatedBaseInAllLPsAndAllAttempts'));
 }
 
 $users = SessionManager::get_users_by_session($session_id);
@@ -86,15 +86,15 @@ 
 $main_result = array();
 //Getting course list
 foreach ($course_list  as $current_course ) {
-	$course_info = api_get_course_info($current_course['code']);
-	$_course = $course_info;
-	$attempt_result = array();
+    $course_info = api_get_course_info($current_course['code']);
+    $_course = $course_info;
+    $attempt_result = array();
 
-	//Getting LP list
-	$list = new LearnpathList('', $current_course['code'], $session_id);
-	$lp_list = $list->get_flat_list();
+    //Getting LP list
+    $list = new LearnpathList('', $current_course['code'], $session_id);
+    $lp_list = $list->get_flat_list();
 
-	// Looping LPs
+    // Looping LPs
     foreach ($lp_list as $lp_id =>$lp) {
         $exercise_list = Event::get_all_exercises_from_lp($lp_id, $course_info['real_id']);
         // Looping Chamilo Exercises in LP
@@ -111,7 +111,7 @@ 
             }
         }
     }
-	$main_result[$current_course['code']] = $attempt_result;
+    $main_result[$current_course['code']] = $attempt_result;
 }
 
 $total_average_score = 0;
@@ -119,102 +119,102 @@ 
 $html_result = '';
 if (!empty($users) && is_array($users)) {
 
-	$html_result .= '<table  class="data_table">';
-	$html_result .= '<tr><th>'.get_lang('User').'</th>';
-	foreach($course_list as $item ) {
-		$html_result .= '<th>'.$item['title'].'<br /> '.get_lang('AverageScore').' %</th>';
-	}
-	$html_result .= '<th>'.get_lang('AverageScore').' %</th>';
-	$html_result .= '<th>'.get_lang('LastConnexionDate').'</th></tr>';
-
-	foreach ($users  as $user) {
-		$total_student = 0;
-		$counter ++;
-		$s_css_class = 'row_even';
-		if ($counter % 2 ==0 ) {
-			$s_css_class = 'row_odd';
-		}
-		$html_result .= "<tr class='$s_css_class'>
+    $html_result .= '<table  class="data_table">';
+    $html_result .= '<tr><th>'.get_lang('User').'</th>';
+    foreach($course_list as $item ) {
+        $html_result .= '<th>'.$item['title'].'<br /> '.get_lang('AverageScore').' %</th>';
+    }
+    $html_result .= '<th>'.get_lang('AverageScore').' %</th>';
+    $html_result .= '<th>'.get_lang('LastConnexionDate').'</th></tr>';
+
+    foreach ($users  as $user) {
+        $total_student = 0;
+        $counter ++;
+        $s_css_class = 'row_even';
+        if ($counter % 2 ==0 ) {
+            $s_css_class = 'row_odd';
+        }
+        $html_result .= "<tr class='$s_css_class'>
 							<td >";
-		$html_result .= $user['firstname'].' '.$user['lastname'];
-		$html_result .= "</td>";
-
-		// Getting course list
-
-		$counter = 0;
-		$total_result_by_user = 0;
-		foreach ($course_list  as $current_course ) {
-			$total_course = 0;
-			$html_result .= "<td>";
-
-
-			$result  = '-';
-			if (isset($main_result[$current_course['code']][$user['user_id']])) {
-				$user_info_stat = $main_result[$current_course['code']][$user['user_id']];
-				if (!empty($user_info_stat['result']) && !empty($user_info_stat['attempts'])) {
-					$result = round(
-						$user_info_stat['result'] / $user_info_stat['attempts'] * 100,
-						2
-					);
-					$total_course += $result;
-					$total_result_by_user += $result;
-					$course_average[$current_course['code']] += $total_course;
-					$course_average_counter[$current_course['code']]++;
-					$result = $result . ' (' . $user_info_stat['attempts'] . ' ' . get_lang(
-							'Attempts'
-						) . ')';
-					$counter++;
-				}
-			}
-
-			$html_result .= $result;
-			$html_result .= "</td>";
-		}
-		if (empty($counter)) {
-			$total_student = '-';
-		} else {
-			$total_student = $total_result_by_user/$counter;
-			$total_average_score+=$total_student;
-			$total_average_score_count++;
-		}
-		$string_date=Tracking :: get_last_connection_date($user['user_id'],true);
-		$html_result .="<td>$total_student</td><td>$string_date</td></tr>";
-	}
-
-	$html_result .="<tr><th>".get_lang('AverageScore')."</th>";
-	$total_average = 0;
-	$counter = 0;
-	foreach($course_list as $course_item) {
-		if (!empty($course_average_counter[$course_item['code']])) {
-			$average_per_course = round(
-				$course_average[$course_item['code']]/($course_average_counter[$course_item['code']]*100)*100,
-				2
-			);
-		} else {
-			$average_per_course = '-';
-		}
-		if (!empty($average_per_course)) {
-			$counter++;
-		}
-		$total_average = $total_average + $average_per_course;
-		$html_result .="<td>$average_per_course</td>";
-	}
-	if (!empty($total_average_score_count)) {
-		$total_average = round($total_average_score/($total_average_score_count*100)*100,2);
-	} else {
-		$total_average = '-';
-	}
-
-	$html_result .='<td>'.$total_average.'</td>';
-	$html_result .="<td>-</td>";
-	$html_result .="</tr>";
-	$html_result .= '</table>';
+        $html_result .= $user['firstname'].' '.$user['lastname'];
+        $html_result .= "</td>";
+
+        // Getting course list
+
+        $counter = 0;
+        $total_result_by_user = 0;
+        foreach ($course_list  as $current_course ) {
+            $total_course = 0;
+            $html_result .= "<td>";
+
+
+            $result  = '-';
+            if (isset($main_result[$current_course['code']][$user['user_id']])) {
+                $user_info_stat = $main_result[$current_course['code']][$user['user_id']];
+                if (!empty($user_info_stat['result']) && !empty($user_info_stat['attempts'])) {
+                    $result = round(
+                        $user_info_stat['result'] / $user_info_stat['attempts'] * 100,
+                        2
+                    );
+                    $total_course += $result;
+                    $total_result_by_user += $result;
+                    $course_average[$current_course['code']] += $total_course;
+                    $course_average_counter[$current_course['code']]++;
+                    $result = $result . ' (' . $user_info_stat['attempts'] . ' ' . get_lang(
+                            'Attempts'
+                        ) . ')';
+                    $counter++;
+                }
+            }
+
+            $html_result .= $result;
+            $html_result .= "</td>";
+        }
+        if (empty($counter)) {
+            $total_student = '-';
+        } else {
+            $total_student = $total_result_by_user/$counter;
+            $total_average_score+=$total_student;
+            $total_average_score_count++;
+        }
+        $string_date=Tracking :: get_last_connection_date($user['user_id'],true);
+        $html_result .="<td>$total_student</td><td>$string_date</td></tr>";
+    }
+
+    $html_result .="<tr><th>".get_lang('AverageScore')."</th>";
+    $total_average = 0;
+    $counter = 0;
+    foreach($course_list as $course_item) {
+        if (!empty($course_average_counter[$course_item['code']])) {
+            $average_per_course = round(
+                $course_average[$course_item['code']]/($course_average_counter[$course_item['code']]*100)*100,
+                2
+            );
+        } else {
+            $average_per_course = '-';
+        }
+        if (!empty($average_per_course)) {
+            $counter++;
+        }
+        $total_average = $total_average + $average_per_course;
+        $html_result .="<td>$average_per_course</td>";
+    }
+    if (!empty($total_average_score_count)) {
+        $total_average = round($total_average_score/($total_average_score_count*100)*100,2);
+    } else {
+        $total_average = '-';
+    }
+
+    $html_result .='<td>'.$total_average.'</td>';
+    $html_result .="<td>-</td>";
+    $html_result .="</tr>";
+    $html_result .= '</table>';
 } else {
-	Display::display_warning_message(get_lang('NoResults'));
+    Display::display_warning_message(get_lang('NoResults'));
 }
 
 if (!$export_to_xls) {
-	echo $html_result;
+    echo $html_result;
 }
 
 Display :: display_footer();

Spacing +25 added lines, -25 removed lines

@@ -21,7 +21,7 @@ 
 if (isset($_GET['export'])) {
 	$export_to_xls = true;
 }
-if (api_is_platform_admin() ) {
+if (api_is_platform_admin()) {
 	$global = true;
 } else {
 	$global = false;
@@ -30,15 +30,15 @@ 
 
 $session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
 if (empty($session_id)) {
-	$session_id  = 1;
+	$session_id = 1;
 }
 
-$form = new FormValidator('search_simple','POST','','',null,false);
+$form = new FormValidator('search_simple', 'POST', '', '', null, false);
 
 //Get session list
 $session_list = SessionManager::get_sessions_list(array(), array('name'));
 $my_session_list = array();
-foreach($session_list as $sesion_item) {
+foreach ($session_list as $sesion_item) {
 	$my_session_list[$sesion_item['id']] = $sesion_item['name'];
 }
 if (count($session_list) == 0) {
@@ -70,7 +70,7 @@ 
 	}
 	echo '</div>';
 
-	if  (api_is_platform_admin()) {
+	if (api_is_platform_admin()) {
 		echo MySpace::getAdminActions();
 	}
 
@@ -85,7 +85,7 @@ 
 $counter = 0;
 $main_result = array();
 //Getting course list
-foreach ($course_list  as $current_course ) {
+foreach ($course_list  as $current_course) {
 	$course_info = api_get_course_info($current_course['code']);
 	$_course = $course_info;
 	$attempt_result = array();
@@ -121,7 +121,7 @@ 
 
 	$html_result .= '<table  class="data_table">';
 	$html_result .= '<tr><th>'.get_lang('User').'</th>';
-	foreach($course_list as $item ) {
+	foreach ($course_list as $item) {
 		$html_result .= '<th>'.$item['title'].'<br /> '.get_lang('AverageScore').' %</th>';
 	}
 	$html_result .= '<th>'.get_lang('AverageScore').' %</th>';
@@ -129,9 +129,9 @@ 
 
 	foreach ($users  as $user) {
 		$total_student = 0;
-		$counter ++;
+		$counter++;
 		$s_css_class = 'row_even';
-		if ($counter % 2 ==0 ) {
+		if ($counter % 2 == 0) {
 			$s_css_class = 'row_odd';
 		}
 		$html_result .= "<tr class='$s_css_class'>
@@ -143,12 +143,12 @@ 
 
 		$counter = 0;
 		$total_result_by_user = 0;
-		foreach ($course_list  as $current_course ) {
+		foreach ($course_list  as $current_course) {
 			$total_course = 0;
 			$html_result .= "<td>";
 
 
-			$result  = '-';
+			$result = '-';
 			if (isset($main_result[$current_course['code']][$user['user_id']])) {
 				$user_info_stat = $main_result[$current_course['code']][$user['user_id']];
 				if (!empty($user_info_stat['result']) && !empty($user_info_stat['attempts'])) {
@@ -160,9 +160,9 @@ 
 					$total_result_by_user += $result;
 					$course_average[$current_course['code']] += $total_course;
 					$course_average_counter[$current_course['code']]++;
-					$result = $result . ' (' . $user_info_stat['attempts'] . ' ' . get_lang(
+					$result = $result.' ('.$user_info_stat['attempts'].' '.get_lang(
 							'Attempts'
-						) . ')';
+						).')';
 					$counter++;
 				}
 			}
@@ -173,21 +173,21 @@ 
 		if (empty($counter)) {
 			$total_student = '-';
 		} else {
-			$total_student = $total_result_by_user/$counter;
-			$total_average_score+=$total_student;
+			$total_student = $total_result_by_user / $counter;
+			$total_average_score += $total_student;
 			$total_average_score_count++;
 		}
-		$string_date=Tracking :: get_last_connection_date($user['user_id'],true);
-		$html_result .="<td>$total_student</td><td>$string_date</td></tr>";
+		$string_date = Tracking :: get_last_connection_date($user['user_id'], true);
+		$html_result .= "<td>$total_student</td><td>$string_date</td></tr>";
 	}
 
-	$html_result .="<tr><th>".get_lang('AverageScore')."</th>";
+	$html_result .= "<tr><th>".get_lang('AverageScore')."</th>";
 	$total_average = 0;
 	$counter = 0;
-	foreach($course_list as $course_item) {
+	foreach ($course_list as $course_item) {
 		if (!empty($course_average_counter[$course_item['code']])) {
 			$average_per_course = round(
-				$course_average[$course_item['code']]/($course_average_counter[$course_item['code']]*100)*100,
+				$course_average[$course_item['code']] / ($course_average_counter[$course_item['code']] * 100) * 100,
 				2
 			);
 		} else {
@@ -197,17 +197,17 @@ 
 			$counter++;
 		}
 		$total_average = $total_average + $average_per_course;
-		$html_result .="<td>$average_per_course</td>";
+		$html_result .= "<td>$average_per_course</td>";
 	}
 	if (!empty($total_average_score_count)) {
-		$total_average = round($total_average_score/($total_average_score_count*100)*100,2);
+		$total_average = round($total_average_score / ($total_average_score_count * 100) * 100, 2);
 	} else {
 		$total_average = '-';
 	}
 
-	$html_result .='<td>'.$total_average.'</td>';
-	$html_result .="<td>-</td>";
-	$html_result .="</tr>";
+	$html_result .= '<td>'.$total_average.'</td>';
+	$html_result .= "<td>-</td>";
+	$html_result .= "</tr>";
 	$html_result .= '</table>';
 } else {
 	Display::display_warning_message(get_lang('NoResults'));

Braces +10 added lines, -2 removed lines

@@ -47,8 +47,16 @@
 $form->addElement('select', 'session_id', get_lang('Sessions'), $my_session_list);
 $form->addButtonFilter(get_lang('Filter'));
 
-if (!empty($_REQUEST['score']))	$filter_score = intval($_REQUEST['score']); else $filter_score = 70;
-if (!empty($_REQUEST['session_id'])) $session_id = intval($_REQUEST['session_id']); else $session_id = 0;
+if (!empty($_REQUEST['score'])) {
+    $filter_score = intval($_REQUEST['score']);
+} else {
+    $filter_score = 70;
+}
+if (!empty($_REQUEST['session_id'])) {
+    $session_id = intval($_REQUEST['session_id']);
+} else {
+    $session_id = 0;
+}
 
 if (empty($session_id)) {
 	$session_id = key($my_session_list);

main/tracking/question_course_report.php

Indentation +107 added lines, -107 removed lines

@@ -14,20 +14,20 @@ 
 $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin;
 
 if (!$is_allowedToTrack) {
-	Display :: display_header(null);
-	api_not_allowed();
-	Display :: display_footer();
+    Display :: display_header(null);
+    api_not_allowed();
+    Display :: display_footer();
 }
 
 $export_to_xls = false;
 if (isset($_GET['export'])) {
-	$export_to_xls = true;
+    $export_to_xls = true;
 }
 
 if (api_is_platform_admin() ) {
-	$global = true;
+    $global = true;
 } else {
-	$global = false;
+    $global = false;
 }
 $global = true;
 
@@ -45,14 +45,14 @@ 
 $session_id = isset($_REQUEST['session_id']) ? intval($_REQUEST['session_id']) : null;
 
 if (empty($session_id)) {
-	$temp_course_list = CourseManager :: get_courses_list();
+    $temp_course_list = CourseManager :: get_courses_list();
 } else {
-	$temp_course_list = SessionManager::get_course_list_by_session_id($session_id);
+    $temp_course_list = SessionManager::get_course_list_by_session_id($session_id);
 }
 
 foreach ($temp_course_list  as $temp_course_item) {
-	$course_item = CourseManager ::get_course_information($temp_course_item['code']);
-	$course_select_list[$temp_course_item['code']]	= $course_item['title'];
+    $course_item = CourseManager ::get_course_information($temp_course_item['code']);
+    $course_select_list[$temp_course_item['code']]	= $course_item['title'];
 }
 
 //Get session list
@@ -95,132 +95,132 @@ 
 $course_info = api_get_course_info($course_code);
 
 if (!empty($course_info)) {
-	$list = new LearnpathList('', $course_code);
-	$lp_list = $list->get_flat_list();
+    $list = new LearnpathList('', $course_code);
+    $lp_list = $list->get_flat_list();
 
-	$main_question_list = array();
+    $main_question_list = array();
 
-	foreach ($lp_list as $lp_id => $lp) {
+    foreach ($lp_list as $lp_id => $lp) {
         $exercise_list = Event::get_all_exercises_from_lp(
             $lp_id,
             $course_info['real_id']
         );
 
-		foreach ($exercise_list as $exercise) {
-			$my_exercise = new Exercise($course_info['real_id']);
-			$my_exercise->read($exercise['path']);
-			$question_list = $my_exercise->selectQuestionList();
-
-			$exercise_stats = Event::get_all_exercise_event_from_lp(
-				$exercise['path'],
-				$course_info['real_id'],
-				$session_id
-			);
-
-			foreach ($question_list as $question_id) {
-				$question_data = Question::read($question_id);
-				$main_question_list[$question_id] = $question_data;
-				$quantity_exercises = 0;
-				$question_result = 0;
-
-				foreach ($exercise_stats as $stats) {
-					if (!empty($stats['question_list'])) {
-						foreach($stats['question_list'] as $my_question_stat) {
-							if ($question_id == $my_question_stat['question_id']) {
-								$question_result =  $question_result + $my_question_stat['marks'];
-								$quantity_exercises++;
-							}
-						}
-					}
-				}
-
-				if (!empty($quantity_exercises)) {
-					// Score % average
-					$main_question_list[$question_id]->results = ($question_result / ($quantity_exercises));
-				} else {
-					$main_question_list[$question_id]->results = 0;
-				}
-
-				$main_question_list[$question_id]->quantity = $quantity_exercises;
-			}
-		}
-	}
+        foreach ($exercise_list as $exercise) {
+            $my_exercise = new Exercise($course_info['real_id']);
+            $my_exercise->read($exercise['path']);
+            $question_list = $my_exercise->selectQuestionList();
+
+            $exercise_stats = Event::get_all_exercise_event_from_lp(
+                $exercise['path'],
+                $course_info['real_id'],
+                $session_id
+            );
+
+            foreach ($question_list as $question_id) {
+                $question_data = Question::read($question_id);
+                $main_question_list[$question_id] = $question_data;
+                $quantity_exercises = 0;
+                $question_result = 0;
+
+                foreach ($exercise_stats as $stats) {
+                    if (!empty($stats['question_list'])) {
+                        foreach($stats['question_list'] as $my_question_stat) {
+                            if ($question_id == $my_question_stat['question_id']) {
+                                $question_result =  $question_result + $my_question_stat['marks'];
+                                $quantity_exercises++;
+                            }
+                        }
+                    }
+                }
+
+                if (!empty($quantity_exercises)) {
+                    // Score % average
+                    $main_question_list[$question_id]->results = ($question_result / ($quantity_exercises));
+                } else {
+                    $main_question_list[$question_id]->results = 0;
+                }
+
+                $main_question_list[$question_id]->quantity = $quantity_exercises;
+            }
+        }
+    }
 }
 
 if (!$export_to_xls) {
-	Display :: display_header(get_lang("MySpace"));
-	echo '<div class="actions">';
-	if ($global) {
-		echo MySpace::getTopMenu();
-	} else {
-		echo '<div style="float:left; clear:left">
+    Display :: display_header(get_lang("MySpace"));
+    echo '<div class="actions">';
+    if ($global) {
+        echo MySpace::getTopMenu();
+    } else {
+        echo '<div style="float:left; clear:left">
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=true">'.
                     get_lang('StudentsTracking').'</a>&nbsp;|
 				<a href="courseLog.php?'.api_get_cidreq().'&studentlist=false">'.
                     get_lang('CourseTracking').'</a>&nbsp;';
-		echo '</div>';
-	}
-	echo '</div>';
+        echo '</div>';
+    }
+    echo '</div>';
 
-	if (api_is_platform_admin()) {
-		echo MySpace::getAdminActions();
-	}
-	echo '<br />';
-	echo '<h2>'.get_lang('LPQuestionListResults').'</h2>';
+    if (api_is_platform_admin()) {
+        echo MySpace::getAdminActions();
+    }
+    echo '<br />';
+    echo '<h2>'.get_lang('LPQuestionListResults').'</h2>';
 
-	$form->display();
+    $form->display();
 
-	if (empty($course_code)) {
-		Display::display_warning_message(get_lang('PleaseSelectACourse'));
-	}
+    if (empty($course_code)) {
+        Display::display_warning_message(get_lang('PleaseSelectACourse'));
+    }
 }
 
 $course_average = array();
 $counter = 0;
 
 if (!empty($main_question_list) && is_array($main_question_list)) {
-	$html_result .= '<table  class="data_table">';
-	$html_result .= '<tr><th>'.get_lang('Question').
+    $html_result .= '<table  class="data_table">';
+    $html_result .= '<tr><th>'.get_lang('Question').
                     Display :: return_icon('info3.gif', get_lang('QuestionsAreTakenFromLPExercises'), array('align' => 'absmiddle', 'hspace' => '3px')).'</th>';
-	$html_result .= '<th>'.$course_info['visual_code'].' '.get_lang('AverageScore').Display :: return_icon('info3.gif', get_lang('AllStudentsAttemptsAreConsidered'), array('align' => 'absmiddle', 'hspace' => '3px')).' </th>';
-	$html_result .= '<th>'.get_lang('Quantity').'</th>';
-
-	foreach ($main_question_list as $question) {
-		$total_student = 0;
-		$counter ++;
-		$s_css_class = 'row_even';
-		if ($counter % 2 ==0 ) {
-			$s_css_class = 'row_odd';
-		}
-		$html_result .= "<tr class='$s_css_class'>
+    $html_result .= '<th>'.$course_info['visual_code'].' '.get_lang('AverageScore').Display :: return_icon('info3.gif', get_lang('AllStudentsAttemptsAreConsidered'), array('align' => 'absmiddle', 'hspace' => '3px')).' </th>';
+    $html_result .= '<th>'.get_lang('Quantity').'</th>';
+
+    foreach ($main_question_list as $question) {
+        $total_student = 0;
+        $counter ++;
+        $s_css_class = 'row_even';
+        if ($counter % 2 ==0 ) {
+            $s_css_class = 'row_odd';
+        }
+        $html_result .= "<tr class='$s_css_class'>
 							<td >";
-		$question_title = trim($question->question);
-		if (empty($question_title)) {
-			$html_result .= get_lang('Untitled').' '.get_lang('Question').' #'.$question->id;
-		} else {
-			$html_result .= $question->question;
-		}
-
-		$html_result .= "</td>";
-		$html_result .= "<td>";
-		$html_result .= round($question->results, 2).' / '.$question->weighting;
-		$html_result .= "</td>";
-
-		$html_result .= "<td>";
-		$html_result .= $question->quantity;
-		$html_result .= "</td>";
-	}
-
-	$html_result .="</tr>";
-	$html_result .= '</table>';
+        $question_title = trim($question->question);
+        if (empty($question_title)) {
+            $html_result .= get_lang('Untitled').' '.get_lang('Question').' #'.$question->id;
+        } else {
+            $html_result .= $question->question;
+        }
+
+        $html_result .= "</td>";
+        $html_result .= "<td>";
+        $html_result .= round($question->results, 2).' / '.$question->weighting;
+        $html_result .= "</td>";
+
+        $html_result .= "<td>";
+        $html_result .= $question->quantity;
+        $html_result .= "</td>";
+    }
+
+    $html_result .="</tr>";
+    $html_result .= '</table>';
 } else {
-	if (!empty($course_code)) {
-		Display::display_warning_message(get_lang('NoResults'));
-	}
+    if (!empty($course_code)) {
+        Display::display_warning_message(get_lang('NoResults'));
+    }
 }
 
 if (!$export_to_xls) {
-	echo $html_result;
+    echo $html_result;
 }
 
 Display :: display_footer();

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
 	$export_to_xls = true;
 }
 
-if (api_is_platform_admin() ) {
+if (api_is_platform_admin()) {
 	$global = true;
 } else {
 	$global = false;
@@ -52,7 +52,7 @@ 
 
 foreach ($temp_course_list  as $temp_course_item) {
 	$course_item = CourseManager ::get_course_information($temp_course_item['code']);
-	$course_select_list[$temp_course_item['code']]	= $course_item['title'];
+	$course_select_list[$temp_course_item['code']] = $course_item['title'];
 }
 
 //Get session list
@@ -90,7 +90,7 @@ 
     $course_code = 0;
 }
 
-$form->setDefaults(array('course_code'=>(string)$course_code));
+$form->setDefaults(array('course_code'=>(string) $course_code));
 
 $course_info = api_get_course_info($course_code);
 
@@ -125,9 +125,9 @@ 
 
 				foreach ($exercise_stats as $stats) {
 					if (!empty($stats['question_list'])) {
-						foreach($stats['question_list'] as $my_question_stat) {
+						foreach ($stats['question_list'] as $my_question_stat) {
 							if ($question_id == $my_question_stat['question_id']) {
-								$question_result =  $question_result + $my_question_stat['marks'];
+								$question_result = $question_result + $my_question_stat['marks'];
 								$quantity_exercises++;
 							}
 						}
@@ -187,9 +187,9 @@ 
 
 	foreach ($main_question_list as $question) {
 		$total_student = 0;
-		$counter ++;
+		$counter++;
 		$s_css_class = 'row_even';
-		if ($counter % 2 ==0 ) {
+		if ($counter % 2 == 0) {
 			$s_css_class = 'row_odd';
 		}
 		$html_result .= "<tr class='$s_css_class'>
@@ -211,7 +211,7 @@ 
 		$html_result .= "</td>";
 	}
 
-	$html_result .="</tr>";
+	$html_result .= "</tr>";
 	$html_result .= '</table>';
 } else {
 	if (!empty($course_code)) {

main/portfolio/share.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * @license see /license.txt
  * @author Laurent Opprecht <laurent@opprecht.info> for the Univesity of Geneva
  */
-require_once __DIR__ . '/../inc/global.inc.php';
+require_once __DIR__.'/../inc/global.inc.php';
 
 $has_access = api_protect_course_script();
 if (!$has_access) {

main/install/index.php

Braces +4 added lines, -1 removed lines

@@ -445,7 +445,10 @@
     }
 }
     ?>
-    <input type="hidden" name="updatePath"         value="<?php if (!$badUpdatePath) echo api_htmlentities($proposedUpdatePath, ENT_QUOTES); ?>" />
+    <input type="hidden" name="updatePath"         value="<?php if (!$badUpdatePath) {
+    echo api_htmlentities($proposedUpdatePath, ENT_QUOTES);
+}
+?>" />
     <input type="hidden" name="urlAppendPath"      value="<?php echo api_htmlentities($urlAppendPath, ENT_QUOTES); ?>" />
     <input type="hidden" name="pathForm"           value="<?php echo api_htmlentities($pathForm, ENT_QUOTES); ?>" />
     <input type="hidden" name="urlForm"            value="<?php echo api_htmlentities($urlForm, ENT_QUOTES); ?>" />

Spacing +7 added lines, -7 removed lines

@@ -105,7 +105,7 @@ 
 \Patchwork\Utf8\Bootup::initAll();
 
 // Page encoding initialization.
-header('Content-Type: text/html; charset='. $charset);
+header('Content-Type: text/html; charset='.$charset);
 
 // Setting the error reporting levels.
 error_reporting(E_ALL);
@@ -215,7 +215,7 @@ 
     // This is the main configuration file of the system before the upgrade.
     // Old configuration file.
     // Don't change to include_once
-    $oldConfigPath = api_get_path(SYS_CODE_PATH) . 'inc/conf/configuration.php';
+    $oldConfigPath = api_get_path(SYS_CODE_PATH).'inc/conf/configuration.php';
     if (file_exists($oldConfigPath)) {
         include $oldConfigPath;
     }
@@ -345,7 +345,7 @@ 
             //Blocking step6 button
             $("#button_step6").click(function() {
                 $("#button_step6").hide();
-                $("#button_please_wait").html('<?php echo addslashes(get_lang('PleaseWait'));?>');
+                $("#button_please_wait").html('<?php echo addslashes(get_lang('PleaseWait')); ?>');
                 $("#button_please_wait").show();
                 $("#button_please_wait").attr('disabled', true);
                 $("#is_executable").attr("value",'step6');
@@ -412,7 +412,7 @@ 
 
 $instalation_type_label = '';
 if ($installType == 'new') {
-    $instalation_type_label  = get_lang('NewInstallation');
+    $instalation_type_label = get_lang('NewInstallation');
 } elseif ($installType == 'update') {
     $update_from_version = isset($update_from_version) ? $update_from_version : null;
     $instalation_type_label = get_lang('UpdateFromLMSVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : '');
@@ -582,8 +582,8 @@ 
 
     <?php
     if ($installType == 'new') {
-        echo get_lang('AdminLogin') . ' : <strong>' . $loginForm . '</strong><br />';
-        echo get_lang('AdminPass') . ' : <strong>' . $passForm . '</strong><br /><br />'; /* TODO: Maybe this password should be hidden too? */
+        echo get_lang('AdminLogin').' : <strong>'.$loginForm.'</strong><br />';
+        echo get_lang('AdminPass').' : <strong>'.$passForm.'</strong><br /><br />'; /* TODO: Maybe this password should be hidden too? */
     }
     $allowSelfRegistrationLiteral = ($allowSelfReg == 'true') ? get_lang('Yes') : ($allowSelfReg == 'approval' ? get_lang('Approval') : get_lang('No'));
     echo get_lang('AdminFirstName').' : '.$adminFirstName, '<br />', get_lang('AdminLastName').' : '.$adminLastName, '<br />';
@@ -595,7 +595,7 @@ 
     <?php echo get_lang('DBLogin').' : '.$dbUsernameForm; ?><br />
     <?php echo get_lang('DBPassword').' : '.str_repeat('*', api_strlen($dbPassForm)); ?><br />
     <?php echo get_lang('MainDB').' : <strong>'.$dbNameForm; ?></strong><br />
-    <?php echo get_lang('AllowSelfReg').' : '. $allowSelfRegistrationLiteral; ?><br />
+    <?php echo get_lang('AllowSelfReg').' : '.$allowSelfRegistrationLiteral; ?><br />
     <?php echo get_lang('EncryptMethodUserPass').' : ';
     echo $encryptPassForm;
     ?>

main/install/install_files.inc.php

Spacing +16 added lines, -16 removed lines

@@ -17,7 +17,7 @@ 
 if (defined('SYSTEM_INSTALLATION')) {
 
     // Write the system config file
-    write_system_config_file(api_get_path(CONFIGURATION_PATH) . 'configuration.php');
+    write_system_config_file(api_get_path(CONFIGURATION_PATH).'configuration.php');
 
     // Write a distribution file with the config as a backup for the admin
     //write_system_config_file(api_get_path(CONFIGURATION_PATH) . 'configuration.dist.php');
@@ -27,33 +27,33 @@ 
 
     // Copy distribution files with renaming for being the actual system configuration files.
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'add_course.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'add_course.conf.php'
+        api_get_path(CONFIGURATION_PATH).'add_course.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'add_course.conf.php'
     );
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'course_info.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'course_info.conf.php'
+        api_get_path(CONFIGURATION_PATH).'course_info.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'course_info.conf.php'
     );
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'mail.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'mail.conf.php'
+        api_get_path(CONFIGURATION_PATH).'mail.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'mail.conf.php'
     );
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'profile.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'profile.conf.php'
+        api_get_path(CONFIGURATION_PATH).'profile.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'profile.conf.php'
     );
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'events.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'events.conf.php'
+        api_get_path(CONFIGURATION_PATH).'events.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'events.conf.php'
     );
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'auth.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'auth.conf.php'
+        api_get_path(CONFIGURATION_PATH).'auth.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'auth.conf.php'
     );
     copy(
-        api_get_path(CONFIGURATION_PATH) . 'portfolio.conf.dist.php',
-        api_get_path(CONFIGURATION_PATH) . 'portfolio.conf.php'
+        api_get_path(CONFIGURATION_PATH).'portfolio.conf.dist.php',
+        api_get_path(CONFIGURATION_PATH).'portfolio.conf.php'
     );
 } else {
-    echo 'You are not allowed here !' . __FILE__;
+    echo 'You are not allowed here !'.__FILE__;
 }

main/install/update-configuration.inc.php

Indentation +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         if (stripos($line, '$_configuration[\'system_version\']') !== false) {
             $found_version = true;
             $line = '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n";
-       } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
+        } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
             $found_stable = true;
             $line = '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n";
         } elseif (stripos($line, '$_configuration[\'software_name\']') !== false) {

Spacing +13 added lines, -13 removed lines

@@ -10,11 +10,11 @@ 
  */
 if (defined('SYSTEM_INSTALLATION')) {
 
-    error_log("Starting " . basename(__FILE__));
+    error_log("Starting ".basename(__FILE__));
     $perm = api_get_permissions_for_new_files();
 
-    $oldConfFile = api_get_path(SYS_CODE_PATH) . 'inc/conf/configuration.php';
-    $newConfFile = api_get_path(CONFIGURATION_PATH) . 'configuration.php';
+    $oldConfFile = api_get_path(SYS_CODE_PATH).'inc/conf/configuration.php';
+    $newConfFile = api_get_path(CONFIGURATION_PATH).'configuration.php';
 
     if (file_exists($oldConfFile)) {
         copy($oldConfFile, $newConfFile);
@@ -37,18 +37,18 @@ 
         $ignore = false;
         if (stripos($line, '$_configuration[\'system_version\']') !== false) {
             $found_version = true;
-            $line = '$_configuration[\'system_version\'] = \'' . $GLOBALS['new_version'] . '\';' . "\r\n";
+            $line = '$_configuration[\'system_version\'] = \''.$GLOBALS['new_version'].'\';'."\r\n";
        } elseif (stripos($line, '$_configuration[\'system_stable\']') !== false) {
             $found_stable = true;
-            $line = '$_configuration[\'system_stable\'] = ' . ($GLOBALS['new_version_stable'] ? 'true' : 'false') . ';' . "\r\n";
+            $line = '$_configuration[\'system_stable\'] = '.($GLOBALS['new_version_stable'] ? 'true' : 'false').';'."\r\n";
         } elseif (stripos($line, '$_configuration[\'software_name\']') !== false) {
             $found_software_name = true;
-            $line = '$_configuration[\'software_name\'] = \'' . $GLOBALS['software_name'] . '\';' . "\r\n";
+            $line = '$_configuration[\'software_name\'] = \''.$GLOBALS['software_name'].'\';'."\r\n";
         } elseif (stripos($line, '$_configuration[\'software_url\']') !== false) {
             $found_software_url = true;
-            $line = '$_configuration[\'software_url\'] = \'' . $GLOBALS['software_url'] . '\';' . "\r\n";
+            $line = '$_configuration[\'software_url\'] = \''.$GLOBALS['software_url'].'\';'."\r\n";
         } elseif (stripos($line, '$userPasswordCrypted') !== false) {
-            $line = '$_configuration[\'password_encryption\'] = \'' .$userPasswordCrypted.'\';' . "\r\n";
+            $line = '$_configuration[\'password_encryption\'] = \''.$userPasswordCrypted.'\';'."\r\n";
         } elseif (stripos($line, '?>') !== false) {
             $ignore = true;
         }
@@ -58,21 +58,21 @@ 
     }
 
     if (!$found_version) {
-        fwrite($fh, '$_configuration[\'system_version\'] = \'' . $new_version . '\';' . "\r\n");
+        fwrite($fh, '$_configuration[\'system_version\'] = \''.$new_version.'\';'."\r\n");
     }
     if (!$found_stable) {
-        fwrite($fh, '$_configuration[\'system_stable\'] = ' . ($new_version_stable ? 'true' : 'false') . ';' . "\r\n");
+        fwrite($fh, '$_configuration[\'system_stable\'] = '.($new_version_stable ? 'true' : 'false').';'."\r\n");
     }
     if (!$found_software_name) {
-        fwrite($fh, '$_configuration[\'software_name\'] = \'' . $software_name . '\';' . "\r\n");
+        fwrite($fh, '$_configuration[\'software_name\'] = \''.$software_name.'\';'."\r\n");
     }
     if (!$found_software_url) {
-        fwrite($fh, '$_configuration[\'software_url\'] = \'' . $software_url . '\';' . "\r\n");
+        fwrite($fh, '$_configuration[\'software_url\'] = \''.$software_url.'\';'."\r\n");
     }
     fwrite($fh, '?>');
     fclose($fh);
 
     error_log("configuration.php file updated.");
 } else {
-    echo 'You are not allowed here !'. __FILE__;
+    echo 'You are not allowed here !'.__FILE__;
 }

main/link/link_goto.php

Spacing +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
 // Launch event
 Event::event_link($linkId);
 
-header("Cache-Control: no-store, no-cache, must-revalidate");   // HTTP/1.1
+header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1
 header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");                                     // HTTP/1.0
+header("Pragma: no-cache"); // HTTP/1.0
 header("Location: $linkUrl");
 exit;