From 297cf418c013d77069ff1c8e1c21daeb631e25f8 Mon Sep 17 00:00:00 2001
From: "Marcel Kapfer (mmk2410)" <marcelmichaelkapfer@yahoo.co.nz>
Date: Fri, 22 Apr 2016 19:46:46 +0200
Subject: [PATCH] Better code style

---
 extensions/example.js     |  2 +-
 rcc/index.php             |  1 -
 rcc/res/rcc.css           | 35 ++++++++++++++++++++++++-----------
 res/php/Pagination.php    | 33 ++++++++++++++++++++-------------
 themes/background-img.css | 22 +++++++++++++---------
 themes/material-dark.css  | 24 ++++++++++++++----------
 themes/material-light.css | 22 +++++++++++++---------
 7 files changed, 85 insertions(+), 54 deletions(-)

diff --git a/extensions/example.js b/extensions/example.js
index 3219b03..322ffe7 100644
--- a/extensions/example.js
+++ b/extensions/example.js
@@ -5,7 +5,7 @@
  */
 
 function main() {
-    console.log("Welcome Developer! \nYou're seeing the output of a javascript extension for the rangitaki blogging engine.")
+    console.log("Welcome Developer! \nYou're seeing the output of a javascript extension for the rangitaki blogging engine.");
 }
 
 $(document).ready(main());
