Merge pull request #2 in ~MVOELKEL/sks-landingpage from develop to master

* commit 'a5b55567aa':
  - adding Tracking for Downloads and fixing last bugs in tracking and Routing - Adding Download Class correctly with dynamic download function - create 404 Not FPund Page and integrated it correctly - include Facebook like Button - fixing background for devices with 320px display width
  - adding Tracking Class

Application/Config/router.php

@@ -1,3 +1,3 @@
 <?php
 $router->map('GET', '/', ROOT . DS . APP . '/Data/index.php', 'homePage');
-$router->map('GET', '/download/[*:trailing]', ROOT . DS . APP . '/Data/download.php', 'downloadLink');
+$router->map('GET', '/download/[a:controllerFile]/[*:version]?', ROOT . DS . APP . '/Data/download.php', 'downloadLink');

Application/Data/download.php

@@ -1,7 +1,38 @@
 <?php
 
+use SCF\Core\DI;
+use SCF\Additionals\Tracking;
+use SCF\Additionals\Download;
 /**
  *  Download page for Downloads
  */
-//TODO: Create Download Logic with Download Class in scf/Additionals/Download.php
-var_dump($match);
+
+/**
+ * Tracking Settings set for Database logging of Downloads
+ * Please Remind that this only counts Click on DL Button, User can Cancel the Download
+ * and the system will still think it was a finished download
+ */
+$tracking = new Tracking(DI::getInstance()->get('db'));
+$tracking->setCurrentUserIp($_SERVER['REMOTE_ADDR']);
+$tracking->setCurrentUserAgent($_SERVER['HTTP_USER_AGENT']);
+
+/**
+ * Check if controllerFile is NOT the EuropeanFontPatch for DownloadTracking
+ */
+if ($match['params']['controllerFile'] != 'EuropeanFontPatch') {
+    $tracking->saveTrackingInDb('download', $settings->getValue('sks_download_version'));
+    $dlFile = $settings->getValue('sks_download_file');
+} else {
+    $dlFile = $settings->getValue('sks_eufont_file');
+}
+
+/**
+ * Set Needed Variables for the Download Class
+ */
+$dl = new Download();
+$dl->setAbsolutePath($settings->getValue('sks_download_path'));
+$dl->setFileName($dlFile);
+
+$dl->startDownloadFile();
+
+$tpl->display('index.tpl');

Application/scf/Additionals/Download.php

@@ -52,5 +52,27 @@ class Download
         $this->absolutePath = $absolutePath;
     }
 
+    public function startDownloadFile()
+    {
+        $tmpPath = $this->getAbsolutePath();
+        $tmpFile = $this->getFileName();
+
+        $fh = fopen($tmpPath . $tmpFile, "r");
+        header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
+        header('Content-Description: File Transfer');
+        header('Content-Type: application/octed-stream');
+        header('Content-Length: ' . @filesize($tmpPath . $tmpFile));
+        header("Content-Disposition: attachment; filename=" . $tmpFile);
+        header("Content-Transfer-Encoding: binary");
+
+        while (true) {
+            echo fgets($fh, 4096);
+            if (feof($fh)) break;
+            if (connection_status() != 0) break;
+        }
+        fclose($fh);
+
+    }
+
 //TODO: Finishing Download Class to generate correct Downloads for Page!
 }

Application/scf/Additionals/Tracking.php

