From dc7c2786a8d7e075a175bfddef2eafa61e4211a6 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Fri, 23 Oct 2015 19:44:20 -0700
Subject: [PATCH] Made Google Analytics configurable, removed it outside of
 production, and corrected several namespace errors.

---
 config/ponyfm.php                             |  12 ++++++++
 .../2013_09_23_031316_create_track_hashes.php |   4 +--
 .../2014_05_28_071738_update_track_hash.php   |   4 +--
 ..._05_25_011121_create_track_files_table.php |   4 +--
 resources/assets/scripts/app/app.coffee       |  16 +++++-----
 resources/environments/.env.example           |   2 ++
 resources/environments/.env.local             |   2 ++
 resources/environments/.env.production        | Bin 517 -> 552 bytes
 resources/environments/.env.stage             | Bin 533 -> 559 bytes
 resources/views/shared/_app_layout.blade.php  |  29 ++++++++++--------
 resources/views/tracks/embed.blade.php        |  26 ++++++++--------
 11 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/config/ponyfm.php b/config/ponyfm.php
index e10a1967..1203dd76 100644
--- a/config/ponyfm.php
+++ b/config/ponyfm.php
@@ -28,4 +28,16 @@ return [
 
     'sendfile' => env('USE_SENDFILE', true),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Google Analytics ID
+    |--------------------------------------------------------------------------
+    |
+    | If provided, Pony.fm will track activity in the given Google Analytics
+    | profile.
+    |
+    */
+
+    'google_analytics_id' => env('GOOGLE_ANALYTICS_ID', null),
+
 ];
diff --git a/database/migrations/2013_09_23_031316_create_track_hashes.php b/database/migrations/2013_09_23_031316_create_track_hashes.php
index 6fe14832..cdfe0323 100644
--- a/database/migrations/2013_09_23_031316_create_track_hashes.php
+++ b/database/migrations/2013_09_23_031316_create_track_hashes.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Track;
+use Poniverse\Ponyfm\Track;
 use Illuminate\Database\Migrations\Migration;
 
 class CreateTrackHashes extends Migration
@@ -23,4 +23,4 @@ class CreateTrackHashes extends Migration
             $table->dropColumn('hash');
         });
     }
-}
\ No newline at end of file
+}
diff --git a/database/migrations/2014_05_28_071738_update_track_hash.php b/database/migrations/2014_05_28_071738_update_track_hash.php
index 6f2d43bb..c3dca55d 100644
--- a/database/migrations/2014_05_28_071738_update_track_hash.php
+++ b/database/migrations/2014_05_28_071738_update_track_hash.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Track;
+use Poniverse\Ponyfm\Track;
 use Illuminate\Database\Migrations\Migration;
 
 class UpdateTrackHash extends Migration
@@ -16,4 +16,4 @@ class UpdateTrackHash extends Migration
     public function down()
     {
     }
-}
\ No newline at end of file
+}
diff --git a/database/migrations/2015_05_25_011121_create_track_files_table.php b/database/migrations/2015_05_25_011121_create_track_files_table.php
index 6ac15cd3..53ae5f60 100644
--- a/database/migrations/2015_05_25_011121_create_track_files_table.php
+++ b/database/migrations/2015_05_25_011121_create_track_files_table.php
@@ -1,6 +1,6 @@
 <?php
 
-use App\Track;
+use Poniverse\Ponyfm\Track;
 use Illuminate\Database\Migrations\Migration;
 
 
@@ -52,4 +52,4 @@ class CreateTrackFilesTable extends Migration
         Schema::drop('track_files');
     }
 
-}
\ No newline at end of file
+}
diff --git a/resources/assets/scripts/app/app.coffee b/resources/assets/scripts/app/app.coffee
index f130a026..4af1110e 100644
--- a/resources/assets/scripts/app/app.coffee
+++ b/resources/assets/scripts/app/app.coffee
@@ -2,11 +2,12 @@ window.pfm.preloaders = {}
 
 module = angular.module 'ponyfm', ['ui.bootstrap', 'ui.state', 'ui.date', 'ui.sortable', 'pasvaz.bindonce', 'angularytics']
 
