From 2e3cd85aded2980adb9ff7aedfe138d8c0def309 Mon Sep 17 00:00:00 2001
From: Astaf User <info@astaf.de>
Date: Wed, 18 Jun 2014 10:56:50 +0200
Subject: Analytics deaktviert, stats.ccwn.org aktiviert Umleitungen zur
 Wiederherstellung der alten Links eingebaut

---
 .htaccess                           | 34 ++++++++++++++++++++++++++++++++++
 themes/astaf/views/layouts/main.php | 19 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 .htaccess

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..6da3367
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,34 @@
+RewriteEngine On
+RewriteCond %{HTTP_HOST} ^astaf.de
+RewriteRule (.*) http://www.astaf.de/$1 [R=301,L]
+
+#RewriteRule ^(.*)/Der-Charme-der-Altstadt\.html$ $1/index.php/cms/sitecontent/view/page/charme
+
+redirect 301 /Der-Charme-der-Altstadt.html http://www.astaf.de/index.php/cms/sitecontent/view/page/charme
+redirect 301 /Bus-und-Bahn.html http://www.astaf.de/index.php/cms/sitecontent/view/page/bus-und-bahn
+redirect 301 /texte/flair.html http://www.astaf.de/index.php/cms/sitecontent/view/page/charme
+redirect 301 /Notruf/Kinder.html http://www.astaf.de/index.php/cms/sitecontent/view/page/notruf-kinder
+redirect 301 /Impressum.html http://www.astaf.de/index.php/cms/sitecontent/view/page/impressum
+redirect 301 /Auftreten.html http://www.astaf.de/index.php/cms/sitecontent/view/page/auftreten
+redirect 301 /Sperrzeiten.html http://www.astaf.de/index.php/cms/sitecontent/view/page/sperrzeiten
+redirect 301 /Grusswort.html http://www.astaf.de/index.php/cms/sitecontent/view/page/rund-ums-fest
+redirect 301 /Richtpreise.html http://www.astaf.de/index.php/cms/sitecontent/view/page/richtpreise
+redirect 301 /Parken.html http://www.astaf.de/index.php/cms/sitecontent/view/page/parken
+redirect 301 /Toiletten.html http://www.astaf.de/index.php/cms/sitecontent/view/page/toiletten
+redirect 301 /Gottesdienste.html http://www.astaf.de/index.php/cms/sitecontent/view/page/gottesdienste-konzerte
+redirect 301 /Stauferspektakel.html http://www.astaf.de/index.php/cms/sitecontent/view/page/staufer-spektakel
+redirect 301 /Eroeffnungsprogramm.html http://www.astaf.de/index.php/cms/sitecontent/view/page/eroeffnungsprogramm
+redirect 301 /Newsflashes/Newsflash/Auftrittmoeglichkeiten-fuer-Bands.html  http://www.astaf.de/index.php/cms/sitecontent/view/page/auftreten
+
+<IfModule mod_expires.c>
+  ExpiresActive On
+  ExpiresByType image/gif "access plus 7 days"
+  ExpiresByType image/ico "access plus 7 days"
+  ExpiresByType image/jpeg "access plus 7 days"
+  ExpiresByType image/jpg "access plus 7 days"
+  ExpiresByType image/png "access plus 7 days"
+  ExpiresByType text/css "access plus 7 days"
+  ExpiresByType text/javascript "access plus 7 days"
+  ExpiresByType application/x-javascript "access plus 7 days"
+  ExpiresByType application/javascript "access plus 7 days"
+</IfModule>
diff --git a/themes/astaf/views/layouts/main.php b/themes/astaf/views/layouts/main.php
index 092ff25..7847de1 100644
--- a/themes/astaf/views/layouts/main.php
+++ b/themes/astaf/views/layouts/main.php
@@ -19,7 +19,8 @@
 	<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
 	<![endif]-->
 	
-	<script type="text/javascript">
+	<!-- Google Analytics DEAKTIVIERT
+<script type="text/javascript">
 
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', 'UA-1935263-1']);
@@ -31,7 +32,23 @@
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
 
+</script>-->
+
+<!-- Piwik -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://stats.ccwn.org/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', 1]);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
+    g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<noscript><p><img src="http://stats.ccwn.org/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
+<!-- End Piwik Code -->
 </head>
 <body>
 <ul class="ym-skiplinks">
-- 
cgit v1.0-28-g1787