Changeset 2032 for trunk

Timestamp:

07/11/10 09:25:49 (23 months ago)

Author:

nick_ramsay

Message:

[TRUNK] Updating core plugins with admin stats feature reverted for 1.3.

Location:

trunk/content/plugins

Files:

• . (modified) (1 prop)
• bookmarking/bookmarking.php (modified) (2 diffs)
• comments/comments.php (modified) (1 diff)
• comments/languages/comments_language.php (modified) (1 diff)
• post_manager/post_manager.php (modified) (2 diffs)
• users/languages/users_language.php (modified) (1 diff)
• users/users.php (modified) (1 diff)

trunk/content/plugins/bookmarking/bookmarking.php

@@ -7 +7 @@
  * class: Bookmarking
  * type: base
- * hooks: install_plugin, theme_index_top, header_meta, header_include, navigation, breadcrumbs, theme_index_main, admin_plugin_settings, admin_sidebar_plugin_settings, user_settings_pre_save, user_settings_fill_form, user_settings_extra_settings, theme_index_pre_main, profile_navigation, post_rss_feed_items
+ * hooks: install_plugin, theme_index_top, header_meta, header_include, navigation, breadcrumbs, theme_index_main, admin_plugin_settings, admin_sidebar_plugin_settings, user_settings_pre_save, user_settings_fill_form, user_settings_extra_settings, theme_index_pre_main, profile_navigation, post_rss_feed_items, admin_theme_main_stats
  * author: Nick Ramsay
  * authorurl: http://hotarucms.org/member.php?1-Nick
@@ -675 +675 @@
         $h->vars['post_rss_item'] = $item;
     }
+    
+    
+    /**
+     * Show stats on Admin home page
+     */
+    public function admin_theme_main_stats($h, $vars)
+    {
+                echo "<li>&nbsp;</li>";
+                foreach ($vars as $key => $value) {
+                        echo "<li class='title'>" . $key . "</li>";
+                        foreach ($value as $stat_type) {
+                                $posts = $h->post->stats($h, $stat_type);
+                                if (!$posts) { $posts = 0; }
+                                $lang_name = 'bookmarking_admin_stats_' . $stat_type;
+                                echo "<li>" . $h->lang[$lang_name] . ": " . $posts . "</li>";
+                        }
+                }
+        }
 }
 ?>

trunk/content/plugins/comments/comments.php

@@ -808 +808 @@
     public function admin_theme_main_stats($h, $vars)
     {
-            $c = new Comment();
-            $stats = $c->stats($h);
-            $stats_archived = $c->stats($h, 'archived');
-            
-            echo "<li>&nbsp;</li>";
-            if ($stats) {
-                foreach ($stats as $stat) {
-                    $comments[$stat[0]] = $stat[1];
+        echo "<li>&nbsp;</li>";
+                foreach ($vars as $key => $value) {
+                    echo "<li class='title'>" . $key . "</li>";
+                    foreach ($value as $stat_type) {
+                        require_once(LIBS . 'Comment.php');
+                        $c = new Comment();
+                        $comments = $c->stats($h, $stat_type);
+                        if (!$comments) { $comments = 0; }
+                        $lang_name = 'comments_admin_stats_' . $stat_type;
+                        echo "<li>" . $h->lang[$lang_name] . ": " . $comments . "</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)) {
-
-                                        switch ($stat_type) {
-                                            case 'all':
-                                                if (isset($comments)) { $comment_count = array_sum($comments); } else { $comment_count = 0; }
-                                                break;
-                                            case 'archived':
-                                                if (isset($stats_archived)) { $comment_count = $stats_archived; } else { $comment_count = 0; }
-                                                break;
-                                            default:
-                                                if (isset($comments[$stat_type])) { $comment_count = $comments[$stat_type]; } else { $comment_count = 0; }
-                                                break;
-                                        }                                                                               
-
-                                        $link = "archived";
-                                        $dontlink = array('');                                  
-                                        if (!in_array($stat_type, $dontlink)) {
-                                            $link = BASEURL . "admin_index.php?comment_status_filter=$stat_type&plugin=comment_manager&page=plugin_settings&type=filter&csrf=" . $h->csrfToken;
-                                        }
-                                        
-                                        $lang_name = 'comments_admin_stats_' . $stat_type;
-                                        echo "<li>";
-                                        if ($link) { echo "<a href='" . $link . "'>"; }
-                                        echo $h->lang[$lang_name] . ": " . $comment_count;
-                                        if ($link) { echo "</a>"; }
-                                        echo "</li>";
-                                }
-                        }
-                }
-            }
     }
     

trunk/content/plugins/comments/languages/comments_language.php

@@ -111 +111 @@
 
 /* Admin Stats */
