chamilo / chamilo-lms

main/admin/group_list.php

Indentation -1 removed lines

@@ -16,7 +16,6 @@
  * @author Patrick Cool
  * @author René Haentjens, added CSV file import (October 2004)
  * @package chamilo.link
-
  */
 
 // Including libraries

main/admin/inactive_user_list.php

Indentation +1 added lines, -2 removed lines

@@ -4,8 +4,7 @@
     @author Andre Boivin base code
 	@author Julio Montoya fixing lot of little details
 	@todo this script is not ready for a production use that's why I'm commenting the function delete_inactive_student
-
-*	@package chamilo.admin
+ *	@package chamilo.admin
 *	script pour effacer les user inactif depuis x temps
 */
 $cidReset = true;

main/admin/event_controller.php

Indentation +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     }
 
     public function deleteAction($id) {
-         $event_email_template = new EventEmailTemplate();
+            $event_email_template = new EventEmailTemplate();
         return $event_email_template->delete($id);
     }
 }
@@ -73,7 +73,7 @@ 
                         array('name'=>'language_id',        'index'=>'language_id',        'width'=>'80',   'align'=>'left'),
                         array('name'=>'activated',        'index'=>'activated',        'width'=>'80',   'align'=>'left'),
                         array('name'=>'actions',        'index'=>'actions',     'width'=>'100')
-                       );
+                        );
 //Autowidth
 $extra_params['autowidth'] = 'true';
 //height auto

main/admin/ldap_users_list.php

Indentation +132 added lines, -132 removed lines

@@ -20,7 +20,7 @@ 
 // Login as ...
 if ($action == "login_as" && !empty ($login_as_user_id))
 {
-	login_user($login_as_user_id);
+    login_user($login_as_user_id);
 }
 
 //if we already have a session id and a user...
