From f082183fd610e058c391bcd2b84dae529b52ae78 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 24 Mar 2017 11:52:29 -0400
Subject: [PATCH 1/3] add the cache directories used by cake php under /var/tmp

---
 distros/ubuntu1604/zoneminder.tmpfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/distros/ubuntu1604/zoneminder.tmpfile b/distros/ubuntu1604/zoneminder.tmpfile
index d307c6640..a7333ec19 100644
--- a/distros/ubuntu1604/zoneminder.tmpfile
+++ b/distros/ubuntu1604/zoneminder.tmpfile
@@ -1,2 +1,6 @@
-d /var/run/zm 0755 www-data www-data
-d /tmp/zm     0755 www-data www-data
+d /var/run/zm                   0755 www-data www-data
+d /tmp/zm                       0755 www-data www-data
+d /var/tmp/zm                   0755 www-data www-data
+d /var/tmp/cache                0755 www-data www-data
+d /var/tmp/cache/models         0755 www-data www-data
+d /var/tmp/cache/persistent     0755 www-data www-data

From 7c86bcdfce38b2e730c91db6c667905b155810c8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 24 Mar 2017 11:52:55 -0400
Subject: [PATCH 2/3] add the link from /usr/share/zoneminder/www/api/app/tmp
 to /var/tmp

---
 distros/ubuntu1604/zoneminder.links | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distros/ubuntu1604/zoneminder.links b/distros/ubuntu1604/zoneminder.links
index 4299f392a..14a8aee91 100644
--- a/distros/ubuntu1604/zoneminder.links
+++ b/distros/ubuntu1604/zoneminder.links
@@ -1,3 +1,4 @@
 /var/cache/zoneminder/events	/usr/share/zoneminder/www/events
 /var/cache/zoneminder/images	/usr/share/zoneminder/www/images
 /var/cache/zoneminder/temp	/usr/share/zoneminder/www/temp
+/var/tmp  /usr/share/zoneminder/www/api/app/tmp

From 589b3691092baea50dc4ed7b9a55f47565f72615 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 28 Mar 2017 20:03:46 -0400
Subject: [PATCH 3/3] fix inserting x10 record with missing ,

---
 web/includes/actions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/actions.php b/web/includes/actions.php
index 8c1300f37..cc2231746 100644
--- a/web/includes/actions.php
+++ b/web/includes/actions.php
@@ -617,7 +617,7 @@ if ( !empty($action) )
                     {
                         if ( !$x10Monitor )
                         {
-                            dbQuery( "insert into TriggersX10 set MonitorId = ?".implode( ", ", $x10Changes ), array( $mid ) );
+                            dbQuery( "insert into TriggersX10 set MonitorId = ?,".implode( ", ", $x10Changes ), array( $mid ) );
                         }
                         else
                         {