From 6abc91c11d10668585acee593ee0259666888f3b Mon Sep 17 00:00:00 2001
From: Patrick <firefly2442@gmail.com>
Date: Sat, 15 Feb 2020 13:52:35 -0700
Subject: [PATCH 1/3] fix spelling

---
 docs/api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api.rst b/docs/api.rst
index 2aaeafb3e..76eadcaa3 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -127,7 +127,7 @@ If you are using the old credentials mechanism present in v1.0, then the credent
 Key lifetime (v2.0)
 ^^^^^^^^^^^^^^^^^^^^^^
 
-In version 2.0, it is easy to know when a key will expire before you use it. You can find that out from the ``access_token_expires`` and ``refresh_token_exipres`` values (in seconds) after you decode the JWT key (there are JWT decode libraries for every language you want). You should refresh the keys before the timeout occurs, or you will not be able to use the APIs. 
+In version 2.0, it is easy to know when a key will expire before you use it. You can find that out from the ``access_token_expires`` and ``refresh_token_expires`` values (in seconds) after you decode the JWT key (there are JWT decode libraries for every language you want). You should refresh the keys before the timeout occurs, or you will not be able to use the APIs. 
 
 Understanding access/refresh tokens (v2.0)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

From 2c51b1436c9438e580a7988f4be06a9786edf685 Mon Sep 17 00:00:00 2001
From: zlodag <11688686+zlodag@users.noreply.github.com>
Date: Sun, 16 Feb 2020 11:26:23 +1300
Subject: [PATCH 2/3] cleaned input for "zmcamtool.pl --export
 <control_or_preset_name>" to fix error when running in taint mode

---
 scripts/zmcamtool.pl.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/zmcamtool.pl.in b/scripts/zmcamtool.pl.in
index 603c979bb..b7665d7d2 100644
--- a/scripts/zmcamtool.pl.in
+++ b/scripts/zmcamtool.pl.in
@@ -351,8 +351,11 @@ sub exportsql {
     }
   }
 
-  if ($ARGV[0]) {
-    $command .= qq( --where="Name = '$ARGV[0]'");
+  my $name = $ARGV[0];
+  if ($name) {
+    $name =~ /([A-Za-z0-9 -]*)/; # Only allow alphanumeric, dash and space
+    $name = $1;
+    $command .= qq( --where="Name = '$name'");
   }
 
   $command .= " zm Controls MonitorPresets";

From a8615c1c85ab33d1a5e0a713e2aa4017433ae78b Mon Sep 17 00:00:00 2001
From: zlodag <11688686+zlodag@users.noreply.github.com>
Date: Sun, 16 Feb 2020 11:30:06 +1300
Subject: [PATCH 3/3] fixed bug in control functions where left arrow panStep
 was inverted

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

diff --git a/web/skins/classic/includes/control_functions.php b/web/skins/classic/includes/control_functions.php
index 7554486af..80cfe4aff 100644
--- a/web/skins/classic/includes/control_functions.php
+++ b/web/skins/classic/includes/control_functions.php
@@ -125,7 +125,7 @@ function controlPanTilt($monitor, $cmds) {
     <button type="button" class="arrowBtn upLeftBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUpLeft'] ?>',event,-1,-1)"></button>
     <button type="button" class="arrowBtn upBtn<?php echo $hasTilt?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUp'] ?>',event,0,-1)"></button>
     <button type="button" class="arrowBtn upRightBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUpRight'] ?>',event,1,-1)"></button>
-    <button type="button" class="arrowBtn leftBtn<?php echo $hasPan?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveLeft'] ?>',event,1,0)"></button>
+    <button type="button" class="arrowBtn leftBtn<?php echo $hasPan?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveLeft'] ?>',event,-1,0)"></button>
 <?php if ( isset($cmds['Center']) ) { ?>
     <button type="button" class="arrowBtn centerBtn" onclick="controlCmd('<?php echo $cmds['Center'] ?>')"></button>
 <?php } else { ?>