google analytics code

5 files changed, 40 insertions, 5 deletions

diff --git a/app/class/config.php b/app/class/config.php
index d6164ca..f9ed8fd 100644
--- a/app/class/config.php
+++ b/app/class/config.php
@@ -20,6 +20,7 @@ abstract class Config
 	protected static $defaultfavicon = '';
 	protected static $showeditmenu = true;
 	protected static $editsymbol = 'pen';	
+	protected static $analytics = '';	
 
 
 
@@ -157,6 +158,11 @@ abstract class Config
 		return self::$editsymbol;
 	}
 
+	public static function analytics()
+	{
+		return self::$analytics;
+	}
+
 
 
 // __________________________________________ S E T ______________________________________
@@ -267,6 +273,13 @@ abstract class Config
 		}
 	}
 
+	public static function setanalytics($analytics)
+	{
+		if(is_string($analytics) && strlen($analytics) < 25) {
+			self::$analytics = $analytics;
+		}
+	}
+
 
 
 
diff --git a/app/class/controllerart.php b/app/class/controllerart.php
index 0ef82da..be86660 100644
--- a/app/class/controllerart.php
+++ b/app/class/controllerart.php
@@ -9,7 +9,7 @@ class Controllerart extends Controller
     protected $fontmanager;
     protected $mediamanager;
 
-    const COMBINE = true;
+    const COMBINE = false;
 
     public function __construct($router)
     {
diff --git a/app/class/modelrender.php b/app/class/modelrender.php
index 9f68aa2..259ce1b 100644
--- a/app/class/modelrender.php
+++ b/app/class/modelrender.php
@@ -195,6 +195,22 @@ class Modelrender extends Modelart
 		}
 		$head .= '<script src="' . Model::renderpath() . $this->art->id() . '.js" async/></script>' . PHP_EOL;
 
+		if (!empty(Config::analytics())) {
+
+			$head .= PHP_EOL . '
+			<!-- Global site tag (gtag.js) - Google Analytics -->
+			<script async src="https://www.googletagmanager.com/gtag/js?id=' . Config::analytics() . '"></script>
+			<script>
+			window.dataLayer = window.dataLayer || [];
+			function gtag(){dataLayer.push(arguments);}
+			gtag(\'js\', new Date());
+
+			gtag(\'config\', \'' . Config::analytics() . '\');
+			</script>
+			' . PHP_EOL;
+		}
+
+
 		return $head;
 	}
 
diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php
index 66c7a33..007ced4 100644
--- a/app/view/templates/admin.php
+++ b/app/view/templates/admin.php
@@ -87,6 +87,13 @@
     ?>
     </select>
 
+
+    <h2>Tracking</h2>
+
+    <label for="analytics">Google analytics Tracking ID</label>
+    <input type="text" name="analytics" id="analytics" value="<?= Config::analytics() ?>">
+
+
     <input type="submit" value="Update configuration">
 
     </form>
diff --git a/app/view/templates/homeopt.php b/app/view/templates/homeopt.php
index cecb79b..f240d0a 100644
--- a/app/view/templates/homeopt.php
+++ b/app/view/templates/homeopt.php
@@ -4,10 +4,7 @@
 <input type="submit" name="submit" value="filter">
 ⬅<input type="submit" name="submit" value="reset">
 
-
-        <!-- $this->optionsort($opt);
-        $this->optionprivacy($opt);
-        $this->optiontag($opt); -->
+<div id="optfield">
 
 <fieldset><legend>Sort</legend>
 <select name="sortby" id="sortby">
@@ -76,6 +73,8 @@ if ($in = true || $out = true) {
         echo '<label for="invert">invert</></br>';
         ?>
 
+</div>
+
 
 <input type="submit" name="submit" value="filter">
 ⬅<input type="submit" name="submit" value="reset">