-module.run [
-	'Angularytics',
-	(analyitcs) ->
-		analyitcs.init()
-]
+if window.pfm.environment == 'production'
+	module.run [
+		'Angularytics',
+		(analytics) ->
+			analytics.init()
+	]
 
 module.config [
 	'$locationProvider', '$stateProvider', '$dialogProvider', 'AngularyticsProvider', '$httpProvider', '$sceDelegateProvider'
@@ -26,7 +27,8 @@ module.config [
 			'/templates/directives/*'
 		]
 
-		analytics.setEventHandlers ['Google']
+		if window.pfm.environment == 'production'
+			analytics.setEventHandlers ['Google']
 
 		# Errors
 		state.state 'errors-404',
@@ -245,4 +247,4 @@ module.config [
 		$dialogProvider.options
 			dialogFade: true
 			backdropClick: false
-]
\ No newline at end of file
+]
diff --git a/resources/environments/.env.example b/resources/environments/.env.example
index b0321a00..3e28b6b7 100644
--- a/resources/environments/.env.example
+++ b/resources/environments/.env.example
@@ -22,3 +22,5 @@ PONI_CLIENT_ID=null
 PONI_CLIENT_SECRET=null
 
 PONYFM_DATASTORE=null
+
+GOOGLE_ANALYTICS_ID=null
diff --git a/resources/environments/.env.local b/resources/environments/.env.local
index f0f884bf..4b58c75c 100644
--- a/resources/environments/.env.local
+++ b/resources/environments/.env.local
@@ -22,3 +22,5 @@ PONI_CLIENT_ID=
 PONI_CLIENT_SECRET=
 
 PONYFM_DATASTORE=/vagrant-files