-$lang["comments_admin_stats_all"] = "Total";
-$lang["comments_admin_stats_approved"] = "Approved";
-$lang["comments_admin_stats_pending"] = "Pending";
-$lang["comments_admin_stats_archived"] = "Archived";
+$lang["comments_admin_stats_total_comments"] = "Total";
+$lang["comments_admin_stats_approved_comments"] = "Approved";
+$lang["comments_admin_stats_pending_comments"] = "Pending";
+$lang["comments_admin_stats_archived_comments"] = "Archived";
 
 /* Email to comment subscribers */

trunk/content/plugins/post_manager/post_manager.php

@@ -6 +6 @@
  * folder: post_manager
  * class: PostManager
- * hooks: hotaru_header, install_plugin, admin_header_include, admin_plugin_settings, admin_sidebar_plugin_settings, user_manager_role, user_manager_details, admin_theme_main_stats
+ * hooks: hotaru_header, install_plugin, admin_header_include, admin_plugin_settings, admin_sidebar_plugin_settings, user_manager_role, user_manager_details
  * author: Nick Ramsay
  * authorurl: http://hotarucms.org/member.php?1-Nick
@@ -90 +90 @@
         }
     }
-
-    /**
-     * Show stats on Admin home page
-     */
-    public function admin_theme_main_stats($h, $vars)
-    {
-            $stats = $h->post->stats($h);
-            $stats_archived = $h->post->stats($h, 'archived');
-
-            echo "<li>&nbsp;</li>";
-            if ($stats) {
-                foreach ($stats as $stat) {
-                    $posts[$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 'all':
-                                                $post_count = array_sum($posts);
-                                                break;
-                                            case 'approved':                                            
-                                                $post_count = 0;
-                                                $array = array('top', 'new');
-                                                foreach ($array as $item) {
-                                                    if (isset($posts[$item])) { $post_count += $posts[$item]; }
-                                                }
-                                                break;
-                                            case 'archived' :
-                                                if (isset($stats_archived)) { $post_count = $stats_archived; } else { $post_count = 0; }
-                                                break;
-                                            default:
-                                                if (isset($posts[$stat_type])) { $post_count = $posts[$stat_type]; } else { $post_count = 0; }
-                                                break;
-                                        }                                       
-
-                                        $link = "";
-                                        $dontlink = array('archived');
-                                        if (!in_array($stat_type, $dontlink)) {
-                                            $link = BASEURL . "admin_index.php?post_status_filter=$stat_type&plugin=post_manager&page=plugin_settings&type=filter&csrf=" . $h->csrfToken;
-                                        }
-                                        
-                                        $lang_name = 'post_man_admin_stats_' . $stat_type;
-                                        echo "<li>";
-                                        if ($link) { echo "<a href='" . $link . "'>"; }
-                                        echo $h->lang[$lang_name] . ": " . $post_count;
-                                        if ($link) { echo "</a>"; }
-                                        echo "</li>";
-                                }
-                        }
-                }
-            }
-    }
 }
 

trunk/content/plugins/users/languages/users_language.php

@@ -69 +69 @@
 
 /* Admin Stats */
-$lang["users_admin_stats_all"] = "Total users";
-$lang["users_admin_stats_admin"] = "Admins";
-$lang["users_admin_stats_supermod"] = "Super Mods";
-$lang["users_admin_stats_moderator"] = "Moderators";
-$lang["users_admin_stats_approved"] = "Approved";
-$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";
+$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_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";
 
 /* UserFunctions CLASS: */

trunk/content/plugins/users/users.php

@@ -432 +432 @@
      */
     public function admin_theme_main_stats($h, $vars)
-    {        
+    {
+        require_once(LIBS . 'UserInfo.php');
         $ui = new UserInfo();
-        $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 'all':
-                                                $user_count = array_sum($users);                                                
-                                                break;
-                                            case 'approved':
-                                                $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;
+        
+        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>";
                                         }
-                                        
-                                        $link = "";
-                                        $dontlink = array('approved');
-                                        if ($h->isActive('user_manager')) {
-                                            if (!in_array($stat_type, $dontlink)) {
-                                                $link = BASEURL . "admin_index.php?user_filter=$stat_type&plugin=user_manager&page=plugin_settings&type=filter&csrf=" . $h->csrfToken;
-                                            }
-                                        }
-                                        
-                                        $lang_name = 'users_admin_stats_' . $stat_type;
-                                        echo "<li>";
-                                        if ($link) { echo "<a href='" . $link . "'>"; }
-                                        echo $h->lang[$lang_name] . ": " . $user_count;
-                                        if ($link) { echo "</a>"; }
-                                        echo "</li>";
                                 }
                         }
                 }
-        }
     }