From 0aafdab8104b7c2bfd2f835e7a2f13d33b89dbf2 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 17 Jan 2018 13:27:41 +0100
Subject: [PATCH 1/6] Use template home.tpl for mod/home

---
 mod/home.php            | 30 +++++++++++++++++++-----------
 view/templates/home.tpl | 14 ++++++++++++++
 2 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 view/templates/home.tpl

diff --git a/mod/home.php b/mod/home.php
index beda739fdb..f3138d1867 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -24,8 +24,6 @@ function home_init(App $a) {
 if(! function_exists('home_content')) {
 function home_content(App $a) {
 
-	$o = '';
-
 	if (x($_SESSION,'theme')) {
 		unset($_SESSION['theme']);
 	}
@@ -33,21 +31,31 @@ function home_content(App $a) {
 		unset($_SESSION['mobile-theme']);
 	}
 
-	/// @TODO No absolute path used, maybe risky (security)
-	if (file_exists('home.html')) {
-		if (file_exists('home.css')) {
+	$customhome = False;
+	$defaultheader = '<h1>'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'</h1>';
+
+	$homefilepath = $a->basepath . '/home.html';
+	$cssfilepath = $a->basepath . '/home.css';
+	if (file_exists($homefilepath)) {
+		$customhome = $homefilepath;
+		if (file_exists($cssfilepath)) {
 			$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.System::baseUrl().'/home.css'.'" media="all" />';
 		}
+	} 
 
-		$o .= file_get_contents('home.html');
-	} else {
-		$o .= '<h1>'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'</h1>';
-	}
+	$login = Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
 
-	$o .= Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
+	$content = '';
+	call_hooks("home_content",$content);
 
 
-	call_hooks("home_content",$o);
+	$tpl = get_markup_template('home.tpl');
+	return replace_macros($tpl, [
+		'$defaultheader' => $defaultheader,
+		'$customhome' => $customhome,
+		'$login' => $login,
+		'$content' => $content
+	]);
 
 	return $o;
 
diff --git a/view/templates/home.tpl b/view/templates/home.tpl
new file mode 100644
index 0000000000..6e50a75306
--- /dev/null
+++ b/view/templates/home.tpl
@@ -0,0 +1,14 @@
+
+{{* custom content from hook will replace everything. *}}
+{{if $content != '' }}
+	{{$content}}
+{{else}}
+
+	{{if $customhome != false }}
+		{{include file="$customhome"}}
+	{{else}}
+		{{$defaultheader}}
+	{{/if}}
+
+	{{$login}}
+{{/if}}

From 9862194914f54052a3ae38bb8ff6a2216e74c227 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 17 Jan 2018 13:29:04 +0100
Subject: [PATCH 2/6] Frio: fix home page

Add home.tpl, fix style with custom home.html, fix style with custom page content from addon
---
 view/theme/frio/css/style.css      | 44 +++++++++++++++++++++---------
 view/theme/frio/templates/home.tpl | 25 +++++++++++++++++
 2 files changed, 56 insertions(+), 13 deletions(-)
 create mode 100644 view/theme/frio/templates/home.tpl

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 2900a727f6..eb08deea46 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -3024,25 +3024,42 @@ section .profile-match-wrapper {
     box-shadow: unset;
     border: 0
 }
-.mod-home.is-not-singleuser #content > h1,
-.mod-login #content > h1 {
-    color: #eee;
+.mod-home.is-not-singleuser .login-content,
+.mod-login .login-content {
+	color: #eee;
+	margin-top: 2.5%;
 }
 
-@media screen and (min-width: 700px) {
-    .mod-home.is-not-singleuser #content > #login-form,
-    .mod-login #content > #login-form {    
-        width: 50%;
+.mod-home.is-not-singleuser .login-form > #login-form,
+.mod-login .login-form > #login-form {
+	color: #eee;  
+}
+	
+.mod-home.is-not-singleuser .login-panel-content,
+.mod-login .login-panel-content { 
+	background-color: rgba(255,255,255,.85);
+}
+
+/* Medium devices (desktops, 992px and up) */
+@media (min-width: 992px) {
+	.mod-home.is-not-singleuser #content,
+    .mod-login #content {
+		margin-top: 100px!important;
+	}    
+	
+	
+
+	.mod-home.is-not-singleuser .login-form > #login-form,
+    .mod-login .login-form > #login-form {    
         background-color: #fff;
         color: #444;
         padding: 1em;
-        float: right;
         position: relative;
         margin-top: 4em;
     }
 
-    .mod-home.is-not-singleuser #content > #login-form:before,
-    .mod-login #content > #login-form:before {
+    .mod-home.is-not-singleuser .login-form > #login-form:before,
+    .mod-login .login-form > #login-form:before {
         display: block;
         position: absolute;
         content: " ";
@@ -3054,8 +3071,8 @@ section .profile-match-wrapper {
         z-index: -1;
     }
 
-    .mod-home.is-not-singleuser #content > #login-form:after,
-    .mod-login #content > #login-form:after {
+    .mod-home.is-not-singleuser .login-form > #login-form:after,
+    .mod-login .login-form > #login-form:after {
         display: block;
         position: absolute;
         content: " ";
@@ -3065,7 +3082,8 @@ section .profile-match-wrapper {
         top: -10%;
         left: 10%;
         z-index: -1;
-    }
+	}
+
 }
 
 
diff --git a/view/theme/frio/templates/home.tpl b/view/theme/frio/templates/home.tpl
new file mode 100644
index 0000000000..dd53a1eae4
--- /dev/null
+++ b/view/theme/frio/templates/home.tpl
@@ -0,0 +1,25 @@
+
+{{* custom content from hook will replace everything. *}}
+<div class="row">
+{{if $content != '' }}
+	<div class="col-sm-12">
+		<div class="panel panel-default login-panel-content">
+			<div class="panel-body">
+				{{$content}}
+			</div>
+		</div>
+	</div>
+{{else}}
+
+	<div class="col-md-7 col-sm-12 login-content">
+		{{if $customhome != false }}
+			{{include file="$customhome"}}
+		{{else}}
+			{{$defaultheader}}
+		{{/if}}
+	</div>
+	<div class="col-md-5 col-sm-12 login-form">
+	{{$login}}
+	</div>
+{{/if}}
+</div>
\ No newline at end of file

From fbb024d1517b847fbcd1655ff558b718cb15c17e Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 17 Jan 2018 14:10:30 +0000
Subject: [PATCH 3/6] Avoid sql error in process handling

---
 src/Model/Process.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Model/Process.php b/src/Model/Process.php
index a960777129..8b7ce8d34a 100644
--- a/src/Model/Process.php
+++ b/src/Model/Process.php
@@ -26,9 +26,13 @@ class Process extends BaseObject
 	{
 		$return = true;
 
+		if (is_null($pid)) {
+			$pid = getmypid();
+		}
+
 		dba::transaction();
 
-		if (!dba::exists('process', ['pid' => getmypid()])) {
+		if (!dba::exists('process', ['pid' => $pid])) {
 			$return = dba::insert('process', ['pid' => $pid, 'command' => $command, 'created' => datetime_convert()]);
 		}
 

From 2c8bbea65d0b0d75bfa3ab4eadcc5ae5bfad8663 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 17 Jan 2018 16:01:34 +0100
Subject: [PATCH 4/6] frio: tweak login template, fix style

move lost pwd link and register to submit wrapper,
use flexbox for submit row in login form,
show register link as button
fix form label colors in mobile
---
 view/theme/frio/css/style.css       | 31 +++++++++++++++++++----------
 view/theme/frio/templates/login.tpl | 12 +++++------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index eb08deea46..f6f6ad9ded 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -3008,6 +3008,14 @@ section .profile-match-wrapper {
 /** 
  * Login page
  */
+#login-submit-wrapper {
+	display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    align-items: center;
+}
+#lost-password-link { flex-grow: 2; }
+
 .mod-home.is-not-singleuser,
 .mod-login {
     background-image: linear-gradient(to right, rgba(0,0,0, 0.7) , rgba(0,0,0, 0.4)), url($login_bg_image);
@@ -3030,10 +3038,11 @@ section .profile-match-wrapper {
 	margin-top: 2.5%;
 }
 
-.mod-home.is-not-singleuser .login-form > #login-form,
-.mod-login .login-form > #login-form {
+.mod-home.is-not-singleuser .login-form > #login-form label,
+.mod-login #content #login-form label {
 	color: #eee;  
 }
+
 	
 .mod-home.is-not-singleuser .login-panel-content,
 .mod-login .login-panel-content { 
@@ -3046,20 +3055,22 @@ section .profile-match-wrapper {
     .mod-login #content {
 		margin-top: 100px!important;
 	}    
-	
-	
 
 	.mod-home.is-not-singleuser .login-form > #login-form,
-    .mod-login .login-form > #login-form {    
+    .mod-login #content #login-form {    
         background-color: #fff;
-        color: #444;
         padding: 1em;
         position: relative;
         margin-top: 4em;
     }
 
-    .mod-home.is-not-singleuser .login-form > #login-form:before,
-    .mod-login .login-form > #login-form:before {
+	.mod-home.is-not-singleuser .login-form > #login-form label,
+	.mod-login #content #login-form label {
+		color: #444;  
+	}
+
+    .mod-home.is-not-singleuser .login-form > #login-form::before,
+    .mod-login #content #login-form::before {
         display: block;
         position: absolute;
         content: " ";
@@ -3071,8 +3082,8 @@ section .profile-match-wrapper {
         z-index: -1;
     }
 
-    .mod-home.is-not-singleuser .login-form > #login-form:after,
-    .mod-login .login-form > #login-form:after {
+    .mod-home.is-not-singleuser .login-form > #login-form::after,
+    .mod-login #content #login-form::after {
         display: block;
         position: absolute;
         content: " ";
diff --git a/view/theme/frio/templates/login.tpl b/view/theme/frio/templates/login.tpl
index 1f818f5245..aaa42d24b4 100644
--- a/view/theme/frio/templates/login.tpl
+++ b/view/theme/frio/templates/login.tpl
@@ -18,15 +18,15 @@
 
 		{{include file="field_checkbox.tpl" field=$lremember}}
 
-		<div id="login-extra-links" class="list-unstyled">
-			{{if $register}}<a href="register" title="{{$register.title|escape:'html'}}" id="register-link">{{$register.desc}}</a>{{/if}}
+		<div id="login-submit-wrapper">
 			<a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link">{{$lostlink}}</a>
+
+			<div class="pull-right" >
+				{{if $register}}<a href="register" title="{{$register.title|escape:'html'}}" id="register-link" class="btn btn-default">{{$register.desc}}</a>{{/if}}
+				<button type="submit" name="submit" id="login-submit-button" class="btn btn-primary" value="{{$login|escape:'html'}}">{{$login|escape:'html'}}</button>
+			</div>
 		</div>
 
-		<div id="login-submit-wrapper" class="pull-right" >
-			<button type="submit" name="submit" id="login-submit-button" class="btn btn-primary" value="{{$login|escape:'html'}}">{{$login|escape:'html'}}</button>
-		</div>
-		<div class="clear"></div>
 
 		{{foreach $hiddens as $k=>$v}}
 			<input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />

From fc8e8feec1a4aeb050bfa8eecb43c658e80a92e3 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 17 Jan 2018 16:33:27 +0100
Subject: [PATCH 5/6] Frio: add login background color admin option

---
 mod/home.php                                 |  4 +--
 view/theme/frio/config.php                   |  6 +++++
 view/theme/frio/css/style.css                | 27 ++++++++++----------
 view/theme/frio/style.php                    | 11 +++++++-
 view/theme/frio/templates/theme_settings.tpl |  3 ++-
 5 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/mod/home.php b/mod/home.php
index f3138d1867..733f612bd0 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -34,8 +34,8 @@ function home_content(App $a) {
 	$customhome = False;
 	$defaultheader = '<h1>'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'</h1>';
 
-	$homefilepath = $a->basepath . '/home.html';
-	$cssfilepath = $a->basepath . '/home.css';
+	$homefilepath = $a->basepath . "/home.html";
+	$cssfilepath = $a->basepath . "/home.css";
 	if (file_exists($homefilepath)) {
 		$customhome = $homefilepath;
 		if (file_exists($cssfilepath)) {
diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index 091ce01326..4e474de5d5 100644
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -40,6 +40,7 @@ function theme_admin_post(App $a) {
 		Config::set('frio', 'background_image', $_POST["frio_background_image"]);
 		Config::set('frio', 'bg_image_option',  $_POST["frio_bg_image_option"]);
 		Config::set('frio', 'login_bg_image',   $_POST["frio_login_bg_image"]);
+		Config::set('frio', 'login_bg_color',   $_POST["frio_login_bg_color"]);
 		Config::set('frio', 'css_modified',     time());
 	}
 }
@@ -77,6 +78,7 @@ function theme_admin(App $a) {
 	$arr["background_image"] = Config::get('frio', 'background_image');
 	$arr["bg_image_option"]  = Config::get('frio', 'bg_image_option');
 	$arr["login_bg_image"]   = Config::get('frio', 'login_bg_image');
+	$arr["login_bg_color"]	 = Config::get('frio', 'login_bg_color');
 
 	return frio_form($arr);
 }
@@ -123,6 +125,10 @@ function frio_form($arr) {
 	if ( array_key_exists("login_bg_image", $arr ) &&  !array_key_exists("login_bg_image", $disable ) ) {
 		$ctx['$login_bg_image']  = ['frio_login_bg_image', t('Login page background image'), $arr['login_bg_image'], $background_image_help];
 	}
+	if ( array_key_exists("login_bg_color", $arr ) &&  !array_key_exists("login_bg_color", $disable ) ) {
+		$ctx['$login_bg_color']  = ['frio_login_bg_color', t('Login page background color'), $arr['login_bg_color'], t('Leave background image and color empty for theme defaults')];
+	}
+
 
 	$o .= replace_macros($t, $ctx);
 
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index f6f6ad9ded..9aa6913e4d 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -3018,6 +3018,7 @@ section .profile-match-wrapper {
 
 .mod-home.is-not-singleuser,
 .mod-login {
+    background-color: $login_bg_color;
     background-image: linear-gradient(to right, rgba(0,0,0, 0.7) , rgba(0,0,0, 0.4)), url($login_bg_image);
     background-size: cover;
     background-attachment: fixed;
@@ -3034,29 +3035,29 @@ section .profile-match-wrapper {
 }
 .mod-home.is-not-singleuser .login-content,
 .mod-login .login-content {
-	color: #eee;
-	margin-top: 2.5%;
+    color: #eee;
+    margin-top: 2.5%;
 }
 
 .mod-home.is-not-singleuser .login-form > #login-form label,
 .mod-login #content #login-form label {
-	color: #eee;  
+    color: #eee;  
 }
 
 	
 .mod-home.is-not-singleuser .login-panel-content,
 .mod-login .login-panel-content { 
-	background-color: rgba(255,255,255,.85);
+    background-color: rgba(255,255,255,.85);
 }
 
 /* Medium devices (desktops, 992px and up) */
 @media (min-width: 992px) {
-	.mod-home.is-not-singleuser #content,
+    .mod-home.is-not-singleuser #content,
     .mod-login #content {
-		margin-top: 100px!important;
-	}    
+        margin-top: 100px!important;
+    }
 
-	.mod-home.is-not-singleuser .login-form > #login-form,
+    .mod-home.is-not-singleuser .login-form > #login-form,
     .mod-login #content #login-form {    
         background-color: #fff;
         padding: 1em;
@@ -3064,10 +3065,10 @@ section .profile-match-wrapper {
         margin-top: 4em;
     }
 
-	.mod-home.is-not-singleuser .login-form > #login-form label,
-	.mod-login #content #login-form label {
-		color: #444;  
-	}
+    .mod-home.is-not-singleuser .login-form > #login-form label,
+    .mod-login #content #login-form label {
+        color: #444;  
+    }
 
     .mod-home.is-not-singleuser .login-form > #login-form::before,
     .mod-login #content #login-form::before {
@@ -3093,7 +3094,7 @@ section .profile-match-wrapper {
         top: -10%;
         left: 10%;
         z-index: -1;
-	}
+    }
 
 }
 
diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 8452877b3e..044f2ab61c 100644
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -47,6 +47,7 @@ if ($a->module !== 'install') {
 		$background_image = Config::get("frio", "background_image");
 		$bg_image_option  = Config::get("frio", "bg_image_option");
 		$login_bg_image   = Config::get("frio", "login_bg_image");
+		$login_bg_color   = Config::get("frio", "login_bg_color");
 		$modified         = Config::get("frio", "css_modified");
 
 		// There is maybe the case that the user did never modify the theme settings.
@@ -101,9 +102,16 @@ $link_color       = (empty($link_color)       ? "#6fdbe8"      : $link_color);
 $bgcolor          = (empty($bgcolor)          ? "#ededed"      : $bgcolor);
 // The background image can not be empty. So we use a dummy jpg if no image was set.
 $background_image = (empty($background_image) ? 'img/none.jpg' : $background_image);
-$login_bg_image   = (empty($login_bg_image)   ? 'img/login_bg.jpg' : $login_bg_image);
 $modified         = (empty($modified)         ? time()         :$modified);
 
+
+// set a default login bg image if no custom image and no custom bg color are set.
+if (empty($login_bg_image) && empty($login_bg_color)) {
+	$login_bg_image   = (empty($login_bg_image)   ? 'img/login_bg.jpg' : $login_bg_image);
+}
+$login_bg_color = (empty($login_bg_color) ? "#ededed" : $login_bg_color);
+
+
 $contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != "") ? $contentbg_transp : 100);
 
 // Calculate some colors in dependance of existing colors.