@@ -37,150 +37,150 @@ 
 
 if (isset ($_GET['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_GET['action'])
-		{
-			case 'show_message' :
-				Display :: display_header($tool_name);
-				Display :: display_normal_message($_GET['message']);
-				break;
-			case 'delete_user' :
-				Display :: display_header($tool_name);
-				if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
-				{
-					Display :: display_normal_message(get_lang('UserDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('CannotDeleteUser'));
-				}
-				break;
-			case 'lock' :
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('lock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'unlock';
-				Display :: display_header($tool_name);
-				$message=lock_unlock_user('unlock',$_GET['user_id']);
-				Display :: display_normal_message($message);
-				break;
-			case 'add_user';
-				$id=$_GET['id'];
-				$UserList=array();
-				$userid_match_login = array();
-				foreach ($id as $user_id) {
-					$tmp = ldap_add_user($user_id);
-					$UserList[]= $tmp;
-					$userid_match_login[$tmp] = $user_id;
-				}
-				if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
-					ldap_add_user_to_session($UserList, $_GET['id_session']);
-					header('Location: resume_session.php?id_session='.$_GET['id_session']);
-				} else {
-					Display :: display_header($tool_name);
-					if(count($userid_match_login)>0)
-					{
-						$message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
-						foreach($userid_match_login as $user_id => $login)
-						{
-							$message .= '- '.$login.'<br />';
-						}
-					}
-					else
-					{
-						$message=get_lang('NoUserAdded');
-					}
-					Display :: display_normal_message($message,false);
-				}
-				break;
-			default :
-				Display :: display_header($tool_name);
-		}
-		Security::clear_token();
-	}
-	else
-	{
-		Display::display_header($tool_name);
-	}
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_GET['action'])
+        {
+            case 'show_message' :
+                Display :: display_header($tool_name);
+                Display :: display_normal_message($_GET['message']);
+                break;
+            case 'delete_user' :
+                Display :: display_header($tool_name);
+                if ($user_id != $_user['user_id'] && UserManager :: delete_user($_GET['user_id']))
+                {
+                    Display :: display_normal_message(get_lang('UserDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('CannotDeleteUser'));
+                }
+                break;
+            case 'lock' :
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('lock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'unlock';
+                Display :: display_header($tool_name);
+                $message=lock_unlock_user('unlock',$_GET['user_id']);
+                Display :: display_normal_message($message);
+                break;
+            case 'add_user';
+                $id=$_GET['id'];
+                $UserList=array();
+                $userid_match_login = array();
+                foreach ($id as $user_id) {
+                    $tmp = ldap_add_user($user_id);
+                    $UserList[]= $tmp;
+                    $userid_match_login[$tmp] = $user_id;
+                }
+                if (isset($_GET['id_session']) && ($_GET['id_session'] == strval(intval($_GET['id_session']))) && ($_GET['id_session']>0)) {
+                    ldap_add_user_to_session($UserList, $_GET['id_session']);
+                    header('Location: resume_session.php?id_session='.$_GET['id_session']);
+                } else {
+                    Display :: display_header($tool_name);
+                    if(count($userid_match_login)>0)
+                    {
+                        $message=get_lang('LDAPUsersAddedOrUpdated').':<br />';
+                        foreach($userid_match_login as $user_id => $login)
+                        {
+                            $message .= '- '.$login.'<br />';
+                        }
+                    }
+                    else
+                    {
+                        $message=get_lang('NoUserAdded');
+                    }
+                    Display :: display_normal_message($message,false);
+                }
+                break;
+            default :
+                Display :: display_header($tool_name);
+        }
+        Security::clear_token();
+    }
+    else
+    {
+        Display::display_header($tool_name);
+    }
 }
 else
 {
-	Display::display_header($tool_name);
+    Display::display_header($tool_name);
 }
 if (isset ($_POST['action']))
 {
-	$check = Security::check_token('get');
-	if($check)
-	{
-		switch ($_POST['action'])
-		{
-			case 'delete' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_deleted_users = 0;
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						if(UserManager :: delete_user($user_id))
-						{
-							$number_of_deleted_users++;
-						}
-					}
-				}
-				if($number_of_selected_users == $number_of_deleted_users)
-				{
-					Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
-				}
-				else
-				{
-					Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
-				}
-				break;
-			case 'add_user' :
-				$number_of_selected_users = count($_POST['id']);
-				$number_of_added_users = 0;
-				$UserList=array();
-				foreach ($_POST['id'] as $index => $user_id)
-				{
-					if($user_id != $_user['user_id'])
-					{
-						$UserList[] = ldap_add_user($user_id);
-					}
-				}
-				if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
-					addUserToSession($UserList, $_GET['id_session']);
-				if(count($UserList)>0)
-				{
-					Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
-				}
-				else
-				{
-					Display :: display_normal_message(get_lang('NoUserAdded'));
-				}
-				break;
+    $check = Security::check_token('get');
+    if($check)
+    {
+        switch ($_POST['action'])
+        {
+            case 'delete' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_deleted_users = 0;
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        if(UserManager :: delete_user($user_id))
+                        {
+                            $number_of_deleted_users++;
+                        }
+                    }
+                }
+                if($number_of_selected_users == $number_of_deleted_users)
+                {
+                    Display :: display_normal_message(get_lang('SelectedUsersDeleted'));
+                }
+                else
+                {
+                    Display :: display_error_message(get_lang('SomeUsersNotDeleted'));
+                }
+                break;
+            case 'add_user' :
+                $number_of_selected_users = count($_POST['id']);
+                $number_of_added_users = 0;
+                $UserList=array();
+                foreach ($_POST['id'] as $index => $user_id)
+                {
+                    if($user_id != $_user['user_id'])
+                    {
+                        $UserList[] = ldap_add_user($user_id);
+                    }
+                }
+                if (isset($_GET['id_session']) && (trim($_GET['id_session'])!=""))
+                    addUserToSession($UserList, $_GET['id_session']);
+                if(count($UserList)>0)
+                {
+                    Display :: display_normal_message(count($UserList)." ".get_lang('LDAPUsersAdded'));
+                }
+                else
+                {
+                    Display :: display_normal_message(get_lang('NoUserAdded'));
+                }
+                break;
 
-		}
-		Security::clear_token();
-	}
+        }
+        Security::clear_token();
+    }
 }
 
 $form = new FormValidator('advanced_search','get');
 $form->addText('keyword_username',get_lang('LoginName'),false);
 if (api_is_western_name_order())
 {
-	$form->addText('keyword_firstname', get_lang('FirstName'), false);
-	$form->addText('keyword_lastname', get_lang('LastName'), false);
+    $form->addText('keyword_firstname', get_lang('FirstName'), false);
+    $form->addText('keyword_lastname', get_lang('LastName'), false);
 }
 else
 {
-	$form->addText('keyword_lastname',get_lang('LastName'),false);
-	$form->addText('keyword_firstname',get_lang('FirstName'),false);
+    $form->addText('keyword_lastname',get_lang('LastName'),false);
+    $form->addText('keyword_firstname',get_lang('FirstName'),false);
 }
 if (isset($_GET['id_session']))
-	$form->addElement('hidden','id_session',$_GET['id_session']);
+    $form->addElement('hidden','id_session',$_GET['id_session']);
 
 $type = array();
 $type["all"] = get_lang('All');
