Changeset 131

Timestamp:

04/20/08 17:50:20 (7 months ago)

Author:

root

Message:

1.5.1 testing

Location:

trunk

Files:

• lib/action.php (modified) (6 diffs)
• lib/settings.php (modified) (1 diff)
• lib/wassup.class.php (modified) (5 diffs)
• wassup.php (modified) (18 diffs)

trunk/lib/action.php

@@ -2 +2 @@
 // action.php -- perform an action that renders an output to the browser
 
-//force browser to disable caching to make action.php work as an ajax request
+//force browser to disable caching so action.php works as an ajax request
 header("Expires: Fri, 22 Jun 2007 05:00:00 GMT"); // Date in the past
 header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); // always modified
@@ -8 +8 @@
 header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', false);
+//echo "\n";
 //#debug...
 //error_reporting(E_ALL | E_STRICT);    //debug, E_STRICT=php5 only
 //ini_set('display_errors','On');       //debug
-//echo "\n"; //debug
 
 //#check for required files and include them
 if (!defined('ABSPATH')) {
-        define ('ABSPATH', substr(__FILE__,0,strpos(__FILE__,'/wp-content/')+1));
-        if (file_exists(ABSPATH. 'wp-blog-header.php')) {
-                include_once(ABSPATH. 'wp-blog-header.php');
-        }
+        $wpabspath=substr(__FILE__,0,strpos(__FILE__,'/wp-content/')+1);
+        if (file_exists($wpabspath. 'wp-blog-header.php')) {
+                include_once($wpabspath. 'wp-blog-header.php');
+        }
+} else {
+        $wpabspath=ABSPATH;
 }
 if (!function_exists('get_bloginfo')) {
-        if (file_exists(ABSPATH. 'wp-config.php')) {
-                include_once(ABSPATH.'wp-config.php');
+        if (file_exists($wpabspath. 'wp-config.php')) {
+                include_once($wpabspath.'wp-config.php');
         } else {
-                echo '<span style="font-color:red;">Action.php '.__('ERROR: file not found','wassup').', '.ABSPATH.'wp-config.php</span>';
-                exit();
+                //Note: localization functions, _e() and __(), are not used
+                //  here because they would not be defined if this error 
+                //  occurred
+                echo '<span style="font-color:red;">Action.php ERROR: file not found, '.$wpabspath.'wp-config.php</span>';
+                die();
         }
 }
@@ -38 +43 @@
 //echo "Debug: Starting action.php from directory ".dirname(__FILE__).".  ABSPATH=".ABSPATH.".<br />\n"; //debug
 
+//#set required variables
+$siteurl =  get_bloginfo('siteurl');
+$wpurl =  get_bloginfo('wpurl');
+$table_name = $wpdb->prefix . "wassup";
+$wassup_settings = get_option('wassup_settings');
+if (!defined('WASSUPFOLDER')) {
+        define('WASSUPFOLDER', substr(__FILE__,0,strpos(__FILE__,'/lib/')+1));
+}
+
 //#do a hash check
-if (function_exists('wp_hash')) {       //in case it was not loaded by WP
+$hashfail = true;
+if (isset($_GET['whash']) && $_GET['whash'] == $wassup_settings['whash']) {
         $hashfail = false;
-        if (!empty($_GET['whash'])) { 
-        if (defined('SECRET_KEY') && $_GET['whash'] == wp_hash(SECRET_KEY)) {
-                $hashfail = false;
-        } elseif ($_GET['whash'] == wp_hash('wassup')) {
-                $hashfail = false;
-        }
-        }
-} else {
-        $hashfail = true;
 }
 //#perform the "action" and display the result
@@ -71 +77 @@
                 exit();
         }
-
-        //#set required variables
-        $siteurl =  get_bloginfo('siteurl');
-        $wpurl =  get_bloginfo('wpurl');
-        $table_name = $wpdb->prefix . "wassup";
-        $wassup_settings = get_option('wassup_settings');
 
         //#perform action and display output
@@ -138 +138 @@
         // ACTION: RUN TOP TEN
         } elseif ($_GET['action'] == "topten") {
+                $top_ten = unserialize($wassup_settings['wassup_top10']);
                 $sitedomain = parse_url($siteurl);
                 $sitedomain = $sitedomain['host'];
                 if (empty($max_char_len)) {
                         $max_char_len = ($wassup_settings['wassup_screen_res'])/10;
+                }
+                //#add an extra width offset when columns count < 5
+                $col_count = 0;
+                foreach ($top_ten as $topitem) {
+                        if ($topitem == 1) { $col_count = $col_count+1; }
+                }
+                if ($col_count > 0 && $col_count < 5 ) {
+                        $widthoffset = (($max_char_len*(5 - $col_count))/$col_count)*.4; //just a guess
+                } else { 
+                        $widthoffset = 0;
                 }
                 //only exclude spam if it is being recorded
@@ -148 +159 @@
                 } else {
                         $spamselect = "";
-                }
-                $col_count = 0;
-                $top_ten = unserialize($wassup_settings['wassup_top10']);
-                //#get top 10 searches...
+                } 
+        ?>
+        <style type="text/css">.top10 { color: #542; }</style>
+        <div id="toptenchart">
+        <table width="100%" border=0>
+                <tr valign="top">
+                <?php
+                //#output top 10 searches
                 if ($top_ten['topsearch'] == 1) {
-                        $ch_search = $wpdb->get_results("SELECT count(search) as top_search, search, referrer FROM $table_name WHERE timestamp BETWEEN $from_date AND $to_date AND search!='' $spamselect GROUP BY search ORDER BY top_search DESC LIMIT 10");
-                        $col_count = $col_count+1;
-                }
-                //#get top 10 requests...
-                if ($top_ten['toprequest'] == 1) {
-                        $ch_urlreq = $wpdb->get_results("SELECT count(urlrequested) as top_urlrequested, urlrequested FROM $table_name WHERE timestamp BETWEEN $from_date AND $to_date AND urlrequested!='' $spamselect GROUP BY REPLACE(urlrequested, '/', '') ORDER BY top_urlrequested DESC LIMIT 10");
-                        $col_count = $col_count+1;
-                }
-                //#get top 200 referrers...will be narrowed down to 10 
+                        $top_results =  $wpdb->get_results("SELECT count(search) as top_search, search, referrer FROM $table_name WHERE timestamp BETWEEN $from_date AND $to_date AND search!='' $spamselect GROUP BY search ORDER BY top_search DESC LIMIT 10");
+                        $char_len = round(($max_char_len*.30)+$widthoffset,0);
+                ?>
+                <td style="min-width:<?php echo $char_len; ?>px;">
+                <ul class="charts">
+                        <li class="chartsT"><?php _e("TOP QUERY", "wassup"); ?></li>
+                <?php 
+                foreach ($top_results as $top10) { ?>
+                        <li class="charts"><?php echo $top10->top_search.': <a href="'.$top10->referrer.'" target="_BLANK">'.stringShortener(preg_replace('/'.preg_quote($siteurl,'/').'/i', '', $top10->search),$char_len).'</a>'; ?></li>
+                <?php } ?>
+                </ul>
+                </td>
+                <?php
+                } // end if topsearch
+
+                //#output top 10 referrers
+                //# select top 200 referrers: will be narrowed down to 10 
                 //#  with exclusion of wpurl referrals...
                 if ($top_ten['topreferrer'] == 1) {
-                        $ch_referer = $wpdb->get_results("SELECT count(referrer) as top_referrer, referrer FROM $table_name WHERE timestamp BETWEEN $from_date AND $to_date AND referrer!='' AND referrer NOT LIKE '%".$sitedomain."%' AND searchengine='' $spamselect GROUP BY referrer ORDER BY top_referrer DESC LIMIT 200");
-                        $col_count = $col_count+1;
-                }
-                //#get top 10 browsers...
-                if ($top_ten['topbrowser'] == 1) {
-                        $ch_browser = $wpdb->get_results("SELECT count(browser) as top_browser, browser FROM $table_name WHERE timestamp BETWEEN $from_date AND $to_date AND browser!='' AND browser NOT LIKE '%N/A%' $spamselect GROUP BY browser ORDER BY top_browser DESC LIMIT 10");
-                        $col_count = $col_count+1;
-                }
-                //#get top 10 operating systems...
-                if ($top_ten['topos'] == 1) {
-                        $ch_os = $wpdb->get_results("SELECT count(os) as top_os, os FROM $table_name WHERE timestamp BETWEEN $from_date AND $to_date AND os!='' AND os NOT LIKE '%N/A%' $spamselect GROUP BY os ORDER BY top_os DESC LIMIT 10");
-                        $col_count = $col_count+1;
-                }
-
-                //#add an extra width offset when number of columns < 5
-                if ($col_count > 0 && $col_count < 5 ) {
-                        $widthoffset = (($max_char_len*(5 - $col_count))/$col_count)*.4; //just a guess
-                } else { 
-                        $widthoffset = 0;
-                }
-        ?>
-        <div id="toptenchart">
-                <table width="100%" border=0>
-                <tr valign="top">
-                <?php if ($top_ten['topsearch'] == 1) { ?>
-                <td><ul class="charts">
-                        <li class="chartsT"><?php _e("TOP QUERY", "wassup") ?></li>
-                <?php 
-                $char_len = round(($max_char_len*.30)+$widthoffset,0);
-                foreach ($ch_search as $chS) { 
-                        print '<li class="charts">'.$chS->top_search.': <a href="'.$chS->referrer.'" target="_BLANK">'.stringShortener(preg_replace('/'.preg_quote($siteurl,'/').'/i', '', $chS->search),$char_len).'</a></li>'."\n";
-                } ?>
-                </ul>
-                </td>
-                <?php }
-                if ($top_ten['topreferrer'] == 1) { ?>
-                <td><ul class="charts">
-                        <li class="chartsT"><?php _e("TOP REFERER", "wassup") ?></li>
-                <?php
-                $char_len = round(($max_char_len*.22)+$widthoffset,0);
+                        $top_results = $wpdb->get_results("SELECT count(referrer) as top_referrer, referrer FROM $table_name WHERE timestamp BETWEEN $from_date AND $to_date AND referrer!='' AND referrer NOT LIKE '%".$sitedomain."%' AND searchengine='' $spamselect GROUP BY referrer ORDER BY top_referrer DESC LIMIT 200");
+                        $char_len = round(($max_char_len*.22)+$widthoffset,0);
+                ?>
+                <td style="min-width:<?php echo $char_len; ?>px;">
+                <ul class="charts">
+                        <li class="chartsT"><?php _e("TOP REFERRER", "wassup"); ?></li>
+                <?php
                 $rec_count=0;   //# of referrer records output...
-                foreach ($ch_referer as $chR) {
+                foreach ($top_results as $top10) {
                         if ($rec_count < 10) { //limits output to 10...
                         //# exclude $wpurl from search results...
                         //# ...$siteurl already excluded in db query.
-                        if ($wpurl == $siteurl || !eregi($wpurl,$chR->referrer)) {
-                           print '<li class="charts">'.$chR->top_referrer.': ';
-                           print '<a href="'.$chR->referrer.'" title="'.$chR->referrer.'" target="_BLANK">';
+                        if ($wpurl == $siteurl || !eregi($wpurl,$top10->referrer)) { ?>
+                        <li class="charts"><?php echo $top10->top_referrer.': ';
+                           print '<a href="'.$top10->referrer.'" title="'.$top10->referrer.'" target="_BLANK">';
                            //#cut http:// from displayed url, then truncate
                            //#   instead of using stringShortener...
-                           print substr(eregi_replace("http://", "", attribute_escape($chR->referrer)),0,$char_len);
-                           if (strlen($chR->referrer) > ($char_len + 7)) { 
+                           print substr(eregi_replace("http://", "", attribute_escape($top10->referrer)),0,$char_len);
+                           if (strlen($top10->referrer) > ($char_len + 7)) { 
                                 print '...';
                            }
-                           print '</a></li>'."\n";
+                           print '</a>'; ?></li>
+                           <?php
                            $rec_count=$rec_count+1;
                         } //end if !wpurl
                         } //end if rec_count
-                } ?>
+                } //end foreach ?>
                 </ul>
                 </td>
-                <?php } 
-                if ($top_ten['toprequest'] == 1) {  ?>
-                <td><ul class="charts">
-                        <li class="chartsT"><?php _e("TOP REQUEST", "wassup") ?></li>
-                <?php
-                $char_len = round(($max_char_len*.28)+$widthoffset,0);
-                foreach ($ch_urlreq as $chU) { 
-                        print '<li class="charts">'.$chU->top_urlrequested.': ';
-                        print '<a href="'.wAddSiteurl(htmlspecialchars(html_entity_decode($chU->urlrequested))).'" title="'.html_entity_decode($chU->urlrequested).'" target="_BLANK">';
-                        print stringShortener(urlencode(html_entity_decode($chU->urlrequested)),$char_len).'</a></li>'."\n";
-                } ?>
-                </ul>
-                </td>
-                <?php } 
-                if ($top_ten['topbrowser'] == 1) {  ?>
-                <td><ul class="charts">
+                <?php
+                } //end if topreferrer
+
+                //#output top 10 url requests
+                if ($top_ten['toprequest'] == 1) {
+                        $top_results = $wpdb->get_results("SELECT count(urlrequested) as top_urlrequested, urlrequested FROM $table_name WHERE timestamp BETWEEN $from_date AND $to_date AND urlrequested!='' $spamselect GROUP BY REPLACE(urlrequested, '/', '') ORDER BY top_urlrequested DESC LIMIT 10");
+                        $char_len = round(($max_char_len*.28)+$widthoffset,0);
+                 ?>
+                <td style="min-width:<?php echo $char_len; ?>px;">
+                <ul class="charts">
+                        <li class="chartsT"><?php _e("TOP REQUEST", "wassup"); ?></li>
+                <?php
+                foreach ($top_results as $top10) { ?>
+                        <li class="charts"><?php echo $top10->top_urlrequested.': ';
+                        print '<a href="'.wAddSiteurl(htmlspecialchars(html_entity_decode($top10->urlrequested))).'" title="'.html_entity_decode($top10->urlrequested).'" target="_BLANK">';
+                        print stringShortener(urlencode(html_entity_decode($top10->urlrequested)),$char_len).'</a>'; ?></li>
+                <?php } ?>
+                </ul>
+                </td>
+                <?php 
+                } //end if toprequest
+
+                //#get top 10 browsers...
+                if ($top_ten['topbrowser'] == 1) {
+                        $top_results = $wpdb->get_results("SELECT count(browser) as top_browser, browser FROM $table_name WHERE timestamp BETWEEN $from_date AND $to_date AND browser!='' AND browser NOT LIKE '%N/A%' $spamselect GROUP BY browser ORDER BY top_browser DESC LIMIT 10");
+                        $char_len = round(($max_char_len*.17)+$widthoffset,0);
+                ?>
+                <td style="min-width:<?php echo $char_len; ?>px;">
+                <ul class="charts">
                         <li class="chartsT"><?php _e("TOP BROWSER", "wassup") ?></li>
                 <?php
-                $char_len = round(($max_char_len*.17)+$widthoffset,0);
-                foreach ($ch_browser as $chB) { 
-                        print '<li class="charts"><span title="'.$chB->browser.'">';
-                        print $chB->top_browser.': '.stringShortener($chB->browser, $char_len);
-                        print '</span></li>'."\n";
-                } ?>
-                </ul>
-                </td>
-                <?php } 
-                if ($top_ten['topos'] == 1) {  ?>
-                <td><ul class="charts">
+                foreach ($top_results as $top10) { ?>
+                        <li class="charts"><?php echo $top10->top_browser.': ';
+                        echo '<span class="top10" title="'.$top10->browser.'">'.stringShortener($top10->browser, $char_len).'</span>'; ?>
+                        </li>
+                <?php } ?>
+                </ul>
+                </td>
+                <?php }  //end if topbrowser
+
+                //#output top 10 operating systems...
+                if ($top_ten['topos'] == 1) { 
+                        $top_results = $wpdb->get_results("SELECT count(os) as top_os, os FROM $table_name WHERE timestamp BETWEEN $from_date AND $to_date AND os!='' AND os NOT LIKE '%N/A%' $spamselect GROUP BY os ORDER BY top_os DESC LIMIT 10");
+                        $char_len = round(($max_char_len*.15)+$widthoffset,0);
+                
+                 ?>
+                <td style="min-width:<?php echo $char_len; ?>px;">
+                <ul class="charts">
                         <li class="chartsT"><?php _e("TOP OS", "wassup") ?></li>
                 <?php 
-                $char_len = round(($max_char_len*.15)+$widthoffset,0);
-                foreach ($ch_os as $chO) { 
-                        print '<li class="charts"><span title="'.$chO->os.'">';
-                        print $chO->top_os.': '.stringShortener($chO->os, $char_len);
-                        print '</span></li>'."\n";
-                } ?>
-                </ul>
-                </td>
-                <?php } ?>
+                foreach ($top_results as $top10) { ?>
+                        <li class="charts"><?php print $top10->top_os.': '; ?>
+                                <span class="top10" title="<?php echo $top10->os; ?>"><?php echo stringShortener($top10->os, $char_len); ?></span>
+                        </li>
+                <?php } ?>
+                </ul>
+                </td>
+                <?php } // end if topos
+                
+                //#output top 10 locales/geographic regions...
+                if ($top_ten['toplocale'] == 1) {
+                        $top_results = $wpdb->get_results("SELECT count(UPPER(language)) as top_locale, UPPER(language) as locale FROM $table_name WHERE timestamp BETWEEN $from_date AND $to_date AND language!='' AND language NOT LIKE '%N/A%' $spamselect GROUP BY locale ORDER BY top_locale DESC LIMIT 10");
+                        $char_len = round(($max_char_len*.15)+$widthoffset,0);
+                
+                 ?>
+                <td style="min-width:<?php echo $char_len; ?>px;">
+                <ul class="charts">
+                        <li class="chartsT"><?php _e("TOP LOCALE", "wassup"); ?></li>
+                <?php 
+                foreach ($top_results as $top10) { ?>
+                        <li class="charts"><?php echo $top10->top_locale.': ';
+                        echo '<img src="'.$wpurl.'/wp-content/plugins/'.WASSUPFOLDER.'/img/flags/'.strtolower($top10->locale).'.png" alt="" />'; ?>
+                        <span class="top10" title="<?php echo $top10->locale; ?>"><?php echo $top10->locale; ?></span>
+                        </li>
+                <?php } ?>
+                </ul>
+                </td>
+                <?php } // end if toplocale
+                ?>
                 </tr>
                 </table>

trunk/lib/settings.php

@@ -116 +116 @@
                 <input type="checkbox" name="topbrowser" value="1" <?php if($top_ten['topbrowser'] == 1) print "CHECKED"; ?> /><?php _e("Top Browsers", "wassup"); ?> <br />
                 <input type="checkbox" name="topos" value="1" <?php if($top_ten['topos'] == 1) print "CHECKED"; ?> /><?php _e("Top OS", "wassup"); ?> <br />
-                <input type="checkbox" name="toplocale" value="1" DISABLED /><span style="color:#555;"><?php _e("Top Locales", "wassup"); ?></span><br />
+                <input type="checkbox" name="toplocale" value="1" <?php if($top_ten['topos'] == 1) print "CHECKED"; ?> /><?php _e("Top Locales", "wassup"); ?></span><br />
                 </div>
                 <div style="display:block; vertical-align:top; float:left; width:225px; color:#555;">

trunk/lib/wassup.class.php

@@ -36 +36 @@
         var $wassup_remind_flag;
         var $wassup_uninstall;  //for complete uninstall of wassup
-        var $wassup_optimize;   //new - for optimize table once a day
+        var $wassup_optimize;   //for optimize table once a day
 
         /* chart display settings */
@@ -61 +61 @@
         var $wmark;
         var $wip;
+        var $whash = "";        //new - wp_hash value used by action.php
 
         /* Constructor */
@@ -108 +109 @@
                 $this->wassup_uninstall = "0";
                 $this->wassup_optimize = wassup_get_time();
-                //$this->wassup_top10 = array("1","1","1","1","1","0","0","0","0","0");
                 $this->wassup_top10 = serialize(array("topsearch"=>"1",
                                         "topreferrer"=>"1",
@@ -118 +118 @@
                                         "topcrawler"=>"0",
                                         "topvisitor"=>"0"));
+                $this->whash = $this->get_wp_hash();
         }
 
