chamilo / chamilo-lms

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;

main/course_description/listing.php

Indentation +15 added lines, -15 removed lines

@@ -18,27 +18,27 @@ 
     }
     $categories[ADD_BLOCK] = get_lang('NewBloc');
 
-	$i=1;
-	echo '<div class="actions" style="margin-bottom:30px">';
-	ksort($categories);
-	foreach ($categories as $id => $title) {
-		if ($i==ADD_BLOCK) {
-			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
+    $i=1;
+    echo '<div class="actions" style="margin-bottom:30px">';
+    ksort($categories);
+    foreach ($categories as $id => $title) {
+        if ($i==ADD_BLOCK) {
+            echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
                 Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
-			break;
-		} else {
-			echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
+            break;
+        } else {
+            echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
                 Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
-			$i++;
-		}
-	}
-	echo '</div>';
+            $i++;
+        }
+    }
+    echo '</div>';
 }
 $history = isset($history) ? $history : null;
 
 // display course description list
 if ($history) {
-	echo '<div>
+    echo '<div>
         <table width="100%">
             <tr>
                 <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
@@ -49,7 +49,7 @@ 
 $user_info = api_get_user_info();
 
 if (isset($descriptions) && count($descriptions) > 0) {
-	foreach ($descriptions as $id => $description) {
+    foreach ($descriptions as $id => $description) {
         if (!empty($description)) {
             $actions = '';
             if (api_is_allowed_to_edit(null,true) && !$history) {

Spacing +9 added lines, -9 removed lines

@@ -11,18 +11,18 @@ 
 api_protect_course_script(true);
 
 // display actions menu
-if (api_is_allowed_to_edit(null,true)) {
+if (api_is_allowed_to_edit(null, true)) {
     $categories = array();
     foreach ($default_description_titles as $id => $title) {
         $categories[$id] = $title;
     }
     $categories[ADD_BLOCK] = get_lang('NewBloc');
 
-	$i=1;
+	$i = 1;
 	echo '<div class="actions" style="margin-bottom:30px">';
 	ksort($categories);
 	foreach ($categories as $id => $title) {
-		if ($i==ADD_BLOCK) {
+		if ($i == ADD_BLOCK) {
 			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
                 Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
 			break;
@@ -43,7 +43,7 @@ 
             <tr>
                 <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
                 <td align="right"><a href="index.php?action=listing">'.
-                Display::return_icon('info.png',get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'),ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
+                Display::return_icon('info.png', get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'), ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
 }
 
 $user_info = api_get_user_info();
@@ -52,21 +52,21 @@ 
 	foreach ($descriptions as $id => $description) {
         if (!empty($description)) {
             $actions = '';
-            if (api_is_allowed_to_edit(null,true) && !$history) {
+            if (api_is_allowed_to_edit(null, true) && !$history) {
                 if (api_get_session_id() == $description['session_id']) {
                     $description['title'] = $description['title'].' '.api_get_session_image(api_get_session_id(), $user_info['status']);
 
                     // delete
-                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES,api_get_system_encoding())).'\')) return false;">';
-                    $actions .= Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
+                    $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=delete&description_type='.$description['description_type'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, api_get_system_encoding())).'\')) return false;">';
+                    $actions .= Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'), ICON_SIZE_SMALL);
                     $actions .= '</a> ';
 
                     // edit
                     $actions .= '<a href="'.api_get_self().'?id='.$description['id'].'&'.api_get_cidreq_params(api_get_course_id(), $description['session_id']).'&action=edit&description_type='.$description['description_type'].'">';
-                    $actions .= Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'),ICON_SIZE_SMALL);
+                    $actions .= Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'), ICON_SIZE_SMALL);
                     $actions .= '</a> ';
                 } else {
-                    $actions .= Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL);
+                    $actions .= Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'), ICON_SIZE_SMALL);
                 }
             }
             echo Display::panel(

main/course_description/edit.php

Indentation +41 added lines, -41 removed lines

@@ -10,67 +10,67 @@ 
 // protect a course script
 api_protect_course_script(true);
 if (empty($id)) {
-	$id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : '';
-	if (empty($id)) {
-		// If the ID was not provided, find the first matching description item given the item type
-		$course_description = new CourseDescription();
-		$description = $course_description->get_data_by_description_type($description_type);
-		if (count($description) > 0) {
-			$id = $description['id'];
-		}
-		// If no corresponding description is found, edit a new one
-		unset($course_description);
-	}
+    $id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : '';
+    if (empty($id)) {
+        // If the ID was not provided, find the first matching description item given the item type
+        $course_description = new CourseDescription();
+        $description = $course_description->get_data_by_description_type($description_type);
+        if (count($description) > 0) {
+            $id = $description['id'];
+        }
+        // If no corresponding description is found, edit a new one
+        unset($course_description);
+    }
 }
 $original_id = $id;
 
 if (empty($error)) {
-	$token = Security::get_token();
+    $token = Security::get_token();
 }
 // display categories
 $categories = array();
 foreach ($default_description_titles as $id => $title) {
-	$categories[$id] = $title;
+    $categories[$id] = $title;
 }
 $categories[ADD_BLOCK] = get_lang('NewBloc');
 
 $i=1;
 echo '<div class="actions" style="margin-bottom:30px">';
 echo '<a href="index.php?'.api_get_cidreq().'">'.
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
-	'</a>';
+        Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
+    '</a>';
 
 ksort($categories);
 foreach ($categories as $id => $title) {
-	if ($i==ADD_BLOCK) {
-		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
-		break;
-	} else {
-		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
-		$i++;
-	}
+    if ($i==ADD_BLOCK) {
+        echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
+            Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+        break;
+    } else {
+        echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
+            Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+        $i++;
+    }
 }
 echo '</div>';
 
 // error messages
 if (isset($error) && intval($error) == 1) {
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
+    Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
 }
 
 // default header title form
 $description_type = intval($description_type);
 $header = $default_description_titles[$description_type];
 if ($description_type >= ADD_BLOCK) {
-	$header = $default_description_titles[ADD_BLOCK];
+    $header = $default_description_titles[ADD_BLOCK];
 }
 
 // display form
 $form = new FormValidator(
-	'course_description',
-	'POST',
-	'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()
+    'course_description',
+    'POST',
+    'index.php?action=edit&id='.$original_id.'&description_type='.$description_type.'&'.api_get_cidreq()
 );
 
 $form->addElement('header','',$header);
@@ -80,15 +80,15 @@ 
 $form->addText('title', get_lang('Title'), true, array('size'=>'50'));
 $form->applyFilter('title','html_filter');
 $form->addHtmlEditor(
-	'contentDescription',
-	get_lang('Content'),
-	true,
-	false,
-	array(
-		'ToolbarSet' => 'TrainingDescription',
-		'Width' => '100%',
-		'Height' => '200',
-	)
+    'contentDescription',
+    get_lang('Content'),
+    true,
+    false,
+    array(
+        'ToolbarSet' => 'TrainingDescription',
+        'Width' => '100%',
+        'Height' => '200',
+    )
 );
 $form->addButtonCreate(get_lang('Save'));
 
@@ -104,8 +104,8 @@ 
 $form->setDefaults($default);
 
 if (isset ($question[$description_type])) {
-	$message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
-	$message .= $question[$description_type];
-	Display::display_normal_message($message, false);
+    $message = '<strong>'.get_lang('QuestionPlan').'</strong><br />';
+    $message .= $question[$description_type];
+    Display::display_normal_message($message, false);
 }
 $form->display();

Spacing +6 added lines, -6 removed lines

@@ -34,21 +34,21 @@ 
 }
 $categories[ADD_BLOCK] = get_lang('NewBloc');
 
-$i=1;
+$i = 1;
 echo '<div class="actions" style="margin-bottom:30px">';
 echo '<a href="index.php?'.api_get_cidreq().'">'.
-		Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'',ICON_SIZE_MEDIUM).
+		Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('ToolCourseDescription'), '', ICON_SIZE_MEDIUM).
 	'</a>';
 
 ksort($categories);
 foreach ($categories as $id => $title) {
-	if ($i==ADD_BLOCK) {
+	if ($i == ADD_BLOCK) {
 		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
 		break;
 	} else {
 		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
-			Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+			Display::return_icon($default_description_icon[$id], $title, '', ICON_SIZE_MEDIUM).'</a>';
 		$i++;
 	}
 }
@@ -56,7 +56,7 @@ 
 
 // error messages
 if (isset($error) && intval($error) == 1) {
-	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'),false);
+	Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'), false);
 }
 
 // default header title form