@@ -202,7 +202,7 @@ 
 $parameters['keyword_lastname'] = @$_GET['keyword_lastname'] ?: null;
 $parameters['keyword_email'] = @$_GET['keyword_email'] ?: null;
 if (isset($_GET['id_session']))
-	$parameters['id_session'] = $_GET['id_session'];
+    $parameters['id_session'] = $_GET['id_session'];
 // Create a sortable table with user-data
 
 $parameters['sec_token'] = Security::get_token();
@@ -212,13 +212,13 @@ 
 $table->set_header(1, get_lang('LoginName'));
 if (api_is_western_name_order())
 {
-	$table->set_header(2, get_lang('FirstName'));
-	$table->set_header(3, get_lang('LastName'));
+    $table->set_header(2, get_lang('FirstName'));
+    $table->set_header(3, get_lang('LastName'));
 }
 else
 {
-	$table->set_header(2, get_lang('LastName'));
-	$table->set_header(3, get_lang('FirstName'));
+    $table->set_header(2, get_lang('LastName'));
+    $table->set_header(3, get_lang('FirstName'));
 }
 $table->set_header(4, get_lang('Email'));
 $table->set_header(5, get_lang('Actions'));

main/admin/course_create_content.php

Indentation +7 added lines, -7 removed lines

@@ -15,15 +15,15 @@
 Display::display_header($tool_name);
 //api_display_tool_title($tool_name);
 if (api_get_setting('server_type') != 'test') {
-	echo get_lang('DummyCourseOnlyOnTestServer');
+    echo get_lang('DummyCourseOnlyOnTestServer');
 } elseif( isset($_POST['action'])) {
-	require_once('../coursecopy/classes/DummyCourseCreator.class.php');
-	$dcc = new DummyCourseCreator();
-	$dcc->create_dummy_course($_POST['course_code']);
-	echo get_lang('Done');
+    require_once('../coursecopy/classes/DummyCourseCreator.class.php');
+    $dcc = new DummyCourseCreator();
+    $dcc->create_dummy_course($_POST['course_code']);
+    echo get_lang('Done');
 } else {
-	echo get_lang('DummyCourseDescription');
-	echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
+    echo get_lang('DummyCourseDescription');
+    echo '<form method="post"><input type="hidden" name="course_code" value="'.Security::remove_XSS($_GET['course_code']).'"/><input type="submit" name="action" value="'.get_lang('Ok').'"/></form>';
 }
 
 Display::display_footer();

main/mySpace/current_courses.php

Indentation +209 added lines, -209 removed lines

@@ -12,7 +12,7 @@ 
 $filename = 'reporting.xls';
 
 if (!api_is_allowed_to_create_course()) {
-	api_not_allowed(true);
+    api_not_allowed(true);
 }
 
 $user_id = api_get_user_id();
