Changeset 201033

Timestamp:

02/02/2010 01:30:13 PM (15 years ago)

Author:

ShaneF

Message:

subdomain jQuery fix, added soap test when viewing analytics page.

Location:

woopra/trunk/inc

Files:

• admin.php (modified) (2 diffs)
• analytics.php (modified) (3 diffs)

woopra/trunk/inc/admin.php

@@ -535 +535 @@
             <th scope="row"><?php _e('Sub Domains', 'woopra') ?></th>
             <td>
-                <input type="checkbox" value="1"<?php checked('1', $this->get_option('use_subdomain')); ?> id="use_subdomain" name="use_subdomain"/> <label for="use_subdomain"><?php _e("Track Sub Domains"); ?></label><br /><small><?php printf( __('Enabled this if you want to track subdomains. Note: You must have an account that allows subdomain tracking. Please refer to the <a href="%s">account information</a> page for more information.', 'woopra'), 'https://www.woopra.com/members/'); ?></small>
+                <input type="checkbox" value="1"<?php checked('1', $this->get_option('use_subdomain')); ?> id="use_subdomain" name=""/> <label for="use_subdomain"><?php _e("Track Sub Domains"); ?></label><br /><small><?php printf( __('Enabled this if you want to track subdomains. Note: You must have an account that allows subdomain tracking. Please refer to the <a href="%s">account information</a> page for more information.', 'woopra'), 'https://www.woopra.com/members/'); ?></small>
             </td>
         </tr>
@@ -580 +580 @@
      */
     function content_page() {
-        $WoopraAnalytics = new WoopraAnalytics();
+        $_woopra_tests = $this->init_test();        
+        $WoopraAnalytics = new WoopraAnalytics($_woopra_tests);
         unset($WoopraAnalytics);
     }

woopra/trunk/inc/analytics.php

@@ -11 +11 @@
  */
 class WoopraAnalytics extends WoopraAdmin {
-    
-    /**
-     * Your Site API Key
-     * @since 1.4.1
-     * @var string
-     */
-    var $api_key;
-    
+        
     /**
      * Display a notice telling the user to fill in their Woopra details
      * @since 1.4.1
-     * @param object $item
+     * @param mixed $item
+     * @param string $item
      * @return none
      */
-    function analytics_warn($item) {
-        $message[0] =   '<div class="error"><p>' . sprintf( __( 'You must fill in your API Key in order to view Analytics. Please fill it out on the <a href="%s">settings page</a> in order for you to view your analytics.', 'woopra' ), admin_url('options-general.php?page=woopra') ) . "</p></div>\n";
+    function analytics_warn($item, $custom = '') {
+        if ($item == false) {
+            echo '<div class="error"><p>' . $custom[0] . "</p></div>\n";
+            return;
+        } else {
+            $message[0] = '<div class="error"><p>' . sprintf( __( 'You must fill in your API Key in order to view Analytics. Please fill it out on the <a href="%s">settings page</a> in order for you to view your analytics.', 'woopra' ), admin_url('options-general.php?page=woopra') ) . "</p></div>\n";
+        }
+        
         echo $message[$item];
     }
@@ -45 +45 @@
      * @constructor
      */
-    function __construct() {
+    function __construct() {
         WoopraAdmin::__construct();
         Woopra::__construct();
                     
         //  Load the API key into this Class
-        $this->api_key = $this->get_option('api_key');
+        $api_key = $this->get_option('api_key');
         
         ?>
@@ -58 +58 @@
         <?php
         
-        if (empty($this->api_key)) {
+        if (empty($api_key)) {
             $this->analytics_warn(0);
+
+
         } else {
             /** HTML CODE START **/