chamilo / chamilo-lms

main/tracking/courseLog.php

Indentation +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
                             get_lang('HideColumn'),
                             array('align' => 'absmiddle', 'hspace' => '3px'),
                             ICON_SIZE_SMALL
-                         ) . "</div>'
+                            ) . "</div>'
                     );
                 }
             );

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

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

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) {

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) {

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

main/course_description/course_description_controller.php

Indentation +2 added lines, -2 removed lines

@@ -156,7 +156,7 @@ 
                 if (isset($_GET['id_session'])) {
                     $session_id = intval($_GET['id_session']);
                 }
-		        $course_description_data = $course_description->get_data_by_id(
+                $course_description_data = $course_description->get_data_by_id(
                     $id,
                     null,
                     $session_id
@@ -165,7 +165,7 @@ 
                 $data['description_title'] = $course_description_data['description_title'];
                 $data['description_content'] = $course_description_data['description_content'];
                 $data['progress'] = $course_description_data['progress'];
-		        $data['descriptions'] = $course_description->get_data_by_description_type(
+                $data['descriptions'] = $course_description->get_data_by_description_type(
                     $description_type,
                     null,
                     $session_id

main/user/resume_session.php

Indentation +49 added lines, -49 removed lines

@@ -60,9 +60,9 @@ 
     $session_category = '';
 
     if (Database::num_rows($rs)>0) {
-    	$rows_session_category = Database::store_result($rs);
-    	$rows_session_category = $rows_session_category[0];
-    	$session_category = $rows_session_category['name'];
+        $rows_session_category = Database::store_result($rs);
+        $rows_session_category = $rows_session_category[0];
+        $session_category = $rows_session_category['name'];
     }
 
     $action = isset($_GET['action']) ? $_GET['action'] : null;
@@ -147,22 +147,22 @@ 
     	<td><?php echo get_lang('Date'); ?> :</td>
     	<td>
     	<?php
-    		if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
-    		    echo get_lang('NoTimeLimits');
+            if ($session['access_start_date'] == '00-00-0000' && $session['access_end_date']== '00-00-0000' ) {
+                echo get_lang('NoTimeLimits');
             }
-    		else {
+            else {
                 if ($session['access_start_date'] != '00-00-0000') {
-                	//$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
+                    //$session['date_start'] = Display::tag('i', get_lang('NoTimeLimits'));
                     $session['access_start_date'] =  get_lang('From').' '.$session['access_start_date'];
                 } else {
-                	$session['access_start_date'] = '';
+                    $session['access_start_date'] = '';
                 }
                 if ($session['access_end_date'] == '00-00-0000') {
                     $session['access_end_date'] ='';
                 } else {
-                	$session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
+                    $session['access_end_date'] = get_lang('Until').' '.$session['access_end_date'];
                 }
-    			echo $session['access_start_date'].' '.$session['access_end_date'];
+                echo $session['access_start_date'].' '.$session['access_end_date'];
             }
             ?>
     	</td>
@@ -221,22 +221,22 @@ 
     </tr>
     <?php
     if ($session['nbr_courses'] == 0) {
-    	echo '<tr>
+        echo '<tr>
             <td colspan="4">'.get_lang('NoCoursesForThisSession').'</td>
     		</tr>';
     } else {
-    	// select the courses
-    	$sql = "SELECT c.id, code,title,visual_code, nbr_users
+        // select the courses
+        $sql = "SELECT c.id, code,title,visual_code, nbr_users
     			FROM $tbl_course c,$tbl_session_rel_course sc
     			WHERE c.id = sc.c_id
     			AND	session_id='$id_session'
     			ORDER BY title";
-    	$result=Database::query($sql);
-    	$courses=Database::store_result($result);
-    	foreach ($courses as $course) {
-    		//select the number of users
+        $result=Database::query($sql);
+        $courses=Database::store_result($result);
+        foreach ($courses as $course) {
+            //select the number of users
 
-    		$sql = "SELECT count(*) FROM $tbl_session_rel_user sru, $tbl_session_rel_course_rel_user srcru
+            $sql = "SELECT count(*) FROM $tbl_session_rel_user sru, $tbl_session_rel_course_rel_user srcru
                     WHERE
                         srcru.user_id = sru.user_id AND
                         srcru.session_id = sru.session_id AND
@@ -244,49 +244,49 @@ 
                         sru.relation_type<>".SESSION_RELATION_TYPE_RRHH." AND
                         srcru.session_id = '".intval($id_session)."'";
 
-    		$rs = Database::query($sql);
-    		$course['nbr_users'] = Database::result($rs,0,0);
+            $rs = Database::query($sql);
+            $course['nbr_users'] = Database::result($rs,0,0);
 
-    		// Get coachs of the courses in session
+            // Get coachs of the courses in session
 
-    		$sql = "SELECT user.lastname,user.firstname,user.username
+            $sql = "SELECT user.lastname,user.firstname,user.username
     		        FROM $tbl_session_rel_course_rel_user session_rcru, $tbl_user user
     				WHERE
     				    session_rcru.user_id = user.user_id AND
     				    session_rcru.session_id = '".intval($id_session)."' AND
     				    session_rcru.c_id ='".Database::escape_string($course['id'])."' AND
     				    session_rcru.status=2";
-    		$rs = Database::query($sql);
+            $rs = Database::query($sql);
 
-    		$coachs = array();
-    		if (Database::num_rows($rs) > 0) {
-    			while ($info_coach = Database::fetch_array($rs)) {
+            $coachs = array();
+            if (Database::num_rows($rs) > 0) {
+                while ($info_coach = Database::fetch_array($rs)) {
                     $coachs[] = api_get_person_name(
                             $info_coach['firstname'],
                             $info_coach['lastname']
                         ).' ('.$info_coach['username'].')';
-    			}
-    		} else {
-    			$coach = get_lang('None');
-    		}
-
-    		if (count($coachs) > 0) {
-    			$coach = implode('<br />',$coachs);
-    		} else {
-    			$coach = get_lang('None');
-    		}
-
-    		$orig_param = '&origin=resume_session';
-    		//hide_course_breadcrumb the parameter has been added to hide the
+                }
+            } else {
+                $coach = get_lang('None');
+            }
+
+            if (count($coachs) > 0) {
+                $coach = implode('<br />',$coachs);
+            } else {
+                $coach = get_lang('None');
+            }
+
+            $orig_param = '&origin=resume_session';
+            //hide_course_breadcrumb the parameter has been added to hide the
             // name of the course, that appeared in the default $interbreadcrumb
-    		echo '
+            echo '
     		<tr>
     			<td>'.Display::url($course['title'].' ('.$course['visual_code'].')', api_get_path(WEB_COURSE_PATH).$course['code'].'/?id_session='.$id_session),'</td>
     			<td>'.$coach.'</td>
     			<td>'.$course['nbr_users'].'</td>
 
     		</tr>';
-    	}
+        }
     }
     ?>
     </table>
@@ -307,11 +307,11 @@ 
     <?php
 
     if ($session['nbr_users']==0) {
-    	echo '<tr>
+        echo '<tr>
     			<td colspan="2">'.get_lang('NoUsersForThisSession').'</td>
     		</tr>';
     } else {
-    	$order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
+        $order_clause = api_sort_by_first_name() ? ' ORDER BY firstname, lastname' : ' ORDER BY lastname, firstname';
 
         if ($multiple_url_is_on) {
             $sql = "SELECT u.user_id, lastname, firstname, username, access_url_id
@@ -329,11 +329,11 @@ 
                     AND su.session_id = ".$id_session.$order_clause;
         }
 
-    	$result = Database::query($sql);
-    	$users  = Database::store_result($result);
+        $result = Database::query($sql);
+        $users  = Database::store_result($result);
         // change breadcrumb in destination page
-    	$orig_param = '&origin=resume_session&id_session='.$id_session;
-    	foreach ($users as $user) {
+        $orig_param = '&origin=resume_session&id_session='.$id_session;
+        foreach ($users as $user) {
             $user_link = '';
             if (!empty($user['user_id'])) {
                 $user_link = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_information.php?user_id='.intval($user['user_id']).'">'.
@@ -350,7 +350,7 @@ 
                 }
             }
 
-    		echo '<tr>
+            echo '<tr>
                     <td width="90%">
                         '.$user_link.'
                     </td>
@@ -361,7 +361,7 @@ 
                         '.$link_to_add_user_in_url.'
                     </td>
                     </tr>';
-    	}
+        }
     }
     ?>
     </table>

main/user/session_list.php

Indentation +4 added lines, -4 removed lines

@@ -65,13 +65,13 @@ 
         array('name'=>'access_end_date',       'index'=>'access_end_date',      'width'=>'40',   'align'=>'left', 'search' => 'true'),
         array('name'=>'coach_name',     'index'=>'coach_name',    'width'=>'80',   'align'=>'left', 'search' => 'false'),
         array('name'=>'status',         'index'=>'session_active','width'=>'40',   'align'=>'left', 'search' => 'true', 'stype'=>'select',
-          //for the bottom bar
+            //for the bottom bar
             'searchoptions' => array(
                 'defaultValue' => '1',
                 'value' => '1:'.get_lang('Active').';0:'.get_lang('Inactive')
             ),
-          //for the top bar
-          'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))),
+            //for the top bar
+            'editoptions' => array('value' => ':'.get_lang('All').';1:'.get_lang('Active').';0:'.get_lang('Inactive'))),
         array('name'=>'visibility',     'index'=>'visibility',      'width'=>'40',   'align'=>'left', 'search' => 'false'),
         array('name'=>'actions',        'index'=>'actions',         'width'=>'100',  'align'=>'left','formatter'=>'action_formatter','sortable'=>'false', 'search' => 'false')
     );
@@ -86,7 +86,7 @@ 
     //With this function we can add actions to the jgrid (edit, delete, etc)
     $action_links = 'function action_formatter(cellvalue, options, rowObject) {
          return \'&nbsp;<a href="add_users_to_session.php?page=session_list.php&id_session=\'+options.rowId+\'">'.Display::return_icon('user_subscribe_session.png',get_lang('SubscribeUsersToSession'),'',ICON_SIZE_SMALL).'</a>'.
-         '\';
+            '\';
     }';
     ?>
     <script>