Merge branch 'master' of github.com:ZoneMinder/zoneminder

db/zm_update-1.34.2.sql

@@ -0,0 +1,5 @@
+--
+-- This updates a 1.34.1 database to 1.34.2
+--
+-- No changes required
+--

distros/redhat/zoneminder.spec

@@ -28,7 +28,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.34.1
+Version: 1.34.2
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -416,6 +416,9 @@ EOF
 %dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload
 
 %changelog
+* Tue Feb 04 2020 Isaac Connor <isaac@zoneminder.com> - 1.34.2-1
+- 1.34.2 Release
+
 * Fri Jan 31 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.1-1
 - 1.34.1 Release
 

version

@@ -1 +1 @@
-1.34.1
+1.34.2

web/includes/actions/login.php

@@ -49,14 +49,23 @@ if ( ('login' == $action) && isset($_REQUEST['username']) && ( ZM_AUTH_TYPE == '
       // as it produces the same error as when you don't answer a recaptcha
       if ( isset($responseData['error-codes']) && is_array($responseData['error-codes']) ) {
         if ( !in_array('invalid-input-secret', $responseData['error-codes']) ) {
-          Error('reCaptcha authentication failed');
+          ZM\Error('reCaptcha authentication failed. response was: ' . print_r($responseData['error-codes'],true));
           unset($user); // unset should be ok here because we aren't in a function
           return;
         } else {
-          Error('Invalid recaptcha secret detected');
+          ZM\Error('Invalid recaptcha secret detected');
         }
       }
     } // end if success==false
+    if ( ! (empty($_REQUEST['username']) or empty($_REQUEST['password'])) ) {
+      $ret = validateUser($_REQUEST['username'], $_REQUEST['password']);
+      if ( !$ret[0] ) {
+        ZM\Error($ret[1]);
+        unset($user); // unset should be ok here because we aren't in a function
+      } else {
+        $user = $ret[0];
+      }
+    } # end if have username and password
   } // end if using reCaptcha
 
   // if captcha existed, it was passed

web/skins/classic/css/base/views/options.css

@@ -21,3 +21,8 @@ input.large {
 #contentTable.userTable .colMonitor, #contentTable.userTable .colUsername {
     text-align: left;
 }
+
+input[name="newConfig[ZM_OPT_GOOG_RECAPTCHA_SITEKEY]"],
+input[name="newConfig[ZM_OPT_GOOG_RECAPTCHA_SECRETKEY]"] {
+  width: 100%;
+}