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

Author: connortechnology

scripts/ZoneMinder/lib/ZoneMinder/Control/TapoC520WS_ONVIF.pm

@@ -275,7 +275,11 @@ sub autoStop {
   my $iszoom = shift;
 
   if ( $autostop ) {
-    Debug('Auto Stop');
+    my $duration = $autostop * $self->{Monitor}{AutoStopTimeout};
+    $duration = ($duration < 1000) ? $duration * 1000 : int($duration/1000);
+    # Change from microseconds to milliseconds or seconds to milliseconds
+    Debug("Calculate duration $duration from autostop($autostop) and AutoStopTimeout ".$self->{Monitor}{AutoStopTimeout});
+
     my $cmd = $controlUri;
     my $msg_body;
     if ( $iszoom) {
@@ -299,7 +303,7 @@ sub autoStop {
     }
 
     my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
-    usleep($autostop);
+    usleep($duration);
     $self->sendCmd($cmd, $msg_body, $content_type);
   }
 }

web/ajax/modals/download.php

@@ -38,11 +38,11 @@
   }
   if (isset($_REQUEST['maxTimeSecs'])) {
   }
-  if (isset($_REQUEST['minTime'])) {
+  if (isset($_REQUEST['minTime']) and !$filter->has_term('DateTime', '>='))) {
     $filter->addTerm(array('attr' => 'StartDateTime', 'op' => '>=', 'val' => $_REQUEST['minTime'], 'cnj' => 'and'));
     $exportFileName .= ' '.$_REQUEST['minTime']; 
   }
-  if (isset($_REQUEST['maxTime'])) {
+  if (isset($_REQUEST['maxTime']) and !$filter->has_term('DateTime', '<='))) {
     $filter->addTerm(array('attr' => 'StartDateTime', 'op' => '<=', 'val' => $_REQUEST['maxTime'], 'cnj' => 'and'));
     $exportFileName .= ' '.$_REQUEST['maxTime']; 
   }

web/includes/Filter.php

@@ -1135,6 +1135,9 @@ public function simple_widget() {
       #$html .= ($i == 0) ?  '' : htmlSelect("filter[Query][terms][$i][cnj]", $conjunctionTypes, $term['cnj']).PHP_EOL;
       $html .= ($i == 0) ?  '' : html_input("filter[Query][terms][$i][cnj]", 'hidden', $term['cnj']).PHP_EOL;
       if ( isset($term['attr']) ) {
+        if (($term['attr'] == 'Tags') and (count($availableTags)<=1)) {
+          continue;
+        }
         $html .= '<span class="term '.$term['attr'].'"><span class="term-label-wrapper"><label>'.$attrTypes[$term['attr']].'</label>';
         $html .= html_input("filter[Query][terms][$i][attr]", 'hidden', $term['attr']);
         $html .= html_input("filter[Query][terms][$i][op]", 'hidden', $term['op']).PHP_EOL;
@@ -1160,10 +1163,10 @@ public function simple_widget() {
           // echo '<div style="background-color:lightblue"><pre>selected: '; print_r($selected); echo '</pre></div>';
           // echo '<div style="background-color:green"><pre>options: '; print_r($options); echo '</pre></div>';
 
-          $html .= '<span class="term-value-wrapper">';
-          $html .= htmlSelect("filter[Query][terms][$i][val]", $availableTags, $selected, $options).PHP_EOL;
-          $html .= $this->addButtonForFilterSelect("filter[Query][terms][$i][val]");
-          $html .= '</span>';
+            $html .= '<span class="term-value-wrapper">';
+            $html .= htmlSelect("filter[Query][terms][$i][val]", $availableTags, $selected, $options).PHP_EOL;
+            $html .= $this->addButtonForFilterSelect("filter[Query][terms][$i][val]");
+            $html .= '</span>';
           // $html .= '<span>'.htmlSelect("filter[Query][terms][$i][val]", array_combine($availableTags,$availableTags), $term['val'],
           // $options).'</span>'.PHP_EOL;
           // $html .= '<span>'.htmlSelect("filter[Query][terms][$i][val]", $availableTags, $term['val'], $options).'</span>'.PHP_EOL;
@@ -1173,8 +1176,6 @@ public function simple_widget() {
           // Debug('$selected: '.$selected);
           // Debug('$options: '.$options);
 
-
-
         } else if ( $term['attr'] == 'DateTime' || $term['attr'] == 'StartDateTime' || $term['attr'] == 'EndDateTime') {
           $html .= '<span class="term-value-wrapper">';
           $html .= '<input type="text" class="term-value datetimepicker" name="filter[Query][terms]['.$i.'][val]"';

web/includes/auth.php

@@ -414,6 +414,14 @@ function get_auth_relay() {
 
     if (ZM_AUTH_HASH_LOGINS && empty($user) && !empty($_REQUEST['auth'])) {
       $user = getAuthUser($_REQUEST['auth']);
+      if ($user) {
+        $remoteAddr = ZM_AUTH_HASH_IPS ? $_SESSION['remoteAddr'] : '';
+        if (isset($_SESSION['AuthHash'.$remoteAddr]) and ($_SESSION['AuthHash'.$remoteAddr] != $_REQUEST['auth'])) {
+          unset($_SESSION['AuthHashGeneratedAt']);
+          unset($_SESSION['AuthHash'.$remoteAddr]);
+        }
+        $_SESSION['username'] = $user->Username();
+      }
     } else if (!(empty($_REQUEST['user']) or empty($_REQUEST['pass']))) {
       # The shortened versions are used in auth_relay = PLAIN
       $ret = validateUser($_REQUEST['user'], $_REQUEST['pass']);

web/index.php

@@ -292,8 +292,8 @@
 }
 
 if (!$view) {
-  ZM\Debug(1, "Empty view, defaulting to home view");
   $view = getHomeView();
+  ZM\Debug("Empty view, defaulting to home view".$view);
   header('Location: ?view='.$view);
   return;
 }