@@ -293 +294 @@
         }
 
+        //#Set a wp_hash value and return it
+        function get_wp_hash($hashkey="") {
+                $wassuphash = "";
+                if (function_exists('wp_hash')) { 
+                        if (empty($hashkey)) {
+                                if (defined('SECRET_KEY')) { 
+                                        $hashkey = SECRET_KEY;
+                                } else { 
+                                        $hashkey = "wassup";
+                                }
+                        }
+                        $wassuphash = wp_hash($hashkey);
+                }
+                return $wassuphash;
+        } //end function get_wp_hash
+
         //#show a system message in Wassup Admin menus
         function showMessage($message="") {

trunk/wassup.php

@@ -21 +21 @@
 require_once(dirname(__FILE__).'/lib/wassup.class.php');
 require_once(dirname(__FILE__).'/lib/main.php');
-$wpurl = get_bloginfo('wpurl');
+$wpurl = get_bloginfo('wpurl'); //global
 
 if (isset($_GET['export'])) {
@@ -41 +41 @@
         add_action('admin_menu', 'wassup_add_pages');
         add_action('send_headers', 'wassupAppend');
-        //add_action('activity_box_end', 'wassupDashChart');
+        add_action('activity_box_end', 'wassupDashChart');
 }
 
@@ -52 +52 @@
         $wassup_options = new wassupOptions; //#settings initialized here
 
-        // Add timestamp to optimize table once a day
+        //# set hash
+        $whash = $wassup_options->get_wp_hash();
+        if (!empty($whash)) {
+                $wassup_options->whash = $whash;
+        }
+        //# Add timestamp to optimize table once a day
         $wassup_options->wassup_optimize = wassup_get_time();
-        //
-        //### For upgrade of Wassup, manually initialize any new settings
+
+        //# set wmark and wip to null  
+        $wassup_options->wmark = 0;     //#no preservation of delete/mark
+        $wassup_options->wip = null;
+
+        //### For upgrade of Wassup, manually initialize new settings
         //# initialize settings for 'spamcheck', 'refspam', and 'spam'
         if (!isset($wassup_options->wassup_spamcheck)) {
@@ -68 +77 @@
         }
         //# update wassup settings for 'savepath' (default is null)
+        //$wassup_options->wassup_savepath = "/fakedirectory"; //#debug
         if (!isset($wassup_options->wassup_savepath)) {
                 $wassup_options->wassup_savepath = null;
@@ -75 +85 @@
                 $wassup_options->wassup_chart = 1;
         }
-        //# set wmark, and wip to null  
-        $wassup_options->wmark = 0;     //#no preservation of delete/mark
-        $wassup_options->wip = null;
-
-        //$wassup_options->wassup_savepath = "/fakedirectory"; //#debug
+        //# assign top ten items for upgrades from 1.4.9 or less
+        if (empty($wassup_options->wassup_top10)) {
+                $wassup_options->wassup_top10 = serialize(array("topsearch"=>"1",
+                                                "topreferrer"=>"1",
+                                                "toprequest"=>"1",
+                                                "topbrowser"=>"1",
+                                                "topos"=>"1",
+                                                "toplocale"=>"0",
+                                                "topfeed"=>"0",
+                                                "topcrawler"=>"0",
+                                                "topvisitor"=>"0"));
+        }
         $wassup_options->saveSettings();
 
@@ -95 +112 @@
                 }
                 $wassup_options->saveSettings();
