From c368c01433f9bbc1e6cac4133280ff2b8ad45af3 Mon Sep 17 00:00:00 2001
From: trendschau <trendschau@gmail.com>
Date: Tue, 13 Oct 2020 23:01:43 +0200
Subject: [PATCH] Fixed proxy detection and checked for empty ip settings

---
 system/Settings.php                     |  2 +-
 system/author/layouts/layout.twig       | 16 ++++++-------
 system/author/layouts/layoutAuth.twig   |  4 ++--
 system/author/layouts/layoutBlank.twig  |  2 +-
 system/author/layouts/layoutBlox.twig   | 30 ++++++++++++-------------
 system/author/layouts/layoutEditor.twig | 22 +++++++++---------
 system/system.php                       | 12 +++++-----
 7 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/system/Settings.php b/system/Settings.php
index 6119810..f29aa05 100644
--- a/system/Settings.php
+++ b/system/Settings.php
@@ -82,7 +82,7 @@ class Settings
 			'editor'								=> 'visual',
 			'formats'								=> ['markdown', 'headline', 'ulist', 'olist', 'table', 'quote', 'notice', 'image', 'video', 'file', 'toc', 'hr', 'definition', 'code'],
 			'contentFolder'							=> 'content',
-			'version'								=> '1.3.8',
+			'version'								=> '1.4.0',
 			'setup'									=> true,
 			'welcome'								=> true,
 			'images'								=> ['live' => ['width' => 820], 'thumbs' => ['width' => 250, 'height' => 150]],
diff --git a/system/author/layouts/layout.twig b/system/author/layouts/layout.twig
index b63a8af..31aa1b6 100644
--- a/system/author/layouts/layout.twig
+++ b/system/author/layouts/layout.twig
@@ -17,8 +17,8 @@
 		<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
 		
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/tachyons.min.css?20200716" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20200716" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/tachyons.min.css?20201012" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20201012" />
 
 		{{ assets.renderCSS() }}
 		
@@ -41,16 +41,16 @@
 			<footer></footer>
 		</div>
 <!--		<script src="{{ base_url }}/system/author/js/color-picker.min.js?20200505"></script> -->
-		<script src="{{ base_url }}/system/author/js/axios.min.js?20200716"></script>
+		<script src="{{ base_url }}/system/author/js/axios.min.js?20201012"></script>
 		<script>
 			const myaxios = axios.create();
 			myaxios.defaults.baseURL =  "{{ base_url }}";
 		</script>
-		<script src="{{ base_url }}/system/author/js/autosize.min.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vue.min.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vue-shared.js?20200716"></script>		
-		<script src="{{ base_url }}/system/author/js/author.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/typemillutils.js?20200716"></script>
+		<script src="{{ base_url }}/system/author/js/autosize.min.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vue.min.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vue-shared.js?20201012"></script>		
+		<script src="{{ base_url }}/system/author/js/author.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/typemillutils.js?20201012"></script>
 		<script>
 			typemillUtilities.start()
 		</script>
diff --git a/system/author/layouts/layoutAuth.twig b/system/author/layouts/layoutAuth.twig
index 24ce000..7d2790b 100644
--- a/system/author/layouts/layoutAuth.twig
+++ b/system/author/layouts/layoutAuth.twig
@@ -18,7 +18,7 @@
 		<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
 				
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20200716" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20201012" />
 
 		{{ assets.renderCSS() }}
 		
@@ -32,6 +32,6 @@
 			{% block content %}{% endblock %}
 
 		</div>
-		<script src="{{ base_url }}/system/author/js/auth.js?20200716"></script>
+		<script src="{{ base_url }}/system/author/js/auth.js?20201012"></script>
 	</body>
 </html>
\ No newline at end of file
diff --git a/system/author/layouts/layoutBlank.twig b/system/author/layouts/layoutBlank.twig
index 55a25e2..031193a 100644
--- a/system/author/layouts/layoutBlank.twig
+++ b/system/author/layouts/layoutBlank.twig
@@ -17,7 +17,7 @@
 		<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
 
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20200716" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20201012" />
 
 	</head>
 	<body>
diff --git a/system/author/layouts/layoutBlox.twig b/system/author/layouts/layoutBlox.twig
index 8e68602..51fc28e 100644
--- a/system/author/layouts/layoutBlox.twig
+++ b/system/author/layouts/layoutBlox.twig
@@ -18,7 +18,7 @@
 		
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/tachyons.min.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20200716" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20201012" />
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/color-picker.min.css" />
 
 		{{ assets.renderCSS() }}
