Merge branch 'master' into storageareas

distros/redhat/zoneminder.spec

@@ -23,8 +23,8 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.32.2
-Release: 2%{?dist}
+Version: 1.32.3
+Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
 # Mootools is inder the MIT license: http://mootools.net/
@@ -42,7 +42,7 @@ BuildRequires: systemd-devel
 BuildRequires: mariadb-devel
 BuildRequires: perl-podlators
 BuildRequires: polkit-devel
-BuildRequires: cmake >= 2.8.7
+BuildRequires: cmake3
 BuildRequires: gnutls-devel
 BuildRequires: bzip2-devel
 BuildRequires: pcre-devel 
@@ -200,7 +200,7 @@ mv -f CakePHP-Enum-Behavior-%{ceb_version} ./web/api/app/Plugin/CakePHP-Enum-Beh
 ./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no
 
 %build
-%cmake \
+%cmake3 \
         -DZM_WEB_USER="%{zmuid_final}" \
         -DZM_WEB_GROUP="%{zmgid_final}" \
         -DZM_TARGET_DISTRO="%{zmtargetdistro}" \
@@ -411,9 +411,14 @@ EOF
 %dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload
 
 %changelog
-* Wed Nov 14 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.32.2-2
+* Sat Dec 08 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.32.3-1
+- 1.32.3 Release
 - Break into sub-packages
 
+* Tue Nov 13 2018 Antonio Trande <sagitter@fedoraproject.org> - 1.32.2-2
+- Rebuild for ffmpeg-3.4.5 on el7
+- Use CMake3
+
 * Sat Oct 13 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.32.2-1
 - 1.32.2 release
 - Bug fix release

version

@@ -1 +1 @@
-1.32.2
+1.32.3

web/api/app/Model/Event.php

@@ -100,7 +100,7 @@ class Event extends AppModel {
     ),
   );
 
- public function Relative_Path($event) {
+  public function Relative_Path($event) {
     $event_path = '';
 
     if ( $event['Scheme'] == 'Deep' ) {

web/includes/Monitor.php

@@ -451,7 +451,7 @@ private $control_fields = array(
     } else if ( $this->ServerId() ) {
       $Server = $this->Server();
 
-      $url = ZM_BASE_PROTOCOL . '://'.$Server->Hostname().'/zm/api/monitors/daemonControl/'.$this->{'Id'}.'/'.$mode.'/zmc.json';
+      $url = $Server->UrlToApi().'/monitors/daemonControl/'.$this->{'Id'}.'/'.$mode.'/zmc.json';
       if ( ZM_OPT_USE_AUTH ) {
         if ( ZM_AUTH_RELAY == 'hashed' ) {
           $url .= '?auth='.generateAuthHash( ZM_AUTH_HASH_IPS );

web/includes/Server.php

@@ -51,8 +51,8 @@ class Server {
     } else if ( $this->Id() ) {
       return $this->{'Name'};
     }
-    # Use HTTP_HOST instead of SERVER_NAME here for nginx compatiblity
-    return $_SERVER['HTTP_HOST'];
+    $result = explode(':',$_SERVER['HTTP_HOST']);
+    return $result[0];
   }
 
   public function Protocol( $new = null ) {
@@ -91,12 +91,7 @@ class Server {
 
 	public function Url( $port = null ) {
     $url = $this->Protocol().'://';
-		if ( $this->Id() ) {
-			$url .= $this->Hostname();
-		} else {
-                        # Use HTTP_HOST instead of SERVER_NAME here for nginx compatiblity
-			$url .= $_SERVER['HTTP_HOST'];
-		}
+		$url .= $this->Hostname();
     if ( $port ) {
       $url .= ':'.$port;
     } else {

web/skins/classic/views/js/event.js

@@ -275,7 +275,8 @@ function pauseClicked() {
 }
 
 function vjsPause() {
-  stopFastRev();
+  if ( intervalRewind )
+    stopFastRev();
   streamPause();
 }
 
@@ -307,7 +308,7 @@ function vjsPlay() { //catches if we change mode programatically
   if ( intervalRewind )
     stopFastRev();
   $j('#rateValue').html(vid.playbackRate());
-  Cookie.write('zmEventRate', vid.playbackRate(), {duration: 10*365});
+  Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
   streamPlay();
 }
 
@@ -575,7 +576,7 @@ function getEventResponse( respObj, respText ) {
     drawProgressBar();
   }
   nearEventsQuery( eventData.Id );
-}
+} // end function getEventResponse
 
 var eventReq = new Request.JSON( { url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getEventResponse } );