From 867ebeb66183eee7f96c15301a82a0bfc1d123c2 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 28 Jul 2016 08:59:16 +0200
Subject: [PATCH 1/3] PHP7 needs an integer value for the length

---
 library/asn1.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/asn1.php b/library/asn1.php
index e84398bf62..ac14a5b16f 100644
--- a/library/asn1.php
+++ b/library/asn1.php
@@ -4,6 +4,7 @@
 // Attribution: http://www.krisbailey.com
 // license: unknown
 // modified: Mike Macgrivin mike@macgirvin.com 6-oct-2010 to support Salmon auto-discovery
+// modified: Tobias Diekershoff 28-jul-2016 adding an intval in line 162 to make PHP7 happy
 // from openssl public keys
 
 
@@ -159,7 +160,7 @@ class ASN_BASE {
 					}
 					$length = $tempLength;
 				}
-				$data = substr($string, $p, $length);
+				$data = substr($string, $p, intval($length));
 				$parsed[] = self::parseASNData($type, $data, $level, $maxLevels);
 				$p = $p + $length;
 			}

From e74da01276177923948708174aca9e52254034db Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Thu, 28 Jul 2016 11:45:41 +0200
Subject: [PATCH 2/3] frio: contac_edit.tpl was missing a bracket

---
 view/theme/frio/templates/contact_edit.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index b4217aa436..6170dcef82 100644
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -91,7 +91,7 @@
 								{{if $keywords}}
 								<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
 									<hr class="profile-separator">
-									<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{$keywords_label}}</div>
+									<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$keywords_label}}</div>
 									<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$keywords}}</div>
 								</div>
 								{{/if}}

From c9dee2947f7c5c994cba9741c1b363a0f5998299 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Thu, 28 Jul 2016 15:41:25 +0200
Subject: [PATCH 3/3] quickfix for worker delivery problems

---
 boot.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/boot.php b/boot.php
index 056e47b7d2..cad4094c7d 100644
--- a/boot.php
+++ b/boot.php
@@ -1801,9 +1801,13 @@ function proc_run($cmd){
 				$priority = 2;
 
 			if (!$found)
-				q("INSERT INTO `workerqueue` (`function`, `parameter`, `created`, `priority`)
-							VALUES ('%s', '%s', '%s', %d)",
-					dbesc($funcname),
+				//  quickfix for the delivery problems, 2106-07-28
+				/// @todo find better solution
+				//q("INSERT INTO `workerqueue` (`function`, `parameter`, `created`, `priority`)
+				//			VALUES ('%s', '%s', '%s', %d)",
+				//	dbesc($funcname),
+				q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`)
+							VALUES ('%s', '%s', %d)",
 					dbesc($parameters),
 					dbesc(datetime_convert()),
 					intval($priority));