+
+GOOGLE_ANALYTICS_ID=UA-29463256-1
diff --git a/resources/environments/.env.production b/resources/environments/.env.production
index bcc7bf001132189cdf102a924babaa4635bce4f8..49e132d863f825f20e347c205502696264162106 100644
GIT binary patch
literal 552
zcmV+@0@wWjM@dveQdv+`0C~!b_{3AQpkGQStI$L4neh><Y6>29(S+D~mR+g&vZQxy
z!kcMK77NVDzUazE3sb?%c|-1Uvm+s>Qj|)jAS{{1oxXJ&f}ic-{66L3gE!RS_~<$t
z?*H`K7(aPFIghI_Kvv*)1iEMGz!S8IfLozu%7kFWfTZ<=k_${<W7>!zD~cs}TNJr6
zL=bTLBKpDVQ$6`jfe#^$lu&l&Ifn?BEiA&NWc1g|7IXLsx+{9aAi}7>Rz;>r4TDo?
zBd5YkQSns)xdXpD*Gd&w7CU4})F5HCt%HD$C)^K&k-It`RO+eZF~G^9<pEy;*niwH
zj>`Ik@>U`3=(&O{`H%d)%QbEO1$zIBt#}}^oQJvb*Q7R`KK+FtC20*#wmTXIc)Fc`
zAU!ZD>F6@3ulJ^^{)jE++*Zh;eF*st8$Yh{yKg9-Xu~=43eRJp`I(Bxga(q5BGTU=
z*)5Uh<nGb$TXAM)hg4OTQ3`PZm0b`t$x~zqIw=;To)d56)Bk^@W3~<`4Z@pjW?_`x
z`O3mgb7EPiOp?}HflCl+Mu3^5X-cn4j+B*xU;iX+WH2(wd|>Iiu&8^oPW2o^!u(2l
zAi(^evPLuU1JM-7vCU%Ec#w++%G=WsXHAh1n+V7~;)v2adAsuO$WXO6C`RhvAE@^|
qdPNKhp63$b<5xj1+~{UhG9{{L8!_Wp&9YEXIRDurq{W%~6o?lCITdyQ

literal 517
zcmV+g0{Z;`M@dveQdv+`0NFFz_qt&;O&f4%`--|-(s_QDUL31IiXS__(xX_pLF`UQ
zG61Y5-s?*@JdQ9_Cy#PePIGrJv~elX?`L<JJ8XL(CdoG|RxKO(lK*gC$ONypFRI?W
zxB5mo!_e7T$ZY;P<TLP=>sm~y4y6Oo6c`2vl-!b4tF^ftr*ImbcW(f&XL*R3lH#w-
zze_Jxy?_u?j6}1%@bt^kIKAv?J#jNJWL6w7GwBX8dg0~XAP?t{DL-oeNx&hf*)*=v
ziVQ(EgdkjmqbKZiZbY-=oygJT<?e*pk^?i^3d7HTMJZ76k_+6}L~BOzhZi!Yv}9;!
z#kVgEj5CSqH@bvr5+~vZ&KwPIYCs~c&hIDuoTj6S$x)P56Q1QNv&@?|lQ|vN$Eqht
zwI;zRDSL;e3}{zDcOw9sO9tgJQpX$3DJa>5wC=w@D&GY$5Pwy-l<|=3>gyR`&96cq
zNX;Pp2;VGek2_c1JMnl`ukeRdpCZWIk~CFuVaWqc>*D^GQ|GfQA)YV8HwQNf4L`Rp
zhDiQ10_8?J26sJP0B#N*&*8Z`^s6jHWl)~gcz_u;e$yAjH-)a8bh_YYR>YXSsQjrc
zUdDjTKBciaocyL$u0n7vrd0xf7PUI{RXt@U1f`;ZlJo`rH3SOVu^C>SNSPC}^so9G
Hf+{C{ZFKd5

diff --git a/resources/environments/.env.stage b/resources/environments/.env.stage
index 199dcfa4a19d3aeba61f0fda42e449a65d6cc442..7f820962cb39a5e3c7c157a078dabc0a7e781d46 100644
GIT binary patch
literal 559
zcmV+~0?_>cM@dveQdv+`0F5?5>lLc4UvjG=<tf+^FPav2Kq##SB=qf-{SRF_`7?7E
zk~f|?nVfqVYXKaVX6+0>IEQQ#c)p)&F2_2y16E|mV=>caq}4mgw_Iqmqn)93ZGAU9
z`_kdZz;B5B=`8+anTOUE_|_17BlnjQR&mJa;WaT`ddYU2Hl@fQlA&*0#$K@(uEHS0
z0n^hk90D?oO@ZJ-?3Rlxe7{cF(4>&0!jGy&7mxhdp(s;UvV`5E8ryZuYx;>>d+^o~
z8xCKY?gOSypFRCk*U4Xf?MF<`b_0c3C`0Dz)UkOnt<0_OX0u3EzbY55V{6{d?zdGq
zukfQ(0%dF7+KF~1ew<O&Tzo)#XZdvn-3?xY>8Ofl0pBq8#Hdp|#Doq=Ln22r@qbfh
zCfB2u{EiwdcT(SLl3%N+1wv8jV~<kKmHf>-h82^}nC`Nzvq5BbhbNC@UALfUtC0zu
z7FPRbFF==f89|nZLs(Bz`4OLb0`{Y}>wey$NV%Pp5I|7Sz-Rkz)5kc2dF>sC{=9+~
zdD;*?5OTj!Wvi}(VhSJg2#+Z;C7J-`VQ8z<cFPYqaWsl==^gQ(CIMVrcKUjyyfVP@
zB<j-N_vi0w!RYH4_>o>K{Ca{JHqo0{CLNs%np{LuK9*qf%!_C6vyeVtRwNf#IS>*I
xg!Po~)dEJt?o~x?l@6PHZlEUa>yA0MDTcvYY!Fz-%3Y7asELU@jsx!sUdsVf6D|M%

literal 533
zcmV+w0_yz$M@dveQdv+`0Nk~8l-j|^jT@2Et`TIo?6bT!<KqYm^Lh3HlBBKJx~G@|
z*Pqh_7(_&W7KQh}d)8r6_`jOql6$jjk*WSY0cK^4iyP0dX5lOM+qYB51k@tOcOjtX
zZ;A3sX;+Z}S`C5y^EYQd$e{i5$~<WLm8cy*VxQXUI5cYA#Y*{6Uzr7SU;xOXP`am~
znsa9ja$m567~Bgy)D9|(HL>?#UdkxbiA58tqqaThwgq?`Fdv#?^#+ti6;{vGziSGr
zbem?pUP9Ywwsm1m);M?hy%n-+qS?C64AUK62>GZoQi834CFWty<q?Vs{3?{C{-Gwi
z1C#eg5Y8%vNE(7dd41CX@!eAzPT2f{qJmd9r|GGjJ(fH&+TR1r-^w|M>s!a|d;7-s
z2f*Mb0w%0xYdMnP#)j@$xI%^OPB8Zek@a$?3!<2F+tu^lg{pXS4ccmqaK;o3rF#^7
zJ-u>cDa#xS-m`gg4AU7u(twBXGHqu^!?A8qGryvmDr-};>I{uQ@lDc*d}5lrT(`HA
zaXq2PdGJ$NJP{x=f6ooh^Tda^ziiT%N6lNDWU(H?zS843HX|M45Ab%9+Q>17f@Gak
z(PL)h##{cUOeB|+6D#zUr)zD}W<tK!gopw^su}s4ki4LEgf$P6uAW=Ln^*-Md3(N(
XXkU_!6TN`ezY^h)kvG|cq^6o#D_9T<

diff --git a/resources/views/shared/_app_layout.blade.php b/resources/views/shared/_app_layout.blade.php
index 1f0287c5..cb769311 100644
--- a/resources/views/shared/_app_layout.blade.php
+++ b/resources/views/shared/_app_layout.blade.php
@@ -32,7 +32,7 @@
 			@if (Auth::check())
 				<div class="user-details dropdown">
 					<a class="avatar dropdown-toggle" href="#">
-						<img src="{{Auth::user()->getAvatarUrl(\App\Image::THUMBNAIL)}}" />
+						<img src="{{Auth::user()->getAvatarUrl(\Poniverse\Ponyfm\Image::THUMBNAIL)}}" />
 						<span><i class="icon-chevron-down"></i></span>
 					</a>
 					<ul class="dropdown-menu">
@@ -112,22 +112,25 @@
 				@else
 					isLogged: false
 				@endif
-			}
+			},
+            environment: "{{ App::environment() }}"
 		};
 	</script>
 
-	<script>
-		{{-- Google Analytics --}}
-		var _gaq = _gaq || [];
-		_gaq.push(['_setAccount', 'UA-29463256-1']);
-		_gaq.push(['_setDomainName', 'pony.fm']);
+    @if(config('ponyfm.google_analytics_id'))
+        <script>
+            {{-- Google Analytics --}}
+            var _gaq = _gaq || [];
+            _gaq.push(['_setAccount', '{{ config('ponyfm.google_analytics_id') }}']);
+            _gaq.push(['_setDomainName', 'pony.fm']);
 
-		(function() {
-			var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-		})();
-	</script>
+            (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+            })();
+        </script>
+    @endif
 
 	{!! Assets::scriptIncludes() !!}
 
diff --git a/resources/views/tracks/embed.blade.php b/resources/views/tracks/embed.blade.php
index 060ac374..591cef95 100644
--- a/resources/views/tracks/embed.blade.php
+++ b/resources/views/tracks/embed.blade.php
@@ -26,7 +26,7 @@
 		<div class="player loading {{Auth::check() ? 'can-favourite' : ''}} {{$user['is_favourited'] ? 'favourited' : ''}}" data-track-id="{{ $track->id }}" data-duration="{{ $track->duration * 1000 }}">
 			<div class="play" disabled="disabled">
 				<div class="button"><i class="icon-play"></i></div>
-				<img src="{{ $track->getCoverUrl(\App\Image::SMALL) }}" />
+				<img src="{{ $track->getCoverUrl(\Poniverse\Ponyfm\Image::SMALL) }}" />
 			</div>
 			<div class="meta">
 				@if (Auth::check())
@@ -52,17 +52,19 @@
 
 	{!! Assets::scriptIncludes('embed') !!}
 
-	<script type="text/javascript">
-		var _gaq = _gaq || [];
-		_gaq.push(['_setAccount', 'UA-29463256-1']);
-		_gaq.push(['_setDomainName', 'pony.fm']);
-		_gaq.push(['_trackPageview']);
+    @if(config('ponyfm.google_analytics_id'))
+        <script type="text/javascript">
+            var _gaq = _gaq || [];
+            _gaq.push(['_setAccount', '{{ config('ponyfm.google_analytics_id') }}']);
+            _gaq.push(['_setDomainName', 'pony.fm']);
+            _gaq.push(['_trackPageview']);
 
-		(function() {
-			var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-			ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-			var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-		})();
-	</script>
+            (function() {
+                var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+            })();
+        </script>
+    @endif
 </body>
 </html>