Changeset 775 for trunk

Timestamp:

01/06/08 13:47:35 (11 months ago)

Author:

michiel

Message:

added frontend logging.
For this we had to add a global variable with all the users.

Re #161

Location:

trunk/common

Files:

• mvblog.php (modified) (4 diffs)
• mvblog_common.php (modified) (3 diffs)
• mvblog_log.php (modified) (1 diff)

trunk/common/mvblog.php

@@ -78 +78 @@
         public function __construct ($basedir="") {
                 parent::__construct($basedir."plugins/");
+                $this->log = new MvBlog_log($basedir, 0);
         }
         /* }}} */
@@ -1109 +1110 @@
                                 $_SESSION["blog_user"]["email"]    = $row["email"];
                                 $_SESSION["blog_user"]["website"]  = $row["website"];
+                                $this->log->add_log(mktime(), $row["id"], 2, sprintf("User %s logged in", $row["username"]));
                                 return true;
                         } else {
@@ -1223 +1225 @@
                                 $email, $website, $regcode, $email_public
                         );
+                        $logmsg = sprintf("User %s registered", $username);
                 } else {
                         if ($password)
@@ -1234 +1237 @@
                         $sql = sprintf("UPDATE blog_users SET realname = '%s'%s, email = '%s', website = '%s', email_public = %d WHERE id = %d",
                                 $realname, $passwdq, $email, $website, $email_public, $_SESSION["blog_user"]["user_id"]);
+                        $logmsg = sprintf("User %d:%s updated", $_SESSION["blog_user"]["id"], $_SESSION["blog_user"]["username"]);
                 }
                 $this->db->exec($sql);
+                $this->log->add_log(mktime(), 0, 2, $logmsg);
                 if ($register) {
                         if (array_key_exists("HTTPS", $_SERVER) && $_SERVER["HTTPS"] == "on")

trunk/common/mvblog_common.php

@@ -61 +61 @@
         public $authors    = array();
         /**
+         * @var array $users Array with all active users.
+         * The array looks like this:
+         * <pre>
+         * array (
+         *   [id] => "fullname",
+         *   [id] => "fullname"
+         * )
+         * </pre>
+         */
+        public $users      = array();
+        /**
          * @var array $categories Array with all active categories.
          * The array looks like this:
@@ -187 +198 @@
                         /* populate the authors array */
                         $this->_get_authors();
+
+                        /* populate the users array */
+                        $this->_get_users();
 
                         /* populate the categories array */
@@ -607 +621 @@
                 }
                 $this->authors = $authors;
+        }
+        /* }}} */
+        /* _get_users() {{{ */
+        /**
+         * Get all the users into an array.
+         */
+        public function _get_users() {
+                /* user with id 0 is for a new user. */
+                $authors = array(
+                        0 => array(
+                                "login"    => "login",
+                                "password" => "",
+                                "email"    => "",
+                                "fullname" => "",
+                                "active"   => 1,
+                                "website"  => ""
+                        )
+                );
+
+                $res =& $this->db->query("SELECT * FROM blog_users");
+                if (PEAR::isError($res)) {
+                        die($res->getMessage());
+                }
+                while ($row = $res->fetchRow(MDB2_FETCHMODE_ASSOC)) {
+                        $users[$row["id"]] = array(
+                                "username" => $row["username"],
+                                "password" => $row["password"],
+                                "email"    => $row["email"],
+                                "realname" => $row["realname"],
+                                "active"   => $row["active"],
+                                "website"  => $row["website"]
+                        );
+                }
+                $this->users = $users;
         }
         /* }}} */

trunk/common/mvblog_log.php

@@ -80 +80 @@
                 while ($row = $res->fetchRow(MDB2_FETCHMODE_ASSOC)) {
                         $row["human_time"] = date("Y-m-d H:i:s", $row["time"]);
-                        $row["username"] = $this->authors[$row["user_id"]]["login"];
-                        $row["fullname"] = $this->authors[$row["user_id"]]["fullname"];
+                        if ($row["user_type"] == 1) {
+                                $row["username"] = $this->authors[$row["user_id"]]["login"];
+                                $row["fullname"] = $this->authors[$row["user_id"]]["fullname"];
+                        } elseif ($row["user_type"] == 2) {
+                                $row["username"] = $this->users[$row["user_id"]]["username"];
+                                $row["fullname"] = $this->users[$row["user_id"]]["realname"];
+                        }
                         $logrecords[] = $row;
                 }