Add support for tracking and analytics

3 files changed, 28 insertions, 25 deletions

diff --git a/library/WT/Stats.php b/library/WT/Stats.php
index 74abe6d386..3d6736caae 100644
--- a/library/WT/Stats.php
+++ b/library/WT/Stats.php
@@ -1771,7 +1771,6 @@ class WT_Stats {
 		$WT_STATS_S_CHART_X    = Theme::theme()->parameter('stats-small-chart-x');
 		$WT_STATS_S_CHART_Y    = Theme::theme()->parameter('stats-small-chart-y');
 
-
 		if ($simple) {
 			$sql =
 				"SELECT SQL_CACHE FLOOR(d_year/100+1) AS century, COUNT(*) AS total FROM `##dates` " .
diff --git a/library/WT/Theme/Administration.php b/library/WT/Theme/Administration.php
index 22bbdf08e0..04e7305368 100644
--- a/library/WT/Theme/Administration.php
+++ b/library/WT/Theme/Administration.php
@@ -75,6 +75,7 @@ class Administration extends BaseTheme {
 			new WT_Menu(/* I18N: Menu entry */ WT_I18N::translate('Website preferences'), 'admin_site_config.php?action=site'),
 			new WT_Menu(/* I18N: Menu entry */ WT_I18N::translate('Sending email'), 'admin_site_config.php?action=email'),
 			new WT_Menu(/* I18N: Menu entry */ WT_I18N::translate('Login and registration'), 'admin_site_config.php?action=login'),
+			new WT_Menu(/* I18N: Menu entry */ WT_I18N::translate('Tracking and analytics'), 'admin_site_config.php?action=tracking'),
 			new WT_Menu(/* I18N: Menu entry */ WT_I18N::translate('Website logs'), 'admin_site_logs.php'),
 			new WT_Menu(/* I18N: Menu entry */ WT_I18N::translate('Website access rules'), 'admin_site_access.php'),
 			new WT_Menu(/* I18N: Menu entry */ WT_I18N::translate('Clean up data folder'), 'admin_site_clean.php'),
diff --git a/library/WT/Theme/BaseTheme.php b/library/WT/Theme/BaseTheme.php
index 57dd119bc6..e837e3d883 100644
--- a/library/WT/Theme/BaseTheme.php
+++ b/library/WT/Theme/BaseTheme.php
@@ -83,24 +83,27 @@ abstract class BaseTheme {
 	 *
 	 * @return string
 	 */
-	public function analytics() {
-		return
-			$this->analyticsGoogleWebmaster(
-				WT_Site::getPreference('GOOGLE_WEBMASTER_ID')
-			) .
-			$this->analyticsGoogleTracker(
-				WT_Site::getPreference('GOOGLE_ANALYTICS_ID')
-			) .
-			$this->analyticsPiwikTracker(
-				WT_Site::getPreference('PIWIK_URL'),
-				WT_Site::getPreference('PIWIK_SITE_ID')
-			) .
-			$this->analyticsStatcounterTracker(
-				WT_Site::getPreference('STATCOUNTER_PROJECT_ID'),
-				WT_Site::getPreference('STATCOUNTER_SECURITY_ID')
-			);
+	protected function analytics() {
+		if ($this->themeId() === '_administration') {
+			return '';
+		} else {
+			return
+				$this->analyticsGoogleWebmaster(
+					WT_Site::getPreference('GOOGLE_WEBMASTER_ID')
+				) .
+				$this->analyticsGoogleTracker(
+					WT_Site::getPreference('GOOGLE_ANALYTICS_ID')
+				) .
+				$this->analyticsPiwikTracker(
+					WT_Site::getPreference('PIWIK_URL'),
+					WT_Site::getPreference('PIWIK_SITE_ID')
+				) .
+				$this->analyticsStatcounterTracker(
+					WT_Site::getPreference('STATCOUNTER_PROJECT_ID'),
+					WT_Site::getPreference('STATCOUNTER_SECURITY_ID')
+				);
+		}
 	}
-
 	/**
 	 * Create the verification code for Google Webmaster Tools.
 	 *
@@ -108,8 +111,8 @@ abstract class BaseTheme {
 	 *
 	 * @return string
 	 */
-	public function analyticsBingWebmaster($verification_id) {
-		// Only need to add this in the root folder.
+	protected function analyticsBingWebmaster($verification_id) {
+		// Only need to add this to the home page.
 		if (WT_SCRIPT_NAME === 'index.php' && $verification_id) {
 			return '<meta name="msvalidate.01" content="' . $verification_id . '">';
 		} else {
@@ -124,8 +127,8 @@ abstract class BaseTheme {
 	 *
 	 * @return string
 	 */
-	public function analyticsGoogleWebmaster($verification_id) {
-		// Only need to add this in the root folder.
+	protected function analyticsGoogleWebmaster($verification_id) {
+		// Only need to add this to the home page.
 		if (WT_SCRIPT_NAME === 'index.php' && $verification_id) {
 			return '<meta name="google-site-verification" content="' . $verification_id . '">';
 		} else {
@@ -140,7 +143,7 @@ abstract class BaseTheme {
 	 *
 	 * @return string
 	 */
-	public function analyticsGoogleTracker($analytics_id) {
+	protected function analyticsGoogleTracker($analytics_id) {
 		if ($analytics_id) {
 			return
 				'<script>' .
@@ -164,7 +167,7 @@ abstract class BaseTheme {
 	 *
 	 * @return string
 	 */
-	public function analyticsPiwikTracker($url, $site_id) {
+	protected function analyticsPiwikTracker($url, $site_id) {
 		if ($url && $site_id) {
 			return
 				'<script>' .
@@ -190,7 +193,7 @@ abstract class BaseTheme {
 	 *
 	 * @return string
 	 */
-	public function analyticsStatcounterTracker($project_id, $security_id) {
+	protected function analyticsStatcounterTracker($project_id, $security_id) {
 		if ($project_id && $security_id) {
 			return
 				'<script>' .