diff --git a/rcc/index.php b/rcc/index.php
index 79c7878..e7cdf75 100644
--- a/rcc/index.php
+++ b/rcc/index.php
@@ -100,7 +100,6 @@ if ($config["rcc"]["rcc"] == "on") {
 
     <?php
     } else {
-
         if ($passwd == $password) {
             $_SESSION['login'] = true;
             include_once "./../res/php/BlogListGenerator.php";
diff --git a/rcc/res/rcc.css b/rcc/res/rcc.css
index b3a6f2f..ddda642 100644
--- a/rcc/res/rcc.css
+++ b/rcc/res/rcc.css
@@ -37,19 +37,19 @@ body{
 .main{
     height: 100%;
     width: 100%;
-    margin-left: 0px;
+    margin-left: 0;
 }
 
 /*      HEADER      */
 .header{
     background-color: #ff4415;
     position: fixed;
-    top: 0px;
-    right: 0px;
-    left: 0px;
+    top: 0;
+    right: 0;
+    left: 0;
     width: 100%;
     height: 64px;
-    box-shadow: 2px 0px 2px 2px rgba(62, 62, 62, 0.45);
+    box-shadow: 2px 0 2px 2px rgba(62, 62, 62, 0.45);
 }
 
 .title{
@@ -81,7 +81,7 @@ body{
     background: #fff;
     border-radius: 2px;
     padding: 24px;
-    box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
+    box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
     margin-bottom: 40px;
     max-width: 1160px;
 }
@@ -144,9 +144,9 @@ body{
     border-width: 1px;
     border-style: solid;
     border-color: #ff4415;
-    box-shadow: 0.4px 1px 1.5px 1px #aaa;
-    -moz-box-shadow: 0.4px 1px 1.5px 1px #aaa;
     -webkit-box-shadow: 0.4px 1px 1.5px 1px #aaa;
+    -moz-box-shadow: 0.4px 1px 1.5px 1px #aaa;
+    box-shadow: 0.4px 1px 1.5px 1px #aaa;
     border-radius: 2px;
     margin-top: 4px;
     margin-bottom: 5px;
@@ -157,6 +157,10 @@ body{
     transition-delay: 50ms;
     transition-duration: 125ms;
     transition-timing-function: ease;
+    -o-transition-property: box-shadow;
+    -o-transition-delay: 50ms;
+    -o-transition-duration: 125ms;
+    -o-transition-timing-function: ease;
     -moz-transition-property: box-shadow;
     -moz-transition-delay: 50ms;
     -moz-transition-duration: 125ms;
@@ -169,12 +173,13 @@ body{
 }
 
 .button:hover, .button:hover {
-    box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
+    -webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
     -moz-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
-    -webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa; }
+    box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
+}
 
 input.button{
-    padding: 0px 8px;
+    padding: 0 8px;
 }
 
 /*      INPUT FIELD     */
@@ -191,6 +196,10 @@ input.button{
     transition-delay: 50ms;
     transition-duration: 125ms;
     transition-timing-function: ease;
+    -o-transition-property: border-bottom-color;
+    -o-transition-delay: 50ms;
+    -o-transition-duration: 125ms;
+    -o-transition-timing-function: ease;
     -moz-transition-property: border-bottom-color;
     -moz-transition-delay: 50ms;
     -moz-transition-duration: 125ms;
@@ -223,6 +232,10 @@ input.button{
     transition-delay: 50ms;
     transition-duration: 125ms;
     transition-timing-function: ease;
+    -o-transition-property: border-bottom-color;
+    -o-transition-delay: 50ms;
+    -o-transition-duration: 125ms;
+    -o-transition-timing-function: ease;
     -moz-transition-property: border-bottom-color;
     -moz-transition-delay: 50ms;
     -moz-transition-duration: 125ms;
diff --git a/res/php/Pagination.php b/res/php/Pagination.php
index 2c98f2c..df396af 100644
--- a/res/php/Pagination.php
+++ b/res/php/Pagination.php
@@ -11,26 +11,33 @@
  * @link     http://marcel-kapfer.de/rangitaki
  */
 require_once "BlogListGenerator.php";
-require_once "config.php";
-require_once "lang/" . $language . ".php";
 
-if ($pagination) {
+require '../res/php/Config.php';
+use mmk2410\rbe\config\Config as Config;
+
+$configParser = new Config('../config.yaml', '../vendor/autoload.php');
+
+$config = $configParser->getConfig();
+
+require_once "lang/" . $config["language"] . ".php";
+
+if ($blog["design"]["pagination"]) {
 ?>
     <div class="pag_buttons">
-<?php
+    <?php
     if ($pag_min > 0) {
         if (isset($getblog)) {
-?>
+    ?>
     <a href="<?php
             echo "?blog=" . $getblog . "&page=" . ($pagenumber - 1);
             ?>" class="pag_prev button"><?php echo $BLOGLANG["Previous Page"]; ?></a>
-<?php
+        <?php
         } else {
-?>
+        ?>
     <a href="<?php
             echo "?page=" . ($pagenumber - 1);
             ?>" class="pag_prev button"><?php echo $BLOGLANG['Previous Page']; ?></a>
-<?php
+    <?php
         }
     }
     if (isset($getblog)) {
@@ -40,20 +47,20 @@ if ($pagination) {
     }
     if ($pag_max < BlogListGenerator::getArticleAmount($pag_blog)) {
         if (isset($getblog)) {
-?>
+    ?>
     <a href="<?php
             echo "?blog=" . $getblog . "&page=" . ($pagenumber + 1);
             ?>" class="pag_next button"><?php echo $BLOGLANG["Next Page"]; ?></a>
-<?php
+    <?php
         } else {
-?>
+    ?>
     <a href="<?php
             echo "?page=" . ($pagenumber + 1);
             ?>" class="pag_next button"><?php echo $BLOGLANG["Next Page"];?></a>
-<?php
+    <?php
         }
     }
-?>
+    ?>
 </div>
 <?php
 }
diff --git a/themes/background-img.css b/themes/background-img.css
index 59717cf..0864648 100644
--- a/themes/background-img.css
+++ b/themes/background-img.css
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* 
+/*
     Created on : Jun 18, 2015, 6:39:37 PM
     Author     : mmk2410
 */
@@ -83,7 +83,7 @@ body{
 .card{
     background: #fff;
     border-radius: 2px;
-    box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
+    box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
 }
 
 
@@ -129,21 +129,21 @@ body{
 
 .fab{
     background-color: #ff4415;
-    box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
+    box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
 }
 
 .subfab{
     background-color: #fff;
-    box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
+    box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
 }
 
 .button {
     border-width: 1px;
     border-style: solid;
     text-transform: uppercase;
-    box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
-    -moz-box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
-    -webkit-box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
+    -webkit-box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
+    -moz-box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
+    box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
     border-radius: 2px;
     letter-spacing: 0.4px;
     font-weight: 700;
@@ -152,6 +152,10 @@ body{
     transition-delay: 50ms;
     transition-duration: 125ms;
     transition-timing-function: ease;
+    -o-transition-property: box-shadow;
+    -o-transition-delay: 50ms;
+    -o-transition-duration: 125ms;
+    -o-transition-timing-function: ease;
     -moz-transition-property: box-shadow;
     -moz-transition-delay: 50ms;
     -moz-transition-duration: 125ms;
@@ -163,9 +167,9 @@ body{
 }
 
 .button:hover, .button:hover {
-    box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
-    -moz-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
     -webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
+    -moz-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
+    box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
 }
 
 .pag_next{
diff --git a/themes/material-dark.css b/themes/material-dark.css
index 800ba19..1b62634 100644
--- a/themes/material-dark.css
+++ b/themes/material-dark.css
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* 
+/*
     Created on : Jun 18, 2015, 6:39:37 PM
     Author     : mmk2410
 */
@@ -35,7 +35,7 @@ body{
 .header{
     background-color: #212121;
     position: fixed;
-    box-shadow: 2px 0px 2px 2px rgba(32, 32, 32, 0.85);
+    box-shadow: 2px 0 2px 2px rgba(32, 32, 32, 0.85);
 }
 
 .title{
@@ -79,7 +79,7 @@ body{
 .card{
     background: #424242;
     border-radius: 2px;
-    box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
+    box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
 }
 
 
@@ -125,21 +125,21 @@ body{
 
 .fab{
     background-color: #ff4415;
-    box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
+    box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
 }
 
 .subfab{
     background-color: #424242;
-    box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
+    box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
 }
 
 .button{
     text-transform: uppercase;
     border-width: 1px;
     border-style: solid;
-    box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
-    -moz-box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
-    -webkit-box-shadow: 0px 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
+    -webkit-box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
+    -moz-box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
+    box-shadow: 0 1px 1.5px 1.5px rgba(42, 42, 42, 0.65);
     border-radius: 2px;
     letter-spacing: 0.4px;
     font-weight: 700;
@@ -148,6 +148,10 @@ body{
     transition-delay: 50ms;
     transition-duration: 125ms;
     transition-timing-function: ease;
+    -o-transition-property: box-shadow;
+    -o-transition-delay: 50ms;
+    -o-transition-duration: 125ms;
+    -o-transition-timing-function: ease;
     -moz-transition-property: box-shadow;
     -moz-transition-delay: 50ms;
     -moz-transition-duration: 125ms;
@@ -159,9 +163,9 @@ body{
 }
 
 .button:hover, .button:hover {
-    box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
-    -moz-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
     -webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
+    -moz-box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
+    box-shadow: 0.5px 1.8px 2.1px 1.4px rgba(32, 32, 32, 0.85);
 }
 
 .pag_next{
diff --git a/themes/material-light.css b/themes/material-light.css
index 5e7bbee..cd0eb54 100644
--- a/themes/material-light.css
+++ b/themes/material-light.css
@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-/* 
+/*
     Created on : Jun 18, 2015, 6:39:37 PM
     Author     : mmk2410
 */
@@ -35,7 +35,7 @@ body{
 .header{
     background-color: #ff4415;
     position: fixed;
-    box-shadow: 2px 0px 2px 2px rgba(62, 62, 62, 0.45);
+    box-shadow: 2px 0 2px 2px rgba(62, 62, 62, 0.45);
 }
 
 .title{
@@ -83,7 +83,7 @@ body{
 .card{
     background: #fff;
     border-radius: 2px;
-    box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
+    box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
 }
 
 
@@ -129,21 +129,21 @@ body{
 
 .fab{
     background-color: #ff4415;
-    box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
+    box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
 }
 
 .subfab{
     background-color: #fff;
-    box-shadow: 0px 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
+    box-shadow: 0 1px 1.5px 1.5px rgba(62, 62, 62, 0.3);
 }
 
 .button {
     text-transform: uppercase;
     border-width: 1px;
     border-style: solid;
-    box-shadow: 0.4px 1px 1.5px 1px #aaa;
-    -moz-box-shadow: 0.4px 1px 1.5px 1px #aaa;
     -webkit-box-shadow: 0.4px 1px 1.5px 1px #aaa;
+    -moz-box-shadow: 0.4px 1px 1.5px 1px #aaa;
+    box-shadow: 0.4px 1px 1.5px 1px #aaa;
     border-radius: 2px;
     letter-spacing: 0.4px;
     font-weight: 700;
@@ -152,6 +152,10 @@ body{
     transition-delay: 50ms;
     transition-duration: 125ms;
     transition-timing-function: ease;
+    -o-transition-property: box-shadow;
+    -o-transition-delay: 50ms;
+    -o-transition-duration: 125ms;
+    -o-transition-timing-function: ease;
     -moz-transition-property: box-shadow;
     -moz-transition-delay: 50ms;
     -moz-transition-duration: 125ms;
@@ -163,9 +167,9 @@ body{
 }
 
 .button:hover, .button:hover {
-    box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
+    -webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
     -moz-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
-    -webkit-box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa; 
+    box-shadow: 0.5px 1.8px 2.1px 1.4px #aaa;
 }
 
 .pag_next{