@@ -46,28 +46,28 @@
 			const myaxios = axios.create();
 			myaxios.defaults.baseURL =  "{{ base_url }}";
 		</script>
-		<script src="{{ base_url }}/system/author/js/typemillutils.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vue.min.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/autosize.min.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/author.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vue-blox-config.js?20200716"></script>
+		<script src="{{ base_url }}/system/author/js/typemillutils.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vue.min.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/autosize.min.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/author.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vue-blox-config.js?20201012"></script>
 		<script>
 			let formatConfig = {{ settings.formats|json_encode() }};
       		let language = {{ settings.language|json_encode() }};
-          let labels = {{ translations|json_encode() }};
+          	let labels = {{ translations|json_encode() }};
       		let navigation = {{ navigation|json_encode() }};
 		</script>
 
 		{{ assets.renderEditorJS() }}
 
-		<script src="{{ base_url }}/system/author/js/vue-blox.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vue-posts.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/sortable.min.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vue-navi.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vue-shared.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vue-meta.js?20200716"></script>
+		<script src="{{ base_url }}/system/author/js/vue-blox.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vue-posts.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/sortable.min.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vue-navi.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vue-shared.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vue-meta.js?20201012"></script>
 
 		{{ assets.renderJS() }}
 
diff --git a/system/author/layouts/layoutEditor.twig b/system/author/layouts/layoutEditor.twig
index c50f816..460b9fc 100644
--- a/system/author/layouts/layoutEditor.twig
+++ b/system/author/layouts/layoutEditor.twig
@@ -17,7 +17,7 @@
 		<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/system/author/img/favicon-180.png" />
 		
 		<link rel="stylesheet" href="{{ base_url }}/system/author/css/normalize.css" />
-		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20200716" />
+		<link rel="stylesheet" href="{{ base_url }}/system/author/css/style.css?20201012" />
 
 		{{ assets.renderCSS() }}
 
@@ -39,16 +39,16 @@
 			</article>
 			<footer></footer>
 		</div>
-		<script src="{{ base_url }}/system/author/js/axios.min.js?20200716"></script>
+		<script src="{{ base_url }}/system/author/js/axios.min.js?20201012"></script>
 		<script>
 			const myaxios = axios.create();
 			myaxios.defaults.baseURL =  "{{ base_url }}";
 		</script>		
-		<script src="{{ base_url }}/system/author/js/vue.min.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/autosize.min.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/sortable.min.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/author.js?20200716"></script>
+		<script src="{{ base_url }}/system/author/js/vue.min.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/autosize.min.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/sortable.min.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vuedraggable.umd.min.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/author.js?20201012"></script>
 
 	    <script>
     	  	let language = {{ settings.language|json_encode() }};
@@ -58,10 +58,10 @@
     
 		{{ assets.renderEditorJS() }}		
 		
-		<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vue-editor.js?20200716"></script>
-		<script src="{{ base_url }}/system/author/js/vue-meta.js?20200716"></script>		
-		<script src="{{ base_url }}/system/author/js/vue-navi.js?20200716"></script>
+		<script src="{{ base_url }}/system/author/js/vue-publishcontroller.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vue-editor.js?20201012"></script>
+		<script src="{{ base_url }}/system/author/js/vue-meta.js?20201012"></script>		
+		<script src="{{ base_url }}/system/author/js/vue-navi.js?20201012"></script>
 
 		{{ assets.renderJS() }}
 		
diff --git a/system/system.php b/system/system.php
index 904f012..4d97399 100644
--- a/system/system.php
+++ b/system/system.php
@@ -48,12 +48,6 @@ $app = new \Slim\App($settings);
 
 $container = $app->getContainer();
 
-if(isset($settings['settings']['proxy']) && $settings['settings']['proxy'])
-{
-	$trustedProxies = isset($settings['settings']['trustedproxies']) ? explode(",", $settings['settings']['trustedproxies']) : [];
-	$app->add(new RKA\Middleware\ProxyDetection($trustedProxies));
-}
-
 /************************
 * LOAD & UPDATE PLUGINS *
 ************************/
@@ -318,6 +312,12 @@ if($container['flash'])
 	$app->add($container->get('csrf'));	
 }
 
+if(isset($settings['settings']['proxy']) && $settings['settings']['proxy'])
+{
+	$trustedProxies = ( isset($settings['settings']['trustedproxies']) && !empty($settings['settings']['trustedproxies']) ) ? explode(",", $settings['settings']['trustedproxies']) : [];
+	$app->add(new RKA\Middleware\ProxyDetection($trustedProxies));
+}
+
 /************************
 * 	ADD ROUTES			*
 ************************/