diff --git a/plugins/serendipity_event_statistics/serendipity_event_statistics.php b/plugins/serendipity_event_statistics/serendipity_event_statistics.php index 976a0c8a..ef997ae2 100644 --- a/plugins/serendipity_event_statistics/serendipity_event_statistics.php +++ b/plugins/serendipity_event_statistics/serendipity_event_statistics.php @@ -12,7 +12,7 @@ if (file_exists($probelang)) { } include dirname(__FILE__) . '/lang_en.inc.php'; - + class serendipity_event_statistics extends serendipity_event { var $title = PLUGIN_EVENT_STATISTICS_NAME; @@ -25,7 +25,7 @@ class serendipity_event_statistics extends serendipity_event $propbag->add('description', PLUGIN_EVENT_STATISTICS_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Arnan de Gans, Garvin Hicking, Fredrik Sandberg'); - $propbag->add('version', '1.44'); + $propbag->add('version', '1.45'); $propbag->add('requirements', array( 'serendipity' => '0.8', 'smarty' => '2.6.7', @@ -50,11 +50,11 @@ class serendipity_event_statistics extends serendipity_event $propbag->add('description', PLUGIN_EVENT_STATISTICS_MAX_ITEMS_DESC); $propbag->add('default', 20); break; - - + + case 'ext_vis_stat': - $select = array('no' => PLUGIN_EVENT_STATISTICS_EXT_OPT1, - 'yesBot' => PLUGIN_EVENT_STATISTICS_EXT_OPT2, + $select = array('no' => PLUGIN_EVENT_STATISTICS_EXT_OPT1, + 'yesBot' => PLUGIN_EVENT_STATISTICS_EXT_OPT2, 'yesTop' => PLUGIN_EVENT_STATISTICS_EXT_OPT3); $propbag->add('type', 'select'); @@ -64,9 +64,9 @@ class serendipity_event_statistics extends serendipity_event $propbag->add('default', 'no'); break; - + case 'stat_all': - $select = array('no' => PLUGIN_EVENT_STATISTICS_EXT_ALL1, + $select = array('no' => PLUGIN_EVENT_STATISTICS_EXT_ALL1, 'yes' => PLUGIN_EVENT_STATISTICS_EXT_ALL2); $propbag->add('type', 'select'); @@ -76,9 +76,9 @@ class serendipity_event_statistics extends serendipity_event $propbag->add('default', 'yes'); break; - - case 'banned_bots': - $select = array('yes' => PLUGIN_EVENT_STATISTICS_BANNED_HOSTS1, + + case 'banned_bots': + $select = array('yes' => PLUGIN_EVENT_STATISTICS_BANNED_HOSTS1, 'no' => PLUGIN_EVENT_STATISTICS_BANNED_HOSTS2); $propbag->add('type', 'select'); @@ -104,7 +104,7 @@ class serendipity_event_statistics extends serendipity_event if (isset($hooks[$event])) { switch($event) { - + case 'frontend_configure': if ($this->get_config('ext_vis_stat') == 'no') { return; @@ -119,13 +119,13 @@ class serendipity_event_statistics extends serendipity_event if ($this->get_config('db_indices_created', 'false') !== '1') { $this->updateTables(); } - + //Unique visitors are beeing registered and counted here. Calling function below. $sessionChecker = serendipity_db_query("SELECT count(sessID) FROM {$serendipity['dbPrefix']}visitors WHERE '".serendipity_db_escape_string(session_id())."' = sessID GROUP BY sessID", true); if (!is_array($sessionChecker) || (is_array($sessionChecker)) && ($sessionChecker[0] == 0)) { - + $referer = $useragent = $remoteaddr = 'unknown'; - + // gathering intel if ($_SERVER['REMOTE_ADDR']) { $remoteaddr = $_SERVER['REMOTE_ADDR']; @@ -136,9 +136,9 @@ class serendipity_event_statistics extends serendipity_event if ($_SERVER['HTTP_REFERER']) { $referer = $_SERVER['HTTP_REFERER']; } - + $found = 0; - + // avoiding banned browsers if ($this->get_config('banned_bots') == 'yes') { // excludelist botagents @@ -169,25 +169,41 @@ class serendipity_event_statistics extends serendipity_event '24' => "Wells Search II", '25' => "Dumbot", '26' => "GeoBot", - '27' => "DigExt" + '27' => "DigExt", + '28' => "Feedfetcher-Google", + '29' => "FeedBurner", + '30' => "Jeeves/Teoma", + '31' => "FeedBurner/1.0(http://www.FeedBurner.com)", + '32' => "Technorati Feed Engine/0.01 (Java 1.4.2_07 Sun Microsystems Inc./Linux 2.6.9-22.0.1.ELsmp)", + '33' => "Java/1.5.0_10", + '34' => "Java/1.5.0_06", + '35' => "MarsEdit", + '36' => "Blogslive (info@blogslive.com)", + '37' => "XMLRPCCocoa", + '38' => "Feedfetcher-Google; (+www.google.com/feedfetcher.html)", + '39' => "YahooFeedSeeker/2.0 (compatible; Mozilla 4.0; MSIE 5.5; http://publisher.yahoo.com/rssguide)", + '40' => "Mediapartners-Google/2.1", + '41' => "MagpieRSS/0.61 (+http://magpierss.sf.net)", + '42' => "www.google.com/feedfetcher.html)", + '43' => "Sphere Scout&v4.0 (beta)- scout at sphere dot com" ); - + foreach($banned_array AS $ban) { if (stristr($useragent, $ban)) { $found = 1; break; } } - } + } - if ($found == 0){ + if ($found == 0){ $this->countVisitor($useragent, $remoteaddr, $referer); } } else { // Update visitor timestamp $this->updateVisitor(); } - + break; case 'backend_sidebar_entries': ?> @@ -203,12 +219,12 @@ class serendipity_event_statistics extends serendipity_event if (!$max_items || !is_numeric($max_items) || $max_items < 1) { $max_items = 20; } - + if ($ext_vis_stat == 'yesTop') { $this->extendedVisitorStatistics($max_items); } - + if ($this->get_config('stat_all') == 'yes') { $first_entry = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp ASC limit 1", true); $last_entry = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp DESC limit 1", true); @@ -225,10 +241,10 @@ class serendipity_event_statistics extends serendipity_event GROUP BY ec.categoryid, c.category_name ORDER BY postings DESC"; $category_rows = serendipity_db_query($cat_sql); - + $image_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}images", true); $image_rows = serendipity_db_query("SELECT extension, count(id) AS images FROM {$serendipity['dbPrefix']}images GROUP BY extension ORDER BY images DESC"); - + $subscriber_count = count(serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'NORMAL' AND subscribed = 'true' GROUP BY email")); $subscriber_rows = serendipity_db_query("SELECT e.timestamp, e.id, e.title, count(c.id) as postings FROM {$serendipity['dbPrefix']}comments c, @@ -237,7 +253,7 @@ class serendipity_event_statistics extends serendipity_event GROUP BY e.id, c.email, e.title, e.timestamp ORDER BY postings DESC LIMIT $max_items"); - + $comment_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'NORMAL'", true); $comment_rows = serendipity_db_query("SELECT e.timestamp, e.id, e.title, count(c.id) as postings FROM {$serendipity['dbPrefix']}comments c, @@ -246,14 +262,14 @@ class serendipity_event_statistics extends serendipity_event GROUP BY e.id, e.title, e.timestamp ORDER BY postings DESC LIMIT $max_items"); - + $commentor_rows = serendipity_db_query("SELECT author, max(email) as email, max(url) as url, count(id) as postings FROM {$serendipity['dbPrefix']}comments c WHERE type = 'NORMAL' GROUP BY author ORDER BY postings DESC LIMIT $max_items"); - + $tb_count = serendipity_db_query("SELECT count(id) FROM {$serendipity['dbPrefix']}comments WHERE type = 'TRACKBACK'", true); $tb_rows = serendipity_db_query("SELECT e.timestamp, e.id, e.title, count(c.id) as postings FROM {$serendipity['dbPrefix']}comments c, @@ -262,14 +278,14 @@ class serendipity_event_statistics extends serendipity_event GROUP BY e.timestamp, e.id, e.title ORDER BY postings DESC LIMIT $max_items"); - + $tbr_rows = serendipity_db_query("SELECT author, max(email) as email, max(url) as url, count(id) as postings FROM {$serendipity['dbPrefix']}comments c WHERE type = 'TRACKBACK' GROUP BY author ORDER BY postings DESC LIMIT $max_items"); - + $length = serendipity_db_query("SELECT SUM(LENGTH(body) + LENGTH(extended)) FROM {$serendipity['dbPrefix']}entries", true); $length_rows = serendipity_db_query("SELECT id, title, (LENGTH(body) + LENGTH(extended)) as full_length FROM {$serendipity['dbPrefix']}entries ORDER BY full_length DESC LIMIT $max_items"); ?> @@ -527,7 +543,7 @@ class serendipity_event_statistics extends serendipity_event