@@ -23,222 +23,222 @@ 
 $session_id = 0;
 
 if (!empty($my_courses)) {
-	foreach ($my_courses as $course) {
-		$course_code = $course['code'];
-		$course_id = $course['real_id'];
-		$course_info = api_get_course_info($course_code);
-
-		//Only show open courses
-		if ($course_info['visibility'] == 0) {
-			continue;
-		}
-
-		$teachers = CourseManager::get_teacher_list_from_course_code($course_code);
-		$teacher_list =  array();
-
-		if (!empty($teachers)) {
-			foreach($teachers as $teacher) {
-				$teacher_list[]= $teacher['firstname'].' '.$teacher['lastname'];
-			}
-		}
-
-		$tmp_students = CourseManager :: get_student_list_from_course_code($course_code, false);
-
-		//Cleaning students only REAL students
-		$students = array();
-		foreach ($tmp_students  as $student) {
-			$user_info = api_get_user_info($student['user_id']);
-			if ($user_info['status'] != STUDENT) {
-				continue;
-			}
-			$students[] = $student['user_id'];
-		}
-
-		$t_lp 	= Database :: get_course_table(TABLE_LP_MAIN);
-		$sql_lp = "SELECT lp.name, lp.id FROM $t_lp lp
+    foreach ($my_courses as $course) {
+        $course_code = $course['code'];
+        $course_id = $course['real_id'];
+        $course_info = api_get_course_info($course_code);
+
+        //Only show open courses
+        if ($course_info['visibility'] == 0) {
+            continue;
+        }
+
+        $teachers = CourseManager::get_teacher_list_from_course_code($course_code);
+        $teacher_list =  array();
+
+        if (!empty($teachers)) {
+            foreach($teachers as $teacher) {
+                $teacher_list[]= $teacher['firstname'].' '.$teacher['lastname'];
+            }
+        }
+
+        $tmp_students = CourseManager :: get_student_list_from_course_code($course_code, false);
+
+        //Cleaning students only REAL students
+        $students = array();
+        foreach ($tmp_students  as $student) {
+            $user_info = api_get_user_info($student['user_id']);
+            if ($user_info['status'] != STUDENT) {
+                continue;
+            }
+            $students[] = $student['user_id'];
+        }
+
+        $t_lp 	= Database :: get_course_table(TABLE_LP_MAIN);
+        $sql_lp = "SELECT lp.name, lp.id FROM $t_lp lp
 				   WHERE c_id = $course_id AND lp.session_id = 0";
-		$rs_lp 	= Database::query($sql_lp);
-		$t_lpi 	= Database :: get_course_table(TABLE_LP_ITEM);
-		$t_news = Database :: get_course_table(TABLE_ANNOUNCEMENT);
-
-		$total_tools_list = Tracking::get_tools_most_used_by_course(
-			$course_id,
-			$session_id
-		);
-
-		$total_tools = 0;
-		foreach($total_tools_list as $tool) {
-			$total_tools += $tool['count_access_tool'];
-		}
-
-		if (Database :: num_rows($rs_lp) > 0) {
-			while ($learnpath = Database :: fetch_array($rs_lp)) {
-				$lp_id = $learnpath['id'];
-
-				$lp_items =
-				$array[$i]['lp'] = '<a href="'.api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?cidReq='.$course_code.'&amp;action=view&amp;lp_id='.$lp_id.'" target="_blank">'.$learnpath['name'].'</a>';
-
-				$array[$i]['teachers'] = '';
-				if (!empty($teacher_list)) {
-					$array[$i]['teachers'] = implode(', ', $teacher_list);
-				}
-
-				$array[$i]['course_name'] = $course['title'];
-				$count_students_accessing = 0;
-				$count_students_complete_all_activities = 0;
-				$count_students_complete_all_activities_at_50 = 0;
-				$total_time_spent = 0;
-				$total_average_progress = 0;
-
-				if (!empty($students)) {
-					foreach ($students  as $student_id) {
-						$avg_student_progress   = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
-						$myavg_temp 			= Tracking::get_avg_student_score($student_id, $course_code, array($lp_id), $session_id);
-						$avg_progress_in_course = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
-
-						if (intval($avg_progress_in_course) == 100) {
-							$count_students_complete_all_activities++;
-						}
-						if (intval($avg_progress_in_course) > 0 && intval($avg_progress_in_course) <= 50) {
-							$count_students_complete_all_activities_at_50 ++;
-						}
-						$total_average_progress +=$avg_progress_in_course;
-
-						$time_spent = Tracking::get_time_spent_on_the_course($student_id, $course_id, $session_id);
-						$total_time_spent += $time_spent;
-						if (!empty($time_spent)) {
-							$count_students_accessing++;
-						}
-					}
-					//$total_tools += $nb_assignments +  $messages + $links + $chat_last_connection + $documents;
-				}
-
-				$student_count = count($students);
-
-				$array[$i]['count_students'] = $student_count;
-				$array[$i]['count_students_accessing'] = 0;
-				$array[$i]['count_students_accessing_percentage'] = 0;
-				$array[$i]['count_students_complete_all_activities_at_50'] = 0;
-				$array[$i]['count_students_complete_all_activities'] = 0;
-				$array[$i]['average_percentage_activities_completed_per_student'] = 0;
-				$array[$i]['total_time_spent'] = 0;
-				$array[$i]['average_time_spent_per_student'] = 0;
-				$array[$i]['total_time_spent'] = 0;
-				$array[$i]['average_time_spent_per_student'] = 0;
-				//$array[$i]['tools_used'] = 0;
-				$array[$i]['learnpath_docs'] = 0;
-				$array[$i]['learnpath_exercises'] = 0;
-				$array[$i]['learnpath_links'] = 0;
-				$array[$i]['learnpath_forums'] = 0;
-				$array[$i]['learnpath_assignments'] = 0;
-
-				//registering the number of each category of
-				//items in learning path
-				$sql_lpi = "SELECT lpi.item_type FROM $t_lpi lpi
+        $rs_lp 	= Database::query($sql_lp);
+        $t_lpi 	= Database :: get_course_table(TABLE_LP_ITEM);
+        $t_news = Database :: get_course_table(TABLE_ANNOUNCEMENT);
+
+        $total_tools_list = Tracking::get_tools_most_used_by_course(
+            $course_id,
+            $session_id
+        );
+
+        $total_tools = 0;
+        foreach($total_tools_list as $tool) {
+            $total_tools += $tool['count_access_tool'];
+        }
+
+        if (Database :: num_rows($rs_lp) > 0) {
+            while ($learnpath = Database :: fetch_array($rs_lp)) {
+                $lp_id = $learnpath['id'];
+
+                $lp_items =
+                $array[$i]['lp'] = '<a href="'.api_get_path(WEB_CODE_PATH).'newscorm/lp_controller.php?cidReq='.$course_code.'&amp;action=view&amp;lp_id='.$lp_id.'" target="_blank">'.$learnpath['name'].'</a>';
+
+                $array[$i]['teachers'] = '';
+                if (!empty($teacher_list)) {
+                    $array[$i]['teachers'] = implode(', ', $teacher_list);
+                }
+
+                $array[$i]['course_name'] = $course['title'];
+                $count_students_accessing = 0;
+                $count_students_complete_all_activities = 0;
+                $count_students_complete_all_activities_at_50 = 0;
+                $total_time_spent = 0;
+                $total_average_progress = 0;
+
+                if (!empty($students)) {
+                    foreach ($students  as $student_id) {
+                        $avg_student_progress   = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
+                        $myavg_temp 			= Tracking::get_avg_student_score($student_id, $course_code, array($lp_id), $session_id);
+                        $avg_progress_in_course = Tracking::get_avg_student_progress($student_id, $course_code, array($lp_id), $session_id);
+
+                        if (intval($avg_progress_in_course) == 100) {
+                            $count_students_complete_all_activities++;
+                        }
+                        if (intval($avg_progress_in_course) > 0 && intval($avg_progress_in_course) <= 50) {
+                            $count_students_complete_all_activities_at_50 ++;
+                        }
+                        $total_average_progress +=$avg_progress_in_course;
+
+                        $time_spent = Tracking::get_time_spent_on_the_course($student_id, $course_id, $session_id);
+                        $total_time_spent += $time_spent;
+                        if (!empty($time_spent)) {
+                            $count_students_accessing++;
+                        }
+                    }
+                    //$total_tools += $nb_assignments +  $messages + $links + $chat_last_connection + $documents;
+                }
+
+                $student_count = count($students);
+
+                $array[$i]['count_students'] = $student_count;
+                $array[$i]['count_students_accessing'] = 0;
+                $array[$i]['count_students_accessing_percentage'] = 0;
+                $array[$i]['count_students_complete_all_activities_at_50'] = 0;
+                $array[$i]['count_students_complete_all_activities'] = 0;
+                $array[$i]['average_percentage_activities_completed_per_student'] = 0;
+                $array[$i]['total_time_spent'] = 0;
+                $array[$i]['average_time_spent_per_student'] = 0;
+                $array[$i]['total_time_spent'] = 0;
+                $array[$i]['average_time_spent_per_student'] = 0;
+                //$array[$i]['tools_used'] = 0;
+                $array[$i]['learnpath_docs'] = 0;
+                $array[$i]['learnpath_exercises'] = 0;
+                $array[$i]['learnpath_links'] = 0;
+                $array[$i]['learnpath_forums'] = 0;
+                $array[$i]['learnpath_assignments'] = 0;
+
+                //registering the number of each category of
+                //items in learning path
+                $sql_lpi = "SELECT lpi.item_type FROM $t_lpi lpi
 						    WHERE c_id = $course_id AND lpi.lp_id = $lp_id
 						    ORDER BY item_type";
-				$res_lpi = Database::query($sql_lpi);
-				while ($row_lpi = Database::fetch_array($res_lpi)) {
-					switch($row_lpi['item_type']) {
-						case 'document':
-							$array[$i]['learnpath_docs']++;
-							break;
-						case 'quiz':
-							$array[$i]['learnpath_exercises']++;
-							break;
-						case 'link':
-							$array[$i]['learnpath_links']++;
-							break;
-						case 'forum':
-						case 'thread':
-							$array[$i]['learnpath_forums']++;
-							break;
-						case 'student_publication':
-							$array[$i]['learnpath_assignments']++;
-							break;
-					}
-				}
-				// Count announcements
-				$array[$i]['total_announcements'] = 0;
-				$sql_news = "SELECT count(id) FROM $t_news WHERE c_id = $course_id ";
-				$res_news = Database::query($sql_news);
-				while ($row_news = Database::fetch_array($res_news)) {
-					$array[$i]['total_announcements'] = $row_news[0];
-				}
-
-				//@todo don't know what means this value
-				$count_students_complete_all_activities_at_50 = 0;
-
-				if (!empty($student_count)) {
-					$array[$i]['count_students_accessing'] = $count_students_accessing;
-					$array[$i]['count_students_accessing_percentage'] = round($count_students_accessing / $student_count *100 , 0);
-					$array[$i]['count_students_complete_all_activities_at_50'] = $count_students_complete_all_activities;
-					$array[$i]['count_students_complete_all_activities'] = round($count_students_complete_all_activities / $student_count *100 , 0);;
-					$array[$i]['average_percentage_activities_completed_per_student'] = round($count_students_complete_all_activities/$student_count*100,2);
-					$array[$i]['total_time_spent'] = 0;
-					$array[$i]['average_time_spent_per_student'] = 0;
-
-					if (!empty($total_time_spent)) {
-						$array[$i]['total_time_spent'] = api_time_to_hms($total_time_spent);
-						$array[$i]['average_time_spent_per_student'] = api_time_to_hms($total_time_spent / $student_count);
-					}
-					//$array[$i]['tools_used'] = $total_tools;
-				}
-				$i++;
-			}
-		}
-	}
+                $res_lpi = Database::query($sql_lpi);
+                while ($row_lpi = Database::fetch_array($res_lpi)) {
+                    switch($row_lpi['item_type']) {
+                        case 'document':
+                            $array[$i]['learnpath_docs']++;
+                            break;
+                        case 'quiz':
+                            $array[$i]['learnpath_exercises']++;
+                            break;
+                        case 'link':
+                            $array[$i]['learnpath_links']++;
+                            break;
+                        case 'forum':
+                        case 'thread':
+                            $array[$i]['learnpath_forums']++;
+                            break;
+                        case 'student_publication':
+                            $array[$i]['learnpath_assignments']++;
+                            break;
+                    }
+                }
+                // Count announcements
+                $array[$i]['total_announcements'] = 0;
+                $sql_news = "SELECT count(id) FROM $t_news WHERE c_id = $course_id ";
+                $res_news = Database::query($sql_news);
+                while ($row_news = Database::fetch_array($res_news)) {
+                    $array[$i]['total_announcements'] = $row_news[0];
+                }
+
+                //@todo don't know what means this value
+                $count_students_complete_all_activities_at_50 = 0;
+
+                if (!empty($student_count)) {
+                    $array[$i]['count_students_accessing'] = $count_students_accessing;
+                    $array[$i]['count_students_accessing_percentage'] = round($count_students_accessing / $student_count *100 , 0);
+                    $array[$i]['count_students_complete_all_activities_at_50'] = $count_students_complete_all_activities;
+                    $array[$i]['count_students_complete_all_activities'] = round($count_students_complete_all_activities / $student_count *100 , 0);;
+                    $array[$i]['average_percentage_activities_completed_per_student'] = round($count_students_complete_all_activities/$student_count*100,2);
+                    $array[$i]['total_time_spent'] = 0;
+                    $array[$i]['average_time_spent_per_student'] = 0;
+
+                    if (!empty($total_time_spent)) {
+                        $array[$i]['total_time_spent'] = api_time_to_hms($total_time_spent);
+                        $array[$i]['average_time_spent_per_student'] = api_time_to_hms($total_time_spent / $student_count);
+                    }
+                    //$array[$i]['tools_used'] = $total_tools;
+                }
+                $i++;
+            }
+        }
+    }
 }
 
 $headers = array(
-	get_lang('LearningPath'),
-	get_lang('Teachers'),
-	get_lang('Courses'),
-	get_lang('NumberOfStudents'),
-	get_lang('NumberStudentsAccessingCourse'),
-	get_lang('PercentageStudentsAccessingCourse'),
-	get_lang('NumberStudentsCompleteAllActivities'),
-	get_lang('PercentageStudentsCompleteAllActivities'),
-	get_lang('AverageOfActivitiesCompletedPerStudent'),
-	get_lang('TotalTimeSpentInTheCourse'),
-	get_lang('AverageTimePerStudentInCourse'),
-	get_lang('NumberOfDocumentsInLearnpath'),
-	get_lang('NumberOfExercisesInLearnpath'),
-	get_lang('NumberOfLinksInLearnpath'),
-	get_lang('NumberOfForumsInLearnpath'),
-	get_lang('NumberOfAssignmentsInLearnpath'),
-	get_lang('NumberOfAnnouncementsInCourse'),
+    get_lang('LearningPath'),
+    get_lang('Teachers'),
+    get_lang('Courses'),
+    get_lang('NumberOfStudents'),
+    get_lang('NumberStudentsAccessingCourse'),
+    get_lang('PercentageStudentsAccessingCourse'),
+    get_lang('NumberStudentsCompleteAllActivities'),
+    get_lang('PercentageStudentsCompleteAllActivities'),
+    get_lang('AverageOfActivitiesCompletedPerStudent'),
+    get_lang('TotalTimeSpentInTheCourse'),
+    get_lang('AverageTimePerStudentInCourse'),
+    get_lang('NumberOfDocumentsInLearnpath'),
+    get_lang('NumberOfExercisesInLearnpath'),
+    get_lang('NumberOfLinksInLearnpath'),
+    get_lang('NumberOfForumsInLearnpath'),
+    get_lang('NumberOfAssignmentsInLearnpath'),
+    get_lang('NumberOfAnnouncementsInCourse'),
 );
 
 if (isset($_GET['export'])) {
-	global $charset;
+    global $charset;
     $spreadsheet = new PHPExcel();
     $spreadsheet->setActiveSheetIndex(0);
     $worksheet = $spreadsheet->getActiveSheet();
 
-	$line = 0;
-	$column = 0; //skip the first column (row titles)
-
-	foreach ($headers as $header) {
-		$worksheet->SetCellValueByColumnAndRow($line, $column, $header);
-		$column++;
-	}
-	$line++;
-	foreach ($array as $row) {
-		$column = 0;
-		foreach ($row as $item) {
-			$worksheet->SetCellValueByColumnAndRow($line, $column, html_entity_decode(strip_tags($item)));
-			$column++;
-		}
-		$line++;
-	}
-	$line++;
+    $line = 0;
+    $column = 0; //skip the first column (row titles)
+
+    foreach ($headers as $header) {
+        $worksheet->SetCellValueByColumnAndRow($line, $column, $header);
+        $column++;
+    }
+    $line++;
+    foreach ($array as $row) {
+        $column = 0;
+        foreach ($row as $item) {
+            $worksheet->SetCellValueByColumnAndRow($line, $column, html_entity_decode(strip_tags($item)));
+            $column++;
+        }
+        $line++;
+    }
+    $line++;
 
     $file = api_get_path(SYS_ARCHIVE_PATH).api_replace_dangerous_char($filename);
     $writer = new PHPExcel_Writer_Excel2007($spreadsheet);
     $writer->save($file);
     DocumentManager::file_send_for_download($file, true, $filename);
-	exit;
+    exit;
 }
 
 $interbreadcrumb[] = array ('url' => 'index.php', 'name' => get_lang('MySpace'));
