Changeset 700846

Timestamp:

04/20/2013 07:34:19 PM (13 years ago)

Author:

Bilbud

Message:

corrected display of url in error list page for single site installations.

Location:

404-error-monitor/trunk

Files:

• includes/DataTools.php (modified) (2 diffs)
• includes/Error.php (modified) (1 diff)
• includes/errorList.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

404-error-monitor/trunk/includes/DataTools.php

@@ -101 +101 @@
             $wpdb->errorReportTable = $wpdb->prefix . self::LOG_TABLE;
         }
-        if ( $wpdb->get_var("SHOW TABLES LIKE '{$wpdb->errorReportTable}'") != $wpdb->errorReportTable ) {
+        if ( !self::_tableExist($wpdb->errorReportTable) ) {
             $wpdb->query( "CREATE TABLE IF NOT EXISTS `{$wpdb->errorReportTable}` (
                 `id` bigint(20) NOT NULL auto_increment,
@@ -111 +111 @@
                 PRIMARY KEY  (`id`)
             );" );
+        }
+    }
+    
+    public static function _tableExist($tableName)
+    {
+        global $wpdb;
+        if($wpdb->get_var("SHOW TABLES LIKE '{$tableName}'") == $tableName){
+            return true;
+        } else {
+            return false;
         }
     }

404-error-monitor/trunk/includes/Error.php

@@ -167 +167 @@
     {
         global $wpdb;
-        if(is_object($errorRow)){
-            return $wpdb->get_var("SELECT domain FROM ".errorMonitor_DataTools::getTableName('blogs')." WHERE blog_id = ".$errorRow->blog_id.";");
+        
+        $tableName = errorMonitor_DataTools::getTableName('blogs');
+        if(errorMonitor_DataTools::isNetworkInstall() && errorMonitor_DataTools::_tableExist($tableName)){
+            if(is_object($errorRow)){
+                return $wpdb->get_var("SELECT domain FROM ".$tableName." WHERE blog_id = ".$errorRow->blog_id.";");
+            }
+        } else {
+            return str_replace(array('http://','https://'),'',get_bloginfo( 'wpurl'));
         }
     }

404-error-monitor/trunk/includes/errorList.php

@@ -130 +130 @@
                 </tr>
             <?php }
+            
+            $previousBlogId = '';
             foreach($errorsRowset as $row){
                 $domain = $error->getDomain($row);

404-error-monitor/trunk/index.php

@@ -20 +20 @@
  *     Plugin URI: http://www.php-geek.fr/plugin-wordpress-404-error-monitor.html
  *     Description: This plugin logs 404 (Page Not Found) errors on your WordPress site. It also logs useful informations like referrer, user address, and error hit count. It is fully compatible with a multisite configuration.
- *     Version: 1.0.6
+ *     Version: 1.0.7
  *     Author: Bruce Delorme
  *     Author URI: http://www.php-geek.fr
@@ -300 +300 @@
     function curPageURL() {
          $pageURL = 'http';
-         if ($_SERVER["HTTPS"] == "on") {$pageURL .= "s";}
+         if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {$pageURL .= "s";}
          $pageURL .= "://";
          if ($_SERVER["SERVER_PORT"] != "80") {

404-error-monitor/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.2.1
 Tested up to: 3.5.1
-Stable tag: 1.0.6
+Stable tag: 1.0.7
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -47 +47 @@
 * added export fonctionnality.
 * improved extension filters.
+
+= 1.0.7 =
+* corrected display of url in error list page for single site installations.