From 649b7ba7bcbe28e1c33ebfb3698b5a83fd1833de Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Nov 2009 11:49:39 -0800
Subject: [PATCH] Get rid of the installer code, we don't actually need it yet
 since there's no need to do any special work when we upgrade.

Change the theme code to only print out the JS if we have a web
property ID.
---
 .../helpers/google_analytics_installer.php    | 29 -------------------
 .../helpers/google_analytics_theme.php        |  7 ++++-
 2 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 modules/google_analytics/helpers/google_analytics_installer.php

diff --git a/modules/google_analytics/helpers/google_analytics_installer.php b/modules/google_analytics/helpers/google_analytics_installer.php
deleted file mode 100644
index 54d5b8e2..00000000
--- a/modules/google_analytics/helpers/google_analytics_installer.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class google_analytics_installer {
-  static function install() {
-    module::set_var("google_analytics", "code", "");
-    module::set_version("google_analytics", 2);
-  }
-
-  static function uninstall() {
-    module::clear_var("google_analytics", "code");
-  }
-}
diff --git a/modules/google_analytics/helpers/google_analytics_theme.php b/modules/google_analytics/helpers/google_analytics_theme.php
index b8933ba6..c60facad 100644
--- a/modules/google_analytics/helpers/google_analytics_theme.php
+++ b/modules/google_analytics/helpers/google_analytics_theme.php
@@ -19,6 +19,11 @@
  */
 class google_analytics_theme {
   static function page_bottom($theme) {
+    $code = module::get_var("google_analytics", "code");
+    if (!$code) {
+      return;
+    }
+
     $google_code = '
   	<!-- Begin Google Analytics -->
 	<script type="text/javascript">
@@ -29,7 +34,7 @@ class google_analytics_theme {
 	<script type="text/javascript">
 		try
 		{
-			var pageTracker = _gat._getTracker("'.module::get_var("google_analytics", "code").'");
+			var pageTracker = _gat._getTracker("' . $code . '");
 			pageTracker._trackPageview();
 		}
 		catch(err){}