@@ -249,20 +249,20 @@ 
 $row = 0;
 $column = 0;
 foreach ($headers as $header) {
-	$table->setHeaderContents($row, $column, $header);
-	$column++;
+    $table->setHeaderContents($row, $column, $header);
+    $column++;
 }
 $row++;
 
 foreach ($array as $row_table) {
-	$column = 0;
-	foreach ($row_table as $cell) {
-		$table->setCellContents($row, $column, $cell);
-		//$table->updateCellAttributes($row, $column, 'align="center"');
-		$column++;
-	}
-	$table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
-	$row++;
+    $column = 0;
+    foreach ($row_table as $cell) {
+        $table->setCellContents($row, $column, $cell);
+        //$table->updateCellAttributes($row, $column, 'align="center"');
+        $column++;
+    }
+    $table->updateRowAttributes($row, $row % 2 ? 'class="row_even"' : 'class="row_odd"', true);
+    $row++;
 }
 
 echo '<div class="actions">';

main/mySpace/progression.php

Indentation +27 added lines, -27 removed lines

@@ -33,36 +33,36 @@
 $result_course = Database::query($sql_course);
 
 if (Database::num_rows($result_course) > 0) {
-	if (isset($_POST['export'])) {
-		$export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
-		Display :: display_error_message($export_result);
-	}
-	echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
-	$header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
-	while ($a_course = Database::fetch_array($result_course)) {
-		// TODO: This query is to be checked, there are no HotPotatoes tests results.
-		$sql_moy_test = "SELECT exe_result,exe_weighting
+    if (isset($_POST['export'])) {
+        $export_result = export_csv($header, $data, 'test.csv'); // TODO: There is no data for exporting yet.
+        Display :: display_error_message($export_result);
+    }
+    echo '<table class="data_table"><tr><th>'.get_lang('Course').'</th><th>'.get_lang('TempsFrequentation').'</th><th>'.get_lang('Progression').'</th><th>'.get_lang('MoyenneTest').'</th></tr>';
+    $header = array(get_lang('Course', ''), get_lang('TempsFrequentation', ''), get_lang('Progression', ''), get_lang('MoyenneTest', ''));
+    while ($a_course = Database::fetch_array($result_course)) {
+        // TODO: This query is to be checked, there are no HotPotatoes tests results.
+        $sql_moy_test = "SELECT exe_result,exe_weighting
 			FROM $tbl_track_exercice
 			WHERE c_id = ".$a_course['id'];
-		$result_moy_test = Database::query($sql_moy_test);
-		$result = 0;
-		$weighting = 0;
-		while ($moy_test = Database::fetch_array($result_moy_test)) {
-			$result = $result + $moy_test['exe_result'];
-			$weighting = $weighting + $moy_test['exe_weighting'];
-		}
-		if ($weighting != 0) {
-			$moyenne_test = round(($result * 100) / $weighting);
-		} else {
-			$moyenne_test = null;
-		}
-		echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
-	}
-	echo '</table>';
-	echo "<br /><br />";
-	echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
+        $result_moy_test = Database::query($sql_moy_test);
+        $result = 0;
+        $weighting = 0;
+        while ($moy_test = Database::fetch_array($result_moy_test)) {
+            $result = $result + $moy_test['exe_result'];
+            $weighting = $weighting + $moy_test['exe_weighting'];
+        }
+        if ($weighting != 0) {
+            $moyenne_test = round(($result * 100) / $weighting);
+        } else {
+            $moyenne_test = null;
+        }
+        echo '<tr><td>'.$a_course['title'].'</td><td> </td><td> </td><td>'.(is_null($moyenne_test) ? '' : $moyenne_test.'%').'</td> </tr>';
+    }
+    echo '</table>';
+    echo "<br /><br />";
+    echo "<form method='post'><input type='submit' name='export' value='".get_lang('ExportExcel')."'/><form>";
 } else {
-	echo get_lang('NoCourse');
+    echo get_lang('NoCourse');
 }
 
 Display :: display_footer();

