Changeset 1213 for branches/1.2

Timestamp:

02/22/10 14:16:27 (3 years ago)

Author:

nick_ramsay

Message:

[Branch 1.2] Got Hotaru to pass the $h object to ezSQL so we can include user, page and plugin info in database error email notifications.

Location:

branches/1.2

Files:

• Hotaru.php (modified) (1 diff)
• libs/Initialize.php (modified) (1 diff)
• libs/extensions/ezSQL/mysql/ez_sql_mysql.php (modified) (2 diffs)

branches/1.2/Hotaru.php

@@ -84 +84 @@
             $this->checkCssJs();                        // check if we need to merge css/js
             $this->csrf('set');                         // set a csrfToken
+            $this->db->setHotaru($this);                // pass $h object to EzSQL for error reporting
         }
     }

branches/1.2/libs/Initialize.php

@@ -53 +53 @@
         $this->isDebug = $this->checkDebug();
 
-                $this->setUpJsConstants();
+        $this->setUpJsConstants();
 
         return $this;

branches/1.2/libs/extensions/ezSQL/mysql/ez_sql_mysql.php

@@ -48 +48 @@
             $this->dbname = $dbname;
             $this->dbhost = $dbhost;
+        }
+        
+        /**********************************************************************
+        *  Set $h - global Hotaru object
+        */
+
+        function setHotaru($h)
+        {
+            $this->h = $h;
         }
 
@@ -219 +228 @@
                     $headers = "From: " . SITE_EMAIL . "\r\nReply-To: " . SITE_EMAIL . "\r\nX-Priority: 3\r\n";
                     $subject = SITE_NAME . " Database Error";
-                    $body = "SQL query:\r\n";
+                    $body = SITE_NAME . " Database Error\r\n\r\n";
+                    $body .= "Date: " . date('d M Y H:i:s') . " (timezone: " . date_default_timezone_get() . ")\r\n\r\n";
+                    $body .= "SQL query:\r\n";
                     $body .= $query . "\r\n\r\n";
                     
                     $body .= "PHP error log:\r\n";
                     $body .= $str . "\r\n\r\n";
+                    
+                    if(isset($this->h)) {
+                        $body .=  "Current User: " . $this->h->currentUser->name . " (id: " . $this->h->currentUser->id .")\r\n";
+                        $body .=  "User Role: " . $this->h->currentUser->role . "\r\n";
+                        $body .=  "Page Name: " . $this->h->pageName . "\r\n";
+                        $body .=  "Sub Page: " . $this->h->subPage . "\r\n";
+                        $body .=  "Plugin: " . $this->h->plugin->folder . "\r\n\r\n";
+                    }
                     
                     $body .= "If you need help, visit the forums at http://hotarucms.org\r\n";