Changeset 93

Timestamp:

02/19/08 09:36:23 (9 months ago)

Author:

root

Message:

 

Location:

trunk

Files:

• lib/action.php (modified) (2 diffs)
• wassup.php (modified) (14 diffs)

trunk/lib/action.php

@@ -13 +13 @@
 $table_name = $wpdb->prefix . "wassup";
 
-if ( $_GET['hash'] != wp_hash(SECRET_KEY)) {
-        echo "Nothing to do here";
-} else {
         //Retrieve command-line arguments...
         $max_char_len = (urlencode(attribute_escape($_GET['width']))/10);
@@ -159 +156 @@
 </div>
 <?php
-        }
 }
 ?>

trunk/wassup.php

@@ -27 +27 @@
 
 global $wp_version;
+/*
 if (!defined('SECRET_KEY')) {
         function wassup_warning() {
@@ -34 +35 @@
         add_action('admin_notices', 'wassup_warning');
         return;
+*/
 //#This works only in WP2.2 or higher
-} elseif (version_compare($wp_version, '2.2', '<')) {
+if (version_compare($wp_version, '2.2', '<')) {
         wp_die( '<strong style="color:#c00;background-color:#dff;padding:5px;">'.__("Sorry, Wassup requires WordPress 2.2 or higher to work","wassup").'.</strong>');
 } else {
@@ -114 +116 @@
         //# display google chart by default for upgrades from 1.4.4
         if (!isset($wassup_settings['wassup_chart'])) {
-                $wassup_settings['wassup_chart'] == 1;
+                $wassup_settings['wassup_chart'] = 1;
         }
         //#save wassup settings changes
@@ -172 +174 @@
 function add_wassup_css() {
         global $wpurl;
-        $hash = wp_hash(SECRET_KEY);
+        //$hash = wp_hash(SECRET_KEY);
         $plugin_page = attribute_escape($_GET['page']);
 
@@ -249 +251 @@
            var id = $(this).attr('id');
                  $.ajax({
-                  url: "<?php echo $wpurl; ?>/wp-content/plugins/<?php echo WASSUPFOLDER; ?>/lib/action.php?action=delete&hash=<?php echo $hash; ?>&id=" + id,
+                  url: "<?php echo $wpurl; ?>/wp-content/plugins/<?php echo WASSUPFOLDER; ?>/lib/action.php?action=delete&id=" + id,
                   async: false
                  })
@@ -335 +337 @@
                 limit: 10, 
                 fadeLast: 5, 
-                ajax: '<?php echo $wpurl."/wp-content/plugins/".WASSUPFOLDER."/lib/action.php?action=spy&hash=$hash"; ?>',
+                ajax: '<?php echo $wpurl."/wp-content/plugins/".WASSUPFOLDER."/lib/action.php?action=spy"; ?>',
                 timeout: 2000, 
                 'timestamp': myTimestamp, 
@@ -378 +380 @@
 function WassUp() {
         global $wpdb, $version, $wpurl, $defaultWdata;
+        /*
         if ( !defined('SECRET_KEY') ) {
                 echo "<div id='wassup-warning' class='updated fade-ff0000' style='padding:25px;'><p><strong style='color:#c00;'>".__("Sorry, Wassup requires SECRET_KEY constant declared in wp-config.php... Please read <a href='http://www.wpwp.org/download'>documentation</a> for more info...","wassup").".</strong></p></div>";
         }
         $hash = wp_hash(SECRET_KEY);
+        */
         $table_name = $wpdb->prefix . "wassup";
         $wassup_settings = get_option('wassup_settings');
@@ -798 +802 @@
                 echo __('Auto refresh in','wassup').' <span id="CountDownPanel"></span> '.__('seconds','wassup'); ?>
                 </td>
-                <td align="right" style="font-size: 11px;"><a href="<?php echo $wpurl."/wp-content/plugins/".WASSUPFOLDER."/lib/action.php?height=400&width=$res&action=topten&hash=$hash&from_date=$from_date&to_date=$to_date"; ?>" class="thickbox"><?php _e('Show TopTen','wassup'); ?></a> - <a href="#" class='show-search'><?php _e('Search','wassup'); ?></a></td>
+                <td align="right" style="font-size: 11px;"><a href="<?php echo $wpurl."/wp-content/plugins/".WASSUPFOLDER."/lib/action.php?height=400&width=$res&action=topten&from_date=$from_date&to_date=$to_date"; ?>" class="thickbox"><?php _e('Show TopTen','wassup'); ?></a> - <a href="#" class='show-search'><?php _e('Search','wassup'); ?></a></td>
                 </tr>
                 </table>
@@ -864 +868 @@
                         <img src="<?php echo $wpurl.'/wp-content/plugins/'.WASSUPFOLDER.'/img/error_add.png" alt="'.__('mark','wassup').'" title="'.__('Mark IP','wassup'); ?>" /></a>
                 <?php } ?>
-                <a href="<?php echo $wpurl."/wp-content/plugins/".WASSUPFOLDER."/lib/action.php?height=400&width=$res&action=displayraw&hash=$hash&wassup_id=".$rk->wassup_id.""; ?>" class="thickbox">
+                <a href="<?php echo $wpurl."/wp-content/plugins/".WASSUPFOLDER."/lib/action.php?height=400&width=$res&action=displayraw&wassup_id=".$rk->wassup_id.""; ?>" class="thickbox">
                 <img src="<?php echo $wpurl.'/wp-content/plugins/'.WASSUPFOLDER.'/img/database_table.png" alt="'.__('show raw table','wassup').'" title="'.__('Show the items as raw table','wassup'); ?>" /></a>
                 </p>
@@ -1022 +1026 @@
         global $wpdb, $wassup_settings;
         $table_name = $wpdb->prefix . "wassup";
-        // Upgrade from version < 1.1b 
-        if ($wpdb->get_var("SHOW COLUMNS FROM $table_name LIKE 'username'") == "") {
-                $sql_add_username = "ALTER TABLE {$table_name} ADD COLUMN username VARCHAR( 50 ) NULL";
-                $wpdb->query( $sql_add_username );
-        }
-        if ($wpdb->get_var("SHOW COLUMNS FROM $table_name LIKE 'comment_author'") == "") {
-                $sql_add_comment_author = "ALTER TABLE {$table_name} ADD COLUMN comment_author VARCHAR( 50 ) NULL";
-                $wpdb->query( $sql_add_comment_author );
-        }
-        // Upgrade from version < 1.1.4b 
-        $Freferrer = $wpdb->get_results("show columns from $table_name LIKE 'referrer'");
-        foreach ($Freferrer as $ff) {
-                if (eregi("varchar", $ff->Type)) {
-                        $sql_alter_referrer = "ALTER TABLE {$table_name} CHANGE referrer referrer TEXT NULL";
-                        $wpdb->query( $sql_alter_referrer );
-                }
-        }
-        // Upgrade from version < 1.2b
-        $Fsearchpage = $wpdb->get_results("show columns from $table_name LIKE 'searchpage'");
-        foreach ($Fsearchpage as $ss) {
-                if ($ss->Default == "") {
-                        $sql_alter_searchpage = "ALTER TABLE {$table_name} CHANGE searchpage searchpage INT( 11 ) NULL DEFAULT '0'";
-                        $wpdb->query( $sql_alter_searchpage );
-                }
-        }
-        $Fuseragent = $wpdb->get_results("show columns from $table_name LIKE 'agent'");
-        foreach ($Fuseragent as $ua) {
-                if ($ua->Type != "varchar(255)") {
-                        $sql_alter_useragent = "ALTER TABLE {$table_name} CHANGE agent agent varchar(255) NULL";
-                        $wpdb->query( $sql_alter_useragent );
-                }
-        }
-        $Fbrowser = $wpdb->get_results("show columns from $table_name LIKE 'browser'");
-        foreach ($Fbrowser as $br) {
-                if ($br->Type != "varchar(50)") {
-                        $sql_alter_browser = "ALTER TABLE {$table_name} CHANGE browser browser varchar(50) NULL";
-                        $wpdb->query( $sql_alter_browser );
-                }
-        }
-        $Fspider = $wpdb->get_results("show columns from $table_name LIKE 'spider'");
-        foreach ($Fspider as $sp) {
-                if ($sp->Type != "varchar(50)") {
-                        $sql_alter_spider = "ALTER TABLE {$table_name} CHANGE spider spider varchar(50) NULL";
-                        $wpdb->query( $sql_alter_spider );
-                }
-        }
         // Upgrade from version < 1.3.9 
         if ($wpdb->get_var("SHOW COLUMNS FROM $table_name LIKE 'spam'") == "") {
@@ -1078 +1036 @@
 function wassupAppend() {
         global $wpdb, $wassup_id, $wp_query, $HTTP_COOKIE_VARS, $screen_res, $wassup_settings, $wpurl;
+        /*
         // don't do anything if SECRET_KEY is missing
         if (defined('SECRET_KEY')) {
+        */
         $siteurl =  get_bloginfo('siteurl');
         $table_name = $wpdb->prefix . "wassup"; //moved;
@@ -1278 +1238 @@
 
         if ( $wassup_settings['wassup_spamcheck'] == 1 ) { 
-                //
-                //# No duplicate spam testing in same session unless there 
-                //#  is a forum page request or comment...
-                if (isset($spamresult) && stristr($urlRequested,"comment") === FALSE && stristr($urlRequested,"forum") === FALSE && empty($comment_user) && empty($_POST['comment'])) { 
                    //#first check for referrer spam (faster, if positive)
                    //#...but skip when referrer is own blog ($siteurl/$wpurl)
@@ -1295 +1251 @@
                    $spam = $spamresult;
 
+                //
+                //# No duplicate spam testing in same session unless there 
+                //#  is a forum page request or comment...
+                if (isset($spamresult) && stristr($urlRequested,"comment") === FALSE && stristr($urlRequested,"forum") === FALSE && empty($comment_user) && empty($_POST['comment'])) { 
                 //# No spam check on known bots (google, yahoo,...) unless
                 //#  there is a comment or forum page request...
@@ -1445 +1405 @@
            }
         } //if wassup_remind_flag
-        } //if SECRET_KEY
+        //} //if SECRET_KEY
 } //end function wassupAppend()