Changeset 982489

Timestamp:

09/05/2014 10:51:17 PM (11 years ago)

Author:

rorystandley

Message:

Bug fixes and testing for 4.0

Location:

rs-google-analytics/trunk

Files:

• public/class-rs-google-analytics.php (modified) (6 diffs)
• public/views/public.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• rs-google-analytics-model.php (modified) (2 diffs)
• rs-google-analytics.php (modified) (2 diffs)

rs-google-analytics/trunk/public/class-rs-google-analytics.php

@@ -2 +2 @@
 class RSGoogleAnalytics {
 
-    const VERSION = '1.0.0';
+    const VERSION = '1.0.1';
     protected $plugin_slug = 'rs-google-analytics';
     protected static $instance = null;
@@ -9 +9 @@
 
         global $wpdb;
-        global $rsgoogleanalytics;
 
         // Load public-facing style sheet and JavaScript.
@@ -22 +21 @@
         add_filter( 'vanilla', array( $this, 'filter_method_name' ) );
 
-
+        $this->checkDBVersion();
+
+    }
+
+    public function checkDBVersion(){
+        global $wpdb;
+        if (get_site_option( 'rs_google_anal' ) != self::VERSION) {
+            // Update table
+            $table_name = $wpdb->prefix . "rs_google_analytics";
+            $wpdb->query("ALTER TABLE $table_name CHANGE COLUMN rsgoogleanalytics_code rsgoogleanalytics_code VARCHAR(255)");
+            require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+            update_option( "rs_google_anal", self::VERSION );
+        }
     }
 
@@ -147 +158 @@
     private static function single_activate() {
         // We need to install the table 
-        global $vanilla_db_version;
         global $wpdb;
         $table_name = $wpdb->prefix . "rs_google_analytics";
@@ -153 +163 @@
         $sql = "CREATE TABLE $table_name (
         `rsgoogleanalytics_id` int(11) NOT NULL AUTO_INCREMENT,
-        `rsgoogleanalytics_code` varchar(9) NOT NULL,
+        `rsgoogleanalytics_code` varchar(255) NOT NULL,
         `rsgoogleanalytics_location` varchar(6) NOT NULL,
         PRIMARY KEY (`rsgoogleanalytics_id`)
@@ -160 +170 @@
         require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
         dbDelta( $sql );
-
-        add_option( "rs_google_anal", $rsgoogleanalytics );
+        add_option( "rs_google_anal", self::VERSION );
     }
 

rs-google-analytics/trunk/public/views/public.php

@@ -8 +8 @@
  */
 // This file is used to markup the public facing aspect of the plugin.
-$code = $myCode->getCode();
-foreach ($code as $key => $value) {
-    $location   = $value->rsgoogleanalytics_location;
-    $code       = $value->rsgoogleanalytics_code;
-}
-switch($location){
-    case 'header':
-        $hook = "wp_head";
-    break;
-    case 'footer':
-        $hook = "wp_footer";
-    break;
-}
-add_action($hook, 'outputCode');
-function outputCode(){
-    $code = '<script>';
-    $code .= '//<![CDATA[';
-    $code .= 'var _gaq = _gaq || [];';
-    $code .= '_gaq.push(["_setAccount", "UA-'.$code.'"]);';
-    $code .= '_gaq.push(["_trackPageview"]);';
-    $code .= '(function () {';
-    $code .= 'var ga = document.createElement("script");';
-    $code .= 'ga.type = "text/javascript";';
-    $code .= 'ga.async = true;';
-    $code .= 'ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";';
-    $code .= 'var s = document.getElementsByTagName("script")[0];';
-    $code .= 's.parentNode.insertBefore(ga, s);';
-    $code .= '})();';
-    $code .= '//]]>';
-    $code .= '</script>';
-    echo $code;
-}
+$myCode->initPlugin();
 ?>

rs-google-analytics/trunk/readme.txt

@@ -2 +2 @@
 Tags: Google, Analytics, Google Analytics, UA, UA Code, Code
 Requires at least: 3.8
-Tested up to: 3.8
-Stable tag: trunk
+Tested up to: 4.0
+Stable tag: 1.0.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -30 +30 @@
 == Changelog ==
 
+= 1.0.1 =
+* Testing for 4.0, minor bug fix
+
 = 1.0 =
 * First version of plugin

rs-google-analytics/trunk/rs-google-analytics-model.php

@@ -2 +2 @@
 
 class myCode {
+
+    // protected static $myHook = '';
 
     public function __construct() {
@@ -7 +9 @@
         $this->db = $wpdb;
         $this->table = $wpdb->prefix."rs_google_analytics";
+    }
+
+    public function initPlugin(){
+        $myCodeDetails = $this->getCode();
+        $this->myCode = $myCodeDetails[0]->rsgoogleanalytics_code;
+        $this->myHook = $myCodeDetails[0]->rsgoogleanalytics_location;
+
+        add_action("wp_".$this->myHook, array($this,'outputCode'));
+    }
+
+    public function outputCode(){
+        $code = '<script>';
+        $code .= '(function(i,s,o,g,r,a,m){i["GoogleAnalyticsObject"]=r;i[r]=i[r]||function(){';
+        $code .= '(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),';
+        $code .= 'm=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)';
+        $code .= '})(window,document,"script","//www.google-analytics.com/analytics.js","ga");';
+        $code .= 'ga("create", "UA-'.$this->myCode.'", "auto");';
+        $code .= 'ga("send", "pageview");';
+        $code .= '</script>';
+        echo $code;
     }
 

rs-google-analytics/trunk/rs-google-analytics.php

@@ -4 +4 @@
  * Plugin URI:        http://www.rstandley.co.uk
  * Description:       Allows you to add your Google Analytics code to either your header of footer
- * Version:           1.0.0
+ * Version:           1.0.1
  * Author:            Rory Standley
  * Author URI:        http://www.rstandley.co.uk
@@ -13 +13 @@
     die;
 }
-
-$rsgoogleanalytics = "1.0.0";
 
 require_once(plugin_dir_path( __FILE__ ) . "rs-google-analytics-model.php");