Minor code clean ups

main/admin/archive_cleanup.php

@@ -45,7 +45,6 @@ if ($form->validate()) {
 }
 
 Display::display_header(get_lang('ArchiveDirCleanup'));
-
 Display::display_normal_message(get_lang('ArchiveDirCleanupDescr'));
 $form->display();
 Display::display_footer();

main/admin/statistics/index.php

@@ -15,7 +15,7 @@ $interbreadcrumb[] = array ('url' => '../index.php', 'name' => get_lang('Platfor
 
 $tool_name = get_lang('Statistics');
 Display::display_header($tool_name);
-api_display_tool_title($tool_name);
+echo Display::page_header($tool_name);
 
 require_once 'statistics.lib.php';
 
@@ -73,6 +73,16 @@ switch ($_GET['action']) {
 		// courses for each course category
 		statistics::print_stats(get_lang('CountCours'),$courses);
 		break;
+	case 'tools':
+		statistics::print_tool_stats();
+		break;        
+    case 'coursebylanguage':
+		statistics::print_course_by_language_stats();		        
+		break;
+	case 'courselastvisit':
+		statistics::print_course_last_visit();
+        break;
+    //---
 	case 'users':
 		// total amount of users
 		statistics::print_stats(
@@ -89,31 +99,27 @@ switch ($_GET['action']) {
 			$students[$name] = statistics::count_users(5,$code,$_GET['count_invisible_courses']);
 		}
 		// docents for each course category
-		statistics::print_stats(get_lang('Teachers'),$teachers);
+		statistics::print_stats(get_lang('Teachers'), $teachers);
 		// students for each course category
-		statistics::print_stats(get_lang('Students'),$students);
-		break;
-	case 'coursebylanguage':
-		statistics::print_course_by_language_stats();
-		break;
-	case 'logins':
-		statistics::print_login_stats($_GET['type']);
-		break;
-	case 'tools':
-		statistics::print_tool_stats();
-		break;
-	case 'courselastvisit':
-		statistics::print_course_last_visit();
+		statistics::print_stats(get_lang('Students'), $students);
 		break;
 	case 'recentlogins':
 		statistics::print_recent_login_stats();
+		break;        
+	case 'logins':
+		statistics::print_login_stats($_GET['type']);
 		break;
 	case 'pictures':
 		statistics::print_user_pictures_stats();
 		break;
+    case 'no_login_users':
+        statistics::print_users_not_logged_in_stats();
+        break;
+    //---
 	case 'activities':
 		statistics::print_activities_stats();
 		break;
+    //---
 	case 'messagesent':
 		$messages_sent = statistics::get_messages('sent');		
 		statistics::print_stats(get_lang('MessagesSent'), $messages_sent);
@@ -127,9 +133,7 @@ switch ($_GET['action']) {
 		$friends = statistics::get_friends();
 		statistics::print_stats(get_lang('CountFriends'), $friends);
 		break;
-    case 'no_login_users':
-        statistics::print_users_not_logged_in_stats();
-        break;
+
 }
 
 Display::display_footer();

main/admin/statistics/statistics.lib.php

@@ -62,13 +62,11 @@ class Statistics {
         $current_url_id = api_get_current_access_url_id();
 
         if ($_configuration['multiple_access_urls']) {
-
             $status_filter = isset($status)?' AND status = '.intval($status):'';
             $sql = "SELECT COUNT(DISTINCT(u.user_id)) AS number FROM $user_table as u, $access_url_rel_user_table as url WHERE u.user_id=url.user_id AND access_url_id='".$current_url_id."' $status_filter ";
             if (isset ($category_code)) {
                 $sql = "SELECT COUNT(DISTINCT(cu.user_id)) AS number FROM $course_user_table cu, $course_table c, $access_url_rel_user_table as url WHERE c.code = cu.course_code AND c.category_code = '".Database::escape_string($category_code)."' AND cu.user_id=url.user_id AND access_url_id='".$current_url_id."' $status_filter ";
             }
-
         } else {
             $status_filter = isset($status)?' WHERE status = '.intval($status):'';
             $sql = "SELECT COUNT(DISTINCT(user_id)) AS number FROM $user_table $status_filter ";
@@ -462,8 +460,7 @@ class Statistics {
         echo '<div class="actions">';
             $form->display();
         echo '</div>';
-
-
+        
         $table = new SortableTable('activities', array('Statistics','get_number_of_activities'), array('Statistics','get_activities_data'),4,50,'DESC');
         $parameters = array();
 
@@ -610,6 +607,7 @@ class Statistics {
         $user_table = Database::get_main_table(TABLE_MAIN_USER);
         $access_url_rel_user_table= Database :: get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
         $current_url_id = api_get_current_access_url_id();
+        
         if ($_configuration['multiple_access_urls']) {
             $sql = "SELECT lastname, firstname, username, COUNT(friend_user_id) AS count_friend ".
                 "FROM ".$access_url_rel_user_table." as url, ".$user_friend_table." uf ".