From 505d242cbde65e4a9ccd13e83966893b01b82568 Mon Sep 17 00:00:00 2001
From: root <rafta@gmx.net>
Date: Sun, 3 Nov 2013 15:08:46 +0100
Subject: [PATCH 1/4] [FEATURE] Added Google Analytics

---
 public/include/config/admin_settings.inc.php      | 15 +++++++++++++++
 public/include/smarty_globals.inc.php             |  4 ++++
 public/templates/mmcFE/admin/settings/default.tpl |  2 ++
 public/templates/mmcFE/master.tpl                 |  7 ++++++-
 public/templates/mobile/master.tpl                |  7 ++++++-
 public/templates/mpos/admin/settings/default.tpl  |  2 ++
 public/templates/mpos/master.tpl                  |  5 +++++
 7 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php
index d6432b53..ce4a8e14 100644
--- a/public/include/config/admin_settings.inc.php
+++ b/public/include/config/admin_settings.inc.php
@@ -263,6 +263,21 @@ $aSettings['recaptcha'][] = array(
   'name' => 'recaptcha_public_key', 'value' => $setting->getValue('recaptcha_public_key'),
   'tooltip' => 'Your public key as given by your re-Captcha account.'
 );
+$aSettings['analytics'][] = array(
+  'display' => 'Enable Google analytics', 'type' => 'select',
+  'options' => array( 0 => 'No', 1 => 'Yes' ),
+  'default' => 0,
+  'name' => 'analytics_enabled', 'value' => $setting->getValue('analytics_enabled'),
+  'tooltip' => 'Enable or Disable Google Analytics.'
+);
+$aSettings['analytics'][] = array(
+  'display' => 'Google Analytics Code', 'type' => 'textarea',
+  'size' => 5,
+  'height' => 10,
+  'default' => 'Code from Google Analytics',
+  'name' => 'analytics_code', 'value' => $setting->getValue('analytics_code'),
+  'tooltip' => '.'
+);
 $aSettings['monitoring'][] = array(
   'display' => 'Uptime Robot Private API Key', 'type' => 'text',
   'size' => 25,
diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php
index c53fc029..2a91f6e9 100644
--- a/public/include/smarty_globals.inc.php
+++ b/public/include/smarty_globals.inc.php
@@ -92,6 +92,10 @@ $aGlobal['website']['chaininfo']['disabled'] = $setting->getValue('website_chain
 $setting->getValue('website_blockexplorer_url') ? $aGlobal['website']['blockexplorer']['url'] = $setting->getValue('website_blockexplorer_url') : $aGlobal['website']['blockexplorer']['url'] = 'http://explorer.litecoin.net/block/';
 $setting->getValue('website_chaininfo_url') ? $aGlobal['website']['chaininfo']['url'] = $setting->getValue('website_chaininfo_url') : $aGlobal['website']['chaininfo']['url'] = 'http://allchains.info';
 
+// Google Analytics
+$aGlobal['analytics']['enabled'] = $setting->getValue('analytics_enabled');
+$aGlobal['analytics']['code'] = $setting->getValue('analytics_code');
+
 // ACLs
 $aGlobal['acl']['pool']['statistics'] = $setting->getValue('acl_pool_statistics');
 $aGlobal['acl']['block']['statistics'] = $setting->getValue('acl_block_statistics');
diff --git a/public/templates/mmcFE/admin/settings/default.tpl b/public/templates/mmcFE/admin/settings/default.tpl
index 519fb96e..2c21a5eb 100644
--- a/public/templates/mmcFE/admin/settings/default.tpl
+++ b/public/templates/mmcFE/admin/settings/default.tpl
@@ -21,6 +21,8 @@
             {html_options name="data[{$SETTINGS.$TAB[setting].name}]" options=$SETTINGS.$TAB[setting].options selected=$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}
           {else if $SETTINGS.$TAB[setting].type == 'text'}
             <input type="text" size="{$SETTINGS.$TAB[setting].size}" name="data[{$SETTINGS.$TAB[setting].name}]" value="{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}" />
+          {else if $SETTINGS.$TAB[setting].type == 'textarea'}
+          	<textarea name="data[{$SETTINGS.$TAB[setting].name}]" cols="{$SETTINGS.$TAB[setting].size}" name="data[{$SETTINGS.$TAB[setting].name}]" rows="{$SETTINGS.$TAB[setting].height|default:"1"}">{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}</textarea>
           {else}
             Unknown option type: {$SETTINGS.$TAB[setting].type}
           {/if}
diff --git a/public/templates/mmcFE/master.tpl b/public/templates/mmcFE/master.tpl
index 28a6a26d..e5eafafa 100644
--- a/public/templates/mmcFE/master.tpl
+++ b/public/templates/mmcFE/master.tpl
@@ -23,7 +23,12 @@
       @import url("{$PATH}/css/date_input.css");
     </style>
     <!--[if lt IE 8]><style type="text/css" media="all">@import url("{$PATH}/css/ie.css");</style><![endif]-->
-  </head>
+  
+    {if $GLOBAL.analytics.enabled}
+      {$GLOBAL.analytics.code}
+    {/if}
+    
+</head>
 
 <body>
 <div id="hld">
diff --git a/public/templates/mobile/master.tpl b/public/templates/mobile/master.tpl
index a68d351e..20bc62a9 100644
--- a/public/templates/mobile/master.tpl
+++ b/public/templates/mobile/master.tpl
@@ -28,7 +28,12 @@
 {/literal}
     </script>
 {/if}
-  </head>
+  
+    {if $GLOBAL.analytics.enabled}
+      {$GLOBAL.analytics.code}
+    {/if}
+    
+</head>
   <body>
     <div data-role="page" id="mpos-page" data-url="mpos-page">
 {if $smarty.session.AUTHENTICATED|default:"0" == 1}
diff --git a/public/templates/mpos/admin/settings/default.tpl b/public/templates/mpos/admin/settings/default.tpl
index 9cc1f97e..af6f053c 100644
--- a/public/templates/mpos/admin/settings/default.tpl
+++ b/public/templates/mpos/admin/settings/default.tpl
@@ -22,6 +22,8 @@
             {html_options name="data[{$SETTINGS.$TAB[setting].name}]" options=$SETTINGS.$TAB[setting].options selected=$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}
           {else if $SETTINGS.$TAB[setting].type == 'text'}
             <input type="text" size="{$SETTINGS.$TAB[setting].size}" name="data[{$SETTINGS.$TAB[setting].name}]" value="{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}" />
+          {else if $SETTINGS.$TAB[setting].type == 'textarea'}
+          	<textarea name="data[{$SETTINGS.$TAB[setting].name}]" cols="{$SETTINGS.$TAB[setting].size}" name="data[{$SETTINGS.$TAB[setting].name}]" rows="{$SETTINGS.$TAB[setting].height|default:"1"}">{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}</textarea>
           {else}
             Unknown option type: {$SETTINGS.$TAB[setting].type}
           {/if}
diff --git a/public/templates/mpos/master.tpl b/public/templates/mpos/master.tpl
index b7d7e301..0fcfdde3 100644
--- a/public/templates/mpos/master.tpl
+++ b/public/templates/mpos/master.tpl
@@ -27,6 +27,11 @@
   <script type="text/javascript" src="{$PATH}/js/justgage.1.0.1.min.js"></script>
 	<script type="text/javascript" src="{$PATH}/js/custom.js"></script>
   <!--[if IE]><script type="text/javascript" src="{$PATH}/js/excanvas.js"></script><![endif]-->
+  
+    {if $GLOBAL.analytics.enabled}
+      {$GLOBAL.analytics.code}
+    {/if}
+    
 </head>
 <body>
 	<header id="header">

From c8ac14a35f9fbc376a30a10318b7d7fd517d6fc0 Mon Sep 17 00:00:00 2001
From: root <rafta@gmx.net>
Date: Sun, 3 Nov 2013 15:14:19 +0100
Subject: [PATCH 2/4] [FIX] Removed duplicate name in textarea

---
 public/templates/mmcFE/admin/settings/default.tpl | 2 +-
 public/templates/mpos/admin/settings/default.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/templates/mmcFE/admin/settings/default.tpl b/public/templates/mmcFE/admin/settings/default.tpl
index 2c21a5eb..bd4e2817 100644
--- a/public/templates/mmcFE/admin/settings/default.tpl
+++ b/public/templates/mmcFE/admin/settings/default.tpl
@@ -22,7 +22,7 @@
           {else if $SETTINGS.$TAB[setting].type == 'text'}
             <input type="text" size="{$SETTINGS.$TAB[setting].size}" name="data[{$SETTINGS.$TAB[setting].name}]" value="{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}" />
           {else if $SETTINGS.$TAB[setting].type == 'textarea'}
-          	<textarea name="data[{$SETTINGS.$TAB[setting].name}]" cols="{$SETTINGS.$TAB[setting].size}" name="data[{$SETTINGS.$TAB[setting].name}]" rows="{$SETTINGS.$TAB[setting].height|default:"1"}">{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}</textarea>
+          	<textarea name="data[{$SETTINGS.$TAB[setting].name}]" cols="{$SETTINGS.$TAB[setting].size}" rows="{$SETTINGS.$TAB[setting].height|default:"1"}">{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}</textarea>
           {else}
             Unknown option type: {$SETTINGS.$TAB[setting].type}
           {/if}
diff --git a/public/templates/mpos/admin/settings/default.tpl b/public/templates/mpos/admin/settings/default.tpl
index af6f053c..4ceb718b 100644
--- a/public/templates/mpos/admin/settings/default.tpl
+++ b/public/templates/mpos/admin/settings/default.tpl
@@ -23,7 +23,7 @@
           {else if $SETTINGS.$TAB[setting].type == 'text'}
             <input type="text" size="{$SETTINGS.$TAB[setting].size}" name="data[{$SETTINGS.$TAB[setting].name}]" value="{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}" />
           {else if $SETTINGS.$TAB[setting].type == 'textarea'}
-          	<textarea name="data[{$SETTINGS.$TAB[setting].name}]" cols="{$SETTINGS.$TAB[setting].size}" name="data[{$SETTINGS.$TAB[setting].name}]" rows="{$SETTINGS.$TAB[setting].height|default:"1"}">{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}</textarea>
+          	<textarea name="data[{$SETTINGS.$TAB[setting].name}]" cols="{$SETTINGS.$TAB[setting].size}" rows="{$SETTINGS.$TAB[setting].height|default:"1"}">{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}</textarea>
           {else}
             Unknown option type: {$SETTINGS.$TAB[setting].type}
           {/if}

From f14af44d4c1213795c0757e99cca253fece38fb8 Mon Sep 17 00:00:00 2001
From: root <rafta@gmx.net>
Date: Sun, 3 Nov 2013 16:48:47 +0100
Subject: [PATCH 3/4] [FIX] Placed under Statistics

---
 public/include/config/admin_settings.inc.php | 30 ++++++++++----------
 public/include/smarty_globals.inc.php        |  4 +--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php
index ce4a8e14..99a8894b 100644
--- a/public/include/config/admin_settings.inc.php
+++ b/public/include/config/admin_settings.inc.php
@@ -151,6 +151,21 @@ $aSettings['statistics'][] = array(
   'name' => 'statistics_personal_hashrate_modifier', 'value' => $setting->getValue('statistics_personal_hashrate_modifier'),
   'tooltip' => 'Auto-adjust displayed personal hashrates to a certain limit.'
 );
+$aSettings['statistics'][] = array(
+  'display' => 'Enable Google analytics', 'type' => 'select',
+  'options' => array( 0 => 'No', 1 => 'Yes' ),
+  'default' => 0,
+  'name' => 'statistics_analytics_enabled', 'value' => $setting->getValue('statistics_analytics_enabled'),
+  'tooltip' => 'Enable or Disable Google Analytics.'
+);
+$aSettings['statistics'][] = array(
+  'display' => 'Google Analytics Code', 'type' => 'textarea',
+  'size' => 5,
+  'height' => 10,
+  'default' => 'Code from Google Analytics',
+  'name' => 'statistics_analytics_code', 'value' => $setting->getValue('statistics_analytics_code'),
+  'tooltip' => '.'
+);
 $aSettings['acl'][] = array(
   'display' => 'Pool Statistics', 'type' => 'select',
   'options' => array( 0 => 'Private', 1 => 'Public'),
@@ -263,21 +278,6 @@ $aSettings['recaptcha'][] = array(
   'name' => 'recaptcha_public_key', 'value' => $setting->getValue('recaptcha_public_key'),
   'tooltip' => 'Your public key as given by your re-Captcha account.'
 );
-$aSettings['analytics'][] = array(
-  'display' => 'Enable Google analytics', 'type' => 'select',
-  'options' => array( 0 => 'No', 1 => 'Yes' ),
-  'default' => 0,
-  'name' => 'analytics_enabled', 'value' => $setting->getValue('analytics_enabled'),
-  'tooltip' => 'Enable or Disable Google Analytics.'
-);
-$aSettings['analytics'][] = array(
-  'display' => 'Google Analytics Code', 'type' => 'textarea',
-  'size' => 5,
-  'height' => 10,
-  'default' => 'Code from Google Analytics',
-  'name' => 'analytics_code', 'value' => $setting->getValue('analytics_code'),
-  'tooltip' => '.'
-);
 $aSettings['monitoring'][] = array(
   'display' => 'Uptime Robot Private API Key', 'type' => 'text',
   'size' => 25,
diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php
index 2a91f6e9..26cc91b6 100644
--- a/public/include/smarty_globals.inc.php
+++ b/public/include/smarty_globals.inc.php
@@ -93,8 +93,8 @@ $setting->getValue('website_blockexplorer_url') ? $aGlobal['website']['blockexpl
 $setting->getValue('website_chaininfo_url') ? $aGlobal['website']['chaininfo']['url'] = $setting->getValue('website_chaininfo_url') : $aGlobal['website']['chaininfo']['url'] = 'http://allchains.info';
 
 // Google Analytics
-$aGlobal['analytics']['enabled'] = $setting->getValue('analytics_enabled');
-$aGlobal['analytics']['code'] = $setting->getValue('analytics_code');
+$aGlobal['analytics']['enabled'] = $setting->getValue('statistics_analytics_enabled');
+$aGlobal['analytics']['code'] = $setting->getValue('statistics_analytics_code');
 
 // ACLs
 $aGlobal['acl']['pool']['statistics'] = $setting->getValue('acl_pool_statistics');

From 84781763b05439ac77c9dbb8b6f873486629504b Mon Sep 17 00:00:00 2001
From: root <rafta@gmx.net>
Date: Sun, 3 Nov 2013 17:31:02 +0100
Subject: [PATCH 4/4] [FIX] small style changes and smarty default value

---
 public/include/config/admin_settings.inc.php      | 4 ++--
 public/include/smarty_globals.inc.php             | 4 ++--
 public/templates/mmcFE/admin/settings/default.tpl | 2 +-
 public/templates/mmcFE/master.tpl                 | 4 ++--
 public/templates/mobile/master.tpl                | 6 +++---
 public/templates/mpos/admin/settings/default.tpl  | 2 +-
 public/templates/mpos/master.tpl                  | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/public/include/config/admin_settings.inc.php b/public/include/config/admin_settings.inc.php
index 99a8894b..3591ce6d 100644
--- a/public/include/config/admin_settings.inc.php
+++ b/public/include/config/admin_settings.inc.php
@@ -160,8 +160,8 @@ $aSettings['statistics'][] = array(
 );
 $aSettings['statistics'][] = array(
   'display' => 'Google Analytics Code', 'type' => 'textarea',
-  'size' => 5,
-  'height' => 10,
+  'size' => 20,
+  'height' => 12,
   'default' => 'Code from Google Analytics',
   'name' => 'statistics_analytics_code', 'value' => $setting->getValue('statistics_analytics_code'),
   'tooltip' => '.'
diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php
index 26cc91b6..58e639b4 100644
--- a/public/include/smarty_globals.inc.php
+++ b/public/include/smarty_globals.inc.php
@@ -93,8 +93,8 @@ $setting->getValue('website_blockexplorer_url') ? $aGlobal['website']['blockexpl
 $setting->getValue('website_chaininfo_url') ? $aGlobal['website']['chaininfo']['url'] = $setting->getValue('website_chaininfo_url') : $aGlobal['website']['chaininfo']['url'] = 'http://allchains.info';
 
 // Google Analytics
-$aGlobal['analytics']['enabled'] = $setting->getValue('statistics_analytics_enabled');
-$aGlobal['analytics']['code'] = $setting->getValue('statistics_analytics_code');
+$aGlobal['statistics']['analytics']['enabled'] = $setting->getValue('statistics_analytics_enabled');
+$aGlobal['statistics']['analytics']['code'] = $setting->getValue('statistics_analytics_code');
 
 // ACLs
 $aGlobal['acl']['pool']['statistics'] = $setting->getValue('acl_pool_statistics');
diff --git a/public/templates/mmcFE/admin/settings/default.tpl b/public/templates/mmcFE/admin/settings/default.tpl
index bd4e2817..98592f65 100644
--- a/public/templates/mmcFE/admin/settings/default.tpl
+++ b/public/templates/mmcFE/admin/settings/default.tpl
@@ -22,7 +22,7 @@
           {else if $SETTINGS.$TAB[setting].type == 'text'}
             <input type="text" size="{$SETTINGS.$TAB[setting].size}" name="data[{$SETTINGS.$TAB[setting].name}]" value="{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}" />
           {else if $SETTINGS.$TAB[setting].type == 'textarea'}
-          	<textarea name="data[{$SETTINGS.$TAB[setting].name}]" cols="{$SETTINGS.$TAB[setting].size}" rows="{$SETTINGS.$TAB[setting].height|default:"1"}">{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}</textarea>
+          	<textarea name="data[{$SETTINGS.$TAB[setting].name}]" cols="{$SETTINGS.$TAB[setting].size|default:"1"}" rows="{$SETTINGS.$TAB[setting].height|default:"1"}">{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}</textarea>
           {else}
             Unknown option type: {$SETTINGS.$TAB[setting].type}
           {/if}
diff --git a/public/templates/mmcFE/master.tpl b/public/templates/mmcFE/master.tpl
index e5eafafa..69da419e 100644
--- a/public/templates/mmcFE/master.tpl
+++ b/public/templates/mmcFE/master.tpl
@@ -24,8 +24,8 @@
     </style>
     <!--[if lt IE 8]><style type="text/css" media="all">@import url("{$PATH}/css/ie.css");</style><![endif]-->
   
-    {if $GLOBAL.analytics.enabled}
-      {$GLOBAL.analytics.code}
+    {if $GLOBAL.statistics.analytics.enabled}
+      {$GLOBAL.statistics.analytics.code}
     {/if}
     
 </head>
diff --git a/public/templates/mobile/master.tpl b/public/templates/mobile/master.tpl
index 20bc62a9..094772ff 100644
--- a/public/templates/mobile/master.tpl
+++ b/public/templates/mobile/master.tpl
@@ -29,11 +29,11 @@
     </script>
 {/if}
   
-    {if $GLOBAL.analytics.enabled}
-      {$GLOBAL.analytics.code}
+    {if $GLOBAL.statistics.analytics.enabled}
+      {$GLOBAL.statistics.analytics.code}
     {/if}
     
-</head>
+  </head>
   <body>
     <div data-role="page" id="mpos-page" data-url="mpos-page">
 {if $smarty.session.AUTHENTICATED|default:"0" == 1}
diff --git a/public/templates/mpos/admin/settings/default.tpl b/public/templates/mpos/admin/settings/default.tpl
index 4ceb718b..9bdebf21 100644
--- a/public/templates/mpos/admin/settings/default.tpl
+++ b/public/templates/mpos/admin/settings/default.tpl
@@ -23,7 +23,7 @@
           {else if $SETTINGS.$TAB[setting].type == 'text'}
             <input type="text" size="{$SETTINGS.$TAB[setting].size}" name="data[{$SETTINGS.$TAB[setting].name}]" value="{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}" />
           {else if $SETTINGS.$TAB[setting].type == 'textarea'}
-          	<textarea name="data[{$SETTINGS.$TAB[setting].name}]" cols="{$SETTINGS.$TAB[setting].size}" rows="{$SETTINGS.$TAB[setting].height|default:"1"}">{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}</textarea>
+          	<textarea name="data[{$SETTINGS.$TAB[setting].name}]" cols="{$SETTINGS.$TAB[setting].size|default:"1"}" rows="{$SETTINGS.$TAB[setting].height|default:"1"}">{$SETTINGS.$TAB[setting].value|default:$SETTINGS.$TAB[setting].default}</textarea>
           {else}
             Unknown option type: {$SETTINGS.$TAB[setting].type}
           {/if}
diff --git a/public/templates/mpos/master.tpl b/public/templates/mpos/master.tpl
index 0fcfdde3..dbf87e0b 100644
--- a/public/templates/mpos/master.tpl
+++ b/public/templates/mpos/master.tpl
@@ -28,8 +28,8 @@
 	<script type="text/javascript" src="{$PATH}/js/custom.js"></script>
   <!--[if IE]><script type="text/javascript" src="{$PATH}/js/excanvas.js"></script><![endif]-->
   
-    {if $GLOBAL.analytics.enabled}
-      {$GLOBAL.analytics.code}
+    {if $GLOBAL.statistics.analytics.enabled}
+      {$GLOBAL.statistics.analytics.code}
     {/if}
     
 </head>