main/inc/lib/phpdocx/lib/log4php/LoggerConfigurator.php

Indentation +21 added lines, -21 removed lines

@@ -26,28 +26,28 @@
  */
 interface LoggerConfigurator {
 	
-	/**
-	 * Special level value signifying inherited behaviour. The current
-	 * value of this string constant is <b>inherited</b>. 
-	 * {@link CONFIGURATOR_NULL} is a synonym.  
-	 */
-	const CONFIGURATOR_INHERITED = 'inherited';
+    /**
+     * Special level value signifying inherited behaviour. The current
+     * value of this string constant is <b>inherited</b>. 
+     * {@link CONFIGURATOR_NULL} is a synonym.  
+     */
+    const CONFIGURATOR_INHERITED = 'inherited';
 	
-	/**
-	 * Special level signifying inherited behaviour, same as 
-	 * {@link CONFIGURATOR_INHERITED}. 
-	 * The current value of this string constant is <b>null</b>. 
-	 */
-	const CONFIGURATOR_NULL = 'null';
+    /**
+     * Special level signifying inherited behaviour, same as 
+     * {@link CONFIGURATOR_INHERITED}. 
+     * The current value of this string constant is <b>null</b>. 
+     */
+    const CONFIGURATOR_NULL = 'null';
 		
-	/**
-	 * Interpret a resource pointed by a <var>url</var> and configure accordingly.
-	 *
-	 * The configuration is done relative to the <var>repository</var>
-	 * parameter.
-	 *
-	 * @param string $url The URL to parse
-	 */
-	public function configure(LoggerHierarchy $hierarchy, $url = null);
+    /**
+     * Interpret a resource pointed by a <var>url</var> and configure accordingly.
+     *
+     * The configuration is done relative to the <var>repository</var>
+     * parameter.
+     *
+     * @param string $url The URL to parse
+     */
+    public function configure(LoggerHierarchy $hierarchy, $url = null);
 	
 }

main/inc/lib/phpdocx/lib/log4php/renderers/LoggerRendererDefault.php

Indentation +9 added lines, -9 removed lines

@@ -39,13 +39,13 @@
  */
 class LoggerRendererDefault implements LoggerRendererObject {
 
-	/**
-	 * Render objects by type casting
-	 *
-	 * @param mixed $o the object to render
-	 * @return string
-	 */
-	public function render($o) {
-		return var_export($o, true);
-	}
+    /**
+     * Render objects by type casting
+     *
+     * @param mixed $o the object to render
+     * @return string
+     */
+    public function render($o) {
+        return var_export($o, true);
+    }
 }