Changeset 773 for trunk

Timestamp:

01/01/08 03:32:42 (11 months ago)

Author:

michiel

Message:

Create seperate menu item for logging
Seperate Admin and Frontend logging
Re #161

Location:

trunk

Files:

• admin/index.php (modified) (1 diff)
• common/mvblog_admin.php (modified) (4 diffs)
• common/mvblog_log.php (modified) (2 diffs)

trunk/admin/index.php

@@ -176 +176 @@
                                         $admin->show_userlog();
                                         break;
+                                case "show_adminlog" :
+                                        $admin->show_adminlog();
+                                        break;
                                 default : 
                                         $admin->show_index();

trunk/common/mvblog_admin.php

@@ -70 +70 @@
                                 break;
                         case "show_userlog":
-                                $this->_selected_menuitem = "users";
-                                $this->_selected_submenuitem = "log";
+                                $this->_selected_menuitem = "log";
+                                $this->_selected_submenuitem = "users";
+                                break;
+                        case "show_adminlog":
+                                $this->_selected_menuitem = "log";
+                                $this->_selected_submenuitem = "admin";
                                 break;
                         case "show_authors" :
@@ -369 +373 @@
                                 <a class="if_menu_item<?php if ($this->_selected_menuitem == "plugins")    { echo "_act"; } ?>" href="./index.php?action=show_plugins"><?php echo gettext("Plugins"); ?></a>&nbsp;
                                 <a class="if_menu_item<?php if ($this->_selected_menuitem == "import")     { echo "_act"; } ?>" href="./index.php?action=show_import"><?php echo gettext("Import"); ?></a>&nbsp;
+                                <a class="if_menu_item<?php if ($this->_selected_menuitem == "log")        { echo "_act"; } ?>" href="./index.php?action=show_adminlog"><?php echo gettext("Log"); ?></a>&nbsp;
                                 <a class="if_menu_item" href="./index.php?action=logout"><?php echo gettext("Logout"); ?></a>&nbsp;
                         </div>
@@ -399 +404 @@
                                         <a class="if_submenu_item<?php if ($this->_selected_submenuitem == "index")      { echo "_act"; } ?>" href="./index.php"><?php echo gettext("Main"); ?></a>&nbsp;
                                         <a class="if_submenu_item<?php if ($this->_selected_submenuitem == "about")      { echo "_act"; } ?>" href="./index.php?action=show_about"><?php echo gettext("About"); ?></a>&nbsp;
+                                        <?php
+                                        break;
+                                case "log" :
+                                        ?>
+                                        <a class="if_submenu_item<?php if ($this->_selected_submenuitem == "admin")      { echo "_act"; } ?>" href="./index.php?action=show_adminlog"><?php echo gettext("Backend"); ?></a>&nbsp;
+                                        <a class="if_submenu_item<?php if ($this->_selected_submenuitem == "users")      { echo "_act"; } ?>" href="./index.php?action=show_userlog"><?php echo gettext("Frontend"); ?></a>&nbsp;
                                         <?php
                                         break;
@@ -2046 +2057 @@
          */
         public function show_userlog() {
-                $this->log->show_log();
+                $this->log->show_log(2);
+        }
+        /* }}} */
+        /* show_adminlog {{{ */
+        /**
+         * Show a log of what happened
+         */
+        public function show_adminlog() {
+                $this->log->show_log(1);
         }
         /* }}} */

trunk/common/mvblog_log.php

@@ -68 +68 @@
         public function get_log($user_type = 0, $count = 25, $ts_start = 0, $ts_end = 0) {
                 $logrecords = array();
-                $sql = "SELECT * FROM log ORDER BY time DESC";
+                switch ($user_type) {
+                case 1:
+                case 2:
+                        $sql = sprintf("SELECT * FROM log WHERE user_type = %d ORDER BY time DESC", $user_type);
+                        break;
+                default:
+                        $sql = "SELECT * FROM log ORDER BY time DESC";
+                        break;
+                }
                 $res = $this->db->query($sql);
                 while ($row = $res->fetchRow(MDB2_FETCHMODE_ASSOC)) {
@@ -83 +91 @@
         /**
          * Show log overview
+         *
+         * @param int $user_type 1 for admin, 2 for users, 0 for everything
          */
-        public function show_log() {
-                $logrecords = $this->get_log();
+        public function show_log($user_type = 1) {
+                $logrecords = $this->get_log($user_type);
                 echo "<table style=\"border: 1px solid black;\"><tr>\n";
                 echo "\t<td style=\"border: 1px solid black;\">date</td><td style=\"border: 1px solid black;\">login</td><td style=\"border: 1px solid black;\">fullname</td>\n";