-        }
+        }
+        unset($sessionpath); //because "install" works in global scope
+
         //# TODO:
         //###Detect known incompatible plugins like "wp_cache" and disable 
         //#  recordings and show warning message...
 
-        //### Create wassup TMP table
-        $table_tmp_name = $wpdb->prefix . "wassup_tmp";
-        if ($wpdb->get_var("SHOW TABLES LIKE '$table_tmp_name'") != $table_tmp_name) { 
-                CreateTable("wassup_tmp");
-        }
         //### Create/upgrade wassup MAIN table
         $table_name = $wpdb->prefix . "wassup";
         if ($wpdb->get_var("SHOW TABLES LIKE '$table_name'") != $table_name) { 
                 CreateTable("wassup");
+                CreateTable("wassup_tmp");
         } else {
-                UpdateTable();
+                UpdateTable(); //<== wassup_tmp is added here, if missing
         }
 } //#end function wassup_install
 
+//set global variables that are dependent on Wassup's wp_options values
 $wassup_settings = get_option('wassup_settings'); //temp only..
 $wassup_options = new wassupOptions; 
 //$wassup_options->loadSettings();      //done automatically 
+$whash = $wassup_options->whash;        //global...
 
 //#Completely remove all wassup tables and options from Wordpress when
@@ -172 +189 @@
 //Add the wassup stylesheet and other javascripts...
 function add_wassup_css() {
-        global $wpurl, $wassup_options;
-
-        //'wp_hash' is not available until all plugins are loaded
-        if (function_exists('wp_hash')) {
-                if (defined('SECRET_KEY')) { $whash = wp_hash(SECRET_KEY); }
-                else { $whash = wp_hash('wassup'); }
-        } else {
-                $whash = "";
+        global $wpurl, $wassup_options, $whash;
+
+        //assign a value to whash, if none
+        if ($whash == "") {
+                $whash = $wassup_options->get_wp_hash();
+                $wassup_options->whash = $whash;        //save new hash
+                $wassup_options->saveSettings();
         }
 
@@ -255 +271 @@
            var id = $(this).attr('id');
                  $.ajax({
-                  url: "<?php echo $wpurl; ?>/wp-content/plugins/<?php echo WASSUPFOLDER; ?>/lib/action.php?action=delete&whash=<?php echo $whash; ?>&id=" + id,
+                  url: "<?php echo $wpurl.'/wp-content/plugins/'.WASSUPFOLDER.'/lib/action.php?action=delete&whash='.$whash; ?>&id=" + id,
                   async: false
                  })
@@ -384 +400 @@
         global $wpdb, $version, $wpurl, $wassup_options, $whash;
 
+        //#debug...
+        //error_reporting(E_ALL);       //debug
+        //ini_set('display_errors','On');       //debug
+
         //assign a value to whash, if none
-        if (function_exists('wp_hash') && $whash == "") {
-                if (defined('SECRET_KEY')) {
-                        $whash = wp_hash(SECRET_KEY);
-                } else {
-                        $whash = wp_hash('wassup');
-                }
-        }
+        //if ($whash == "") {
+        //      $whash = $wassup_options->get_wp_hash();
+        //      $wassup_options->whash = $whash;        //save new whash