Changeset 1928

Timestamp:

06/10/10 00:46:20 (3 years ago)

Author:

shibuya246

Message:

[Branch 1.4] new query for getting user stats reduced to 1 db call instead of 8

Location:

branches/1.4/content/plugins/users

Files:

• languages/users_language.php (modified) (1 diff)
• users.php (modified) (1 diff)

branches/1.4/content/plugins/users/languages/users_language.php

@@ -70 +70 @@
 /* Admin Stats */
 $lang["users_admin_stats_total_users"] = "Total users";
-$lang["users_admin_stats_admins"] = "Admins";
-$lang["users_admin_stats_supermods"] = "Super Mods";
-$lang["users_admin_stats_moderators"] = "Moderators";
+$lang["users_admin_stats_admin"] = "Admins";
+$lang["users_admin_stats_supermod"] = "Super Mods";
+$lang["users_admin_stats_moderator"] = "Moderators";
 $lang["users_admin_stats_approved_users"] = "Approved";
-$lang["users_admin_stats_pending_users"] = "Pending";
-$lang["users_admin_stats_undermod_users"] = "Under moderation";
-$lang["users_admin_stats_banned_users"] = "Banned";
-$lang["users_admin_stats_killspammed_users"] = "Killspammed";
+$lang["users_admin_stats_pending"] = "Pending";
+$lang["users_admin_stats_undermod"] = "Under moderation";
+$lang["users_admin_stats_banned"] = "Banned";
+$lang["users_admin_stats_killspammed"] = "Killspammed";
 
 /* UserFunctions CLASS: */

branches/1.4/content/plugins/users/users.php

@@ -432 +432 @@
      */
     public function admin_theme_main_stats($h, $vars)
-    {
-        require_once(LIBS . 'UserInfo.php');
+    {        
         $ui = new UserInfo();
-        
-        echo "<li>&nbsp;</li>";
-                if (isset($vars) && (!empty($vars))) {      
-                        foreach ($vars as $key => $value) {
-                                echo "<li class='title'>" . $key . "</li>";
-                                foreach ($value as $stat_type) {                    
-                                        if (isset($value) && !empty($value)) {
-                                                $users = $ui->stats($h, $stat_type);
-                                                if (!$users) { $users = 0; }
-                                                $lang_name = 'users_admin_stats_' . $stat_type;
-                                                echo "<li>" . $h->lang[$lang_name] . ": " . $users . "</li>";
+        $stats = $ui->stats($h);
+
+        //var_dump($stats);
+
+        echo "<li>&nbsp;</li>";
+        if ($stats) {
+            foreach ($stats as $stat) {
+                //var_dump($stat);
+                $users[$stat[0]] = $stat[1];
+            }
+        }
+ 
+        if (isset($vars) && (!empty($vars))) {
+                foreach ($vars as $key => $value) {
+                        echo "<li class='title'>" . $key . "</li>";
+                        foreach ($value as $stat_type) {
+                                if (isset($value) && !empty($value)) {
+
+                                        switch ($stat_type) {
+                                            case 'total_users':
+                                                $user_count = array_sum($users);                                                
+                                                break;
+                                            case 'approved_users':
+                                                $user_count = 0;
+                                                $array = array('admin', 'supermod', 'moderator', 'member');
+                                                foreach ($array as $item) {
+                                                    if (isset($users[$item])) {$user_count .+ $users[$item];}
+                                                }
+                                                break;
+                                            default:
+                                                if (isset($users[$stat_type])) { $user_count = $users[$stat_type]; } else { $user_count = 0; }
+                                                break;
                                         }
+                                        
+                                        $lang_name = 'users_admin_stats_' . $stat_type;
+                                        echo "<li>" . $h->lang[$lang_name] . ": " . $user_count . "</li>";
                                 }
                         }
                 }
+        }
     }