@@ -181,6 +189,7 @@ $options =  [
 	'$background_image'            => $background_image,
 	'$background_size_img'         => $background_size_img,
 	'$login_bg_image'              => $login_bg_image,
+	'$login_bg_color'              => $login_bg_color
 ];
 
 $css_tpl = file_get_contents('view/theme/frio/css/style.css');
diff --git a/view/theme/frio/templates/theme_settings.tpl b/view/theme/frio/templates/theme_settings.tpl
index 38311f27ba..37b29d9a10 100644
--- a/view/theme/frio/templates/theme_settings.tpl
+++ b/view/theme/frio/templates/theme_settings.tpl
@@ -31,10 +31,11 @@
 </div>
 
 {{if $login_bg_image}}{{include file="field_fileinput.tpl" field=$login_bg_image}}{{/if}}
+{{if $login_bg_color}}{{include file="field_colorinput.tpl" field=$login_bg_color}}{{/if}}
 
 <script type="text/javascript">
 	$(document).ready(function() {
-		$("#frio_nav_bg, #frio_nav_icon_color, #frio_background_color, #frio_link_color").colorpicker({format: 'hex', align: 'left'});
+		$("#frio_nav_bg, #frio_nav_icon_color, #frio_background_color, #frio_link_color, #frio_login_bg_color").colorpicker({format: 'hex', align: 'left'});
 
 		// show image options when user user starts to type the address of the image
 		$("#id_frio_background_image").keyup(function(){

From f51fda7911369458ace47003e70a0cdc936a95e5 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Wed, 17 Jan 2018 17:27:27 +0100
Subject: [PATCH 6/6] fix for coding standars

---
 mod/home.php                  | 2 +-
 view/theme/frio/css/style.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/home.php b/mod/home.php
index 733f612bd0..614fd0e3e8 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -31,7 +31,7 @@ function home_content(App $a) {
 		unset($_SESSION['mobile-theme']);
 	}
 
-	$customhome = False;
+	$customhome = false;
 	$defaultheader = '<h1>'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'</h1>';
 
 	$homefilepath = $a->basepath . "/home.html";
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 9aa6913e4d..894f1b2dd6 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -3009,7 +3009,7 @@ section .profile-match-wrapper {
  * Login page
  */
 #login-submit-wrapper {
-	display: flex;
+    display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
     align-items: center;