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

* commit 'ef6a423a0f':
  - fixing bug in Version NUmber Tracking
  -fixing stuff

Application/scf/Additionals/Download.php

         $this->absolutePath = $absolutePath;
     }
 
+    /**
+     * Download Control. Starts Downloads with the selected File in $tmpFile
+     * Absolute Path must be given!
+     */
     public function startDownloadFile()
     {
         $tmpPath = $this->getAbsolutePath();
         fclose($fh);
 
     }
-
-//TODO: Finishing Download Class to generate correct Downloads for Page!
 }

Application/scf/Additionals/Tracking.php

 
 class Tracking
 {
-
+    /**
+     * @var Database
+     */
     private $_db;
 
+    /**
+     * @var string
+     */
     private $currentUserIp;
 
+    /**
+     * @var string
+     */
     private $currentUserAgent;
 
+    /**
+     * @var string
+     */
     private $currentUserReferer;
 
+    /**
+     * @var string
+     */
     private $trackingTarget;
 
+    /**
+     * Tracking constructor.
+     * @param Database $db
+     */
     public function __construct(Database $db)
     {
         $this->_db = $db;
         return $this->currentUserReferer;
     }
 
+    /**
+     * Check Users to track them only once a day
+     */
     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");
         return $this->trackingTarget;
     }
 
+    /**
+     * @param $target
+     * @param $dlVersion
+     */
     public function saveTrackingInDb($target, $dlVersion)
     {
         $tmpTarget = $target;
-        $tmpDlVersion = $dlVersion;
+        $tmpDlVersion = substr($dlVersion, 1);
         $timestamp = time();
         if ($tmpTarget == 'download') {
             try {

Application/templates/sternenkindsaga/errorpages/404.tpl

         <div class="clearfix"></div>
     </div>
 </div>
-
-
-
 {include file="footer.tpl"}

Application/templates/sternenkindsaga/misc/facebook.tpl

 <div id="fb-root"></div>
-<script>(function (d, s, id) {
+<script type="text/javascript">(function (d, s, id) {
         var js, fjs = d.getElementsByTagName(s)[0];
         if (d.getElementById(id)) return;
         js = d.createElement(s);

bootstrap.php

 $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

-v1.1.2 Rev: 2
+v1.1.2 Rev: 4

web/Styles/css/sks-v2.css

 
 header {
     max-width: 800px;
-    margin: 20px auto 0px auto;
-    box-shadow: 0px 5px 10px #000;
+    margin: 20px auto 0 auto;
+    box-shadow: 0 5px 10px #000;
 }
 
 footer {
     border-top: 2px solid #e79b1f;
     background: url("../images/bg.png");
     background-position: top left;
-    box-shadow: 0px -5px 10px #000000;
+    box-shadow: 0 -5px 10px #000000;
 }
 
 a {
 }
 
 .mediaLinks {
-    margin: 10px auto 0px auto;
+    margin: 10px auto 0 auto;
     float: right;
 }
 
 }
 
 .row-width {
-
     width: 95%;
     max-width: 800px;
     margin: 20px auto 10px auto;
     background: linear-gradient(#1f1a16, #4d3c32);
     padding: 10px;
 
-    box-shadow: 0px 5px 10px #000000;
+    box-shadow: 0 5px 10px #000000;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;

web/index.php

 $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();
     }
 }