@@ -0,0 +1,127 @@
+<?php
+
+namespace SCF\Additionals;
+
+use SCF\Core\Database;
+
+class Tracking
+{
+
+    private $_db;
+
+    private $currentUserIp;
+
+    private $currentUserAgent;
+
+    private $currentUserReferer;
+
+    private $trackingTarget;
+
+    public function __construct(Database $db)
+    {
+        $this->_db = $db;
+    }
+
+    /**
+     * @param mixed $currentUserIp
+     */
+    public function setCurrentUserIp($currentUserIp)
+    {
+        $this->currentUserIp = $currentUserIp;
+    }
+
+    /**
+     * @param mixed $currentUserAgent
+     */
+    public function setCurrentUserAgent($currentUserAgent)
+    {
+        $this->currentUserAgent = $currentUserAgent;
+    }
+
+    /**
+     * @param mixed $currentUserReferer
+     */
+    public function setCurrentUserReferer($currentUserReferer)
+    {
+        $this->currentUserReferer = $currentUserReferer;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCurrentUserIp()
+    {
+        return $this->currentUserIp;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCurrentUserAgent()
+    {
+        return $this->currentUserAgent;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getCurrentUserReferer()
+    {
+        return $this->currentUserReferer;
+    }
+
+    public function checkUniqueUser()
+    {
+        $this->_db->query("SELECT ip_adress, `timestamp` FROM sks_unique_user WHERE ip_adress = '{$this->getCurrentUserIp()}' ORDER BY `timestamp` DESC LIMIT 1");
+        $result = $this->_db->single();
+        $trackedDate = date("Y-m-d", $result['timestamp']);
+        $currentDate = date("Y-m-d", time());
+        //echo $trackedDate . ' - ' . $currentDate;
+        if ($trackedDate == $currentDate) {
+            //echo 'Du warst heute um ' . date("H:i:s", $result['timestamp']) . ' Uhr schon einmal hier!';
+        } else {
+            //echo 'different Dates visit';
+            $this->_db->query("INSERT INTO sks_unique_user (`ip_adress`, `user_agent`, `referrer`, `timestamp`) VALUES
+                                      (:ip, :userAgent, :userReferer, :timeValue)");
+            $this->_db->bind(':ip', $this->getCurrentUserIp());
+            $this->_db->bind(':userAgent', $this->getCurrentUserAgent());
+            $this->_db->bind(':userReferer', $this->getCurrentUserReferer());
+            $this->_db->bind(':timeValue', time());
+            $this->_db->execute();
+        }
+
+    }
+
+    /**
+     * @param mixed $trackingTarget
+     */
+    public function setTrackingTarget($trackingTarget)
+    {
+        $this->trackingTarget = $trackingTarget;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getTrackingTarget()
+    {
+        return $this->trackingTarget;
+    }
+
+    public function saveTrackingInDb($target, $dlVersion)
+    {
+        $tmpTarget = $target;
+        $tmpDlVersion = $dlVersion;
+        $timestamp = time();
+        if ($tmpTarget == 'download') {
+            try {
+                $this->_db->query("INSERT INTO `sks_unique_dls` (ip_adress, timestamp, user_agent, dl_version)
+                              VALUES ('{$this->getCurrentUserIp()}', '{$timestamp}', '{$this->getCurrentUserAgent()}', '{$tmpDlVersion}')");
+                $this->_db->execute();
+            } catch (\PDOException $e) {
+                echo $e->getMessage();
+            }
+        }
+
+    }
+}

Application/templates/sternenkindsaga/errorpages/404.tpl

@@ -1,3 +1,16 @@
 {include file="header.tpl"}
+<div class="row row-width">
+    <div class="col-lg-12 sks-not-found">
+        <h1>Huch!</h1>
+        <h2>404 Not Found</h2>
+        <p>
+            Die Information die Du aufrufen wolltest, existiert nicht. Gehe bitte wieder zurück auf die <a
+                    href="{$settings->getValue('siteaddr')}">Startseite</a>
+        </p>
+        <div class="clearfix"></div>
+    </div>
+</div>
+
+
 
 {include file="footer.tpl"}

Application/templates/sternenkindsaga/html/htmlHead.tpl

@@ -2,7 +2,7 @@
 
 <html lang="en">
 <head>
-    <title>{$settings->getValue("sitename")}</title>
+    <title>{$settings->getValue("sitename")|replace:'{1}':$settings->getValue("sks_download_version")}</title>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">

Application/templates/sternenkindsaga/index.tpl

@@ -2,31 +2,38 @@
 <div class="row row-width">
     <div class="col-sm-7 less-padding sks-bottom-spacer">
         <div class="sks-box">
-            <strong>{$settings->getValue('lp_teaser_text_headline')}</strong>
+            <strong>{$settings->getValue('lp_teaser_text_headline')}</strong><br/>
             {$settings->getValue('lp_teaser_text')|nl2br}
         </div>
 
     </div>
     <div class="row">
-        <div class="col-sm-5 sks-bottom-spacer">
+        <div class="col-sm-offset-0 col-sm-5 sks-bottom-spacer">
             <div class="sks-box">
                 {include file="misc/carousel.tpl"}
                 <b> Erwecke jetzt das Sternenkind in dir!</b>
-                <button class="sks-download-button" id="sks-dl-button">Download</button>
+                <a href="download/SternenkindSaga/{$settings->getValue('sks_download_version')}">
+                    <button class="sks-download-button" id="sks-dl-button">Download</button>
+                </a>
             </div>
         </div>
-        <div class="col-sm-5 sks-bottom-spacer">
+        <div class="col-sm-offset-0 col-sm-5 sks-bottom-spacer">
             <div class="sks-box">
                 <strong>{$settings->getValue('sks_additional_files')}</strong><br/>
                 {$settings->getValue('sks_eu_patch')}
             </div>
         </div>
-        <div class="col-sm-5">
+        <div class="col-sm-offset-7 col-sm-5">
             <div class="sks-box">
                 <strong>{$settings->getValue('sks_social_media')}</strong><br/>
+                <div class="fb-like"
+                     data-href="https://www.facebook.com/pages/Sternenkind-Saga-Release-13122014/666851820057165"
+                     data-layout="button_count" data-action="like" data-show-faces="false" data-share="false"
+                     style="float:right; margin-top:5px;"></div>
                 {$settings->getValue('sks_forum_link')}<br/>
                 {$settings->getValue('sks_facebook_link')}<br/>
-                {$settings->getValue('sks_homepage_link')}<br/>
+                {$settings->getValue('sks_homepage_link')}
+
             </div>
         </div>
     </div>

bootstrap.php

@@ -16,6 +16,7 @@ use Symfony\Component\Debug\Debug;
 use SCF\Core\DI;
 use SCF\Core\Database;
 use SCF\Core\System;
+use SCF\Additionals\Tracking;
 use SCF\Core\Templates;
 
 /**
@@ -40,9 +41,11 @@ else {
 $di = DI::getInstance();
 $di->set('db', new Database($config['dbext'], $config['server'], $config['mysqluser'], $config['mysqlpass'], $config['mysqldbname']), true);
 $di->set('router', 'AltoRouter', true);
+$di->set('tracking', new Tracking(DI::getInstance()->get('db')), true);
 
 $settings = new System(DI::getInstance()->get('db'));
 
 $router = DI::getInstance()->get('router');
 
+
 $tpl = new Templates($settings,$router);

version

@@ -1 +1 @@
-v1.1.2
+v1.1.2 Rev: 2

web/Styles/css/sks-v2.css

@@ -50,7 +50,7 @@ a:hover {
 }
 
 .row-width {
-    border: 1px solid #ffffff;
+
     width: 95%;
     max-width: 800px;
     margin: 20px auto 10px auto;
@@ -65,9 +65,18 @@ a:hover {
     margin-bottom: -10px;
 }
 
+.sks-not-found {
+    background: url("../images/sks-background.png") repeat;
+    border: 2px solid #e79b1f;
+    width: 100%;
+    color: #e79b1f;
+    margin: 5px auto 5px auto;
+    box-shadow: 0 5px 10px #000000;
+}
+
 .sks-dropdown {
     background: linear-gradient(#1f1a16, #4d3c32);
-    border: 1px solid #e79b1f;
+    border: 2px solid #e79b1f;
 }
 
 .sks-dropdown li a {
@@ -82,7 +91,7 @@ a:hover {
 }
 
 .sks-margin-bottom {
-    margin-bottom: 25%;
+    margin-bottom: 100px;
 }
 
 .sks-max-width {
@@ -121,7 +130,19 @@ a:hover {
     box-shadow: 0 5px 10px #000000;
 }
 
-@media only screen and (min-device-width: 375px) {
+.sks-small-text {
+    font-size: 80%;
+    margin: 0;
+    padding: 0;
+}
+
+.sks-center-text {
+    text-align: center;
+    margin: 0;
+    padding: 0;
+}
+
+@media only screen and (min-device-width: 320px) {
     body {
         background: #cfcfcf url('../images/sks-background.png') repeat;
     }

web/index.php

@@ -2,6 +2,7 @@
 require_once '../bootstrap.php';
 
 use SCF\Additionals\Carousel;
+use SCF\Core\DI;
 
 $c = new Carousel(ROOT . DS . 'web/Styles/sks-screens' . DS);
 
@@ -13,13 +14,22 @@ require_once ROOT.DS.APP."/Config/router.php";
 $tpl->assign('sksscreens', $c->getPicArray());
 $match = $router->match();
 
+$userReferer = (!isset($_SERVER['HTTP_REFERER']) ? 'direct' : $_SERVER['HTTP_REFERER']);
+
+$tracking = DI::getInstance()->get('tracking');
+$tracking->setCurrentUserIp($_SERVER['REMOTE_ADDR']);
+$tracking->setCurrentUserAgent($_SERVER['HTTP_USER_AGENT']);
+$tracking->setCurrentUserReferer($userReferer);
+$tracking->checkUniqueUser();
 if($match === false) {
+    var_dump($match);
     $tpl->display('errorpages/404.tpl');
 }
 else {
     try {
         require $match['target'];
     } catch(Exception $e) {
+        echo '3';
         return $e->getMessage();
     }
 }

web/lib/sks.js

@@ -1,5 +1,5 @@
 $(document).ready(function () {
     $(".carousel").carousel({
-        interval: 2000
+        interval: 5000
     });
 });