Changeset 81 for trunk

Timestamp:

02/15/08 15:35:58 (11 months ago)

Author:

root

Message:

added some features, fixed akismet check

Location:

trunk

Files:

• lib/settings.php (modified) (1 diff)
• wassup.php (modified) (8 diffs)

trunk/lib/settings.php

@@ -127 +127 @@
                 <br /><span style="padding-left:10px;display:block;clear:left;">
                 <textarea name="wassup_exclude" rows="4" cols="40"><?php print $wassup_settings['wassup_exclude']; ?></textarea></span><?php _e("comma separated value (ex: 127.0.0.1, 10.0.0.1, etc...)", "wassup") ?></p>
+                <br /><p><strong><?php _e('Enter requested URLs to exclude from recording','wassup'); ?></strong>:
+                <br /><span style="padding-left:10px;display:block;clear:left;">
+                <textarea name="wassup_exclude_url" rows="4" cols="40"><?php print $wassup_settings['wassup_exclude_url']; ?></textarea></span><?php _e("comma separated value, don't put the entire url, only the last path or some word to exclude (ex: /category/wordpress, 2007, etc...)", "wassup") ?></p>
                 <br /><br />
         <?php   $tab=2;

trunk/wassup.php

@@ -57 +57 @@
         'wassup_refspam' => "0",
         'wassup_exclude' => "",
+        'wassup_exclude_url' => "",
         'wassup_savepath' => null,
         'wassup_chart' => "1",
@@ -402 +403 @@
                 $wassup_settings['wassup_refspam'] = $_POST['wassup_refspam'];
                 $wassup_settings['wassup_exclude'] = $_POST['wassup_exclude'];
+                $wassup_settings['wassup_exclude_url'] = $_POST['wassup_exclude_url'];
                 $wassup_settings['delete_auto'] = $_POST['delete_auto'];
                 $wassup_settings['delete_auto_size'] = $_POST['delete_auto_size'];
@@ -656 +658 @@
                         $markedtot = $Tot->calc_tot("count", $search, "AND ip LIKE '%".$wassup_settings['wip']."%'", "DISTINCT");
                 }
+                // Check if some records was searched
+                if (!empty($search)) {
+                        $searchtot = $Tot->calc_tot("count", $search, null, "DISTINCT");
+                }
 
 
@@ -729 +735 @@
                         <li><span style="border-bottom:2px dashed #FF6D06;"><?php echo $pagestot; ?></span> <small><?php _e('Pageviews','wassup'); ?></small></li>
                         <li><span><?php echo @number_format(($pagestot/$itemstot), 2); ?></span> <small><?php _e('Pages/Visits','wassup'); ?></small></li>
-                        <li><span><a href="#TB_inline?height=55&width=400&inlineId=hiddenspam" class="thickbox"><?php echo $spamtot; ?></a></span> <span>(<?php echo @number_format(($spamtot*100/$pagestot), 2); ?>%)</span> <small><?php _e('Spams','wassup'); ?></small></li>
+                        <li><span><a href="#TB_inline?height=180&width=300&inlineId=hiddenspam" class="thickbox"><?php echo $spamtot; ?></a></span> <span>(<?php echo @number_format(($spamtot*100/$pagestot), 2); ?>%)</span> <small><?php _e('Spams','wassup'); ?></small></li>
                         </ul>
                 <?php
@@ -778 +784 @@
                 <td align="left" style="font-size: 11px;">
                 <?php
-                if ($wassup_settings['wmark'] == 1) echo '<a href="?'.$_SERVER['QUERY_STRING'].'&search='.$wassup_settings['wip'].'" title="'.__('Filter by marked IP','wassup').'"><strong>'.$markedtot.'</strong> '.__('visits marked','wassup').'</a> - ';
-                if ($search != "") print __('Searched for','wassup').": <strong>$search</strong> - ";
+                if ($wassup_settings['wmark'] == 1) echo '<a href="?'.$_SERVER['QUERY_STRING'].'&search='.$wassup_settings['wip'].'" title="'.__('Filter by marked IP','wassup').'"><strong>'.$markedtot.'</strong> '.__('show marked items','wassup').'</a> - ';
+                if (!empty($search)) print "<strong>$searchtot</strong>".__('Searched for','wassup').": <strong>$search</strong> - ";
                 echo __('Auto refresh in','wassup').' <span id="CountDownPanel"></span> '.__('seconds','wassup'); ?>
                 </td>
@@ -1095 +1101 @@
         if (empty($wassup_settings['wassup_exclude']) ||
              strstr($wassup_settings['wassup_exclude'],$ipAddress) == FALSE) {
-
+        
+        //## check if url requested is not on exclusion list...
+        if (!empty($wassup_settings['wassup_exclude_url'])) {
+                $exclude_url_list = explode(",", $wassup_settings['wassup_exclude_url']);
+                foreach ($exclude_url_list as $exclude_url) {
+                        if (stristr($urlRequested, trim($exclude_url)) !== FALSE) {
+                                $flag_exclude_url = 1;
+                        }
+                }
+        }
+        if ($flag_exclude_url != 1) {
+        
         //### Exclude requests for themes, plugins, and favicon from recordings
         if (stristr($urlRequested,"favicon.ico") === FALSE) {           //moved
@@ -1292 +1309 @@
                 $akismet = new Akismet($wpurl, $akismet_key, $Acomment);
 
-                // Check if it's spam
-                if ( $akismet->isSpam() ) {
-                        $spam = 1;
+                // Check if it's Akismet spam but before continuing
+                // double check if there is some errors connecting with Akismet
+                if($akismet->errorsExist()) { 
+                // returns true if any errors exist 
+                        if($akismet->isError('AKISMET_INVALID_KEY')) { 
+                        unset($spamresult);
+                        } elseif($akismet->isError('AKISMET_RESPONSE_FAILED')) { 
+                        unset($spamresult);
+                        } elseif($akismet->isError('AKISMET_SERVER_NOT_FOUND')) { 
+                        unset($spamresult);
+                        } 
+                } else {
+                // ok no errors connecting to Akismet, go on check for spam
+                        if ( $akismet->isSpam() ) {
+                                $spam = 1;
+                        }
+                        $spamresult = $spam;
                 }
                 // test for errors
                 //#error means don't record Akismet result in session...
-                if($akismet->errorsExist()) {
-                        unset($spamresult);
-
-                        // no need to alter spam for errors...spam=0 already set by default
-                        // returns true if any errors exist 
-                        //if($akismet->isError('AKISMET_INVALID_KEY')) { 
-                        //      $spam = 0;
-                        //} elseif($akismet->isError('AKISMET_RESPONSE_FAILED')) { 
-                        //      $spam = 0;
-                        //} elseif($akismet->isError('AKISMET_SERVER_NOT_FOUND')) { 
-                        //      $spam = 0;
-                        //} 
-                } else {
-                        $spamresult = $spam;
-                }
            //end if akismet_key
            } else {     
@@ -1428 +1444 @@
 
         } //end if wassup_exclude
+        } //end if wassup_exclude_url
         } //end if wassup_active
         } //end if !is_admin