From 315b1bc11e79cc888b6d92d26bd83969a87557a2 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 10 Jul 2018 11:48:08 -0400 Subject: [PATCH 001/330] Implement a GetData function and use it to simplify the code everywhere we want to get more data. --- src/zm_remote_camera_http.cpp | 51 ++++++++++++++++++----------------- src/zm_remote_camera_http.h | 3 ++- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/zm_remote_camera_http.cpp b/src/zm_remote_camera_http.cpp index 9c91d235b..a3b31029c 100644 --- a/src/zm_remote_camera_http.cpp +++ b/src/zm_remote_camera_http.cpp @@ -220,7 +220,7 @@ int RemoteCameraHttp::ReadData( Buffer &buffer, unsigned int bytes_expected ) { } else { if ( ioctl( sd, FIONREAD, &total_bytes_to_read ) < 0 ) { Error( "Can't ioctl(): %s", strerror(errno) ); - return( -1 ); + return -1; } if ( total_bytes_to_read == 0 ) { @@ -228,20 +228,20 @@ int RemoteCameraHttp::ReadData( Buffer &buffer, unsigned int bytes_expected ) { int error = 0; socklen_t len = sizeof (error); int retval = getsockopt( sd, SOL_SOCKET, SO_ERROR, &error, &len ); - if(retval != 0 ) { + if ( retval != 0 ) { Debug( 1, "error getting socket error code %s", strerror(retval) ); } - if (error != 0) { + if ( error != 0 ) { return -1; } // Case where we are grabbing a single jpg, but no content-length was given, so the expectation is that we read until close. - return( 0 ); + return 0; } // If socket is closed locally, then select will fail, but if it is closed remotely // then we have an exception on our socket.. but no data. - Debug( 3, "Socket closed remotely" ); + Debug(3, "Socket closed remotely"); //Disconnect(); // Disconnect is done outside of ReadData now. - return( -1 ); + return -1; } // There can be lots of bytes available. I've seen 4MB or more. This will vastly inflate our buffer size unnecessarily. @@ -278,6 +278,18 @@ int RemoteCameraHttp::ReadData( Buffer &buffer, unsigned int bytes_expected ) { return( total_bytes_read ); } +int RemoteCameraHttp::GetData() { + time_t start_time = time(NULL); + int buffer_len = 0; + while ( !( buffer_len = ReadData(buffer) ) ) { + if ( zm_terminate || ( start_time - time(NULL) < ZM_WATCH_MAX_DELAY )) + return -1; + Debug(4, "Timeout waiting for REGEXP HEADER"); + usleep(100000); + } + return buffer_len; +} + int RemoteCameraHttp::GetResponse() { int buffer_len; @@ -310,9 +322,7 @@ int RemoteCameraHttp::GetResponse() static RegExpr *content_length_expr = 0; static RegExpr *content_type_expr = 0; - while ( !( buffer_len = ReadData(buffer) ) && !zm_terminate ) { - Debug(4, "Timeout waiting for REGEXP HEADER"); - } + buffer_len = GetData(); if ( buffer_len < 0 ) { Error( "Unable to read header data" ); return( -1 ); @@ -485,9 +495,7 @@ int RemoteCameraHttp::GetResponse() else { Debug( 3, "Unable to extract subheader from stream, retrying" ); - while ( !( buffer_len = ReadData(buffer) ) && !zm_terminate ) { - Debug(4, "Timeout waiting to extract subheader"); - } + buffer_len = GetData(); if ( buffer_len < 0 ) { Error( "Unable to extract subheader data" ); return( -1 ); @@ -528,7 +536,7 @@ int RemoteCameraHttp::GetResponse() while ( ((long)buffer.size() < content_length ) && ! zm_terminate ) { Debug(3, "Need more data buffer %d < content length %d", buffer.size(), content_length ); - int bytes_read = ReadData( buffer ); + int bytes_read = GetData(); if ( bytes_read < 0 ) { Error( "Unable to read content" ); @@ -542,9 +550,7 @@ int RemoteCameraHttp::GetResponse() { while ( !content_length ) { - while ( !( buffer_len = ReadData(buffer) ) && !zm_terminate ) { - Debug(4, "Timeout waiting for content"); - } + buffer_len = GetData(); if ( buffer_len < 0 ) { Error( "Unable to read content" ); return( -1 ); @@ -663,9 +669,7 @@ int RemoteCameraHttp::GetResponse() } case HEADERCONT : { - while ( !( buffer_len = ReadData(buffer) ) && !zm_terminate ) { - Debug(4, "Timeout waiting for HEADERCONT"); - } + buffer_len = GetData(); if ( buffer_len < 0 ) { Error( "Unable to read header" ); return( -1 ); @@ -949,9 +953,7 @@ int RemoteCameraHttp::GetResponse() state = CONTENT; } else { Debug( 3, "Unable to extract subheader from stream, retrying" ); - while ( !( buffer_len = ReadData(buffer) ) &&!zm_terminate ) { - Debug(1, "Timeout waiting to extra subheader non regexp"); - } + buffer_len = GetData(); if ( buffer_len < 0 ) { Error( "Unable to read subheader" ); return( -1 ); @@ -991,7 +993,7 @@ int RemoteCameraHttp::GetResponse() if ( content_length ) { while ( ( (long)buffer.size() < content_length ) && ! zm_terminate ) { Debug(4, "getting more data"); - int bytes_read = ReadData(buffer); + int bytes_read = GetData(); if ( bytes_read < 0 ) { Error("Unable to read content"); return -1; @@ -1004,8 +1006,7 @@ int RemoteCameraHttp::GetResponse() while ( !content_length && !zm_terminate ) { Debug(4, "!content_length, ReadData"); buffer_len = ReadData( buffer ); - if ( buffer_len < 0 ) - { + if ( buffer_len < 0 ) { Error( "Unable to read content" ); return( -1 ); } diff --git a/src/zm_remote_camera_http.h b/src/zm_remote_camera_http.h index a1ed4a267..d2bc96848 100644 --- a/src/zm_remote_camera_http.h +++ b/src/zm_remote_camera_http.h @@ -53,12 +53,13 @@ public: int Disconnect(); int SendRequest(); int ReadData( Buffer &buffer, unsigned int bytes_expected=0 ); + int GetData(); int GetResponse(); int PreCapture(); int Capture( Image &image ); int PostCapture(); int CaptureAndRecord( Image &image, timeval recording, char* event_directory ) {return 0;}; - int Close() { return 0; }; + int Close() { Disconnect(); return 0; }; }; #endif // ZM_REMOTE_CAMERA_HTTP_H From 312dab2c2050101fc02be886bc750a3e1aeafc1b Mon Sep 17 00:00:00 2001 From: Javier Gonzalez Date: Sat, 20 Apr 2019 17:14:43 +0200 Subject: [PATCH 002/330] Fixing video export view --- web/skins/classic/views/video.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/video.php b/web/skins/classic/views/video.php index aab9278d6..ca4c46f4b 100644 --- a/web/skins/classic/views/video.php +++ b/web/skins/classic/views/video.php @@ -46,7 +46,7 @@ if ( isset($_REQUEST['scale']) ) else $scale = reScale(SCALE_BASE, $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE); -$Event = new Event($event['Id']); +$Event = new ZM\Event($event['Id']); $eventPath = $Event->Path(); $videoFormats = array(); From 2e7fad68d12e4a5da1b3403227795617e1902402 Mon Sep 17 00:00:00 2001 From: Selva Nair Date: Fri, 1 Nov 2019 17:29:55 -0400 Subject: [PATCH 003/330] Properly compute video buffer length when analysis fps is set Currently the number of video frames kept in the buffer is set as the pre_event_count. This falls short when the capture fps is larger than the analysis fps. Fix by computing the retained video duration as pre_event_count/analysis_fps No change if analysis fps is not set. Signed-off-by: Selva Nair --- src/zm_ffmpeg_camera.cpp | 10 +++++- src/zm_monitor.cpp | 7 +++++ src/zm_monitor.h | 4 ++- src/zm_packetqueue.cpp | 66 ++++++++++++++++++++++++++++++++++++++++ src/zm_packetqueue.h | 1 + 5 files changed, 86 insertions(+), 2 deletions(-) diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index 3ae65d97f..acc3a32c4 100644 --- a/src/zm_ffmpeg_camera.cpp +++ b/src/zm_ffmpeg_camera.cpp @@ -744,6 +744,8 @@ int FfmpegCamera::CaptureAndRecord( } int ret; + struct timeval video_buffer_duration = monitor->GetVideoBufferDuration(); + int frameComplete = false; while ( !frameComplete ) { av_init_packet(&packet); @@ -920,6 +922,13 @@ int FfmpegCamera::CaptureAndRecord( if ( packet.stream_index == mVideoStreamId ) { if ( keyframe ) { Debug(3, "Clearing queue"); + if (video_buffer_duration.tv_sec > 0 || video_buffer_duration.tv_usec > 0) { + packetqueue->clearQueue(&video_buffer_duration, mVideoStreamId); + } + else { + packetqueue->clearQueue(monitor->GetPreEventCount(), mVideoStreamId); + } + if ( packetqueue->packet_count(mVideoStreamId) >= @@ -933,7 +942,6 @@ int FfmpegCamera::CaptureAndRecord( packetqueue->packet_count(mVideoStreamId)+1); } - packetqueue->clearQueue(monitor->GetPreEventCount(), mVideoStreamId); packetqueue->queuePacket(&packet); } else if ( packetqueue->size() ) { // it's a keyframe or we already have something in the queue diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index d8d06016a..2f0e4826b 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -338,6 +338,7 @@ Monitor::Monitor( warmup_count( p_warmup_count ), pre_event_count( p_pre_event_count ), post_event_count( p_post_event_count ), + video_buffer_duration({0}), stream_replay_buffer( p_stream_replay_buffer ), section_length( p_section_length ), min_section_length( p_min_section_length ), @@ -368,6 +369,12 @@ Monitor::Monitor( privacy_bitmask( NULL ), event_delete_thread(NULL) { + if (analysis_fps > 0.0) { + uint64_t usec = round(1000000*pre_event_count/analysis_fps); + video_buffer_duration.tv_sec = usec/1000000; + video_buffer_duration.tv_usec = usec % 1000000; + } + strncpy(name, p_name, sizeof(name)-1); strncpy(event_prefix, p_event_prefix, sizeof(event_prefix)-1); diff --git a/src/zm_monitor.h b/src/zm_monitor.h index 046f20c5a..97f173845 100644 --- a/src/zm_monitor.h +++ b/src/zm_monitor.h @@ -273,6 +273,7 @@ protected: int warmup_count; // How many images to process before looking for events int pre_event_count; // How many images to hold and prepend to an alarm event int post_event_count; // How many unalarmed images must occur before the alarm state is reset + struct timeval video_buffer_duration; // How long a video segment to keep in buffer (set only if analysis fps != 0 ) int stream_replay_buffer; // How many frames to store to support DVR functions, IGNORED from this object, passed directly into zms now int section_length; // How long events should last in continuous modes int min_section_length; // Minimum event length when using event_close_mode == ALARM @@ -467,7 +468,8 @@ public: void SetVideoWriterEventId( unsigned long long p_event_id ) { video_store_data->current_event = p_event_id; } unsigned int GetPreEventCount() const { return pre_event_count; }; - int GetImageBufferCount() const { return image_buffer_count; }; + struct timeval GetVideoBufferDuration() const { return video_buffer_duration; }; + int GetImageBufferCount() const { return image_buffer_count; }; State GetState() const; int GetImage( int index=-1, int scale=100 ); Snapshot *getSnapshot() const; diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp index 45be587c8..c48857be4 100644 --- a/src/zm_packetqueue.cpp +++ b/src/zm_packetqueue.cpp @@ -204,6 +204,72 @@ void zm_packetqueue::clearQueue() { Debug(3, "Deleted (%d) packets", delete_count ); } +// clear queue keeping only specified duration of video -- return number of pkts removed +unsigned int zm_packetqueue::clearQueue(struct timeval *duration, int streamId) { + + if (pktQueue.empty()) { + return 0; + } + struct timeval keep_from; + std::list::reverse_iterator it; + it = pktQueue.rbegin(); + + timersub(&(*it)->timestamp, duration, &keep_from); + ++it; + + Debug(3, "Looking for frame before queue keep time with stream id (%d), queue has %d packets", + streamId, pktQueue.size()); + for ( ; it != pktQueue.rend(); ++it) { + ZMPacket *zm_packet = *it; + AVPacket *av_packet = &(zm_packet->packet); + if (av_packet->stream_index == streamId + && timercmp( &zm_packet->timestamp, &keep_from, <= )) { + Debug(3, "Found frame before keep time with stream index %d at %d.%d", + av_packet->stream_index, + zm_packet->timestamp.tv_sec, + zm_packet->timestamp.tv_usec); + break; + } + } + + if (it == pktQueue.rend()) { + Debug(1, "Didn't find a frame before queue preserve time. keeping all"); + return 0; + } + + Debug(3, "Looking for keyframe"); + for ( ; it != pktQueue.rend(); ++it) { + ZMPacket *zm_packet = *it; + AVPacket *av_packet = &(zm_packet->packet); + if (av_packet->flags & AV_PKT_FLAG_KEY + && av_packet->stream_index == streamId) { + Debug(3, "Found keyframe before start with stream index %d at %d.%d", + av_packet->stream_index, + zm_packet->timestamp.tv_sec, + zm_packet->timestamp.tv_usec ); + break; + } + } + if ( it == pktQueue.rend() ) { + Debug(1, "Didn't find a keyframe before event starttime. keeping all" ); + return 0; + } + + unsigned int deleted_frames = 0; + ZMPacket *zm_packet = NULL; + while (distance(it, pktQueue.rend()) > 1) { + zm_packet = pktQueue.front(); + pktQueue.pop_front(); + packet_counts[zm_packet->packet.stream_index] -= 1; + delete zm_packet; + deleted_frames += 1; + } + zm_packet = NULL; + Debug(3, "Deleted %d frames", deleted_frames); + + return deleted_frames; +} + unsigned int zm_packetqueue::size() { return pktQueue.size(); } diff --git a/src/zm_packetqueue.h b/src/zm_packetqueue.h index 0faa281d2..31fe321cb 100644 --- a/src/zm_packetqueue.h +++ b/src/zm_packetqueue.h @@ -40,6 +40,7 @@ public: bool popVideoPacket(ZMPacket* packet); bool popAudioPacket(ZMPacket* packet); unsigned int clearQueue(unsigned int video_frames_to_keep, int stream_id); + unsigned int clearQueue(struct timeval *duration, int streamid); void clearQueue(); void dumpQueue(); unsigned int size(); From dd31279ca368f201a10eb90b22b0007976d6f7de Mon Sep 17 00:00:00 2001 From: Selva Nair Date: Sun, 3 Nov 2019 18:11:55 -0500 Subject: [PATCH 004/330] Fix the recorded video start time The event start time already includes the duration of the pre_event frames. Do not back track the video by a further pre_event_count. Signed-off-by: Selva Nair --- src/zm_ffmpeg_camera.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index acc3a32c4..029a2de0d 100644 --- a/src/zm_ffmpeg_camera.cpp +++ b/src/zm_ffmpeg_camera.cpp @@ -875,7 +875,7 @@ int FfmpegCamera::CaptureAndRecord( // Clear all packets that predate the moment when the recording began packetqueue->clear_unwanted_packets( - &recording, monitor->GetPreEventCount(), mVideoStreamId); + &recording, 0, mVideoStreamId); while ( (queued_packet = packetqueue->popPacket()) ) { AVPacket *avp = queued_packet->av_packet(); From 5260563ec47dea417b4f69dca50e9eeeeebf43be Mon Sep 17 00:00:00 2001 From: Selva Nair Date: Fri, 1 Nov 2019 17:30:57 -0400 Subject: [PATCH 005/330] Update frame deltas in the database to be relative to the video start time Currenltly the frames written to database have delta time measured from the event start time. As these deltas are also used to generate any frame on the fly from the recorded video, these should be relative to the video start time. Adjust by subtracting the offset of the video start from event start. Done when the event is closed. If video is not stored, this has no effect. Signed-off-by: Selva Nair --- src/zm_event.cpp | 35 +++++++++++++++++++++++++++++++++++ src/zm_event.h | 1 + src/zm_ffmpeg_camera.cpp | 9 +++++++++ src/zm_monitor.h | 2 ++ 4 files changed, 47 insertions(+) diff --git a/src/zm_event.cpp b/src/zm_event.cpp index 109df5dd3..e564479f3 100644 --- a/src/zm_event.cpp +++ b/src/zm_event.cpp @@ -256,6 +256,20 @@ Event::~Event() { if ( frame_data.size() ) WriteDbFrames(); + // update frame deltas to refer to video start time which may be a few frames before event start + struct timeval video_offset = {0}; + struct timeval video_start_time = monitor->GetVideoWriterStartTime(); + if (video_start_time.tv_sec > 0) { + timersub(&video_start_time, &start_time, &video_offset); + Debug(1, "Updating frames delta by %d sec %d usec", + video_offset.tv_sec, video_offset.tv_usec); + UpdateFramesDelta(video_offset.tv_sec + video_offset.tv_usec*1e-6); + } + else { + Debug(3, "Video start_time %d sec %d usec not valid -- frame deltas not updated", + video_start_time.tv_sec, video_start_time.tv_usec); + } + // Should not be static because we might be multi-threaded char sql[ZM_SQL_LGE_BUFSIZ]; snprintf(sql, sizeof(sql), @@ -554,6 +568,27 @@ void Event::WriteDbFrames() { db_mutex.unlock(); } // end void Event::WriteDbFrames() +// Subtract an offset time from frames deltas to match with video start time +void Event::UpdateFramesDelta(double offset) { + char sql[ZM_SQL_MED_BUFSIZ]; + + if (offset == 0.0) return; + // the table is set to auto update timestamp so we force it to keep current value + snprintf(sql, sizeof(sql), + "UPDATE Frames SET timestamp = timestamp, Delta = Delta - (%.4f) WHERE EventId = %" PRIu64, + offset, id); + + db_mutex.lock(); + if (mysql_query(&dbconn, sql)) { + db_mutex.unlock(); + Error("Can't update frames: %s, sql was %s", mysql_error(&dbconn), sql); + return; + } + db_mutex.unlock(); + Info("Updating frames delta by %0.2f sec to match video file", offset); +} + + void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *alarm_image) { if ( !timestamp.tv_sec ) { Debug(1, "Not adding new frame, zero timestamp"); diff --git a/src/zm_event.h b/src/zm_event.h index 2035b6af6..77199509c 100644 --- a/src/zm_event.h +++ b/src/zm_event.h @@ -132,6 +132,7 @@ class Event { private: void AddFramesInternal( int n_frames, int start_frame, Image **images, struct timeval **timestamps ); void WriteDbFrames(); + void UpdateFramesDelta(double offset); public: static const char *getSubPath( struct tm *time ) { diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index 029a2de0d..ef4dfc057 100644 --- a/src/zm_ffmpeg_camera.cpp +++ b/src/zm_ffmpeg_camera.cpp @@ -872,6 +872,7 @@ int FfmpegCamera::CaptureAndRecord( // since the last keyframe. unsigned int packet_count = 0; ZMPacket *queued_packet; + struct timeval video_offset = {0}; // Clear all packets that predate the moment when the recording began packetqueue->clear_unwanted_packets( @@ -880,6 +881,14 @@ int FfmpegCamera::CaptureAndRecord( while ( (queued_packet = packetqueue->popPacket()) ) { AVPacket *avp = queued_packet->av_packet(); + // compute time offset between event start and first frame in video + if (packet_count == 0){ + monitor->SetVideoWriterStartTime(queued_packet->timestamp); + timersub(&queued_packet->timestamp, &recording, &video_offset); + Info("Event video offset is %.3f sec (<0 means video starts early)", + video_offset.tv_sec + video_offset.tv_usec*1e-6); + } + packet_count += 1; // Write the packet to our video store Debug(2, "Writing queued packet stream: %d KEY %d, remaining (%d)", diff --git a/src/zm_monitor.h b/src/zm_monitor.h index 97f173845..9109c9c72 100644 --- a/src/zm_monitor.h +++ b/src/zm_monitor.h @@ -466,6 +466,8 @@ public: const std::vector* GetOptEncoderParams() const { return &encoderparamsvec; } uint64_t GetVideoWriterEventId() const { return video_store_data->current_event; } void SetVideoWriterEventId( unsigned long long p_event_id ) { video_store_data->current_event = p_event_id; } + struct timeval GetVideoWriterStartTime() const { return video_store_data->recording; } + void SetVideoWriterStartTime(struct timeval &t) { video_store_data->recording = t; } unsigned int GetPreEventCount() const { return pre_event_count; }; struct timeval GetVideoBufferDuration() const { return video_buffer_duration; }; From e096e0a7fe5e20ba02d8ffdf594cd9e611428a1a Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 30 Nov 2019 15:35:09 -0500 Subject: [PATCH 006/330] improve error logging when running as root as can't chown log file --- scripts/ZoneMinder/lib/ZoneMinder/Logger.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm index dc843449a..5d05ae7c5 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm @@ -503,11 +503,14 @@ sub openFile { $LOGFILE->autoflush() if $this->{autoFlush}; my $webUid = (getpwnam($ZoneMinder::Config::Config{ZM_WEB_USER}))[2]; + Error("Can't get uid for $ZoneMinder::Config::Config{ZM_WEB_USER}") if ! defined $webUid; my $webGid = (getgrnam($ZoneMinder::Config::Config{ZM_WEB_GROUP}))[2]; + Error("Can't get gid for $ZoneMinder::Config::Config{ZM_WEB_USER}") if ! defined $webGid; if ( $> == 0 ) { - chown( $webUid, $webGid, $this->{logFile} ) - or Fatal("Can't change permissions on log file $$this{logFile}: $!"); - } + # If we are root, we want to make sure that www-data or whatever owns the file + chown($webUid, $webGid, $this->{logFile} ) or + Error("Can't change permissions on log file $$this{logFile}: $!"); + } # end if are root } else { $this->fileLevel(NOLOG); $this->termLevel(INFO); From 927165a934cff0437f595cac804f6fbea86bb4e9 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 30 Nov 2019 15:37:05 -0500 Subject: [PATCH 007/330] debug the recording_started timestamp and warning when we can't fine a frame before the requested time --- src/zm_packetqueue.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp index 45be587c8..bf487d020 100644 --- a/src/zm_packetqueue.cpp +++ b/src/zm_packetqueue.cpp @@ -229,8 +229,8 @@ void zm_packetqueue::clear_unwanted_packets( std::list::reverse_iterator it; // Step 1 - find frame <= recording_started. - Debug(3, "Looking for frame before start recording stream id (%d), queue has %d packets", - mVideoStreamId, pktQueue.size()); + Debug(3, "Looking for frame before start (%d.%d) recording stream id (%d), queue has %d packets", + recording_started->tv_sec, recording_started->tv_usec, mVideoStreamId, pktQueue.size()); for ( it = pktQueue.rbegin(); it != pktQueue.rend(); ++ it ) { ZMPacket *zm_packet = *it; AVPacket *av_packet = &(zm_packet->packet); @@ -252,7 +252,7 @@ void zm_packetqueue::clear_unwanted_packets( } if ( it == pktQueue.rend() ) { - Debug(1, "Didn't find a frame before event starttime. keeping all"); + Info("Didn't find a frame before event starttime. keeping all"); return; } From 0b2853095e1c07c6efaddf9e639a21dc8c4fe6db Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 1 Dec 2019 12:30:27 -0500 Subject: [PATCH 008/330] cleanup auth in monitors alarm method --- web/api/app/Controller/MonitorsController.php | 60 +++++++++---------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php index ea7a666a1..3be9166b8 100644 --- a/web/api/app/Controller/MonitorsController.php +++ b/web/api/app/Controller/MonitorsController.php @@ -249,16 +249,11 @@ class MonitorsController extends AppController { // where C=on|off|status public function alarm() { $id = $this->request->params['named']['id']; - $cmd = strtolower($this->request->params['named']['command']); if ( !$this->Monitor->exists($id) ) { throw new NotFoundException(__('Invalid monitor')); } - if ( $cmd != 'on' && $cmd != 'off' && $cmd != 'status' ) { - throw new BadRequestException(__('Invalid command')); - } - $zm_path_bin = Configure::read('ZM_PATH_BIN'); - $mToken = $this->request->query('token') ? $this->request->query('token') : null; + $cmd = strtolower($this->request->params['named']['command']); switch ($cmd) { case 'on': $q = '-a'; @@ -272,42 +267,43 @@ class MonitorsController extends AppController { $verbose = ''; // zmu has a bug - gives incorrect verbose output in this case $q = '-s'; break; + default : + throw new BadRequestException(__('Invalid command')); } // form auth key based on auth credentials - $this->loadModel('Config'); - $options = array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_OPT_USE_AUTH')); - $config = $this->Config->find('first', $options); - $zmOptAuth = $config['Config']['Value']; - - $options = array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_RELAY')); - $config = $this->Config->find('first', $options); - $zmAuthRelay = $config['Config']['Value']; - $auth = ''; - if ( $zmOptAuth ) { - if ($mToken) { + if ( ZM_OPT_USE_AUTH ) { + global $user; + $mToken = $this->request->query('token') ? $this->request->query('token') : $this->request->data('token');; + if ( $mToken ) { $auth = ' -T '.$mToken; - } - elseif ( $zmAuthRelay == 'hashed' ) { - $options = array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_HASH_SECRET')); - $config = $this->Config->find('first', $options); - $zmAuthHashSecret = $config['Config']['Value']; + } else if ( ZM_AUTH_RELAY == 'hashed' ) { + $auth = ' -A '.generateAuthHash(ZM_AUTH_HASH_IPS); + } else if ( ZM_AUTH_RELAY == 'plain' ) { + # Plain requires the plain text password which must either be in request or stored in session + $password = $this->request->query('pass') ? $this->request->query('pass') : $this->request->data('pass');; + if ( !$password ) + $password = $this->request->query('password') ? $this->request->query('password') : $this->request->data('password'); - $time = localtime(); - $ak = $zmAuthHashSecret.$this->Session->Read('username').$this->Session->Read('passwordHash').$time[2].$time[3].$time[4].$time[5]; - $ak = md5($ak); - $auth = ' -A '.$ak; - } else if ( $zmAuthRelay == 'plain' ) { - $auth = ' -U ' .$this->Session->Read('username').' -P '.$this->Session->Read('password'); - - } else if ( $zmAuthRelay == 'none' ) { - $auth = ' -U ' .$this->Session->Read('username'); + if ( ! $password ) { + # during auth the session will have been populated with the plaintext password + $stateful = $this->request->query('stateful') ? $this->request->query('stateful') : $this->request->data('stateful'); + if ( $stateful ) { + $password = $_SESSION['password']; + } + } else if ( $_COOKIE['ZMSESSID'] ) { + $password = $_SESSION['password']; + } + + $auth = ' -U ' .$user['Username'].' -P '.$password; + } else if ( ZM_AUTH_RELAY == 'none' ) { + $auth = ' -U ' .$user['Username']; } } - $shellcmd = escapeshellcmd("$zm_path_bin/zmu $verbose -m$id $q $auth"); + $shellcmd = escapeshellcmd(ZM_PATH_BIN."/zmu $verbose -m$id $q $auth"); $status = exec ($shellcmd); $this->set(array( From 76d795f413f89069a7c73ae6c0a329f015c74c10 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 1 Dec 2019 12:32:14 -0500 Subject: [PATCH 009/330] add rendering of enums for Events Controller --- web/api/app/Controller/EventsController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php index 2eb5f7280..d9ad29b0d 100644 --- a/web/api/app/Controller/EventsController.php +++ b/web/api/app/Controller/EventsController.php @@ -15,6 +15,10 @@ class EventsController extends AppController { */ public $components = array('RequestHandler', 'Scaler', 'Image', 'Paginator'); + public function beforeRender() { + $this->set($this->Event->enumValues()); + } + public function beforeFilter() { parent::beforeFilter(); global $user; From 03d7bcdd11c50d7432a179fea9fc3c983f98def7 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 12:17:18 -0500 Subject: [PATCH 010/330] better debug logging when on-click-this function isn't defined --- web/skins/classic/js/skin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js index 0a446e255..5ccddf96b 100644 --- a/web/skins/classic/js/skin.js +++ b/web/skins/classic/js/skin.js @@ -168,7 +168,7 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() { document.querySelectorAll("a[data-on-click-this], button[data-on-click-this], input[data-on-click-this]").forEach(function attachOnClick(el) { var fnName = el.getAttribute("data-on-click-this"); if ( !window[fnName] ) { - console.error("Nothing found to bind to " + fnName); + console.error("Nothing found to bind to " + fnName + " on element " + el.name); return; } el.onclick = window[fnName].bind(el, el); @@ -178,7 +178,7 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() { document.querySelectorAll("a[data-on-click], button[data-on-click], input[data-on-click]").forEach(function attachOnClick(el) { var fnName = el.getAttribute("data-on-click"); if ( !window[fnName] ) { - console.error("Nothing found to bind to " + fnName); + console.error("Nothing found to bind to " + fnName + " on element " + el.name); return; } el.onclick = function() { From caefcc2f7a1325da4c639319c7cee8e2d107ac0b Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 12:17:33 -0500 Subject: [PATCH 011/330] increase size of export popup --- web/skins/classic/js/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/js/base.js b/web/skins/classic/js/base.js index 20ca27002..24f5d9a22 100644 --- a/web/skins/classic/js/base.js +++ b/web/skins/classic/js/base.js @@ -38,7 +38,7 @@ var popupSizes = { 'event': {'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540}, 'eventdetail': {'width': 600, 'height': 420}, 'events': {'width': 1220, 'height': 780}, - 'export': {'width': 400, 'height': 340}, + 'export': {'width': 500, 'height': 640}, 'filter': {'width': 900, 'height': 700}, 'frame': {'addWidth': 32, 'minWidth': 384, 'addHeight': 200}, 'frames': {'addWidth': 600, 'addHeight': 600}, From 355fceccb417bd72e814546097d6752317ce1ac0 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 12:30:03 -0500 Subject: [PATCH 012/330] test for existence of default --- web/includes/Object.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/includes/Object.php b/web/includes/Object.php index fec0a3ff5..d51cf082d 100644 --- a/web/includes/Object.php +++ b/web/includes/Object.php @@ -192,7 +192,7 @@ class ZM_Object { continue; } - if ( $this->defaults[$field] ) { + if ( isset($this->defaults[$field]) ) { if ( is_array($this->defaults[$field]) ) { $new_values[$field] = $this->defaults[$field]['default']; } else { From 576dd239076861d75f4f1dda5c79ad0a2adf3e35 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 12:30:15 -0500 Subject: [PATCH 013/330] test for existence of filter in query --- web/includes/functions.php | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/web/includes/functions.php b/web/includes/functions.php index eaa8f8601..1710b0ab4 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -1449,7 +1449,7 @@ function sortHeader($field, $querySep='&') { global $view; return implode($querySep, array( '?view='.$view, - 'page=1'.$_REQUEST['filter']['query'], + 'page=1'.(isset($_REQUEST['filter'])?$_REQUEST['filter']['query']:''), 'sort_field='.$field, 'sort_asc='.($_REQUEST['sort_field'] == $field ? !$_REQUEST['sort_asc'] : 0), 'limit='.validInt($_REQUEST['limit']), @@ -2569,4 +2569,37 @@ function array_recursive_diff($aArray1, $aArray2) { return $aReturn; } +function html_radio($name, $values, $selected=null, $options=array(), $attrs=array()) { + + $html = ''; + if ( isset($options['default']) and ( $selected == null ) ) { + $selected = $options['default']; + } # end if + + foreach ( $values as $value => $label ) { + if ( isset($options['container']) ) { + $html .= $options['container'][0]; + } + $html .= sprintf(' +
+
+ ', $name, $value, $label, ($value==$selected?' checked="checked"':''), + implode(' ', array_map( + function($attr, $value){return $attr.'="'.$value.'"';}, + array_keys($attrs), + array_values($attrs) + ), + ), + ( isset($options['id']) ? $options['id'] : ''), + ( ( (!isset($options['inline'])) or $options['inline'] ) ? '-inline' : ''), + ); + if ( isset($options['container']) ) { + $html .= $options['container'][1]; + } + } # end foreach value + return $html; +} # end sub html_radio + ?> From d39193cb6b9a52dcf77adbd5b4099351ce15f9b9 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 12:33:13 -0500 Subject: [PATCH 014/330] convert flip to material icons --- web/skins/classic/includes/functions.php | 107 +++++++++++++---------- 1 file changed, 59 insertions(+), 48 deletions(-) diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php index 06603c7b9..5abd519cf 100644 --- a/web/skins/classic/includes/functions.php +++ b/web/skins/classic/includes/functions.php @@ -133,8 +133,14 @@ if ( $css != 'base' ) jQuery(document).ready(function() { jQuery("#flip").click(function() { jQuery("#panel").slideToggle("slow"); - jQuery("#flip").toggleClass('glyphicon-menu-down').toggleClass('glyphicon-menu-up'); - Cookie.write( 'zmHeaderFlip', jQuery('#flip').hasClass('glyphicon-menu-up') ? 'up' : 'down', {duration: 10*365} ); + var flip = jQuery("#flip"); + if ( flip.html() == 'keyboard_arrow_up' ) { + flip.html('keyboard_arrow_down'); + Cookie.write('zmHeaderFlip', 'down', {duration: 10*365} ); + } else { + flip.html('keyboard_arrow_up'); + Cookie.write('zmHeaderFlip', 'up', {duration: 10*365} ); + } }); }); var $j = jQuery.noConflict(); @@ -255,10 +261,10 @@ function getNavBarHTML($reload = null) {
@@ -267,38 +273,45 @@ function getNavBarHTML($reload = null) {
From c9a324b7b35a0daf3a34056dca1bf2ba8c8cf611 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 13:40:02 -0500 Subject: [PATCH 018/330] improve the configureExportButton to look at specific inputs instead of just counting checkboxes --- web/skins/classic/views/js/export.js | 53 ++++++++++++++++------------ 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/web/skins/classic/views/js/export.js b/web/skins/classic/views/js/export.js index 74e7d029b..76c26df27 100644 --- a/web/skins/classic/views/js/export.js +++ b/web/skins/classic/views/js/export.js @@ -1,22 +1,33 @@ var exportTimer = null; -function configureExportButton( element ) { +function configureExportButton(element) { var form = element.form; - var checkCount = 0; - var radioCount = 0; - for ( var i = 0; i < form.elements.length; i++ ) { - if ( form.elements[i].type == "checkbox" && form.elements[i].checked ) { - checkCount++; - } else if ( form.elements[i].type == "radio" && form.elements[i].checked ) { - radioCount++; + var eventCount = 0; + document.querySelectorAll('input[name="eids[]"]').forEach(function(el){ + if ( el.checked ) { + eventCount ++; } - } - form.elements['exportButton'].disabled = (checkCount == 0 || radioCount == 0); + }); + + form.elements['exportButton'].disabled = ( + eventCount && + ( + form.elements['exportDetail'].checked || + form.elements['exportFrames'].checked || + form.elements['exportImages'].checked || + form.elements['exportVideo'].checked || + form.elements['exportMisc'].checked + ) + && + ( form.elements['exportFormat'][0].checked || form.elements['exportFormat'][1].checked ) + && + ( form.elements['exportCompress'][0].checked || form.elements['exportCompress'][1].checked ) + ); } function startDownload(file) { - console.log("Starting download of " + file); + console.log('Starting download of ' + file); window.location.replace(file); } @@ -32,17 +43,14 @@ function exportProgress() { } function exportResponse(respObj, respText) { - //console.log(respText); - $clear(exportTimer); + clearInterval(exportTimer); + console.log("Export Timer after clearing: " + exportTimer); if ( respObj.result != 'Ok' ) { $('exportProgressTicker').set('text', respObj.message); } else { $('exportProgressTicker').set('text', exportSucceededString); - console.log(respObj.exportFile); - console.log(encodeURIComponent(respObj.exportFile)); - - startDownload.pass(decodeURIComponent(respObj.exportFile)).delay( 1500 ); + startDownload.pass(decodeURIComponent(respObj.exportFile)).delay(1500); } return; @@ -69,17 +77,18 @@ function exportEvent( ) { onSuccess: exportResponse } ); query.send(); - $('exportProgress').removeClass( 'hidden' ); - $('exportProgress').setProperty( 'class', 'warnText' ); - $('exportProgressText').set( 'text', exportProgressString ); - exportProgress(); + $('exportProgress').removeClass('hidden'); + $('exportProgress').setProperty('class', 'warnText'); + $('exportProgressText').set('text', exportProgressString); + //exportProgress(); exportTimer = exportProgress.periodical( 500 ); + console.log("Export Timer after starting: " + exportTimer); } function initPage() { configureExportButton( $('exportButton') ); if ( exportReady ) { - startDownload.pass(exportFile).delay( 1500 ); + startDownload.pass(exportFile).delay(1500); } document.getElementById('exportButton').addEventListener('click', exportEvent); } From 9d0a416311509d815a89dffa16b9be9671922862 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 13:41:42 -0500 Subject: [PATCH 019/330] remove debugging code --- web/skins/classic/views/js/export.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/skins/classic/views/js/export.js b/web/skins/classic/views/js/export.js index 76c26df27..73e81ab4a 100644 --- a/web/skins/classic/views/js/export.js +++ b/web/skins/classic/views/js/export.js @@ -45,7 +45,6 @@ function exportProgress() { function exportResponse(respObj, respText) { clearInterval(exportTimer); - console.log("Export Timer after clearing: " + exportTimer); if ( respObj.result != 'Ok' ) { $('exportProgressTicker').set('text', respObj.message); } else { @@ -82,7 +81,6 @@ function exportEvent( ) { $('exportProgressText').set('text', exportProgressString); //exportProgress(); exportTimer = exportProgress.periodical( 500 ); - console.log("Export Timer after starting: " + exportTimer); } function initPage() { From b70b75421bf46c416b3af5770512bdb724f4b512 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 14:18:27 -0500 Subject: [PATCH 020/330] quotes and spacing --- web/skins/classic/views/js/console.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js index 2ffe1d367..27000ce5e 100644 --- a/web/skins/classic/views/js/console.js +++ b/web/skins/classic/views/js/console.js @@ -100,11 +100,11 @@ function selectMonitor(element) { var url = thisUrl+'?view=console'; for ( var i = 0; i < form.elements.length; i++ ) { if ( - form.elements[i].type == "checkbox" - && - form.elements[i].name == "markMids[]" - && - form.elements[i].checked + form.elements[i].type == 'checkbox' + && + form.elements[i].name == 'markMids[]' + && + form.elements[i].checked ) { url += '&MonitorId='+form.elements[i].value; } From 8e645e45e1c5a15408f19d4d3a54b940e5ffe7eb Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 14:21:25 -0500 Subject: [PATCH 021/330] fix selecting Monitors by passing MonitorId as MonitorId[] --- web/skins/classic/views/js/console.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js index 27000ce5e..ede1d9e33 100644 --- a/web/skins/classic/views/js/console.js +++ b/web/skins/classic/views/js/console.js @@ -106,7 +106,7 @@ function selectMonitor(element) { && form.elements[i].checked ) { - url += '&MonitorId='+form.elements[i].value; + url += '&MonitorId[]='+form.elements[i].value; } } window.location.replace(url); From cf35db120d4f41c84345f191fc66a1a7b43fe4bc Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 14:21:51 -0500 Subject: [PATCH 022/330] change to material icons, fix missing div --- web/skins/classic/views/console.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index b1cc51215..ee215451b 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -181,20 +181,27 @@ getBodyTopHTML(); - + @@ -359,7 +366,7 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) { ?> ' : '') . - $eventCounts[$i]['totalevents'].'
'.'
'.human_filesize($eventCounts[$i]['totaldiskspace']) ?> + $eventCounts[$i]['totalevents'].'
'.'
'.human_filesize($eventCounts[$i]['totaldiskspace']) ?>
From f7e01aa999b107b7c69aa8de4b9ebd70e659e2d2 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 14:31:05 -0500 Subject: [PATCH 023/330] switch to material icon for dot --- web/skins/classic/views/console.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index ee215451b..8d8b08ff6 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -279,7 +279,10 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) { } ?> - ' : '>') . $monitor['Name'] ?>
+ lens + ' : '>') . $monitor['Name'] ?>
+
+ ', array_map(function($group_id){ $Group = ZM\Group::find_one(array('Id'=>$group_id)); @@ -335,7 +338,6 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) { ?> disabled="disabled"/> - swap_vert Date: Mon, 2 Dec 2019 15:04:01 -0500 Subject: [PATCH 024/330] Add an update to Storage DiskSpace. --- scripts/zmaudit.pl.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in index 69680056e..9204ef3a1 100644 --- a/scripts/zmaudit.pl.in +++ b/scripts/zmaudit.pl.in @@ -944,6 +944,10 @@ FROM `Frames` WHERE `EventId`=?'; $eventcounts_day_sth->execute() or Error("Can't execute: ".$eventcounts_sth->errstr()); $eventcounts_week_sth->execute() or Error("Can't execute: ".$eventcounts_sth->errstr()); $eventcounts_month_sth->execute() or Error("Can't execute: ".$eventcounts_sth->errstr()); + + my $storage_diskspace_sth = $dbh->prepare_cached('UPDATE Storage SET DiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE StorageId=Storage.Id)'); + $storage_diskspace_sth->execute() or Error("Can't execute: ".$storage_diskspace_sth->errstr()); + sleep($Config{ZM_AUDIT_CHECK_INTERVAL}) if $continuous; }; From 9f49e4f3677a6b8f1981d8edaf1b7ad3247e4737 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 15:07:35 -0500 Subject: [PATCH 025/330] make Mark column text-align left so that checkboxes line up --- web/skins/classic/css/base/views/console.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/css/base/views/console.css b/web/skins/classic/css/base/views/console.css index 4a5470b6b..1b0e77b4f 100644 --- a/web/skins/classic/css/base/views/console.css +++ b/web/skins/classic/css/base/views/console.css @@ -75,7 +75,7 @@ .consoleTable .colMark { width: 52px; - text-align: center; + text-align: left; } .consoleTable .colEvents { From 24022d157dd1fced0efd7eb86fe74231f3be2af8 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 15:33:58 -0500 Subject: [PATCH 026/330] use & instead of &. Put inputs out of table where they belong --- web/skins/classic/views/frames.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/web/skins/classic/views/frames.php b/web/skins/classic/views/frames.php index eaf1edd0e..1f4abe240 100644 --- a/web/skins/classic/views/frames.php +++ b/web/skins/classic/views/frames.php @@ -99,7 +99,7 @@ if ( !empty($page) ) { } $maxShortcuts = 5; -$totalQuery = $sortQuery.'&eid='.$eid.$limitQuery.$filterQuery; +$totalQuery = $sortQuery.'&eid='.$eid.$limitQuery.$filterQuery; $pagination = getPagination($pages, $page, $maxShortcuts, $totalQuery); $frames = dbFetchAll($frameSql); @@ -139,15 +139,15 @@ if ( $pages > 1 ) {
- - - - - - - - - + + + + + + + + +
From 8bf74d2f3598ddf6a1c23d482ec5e232d3874b55 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 15:34:23 -0500 Subject: [PATCH 027/330] fix & instead of &. --- web/skins/classic/views/events.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php index dfac3975c..ba57769be 100644 --- a/web/skins/classic/views/events.php +++ b/web/skins/classic/views/events.php @@ -251,11 +251,10 @@ while ( $event_row = dbFetchNext($results) ) { '; - $imgSrc = $event->getThumbnailSrc(); + $imgSrc = $event->getThumbnailSrc(array(),'&'); $streamSrc = $event->getStreamSrc(array( - 'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single')); + 'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single'), '&'); $imgHtml = ''. validHtmlStr('Event '.$event->Id()) .''; echo ''.$imgHtml.''; From b686649589600bc3fa8cbad8085982f17798af8c Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 15:34:31 -0500 Subject: [PATCH 028/330] fix & instead of &. --- web/skins/classic/views/event.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php index a13697953..947bd3972 100644 --- a/web/skins/classic/views/event.php +++ b/web/skins/classic/views/event.php @@ -163,7 +163,7 @@ if ( canEdit('Events') ) { DefaultVideo() ) { ?> - + @@ -192,9 +192,14 @@ if ( canEdit('Events') ) { if ( ($codec == 'MP4' || $codec == 'auto' ) && $Event->DefaultVideo() ) { ?>
-
@@ -204,10 +209,10 @@ if ( ($codec == 'MP4' || $codec == 'auto' ) && $Event->DefaultVideo() ) {
getStreamSrc(array('mode'=>'mpeg', 'scale'=>$scale, 'rate'=>$rate, 'bitrate'=>ZM_WEB_VIDEO_BITRATE, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'format'=>ZM_MPEG_REPLAY_FORMAT, 'replay'=>$replayMode)); + $streamSrc = $Event->getStreamSrc(array('mode'=>'mpeg', 'scale'=>$scale, 'rate'=>$rate, 'bitrate'=>ZM_WEB_VIDEO_BITRATE, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'format'=>ZM_MPEG_REPLAY_FORMAT, 'replay'=>$replayMode),'&'); outputVideoStream('evtStream', $streamSrc, reScale( $Event->Width(), $scale ).'px', reScale( $Event->Height(), $scale ).'px', ZM_MPEG_LIVE_FORMAT ); } else { - $streamSrc = $Event->getStreamSrc(array('mode'=>'jpeg', 'frame'=>$fid, 'scale'=>$scale, 'rate'=>$rate, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>$replayMode)); + $streamSrc = $Event->getStreamSrc(array('mode'=>'jpeg', 'frame'=>$fid, 'scale'=>$scale, 'rate'=>$rate, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>$replayMode),'&'); if ( canStreamNative() ) { outputImageStream('evtStream', $streamSrc, reScale($Event->Width(), $scale).'px', reScale($Event->Height(), $scale).'px', validHtmlStr($Event->Name())); } else { From 09faa0a731dcbe97efdc9282f74ea51425c89d26 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 15:49:32 -0500 Subject: [PATCH 029/330] fix & to & --- web/skins/classic/views/frame.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php index da14648cf..64f1035b3 100644 --- a/web/skins/classic/views/frame.php +++ b/web/skins/classic/views/frame.php @@ -115,7 +115,7 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id().' - '.$Frame->Frame

Id().'&scale='.$scale.'&show='.$show.'&fid='; + $frame_url_base = '?view=frame&eid='.$Event->Id().'&scale='.$scale.'&show='.$show.'&fid='; ?>

FrameId() > 1 ) ? 'href="'.$frame_url_base.$firstFid.'" class="btn-primary"' : 'class="btn-primary disabled"') ?>> From 72cb5bd1bb39be1112116f61e8e086f792e3cd5d Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 15:49:42 -0500 Subject: [PATCH 030/330] add missing --- web/skins/classic/views/monitor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index 49fbabe2f..03e4ce1f8 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -683,7 +683,7 @@ switch ( $tab ) {

+ ?> Date: Mon, 2 Dec 2019 15:49:49 -0500 Subject: [PATCH 031/330] fix & to & --- web/skins/classic/views/montage.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php index ebf7a243c..45ebcb0cc 100644 --- a/web/skins/classic/views/montage.php +++ b/web/skins/classic/views/montage.php @@ -152,11 +152,11 @@ if ( $showControl ) { } if ( $showZones ) { ?> - Hide Zones + Hide Zones - Show Zones + Show Zones @@ -189,7 +189,7 @@ if ( $showZones ) { From 22b61cd5b2a471d0e472c82bd57569030b12d22f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 Dec 2019 15:51:40 -0500 Subject: [PATCH 032/330] wip cleanup of AxisV2 --- .../lib/ZoneMinder/Control/AxisV2.pm | 182 +++++++++++------- 1 file changed, 113 insertions(+), 69 deletions(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm index d63236c86..8ca2c7330 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm @@ -33,6 +33,12 @@ require ZoneMinder::Control; our @ISA = qw(ZoneMinder::Control); +our $REALM = ''; +our $PROTOCOL = 'http://'; +our $USERNAME = 'admin'; +our $PASSWORD = ''; +our $ADDRESS = ''; +our $PORT = ''; # ========================================================================== # # Axis V2 Control Protocol @@ -43,59 +49,108 @@ use ZoneMinder::Logger qw(:all); use ZoneMinder::Config qw(:all); use Time::HiRes qw( usleep ); +use URI; -sub open -{ +sub open { my $self = shift; $self->loadMonitor(); +my $uri = URI->new($self->{Monitor}->{ControlAddress}); +Debug("Have " . $uri); +#my($scheme, $authority, $path, $query, $fragment) = +# $self->{Monitor}->{ControlAddress} =~ m|(?:([^:/?#]+):)?(?://([^/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?|; +#Debug("Have $scheme, $authority, $path, $query, $fragment)"); - use LWP::UserAgent; - $self->{ua} = LWP::UserAgent->new; - $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION ); +# $PROTOCOL = $scheme; +#($USERNAME, $PASSWORD) = split(':', $authority); +# $ADDRESS = $path; +$ADDRESS = $uri->scheme.'://'.$uri->host().$uri->path().($uri->port()?':'.$uri->port():''); +Debug($uri->authority()); + + + use LWP::UserAgent; + $self->{ua} = LWP::UserAgent->new; + $self->{ua}->cookie_jar( {} ); + $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION); + $self->{state} = 'closed'; + # credentials: ("ip:port" (no prefix!), realm (string), username (string), password (string) + Debug("sendCmd credentials control address:'".$ADDRESS + ."' realm:'".$REALM + ."' username:'".$USERNAME + ."' password:'".$PASSWORD + ."'" + ); + $self->{ua}->credentials($ADDRESS, $REALM, $USERNAME, $PASSWORD); + + # Detect REALM + my $res = $self->{ua}->get($ADDRESS.'/cgi/ptdc.cgi'); + + if ( $res->is_success ) { $self->{state} = 'open'; -} + return; + } -sub printMsg -{ - my $self = shift; - my $msg = shift; - my $msg_len = length($msg); + if ( $res->status_line() eq '401 Unauthorized' ) { - Debug( $msg."[".$msg_len."]" ); -} - -sub sendCmd -{ - my $self = shift; - my $cmd = shift; - - my $result = undef; - - printMsg( $cmd, "Tx" ); - - #print( "http://$address/$cmd\n" ); - my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" ); - my $res = $self->{ua}->request($req); - - if ( $res->is_success ) - { - $result = !undef; - } - else - { - Error( "Error check failed: '".$res->status_line()."'" ); + my $headers = $res->headers(); + foreach my $k ( keys %$headers ) { + Debug("Initial Header $k => $$headers{$k}"); } - return( $result ); + if ( $$headers{'www-authenticate'} ) { + Debug("Authenticating"); + my ( $auth, $tokens ) = $$headers{'www-authenticate'} =~ /^(\w+)\s+(.*)$/; + if ( $tokens =~ /\w+="([^"]+)"/i ) { + if ( $REALM ne $1 ) { + $REALM = $1; + Debug("Changing REALM to $REALM"); + $self->{ua}->credentials($ADDRESS,$REALM,$USERNAME,$PASSWORD); + $res = $self->{ua}->get($ADDRESS); + if ( $res->is_success() ) { + $self->{state} = 'open'; + return; + } + Error('Authentication still failed after updating REALM'.$res->status_line); + $headers = $res->headers(); + foreach my $k ( keys %$headers ) { + Debug("Initial Header $k => $$headers{$k}"); + } # end foreach + } else { + Error('Authentication failed, not a REALM problem'); + } + } else { + Error('Failed to match realm in tokens'); + } # end if + } else { + Debug('No headers line'); + } # end if headers + } # end if $res->status_line() eq '401 Unauthorized' +} # end sub open + +sub sendCmd { + my $self = shift; + my $cmd = shift; + + $self->printMsg($cmd, 'Tx'); + + my $url = $ADDRESS.$cmd; + my $res = $self->{ua}->get($url); + + if ( $res->is_success ) { + Debug('sndCmd command: ' . $url . ' content: '.$res->content); + return !undef; + } + + Error("Error cmd $url failed: '".$res->status_line()."'"); + + return undef; } -sub cameraReset -{ +sub cameraReset { my $self = shift; - Debug( "Camera Reset" ); - my $cmd = "/axis-cgi/admin/restart.cgi"; + Debug('Camera Reset'); + my $cmd = '/axis-cgi/admin/restart.cgi'; $self->sendCmd( $cmd ); } @@ -123,52 +178,42 @@ sub moveConLeft $self->sendCmd( $cmd ); } -sub moveConRight -{ +sub moveConRight { my $self = shift; - Debug( "Move Right" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=right"; - $self->sendCmd( $cmd ); + Debug('Move Right'); + $self->sendCmd('/axis-cgi/com/ptz.cgi?move=right'); } -sub moveConUpRight -{ +sub moveConUpRight { my $self = shift; - Debug( "Move Up/Right" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=upright"; - $self->sendCmd( $cmd ); + Debug('Move Up/Right'); + $self->sendCmd('/axis-cgi/com/ptz.cgi?move=upright'); } -sub moveConUpLeft -{ +sub moveConUpLeft { my $self = shift; Debug( "Move Up/Left" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=upleft"; - $self->sendCmd( $cmd ); + $self->sendCmd('/axis-cgi/com/ptz.cgi?move=upleft'); } -sub moveConDownRight -{ +sub moveConDownRight { my $self = shift; - Debug( "Move Down/Right" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=downright"; - $self->sendCmd( $cmd ); + Debug('Move Down/Right'); + $self->sendCmd('/axis-cgi/com/ptz.cgi?move=downright'); } -sub moveConDownLeft -{ +sub moveConDownLeft { my $self = shift; - Debug( "Move Down/Left" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=downleft"; - $self->sendCmd( $cmd ); + Debug('Move Down/Left'); + my $cmd = '/axis-cgi/com/ptz.cgi?move=downleft'; + $self->sendCmd($cmd); } -sub moveMap -{ +sub moveMap { my $self = shift; my $params = shift; - my $xcoord = $self->getParam( $params, 'xcoord' ); - my $ycoord = $self->getParam( $params, 'ycoord' ); + my $xcoord = $self->getParam($params, 'xcoord'); + my $ycoord = $self->getParam($params, 'ycoord'); Debug( "Move Map to $xcoord,$ycoord" ); my $cmd = "/axis-cgi/com/ptz.cgi?center=$xcoord,$ycoord&imagewidth=".$self->{Monitor}->{Width}."&imageheight=".$self->{Monitor}->{Height}; $self->sendCmd( $cmd ); @@ -210,8 +255,7 @@ sub moveRelRight my $params = shift; my $step = $self->getParam( $params, 'panstep' ); Debug( "Step Right $step" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$step"; - $self->sendCmd( $cmd ); + $self->sendCmd("/axis-cgi/com/ptz.cgi?rpan=$step&camera=1&whoami=1"); } sub moveRelUpRight From 78912584e189ea7d32caa40af8870076b09b34a2 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 4 Dec 2019 07:10:33 -0500 Subject: [PATCH 033/330] re-arrange code to hopefully get rid of syntax error reported by some people --- web/includes/functions.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/web/includes/functions.php b/web/includes/functions.php index 1710b0ab4..bb36718a7 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -2580,21 +2580,23 @@ function html_radio($name, $values, $selected=null, $options=array(), $attrs=arr if ( isset($options['container']) ) { $html .= $options['container'][0]; } + $attributes = array_map( + function($attr, $value){return $attr.'="'.$value.'"';}, + array_keys($attrs), + array_values($attrs) + ); + $attributes_string = implode(' ', $attributes); + $html .= sprintf('
', $name, $value, $label, ($value==$selected?' checked="checked"':''), - implode(' ', array_map( - function($attr, $value){return $attr.'="'.$value.'"';}, - array_keys($attrs), - array_values($attrs) - ), - ), - ( isset($options['id']) ? $options['id'] : ''), + $attributes_string, + (isset($options['id']) ? $options['id'] : ''), ( ( (!isset($options['inline'])) or $options['inline'] ) ? '-inline' : ''), - ); + ); if ( isset($options['container']) ) { $html .= $options['container'][1]; } From df9f6103e4589f68c18a46d05c6723d059d2fee4 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 4 Dec 2019 09:00:20 -0500 Subject: [PATCH 034/330] fix syntax error --- web/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/includes/functions.php b/web/includes/functions.php index bb36718a7..aea0c8b14 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -2595,7 +2595,7 @@ function html_radio($name, $values, $selected=null, $options=array(), $attrs=arr ', $name, $value, $label, ($value==$selected?' checked="checked"':''), $attributes_string, (isset($options['id']) ? $options['id'] : ''), - ( ( (!isset($options['inline'])) or $options['inline'] ) ? '-inline' : ''), + ( ( (!isset($options['inline'])) or $options['inline'] ) ? '-inline' : '') ); if ( isset($options['container']) ) { $html .= $options['container'][1]; From eee3729b854cb6e40d9f5fb1698c1e2ea60e35aa Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 4 Dec 2019 22:23:55 -0500 Subject: [PATCH 035/330] dirty fix filtering Monitors by GroupId. Change occurrences of GroupId to ' ' as that is what the key is in conditions. Please note that other operators like != won't work. --- web/api/app/Controller/MonitorsController.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php index 3be9166b8..eb229975b 100644 --- a/web/api/app/Controller/MonitorsController.php +++ b/web/api/app/Controller/MonitorsController.php @@ -36,7 +36,7 @@ class MonitorsController extends AppController { * @return void */ public function index() { - $this->Monitor->recursive = 0; + $this->Monitor->recursive = 1; if ( $this->request->params['named'] ) { $this->FilterComponent = $this->Components->load('Filter'); @@ -44,21 +44,21 @@ class MonitorsController extends AppController { } else { $conditions = array(); } - global $user; $allowedMonitors = $user ? preg_split('@,@', $user['MonitorIds'], NULL, PREG_SPLIT_NO_EMPTY) : null; if ( $allowedMonitors ) { $conditions['Monitor.Id' ] = $allowedMonitors; } - $find_array = array('conditions'=>$conditions,'contain'=>array('Group')); - if ( isset($conditions['GroupId']) ) { + $find_array = array('conditions'=>&$conditions,'contain'=>array('Group')); + if ( isset($conditions['`GroupId` ']) ) { $find_array['joins'] = array( array( 'table' => 'Groups_Monitors', 'type' => 'inner', 'conditions' => array( - 'Groups_Monitors.MonitorId = Monitor.Id' + 'Groups_Monitors.MonitorId = Monitor.Id', + 'Groups_Monitors.GroupId' => $conditions['`GroupId` '] ), ), //array( @@ -70,6 +70,7 @@ class MonitorsController extends AppController { //), //) ); + unset($conditions['`GroupId` ']); } $monitors = $this->Monitor->find('all',$find_array); $this->set(array( From 4b786eaad57397be54bde84db0a103bd3d1c3702 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 6 Dec 2019 14:31:06 -0500 Subject: [PATCH 036/330] fix errors when ['id'] does not exist, and move the definition of values up because we use it outside the block it is defined in --- web/ajax/status.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/ajax/status.php b/web/ajax/status.php index a553eaa04..2725dcce8 100644 --- a/web/ajax/status.php +++ b/web/ajax/status.php @@ -83,8 +83,8 @@ $statusData = array( 'MinEventId' => array( 'sql' => '(SELECT min(Events.Id) FROM Events WHERE Events.MonitorId = Monitors.Id' ), 'MaxEventId' => array( 'sql' => '(SELECT max(Events.Id) FROM Events WHERE Events.MonitorId = Monitors.Id' ), 'TotalEvents' => array( 'sql' => '(SELECT count(Events.Id) FROM Events WHERE Events.MonitorId = Monitors.Id' ), - 'Status' => array( 'zmu' => '-m '.escapeshellarg($_REQUEST['id'][0]).' -s' ), - 'FrameRate' => array( 'zmu' => '-m '.escapeshellarg($_REQUEST['id'][0]).' -f' ), + 'Status' => (isset($_REQUEST['id'])?array( 'zmu' => '-m '.escapeshellarg($_REQUEST['id'][0]).' -s' ):null), + 'FrameRate' => (isset($_REQUEST['id'])?array( 'zmu' => '-m '.escapeshellarg($_REQUEST['id'][0]).' -f' ):null), ), ), 'events' => array( @@ -204,6 +204,7 @@ function collectData() { $fieldSql = array(); $joinSql = array(); $groupSql = array(); + $values = array(); $elements = &$entitySpec['elements']; $lc_elements = array_change_key_case( $elements ); @@ -258,7 +259,6 @@ function collectData() { if ( $id && !empty($entitySpec['selector']) ) { $index = 0; $where = array(); - $values = array(); foreach( $entitySpec['selector'] as $selIndex => $selector ) { $selectorParamName = ':selector' . $selIndex; if ( is_array( $selector ) ) { From e123e689cac837455d97149bde08cf06ab148d61 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 6 Dec 2019 14:31:06 -0500 Subject: [PATCH 037/330] fix errors when ['id'] does not exist, and move the definition of values up because we use it outside the block it is defined in --- web/ajax/status.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/ajax/status.php b/web/ajax/status.php index a553eaa04..2725dcce8 100644 --- a/web/ajax/status.php +++ b/web/ajax/status.php @@ -83,8 +83,8 @@ $statusData = array( 'MinEventId' => array( 'sql' => '(SELECT min(Events.Id) FROM Events WHERE Events.MonitorId = Monitors.Id' ), 'MaxEventId' => array( 'sql' => '(SELECT max(Events.Id) FROM Events WHERE Events.MonitorId = Monitors.Id' ), 'TotalEvents' => array( 'sql' => '(SELECT count(Events.Id) FROM Events WHERE Events.MonitorId = Monitors.Id' ), - 'Status' => array( 'zmu' => '-m '.escapeshellarg($_REQUEST['id'][0]).' -s' ), - 'FrameRate' => array( 'zmu' => '-m '.escapeshellarg($_REQUEST['id'][0]).' -f' ), + 'Status' => (isset($_REQUEST['id'])?array( 'zmu' => '-m '.escapeshellarg($_REQUEST['id'][0]).' -s' ):null), + 'FrameRate' => (isset($_REQUEST['id'])?array( 'zmu' => '-m '.escapeshellarg($_REQUEST['id'][0]).' -f' ):null), ), ), 'events' => array( @@ -204,6 +204,7 @@ function collectData() { $fieldSql = array(); $joinSql = array(); $groupSql = array(); + $values = array(); $elements = &$entitySpec['elements']; $lc_elements = array_change_key_case( $elements ); @@ -258,7 +259,6 @@ function collectData() { if ( $id && !empty($entitySpec['selector']) ) { $index = 0; $where = array(); - $values = array(); foreach( $entitySpec['selector'] as $selIndex => $selector ) { $selectorParamName = ':selector' . $selIndex; if ( is_array( $selector ) ) { From 3f8092a430a4acac70456ed4a71a399d1aef9873 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 6 Dec 2019 17:25:41 -0500 Subject: [PATCH 038/330] Add funding.yml --- .github/FUNDING.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000000000..8804e639c --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,12 @@ +# These are supported funding model platforms + +github: [connortechnology,pliablepixels] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: zoneminder # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +liberapay: # Replace with a single Liberapay username +issuehunt: # Replace with a single IssueHunt username +otechie: # Replace with a single Otechie username +custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] From bda4e95c7abd6f6ce1f7cad3b46d359c5713ecc0 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 6 Dec 2019 17:51:06 -0500 Subject: [PATCH 039/330] Add irc to badges --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9be80d4b7..b9d215a40 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,10 @@ ZoneMinder ========== -[![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder) [![Bountysource](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received) - +[![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder) +[![Bounty Source](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received) [![Join Slack](https://github.com/ozonesecurity/ozonebase/blob/master/img/slacksm.png?raw=true)](https://join.slack.com/t/zoneminder-chat/shared_invite/enQtNTU0NDkxMDM5NDQwLTdhZmQ5Y2M2NWQyN2JkYTBiN2ZkMzIzZGQ0MDliMTRmM2FjZWRlYzUwYTQ2MjMwMTVjMzQ1NjYxOTdmMjE2MTE) +[![IRC Network](https://img.shields.io/badge/irc-%23zoneminder-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=zoneminder) All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org From cc6d40d67ef6a4bc09e2da44be9ea3b189e451e8 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 7 Dec 2019 10:38:51 -0500 Subject: [PATCH 040/330] Missing -> --- web/includes/Server.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/includes/Server.php b/web/includes/Server.php index 93a59bfed..c0fd27a38 100644 --- a/web/includes/Server.php +++ b/web/includes/Server.php @@ -80,7 +80,7 @@ class Server extends ZM_Object { public function PathToZMS( $new = null ) { if ( $new != null ) - $this{'PathToZMS'} = $new; + $this->{'PathToZMS'} = $new; if ( $this->Id() and $this->{'PathToZMS'} ) { return $this->{'PathToZMS'}; } else { From 4632bbd12424068ece63a3652470bc09a00ea593 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 7 Dec 2019 11:45:32 -0500 Subject: [PATCH 041/330] Apply relevant changes to deal with php7,4 deprecations --- web/includes/Event.php | 14 ++-- web/includes/Filter.php | 4 +- web/includes/Group.php | 6 +- web/includes/Monitor.php | 30 ++++---- web/includes/MontageLayout.php | 127 +++------------------------------ web/includes/Object.php | 8 +-- web/includes/Storage.php | 10 +-- web/includes/database.php | 12 +--- 8 files changed, 47 insertions(+), 164 deletions(-) diff --git a/web/includes/Event.php b/web/includes/Event.php index 460d6eaa1..da633f439 100644 --- a/web/includes/Event.php +++ b/web/includes/Event.php @@ -51,10 +51,10 @@ class Event extends ZM_Object { if ( $new ) { $this->{'Storage'} = $new; } - if ( ! ( array_key_exists('Storage', $this) and $this->{'Storage'} ) ) { + if ( ! ( property_exists($this, 'Storage') and $this->{'Storage'} ) ) { if ( isset($this->{'StorageId'}) and $this->{'StorageId'} ) $this->{'Storage'} = Storage::find_one(array('Id'=>$this->{'StorageId'})); - if ( ! ( array_key_exists('Storage', $this) and $this->{'Storage'} ) ) + if ( ! ( property_exists($this, 'Storage') and $this->{'Storage'} ) ) $this->{'Storage'} = new Storage(NULL); } return $this->{'Storage'}; @@ -64,10 +64,10 @@ class Event extends ZM_Object { if ( $new ) { $this->{'SecondaryStorage'} = $new; } - if ( ! ( array_key_exists('SecondaryStorage', $this) and $this->{'SecondaryStorage'} ) ) { + if ( ! ( property_exists($this, 'SecondaryStorage') and $this->{'SecondaryStorage'} ) ) { if ( isset($this->{'SecondaryStorageId'}) and $this->{'SecondaryStorageId'} ) $this->{'SecondaryStorage'} = Storage::find_one(array('Id'=>$this->{'SecondaryStorageId'})); - if ( ! ( array_key_exists('SecondaryStorage', $this) and $this->{'SecondaryStorage'} ) ) + if ( ! ( property_exists($this, 'SecondaryStorage') and $this->{'SecondaryStorage'} ) ) $this->{'SecondaryStorage'} = new Storage(NULL); } return $this->{'SecondaryStorage'}; @@ -262,7 +262,7 @@ class Event extends ZM_Object { if ( is_null($new) or ( $new != '' ) ) { $this->{'DiskSpace'} = $new; } - if ( (!array_key_exists('DiskSpace',$this)) or (null === $this->{'DiskSpace'}) ) { + if ( (!property_exists($this, 'DiskSpace')) or (null === $this->{'DiskSpace'}) ) { $this->{'DiskSpace'} = folder_size($this->Path()); dbQuery('UPDATE Events SET DiskSpace=? WHERE Id=?', array($this->{'DiskSpace'}, $this->{'Id'})); } @@ -298,7 +298,7 @@ class Event extends ZM_Object { } // end function createListThumbnail function ThumbnailWidth( ) { - if ( ! ( array_key_exists('ThumbnailWidth', $this) ) ) { + if ( ! ( property_exists($this, 'ThumbnailWidth') ) ) { if ( ZM_WEB_LIST_THUMB_WIDTH ) { $this->{'ThumbnailWidth'} = ZM_WEB_LIST_THUMB_WIDTH; $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_WIDTH)/$this->{'Width'}; @@ -315,7 +315,7 @@ class Event extends ZM_Object { } // end function ThumbnailWidth function ThumbnailHeight( ) { - if ( ! ( array_key_exists('ThumbnailHeight', $this) ) ) { + if ( ! ( property_exists($this, 'ThumbnailHeight') ) ) { if ( ZM_WEB_LIST_THUMB_WIDTH ) { $this->{'ThumbnailWidth'} = ZM_WEB_LIST_THUMB_WIDTH; $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_WIDTH)/$this->{'Width'}; diff --git a/web/includes/Filter.php b/web/includes/Filter.php index fa7c41bff..2ecf7b61e 100644 --- a/web/includes/Filter.php +++ b/web/includes/Filter.php @@ -39,8 +39,8 @@ class Filter extends ZM_Object { $this->{'Query'} = func_get_arg(0);; $this->{'Query_json'} = jsonEncode($this->{'Query'}); } - if ( !array_key_exists('Query', $this) ) { - if ( array_key_exists('Query_json', $this) and $this->{'Query_json'} ) { + if ( !property_exists($this, 'Query') ) { + if ( property_exists($this, 'Query_json') and $this->{'Query_json'} ) { $this->{'Query'} = jsonDecode($this->{'Query_json'}); } else { $this->{'Query'} = array(); diff --git a/web/includes/Group.php b/web/includes/Group.php index b329946a3..3a34e0af4 100644 --- a/web/includes/Group.php +++ b/web/includes/Group.php @@ -18,7 +18,7 @@ class Group extends ZM_Object { } public function delete() { - if ( array_key_exists('Id', $this) ) { + if ( property_exists($this, 'Id') ) { dbQuery('DELETE FROM Groups_Monitors WHERE GroupId=?', array($this->{'Id'})); dbQuery('UPDATE Groups SET ParentId=NULL WHERE ParentId=?', array($this->{'Id'})); dbQuery('DELETE FROM Groups WHERE Id=?', array($this->{'Id'})); @@ -35,7 +35,7 @@ class Group extends ZM_Object { if ( isset($new) ) { $this->{'depth'} = $new; } - if ( !array_key_exists('depth', $this) or ($this->{'depth'} === null) ) { + if ( !property_exists($this, 'depth') or ($this->{'depth'} === null) ) { $this->{'depth'} = 0; if ( $this->{'ParentId'} != null ) { $Parent = Group::find_one(array('Id'=>$this->{'ParentId'})); @@ -46,7 +46,7 @@ class Group extends ZM_Object { } // end public function depth public function MonitorIds( ) { - if ( ! array_key_exists('MonitorIds', $this) ) { + if ( ! property_exists($this, 'MonitorIds') ) { $this->{'MonitorIds'} = dbFetchAll('SELECT MonitorId FROM Groups_Monitors WHERE GroupId=?', 'MonitorId', array($this->{'Id'})); } return $this->{'MonitorIds'}; diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index a9be54405..747fffea6 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -116,11 +116,11 @@ private $status_fields = array( ); public function Control() { - if ( !array_key_exists('Control', $this) ) { + if ( !property_exists($this, 'Control') ) { if ( $this->ControlId() ) $this->{'Control'} = Control::find_one(array('Id'=>$this->{'ControlId'})); - if ( !(array_key_exists('Control', $this) and $this->{'Control'}) ) + if ( !(property_exists($this, 'Control') and $this->{'Control'}) ) $this->{'Control'} = new Control(); } return $this->{'Control'}; @@ -138,7 +138,7 @@ private $status_fields = array( $this->{$fn} = $args[0]; } } - if ( array_key_exists($fn, $this) ) { + if ( property_exists($this, $fn) ) { return $this->{$fn}; } else if ( array_key_exists($fn, $this->defaults) ) { if ( is_array($this->defaults[$fn]) ) { @@ -211,9 +211,9 @@ private $status_fields = array( $this->{'Width'} = $new; $field = ( $this->Orientation() == 'ROTATE_90' or $this->Orientation() == 'ROTATE_270' ) ? 'Height' : 'Width'; - if ( array_key_exists($field, $this) ) + if ( property_exists($this, $field) ) return $this->{$field}; - return $this->defaults{$field}; + return $this->defaults[$field]; } // end function Width public function ViewHeight($new=null) { @@ -221,9 +221,9 @@ private $status_fields = array( $this->{'Height'} = $new; $field = ( $this->Orientation() == 'ROTATE_90' or $this->Orientation() == 'ROTATE_270' ) ? 'Width' : 'Height'; - if ( array_key_exists($field, $this) ) + if ( property_exists($this, $field) ) return $this->{$field}; - return $this->defaults{$field}; + return $this->defaults[$field]; } // end function Height public function SignalCheckColour($new=null) { @@ -234,10 +234,10 @@ private $status_fields = array( // Validate that it's a valid colour (we seem to allow color names, not just hex). // This also helps prevent XSS. - if (array_key_exists($field, $this) && preg_match('/^[#0-9a-zA-Z]+$/', $this->{$field})) { + if ( property_exists($this, $field) && preg_match('/^[#0-9a-zA-Z]+$/', $this->{$field})) { return $this->{$field}; } - return $this->defaults{$field}; + return $this->defaults[$field]; } // end function SignalCheckColour public static function find( $parameters = array(), $options = array() ) { @@ -253,7 +253,7 @@ private $status_fields = array( Warning('Attempt to control a monitor with no Id'); return; } - if ( (!defined('ZM_SERVER_ID')) or ( array_key_exists('ServerId', $this) and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) { + if ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) { if ( $this->Type() == 'Local' ) { $zmcArgs = '-d '.$this->{'Device'}; } else { @@ -306,7 +306,7 @@ private $status_fields = array( return; } - if ( (!defined('ZM_SERVER_ID')) or ( array_key_exists('ServerId', $this) and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) { + if ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) { if ( $this->{'Function'} == 'None' || $this->{'Function'} == 'Monitor' || $mode == 'stop' ) { if ( ZM_OPT_CONTROL ) { daemonControl('stop', 'zmtrack.pl', '-m '.$this->{'Id'}); @@ -367,8 +367,8 @@ private $status_fields = array( } } - if ( !array_key_exists('GroupIds', $this) ) { - if ( array_key_exists('Id', $this) and $this->{'Id'} ) { + if ( !property_exists($this, 'GroupIds') ) { + if ( property_exists($this, 'Id') and $this->{'Id'} ) { $this->{'GroupIds'} = dbFetchAll('SELECT `GroupId` FROM `Groups_Monitors` WHERE `MonitorId`=?', 'GroupId', array($this->{'Id'}) ); if ( ! $this->{'GroupIds'} ) $this->{'GroupIds'} = array(); @@ -417,7 +417,7 @@ private $status_fields = array( if ( $new ) { $this->{'Storage'} = $new; } - if ( ! ( array_key_exists('Storage', $this) and $this->{'Storage'} ) ) { + if ( ! ( property_exists($this, 'Storage') and $this->{'Storage'} ) ) { $this->{'Storage'} = isset($this->{'StorageId'}) ? Storage::find_one(array('Id'=>$this->{'StorageId'})) : new Storage(NULL); @@ -493,7 +493,7 @@ public function sendControlCommand($command) { } } - if ( (!defined('ZM_SERVER_ID')) or ( array_key_exists('ServerId', $this) and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) { + if ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) { # Local Logger::Debug('Trying to send options ' . print_r($options, true)); diff --git a/web/includes/MontageLayout.php b/web/includes/MontageLayout.php index ca6b17ef7..f67f3ace5 100644 --- a/web/includes/MontageLayout.php +++ b/web/includes/MontageLayout.php @@ -1,133 +1,22 @@ null, 'Name' => '', 'Positions' => 0, ); - public function __construct( $IdOrRow = NULL ) { - if ( $IdOrRow ) { - $row = NULL; - if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) { - $row = dbFetchOne( 'SELECT * FROM MontageLayouts WHERE Id=?', NULL, array( $IdOrRow ) ); - if ( ! $row ) { - Error("Unable to load MontageLayout record for Id=" . $IdOrRow ); - } - } else if ( is_array( $IdOrRow ) ) { - $row = $IdOrRow; - } else { - Error("Unknown argument passed to MontageLayout Constructor ($IdOrRow)"); - return; - } - - if ( $row ) { - foreach ($row as $k => $v) { - $this->{$k} = $v; - } - } else { - Error('No row for MontageLayout ' . $IdOrRow ); - } - } # end if isset($IdOrRow) - } // end function __construct - - public function __call($fn, array $args){ - if ( count($args) ) { - $this->{$fn} = $args[0]; - } - if ( array_key_exists($fn, $this) ) { - return $this->{$fn}; - } else { - if ( array_key_exists( $fn, $this->defaults ) ) { - return $this->defaults{$fn}; - } else { - $backTrace = debug_backtrace(); - $file = $backTrace[1]['file']; - $line = $backTrace[1]['line']; - Warning( "Unknown function call MontageLayout->$fn from $file:$line" ); - } - } + public static function find( $parameters = array(), $options = array() ) { + return ZM_Object::_find(get_class(), $parameters, $options); } - public function set( $data ) { - foreach ($data as $k => $v) { - if ( is_array( $v ) ) { - # perhaps should turn into a comma-separated string - $this->{$k} = implode(',',$v); - } else if ( is_string( $v ) ) { - $this->{$k} = trim( $v ); - } else if ( is_integer( $v ) ) { - $this->{$k} = $v; - } else if ( is_bool( $v ) ) { - $this->{$k} = $v; - } else { - Error( "Unknown type $k => $v of var " . gettype( $v ) ); - $this->{$k} = $v; - } - } + public static function find_one( $parameters = array(), $options = array() ) { + return ZM_Object::_find_one(get_class(), $parameters, $options); } - public static function find( $parameters = null, $options = null ) { - $filters = array(); - $sql = 'SELECT * FROM MontageLayouts '; - $values = array(); - - if ( $parameters ) { - $fields = array(); - $sql .= 'WHERE '; - foreach ( $parameters as $field => $value ) { - if ( $value == null ) { - $fields[] = $field.' IS NULL'; - } else if ( is_array( $value ) ) { - $func = function(){return '?';}; - $fields[] = $field.' IN ('.implode(',', array_map( $func, $value ) ). ')'; - $values += $value; - - } else { - $fields[] = $field.'=?'; - $values[] = $value; - } - } - $sql .= implode(' AND ', $fields ); - } - if ( $options and isset($options['order']) ) { - $sql .= ' ORDER BY ' . $options['order']; - } - $result = dbQuery($sql, $values); - if ( $result ) { - $results = $result->fetchALL(); - foreach ( $results as $row ) { - $filters[] = new MontageLayout($row); - } - } - return $filters; - } - public function save( $new_values = null ) { - if ( $new_values ) { - foreach ( $new_values as $k=>$v ) { - $this->{$k} = $v; - } - } - - $fields = array_values( array_filter( array_keys($this->defaults), function($field){return $field != 'Id';} ) ); - $values = null; - if ( isset($this->{'Id'}) ) { - $sql = 'UPDATE MontageLayouts SET '.implode(', ', array_map( function($field) {return $field.'=?';}, $fields ) ) . ' WHERE Id=?'; - $values = array_map( function($field){return $this->{$field};}, $fields ); - $values[] = $this->{'Id'}; - dbQuery($sql, $values); - } else { - $sql = 'INSERT INTO MontageLayouts ('.implode( ',', $fields ).') VALUES ('.implode(',',array_map( function(){return '?';}, $fields ) ).')'; - $values = array_map( function($field){return $this->{$field};}, $fields ); - dbQuery($sql, $values); - global $dbConn; - $this->{'Id'} = $dbConn->lastInsertId(); - } - } // end function save } // end class MontageLayout ?> diff --git a/web/includes/Object.php b/web/includes/Object.php index d51cf082d..6a82ec37f 100644 --- a/web/includes/Object.php +++ b/web/includes/Object.php @@ -45,7 +45,7 @@ class ZM_Object { $this->{$fn} = $args[0]; } - if ( array_key_exists($fn, $this) ) { + if ( property_exists($this, $fn) ) { return $this->{$fn}; } else { if ( array_key_exists($fn, $this->defaults) ) { @@ -140,10 +140,10 @@ class ZM_Object { foreach ($this->defaults as $key => $value) { if ( is_callable(array($this, $key)) ) { $json[$key] = $this->$key(); - } else if ( array_key_exists($key, $this) ) { + } else if ( property_exists($this, $key) ) { $json[$key] = $this->{$key}; } else { - $json[$key] = $this->defaults{$key}; + $json[$key] = $this->defaults[$key]; } } return json_encode($json); @@ -215,7 +215,7 @@ class ZM_Object { } else if ( $this->$field() != $value ) { $changes[$field] = $value; } - } else if ( array_key_exists($field, $this) ) { + } else if ( property_exists($this, $field) ) { $type = (array_key_exists($field, $this->defaults) && is_array($this->defaults[$field])) ? $this->defaults[$field]['type'] : 'scalar'; Logger::Debug("Checking field $field => current ". (is_array($this->{$field}) ? implode(',',$this->{$field}) : $this->{$field}) . ' ?= ' . diff --git a/web/includes/Storage.php b/web/includes/Storage.php index 01465de65..286cec8da 100644 --- a/web/includes/Storage.php +++ b/web/includes/Storage.php @@ -80,7 +80,7 @@ class Storage extends ZM_Object { } public function disk_total_space() { - if ( !array_key_exists('disk_total_space', $this) ) { + if ( !property_exists($this, 'disk_total_space') ) { $path = $this->Path(); if ( file_exists($path) ) { $this->{'disk_total_space'} = disk_total_space($path); @@ -94,7 +94,7 @@ class Storage extends ZM_Object { public function disk_used_space() { # This isn't a function like this in php, so we have to add up the space used in each event. - if ( ( !array_key_exists('disk_used_space', $this)) or !$this->{'disk_used_space'} ) { + if ( ( !property_exists($this, 'disk_used_space')) or !$this->{'disk_used_space'} ) { if ( $this->{'Type'} == 's3fs' ) { $this->{'disk_used_space'} = $this->event_disk_space(); } else { @@ -112,7 +112,7 @@ class Storage extends ZM_Object { public function event_disk_space() { # This isn't a function like this in php, so we have to add up the space used in each event. - if ( (! array_key_exists('DiskSpace', $this)) or (!$this->{'DiskSpace'}) ) { + if ( (! property_exists($this, 'DiskSpace')) or (!$this->{'DiskSpace'}) ) { $used = dbFetchOne('SELECT SUM(DiskSpace) AS DiskSpace FROM Events WHERE StorageId=? AND DiskSpace IS NOT NULL', 'DiskSpace', array($this->Id())); do { @@ -130,8 +130,8 @@ class Storage extends ZM_Object { } // end function event_disk_space public function Server() { - if ( ! array_key_exists('Server',$this) ) { - if ( array_key_exists('ServerId', $this) ) { + if ( ! property_exists($this, 'Server') ) { + if ( property_exists($this, 'ServerId') ) { $this->{'Server'} = Server::find_one(array('Id'=>$this->{'ServerId'})); if ( !$this->{'Server'} ) { diff --git a/web/includes/database.php b/web/includes/database.php index eab70f47f..5cd900be0 100644 --- a/web/includes/database.php +++ b/web/includes/database.php @@ -110,16 +110,10 @@ function dbError($sql) { function dbEscape( $string ) { global $dbConn; - if ( version_compare(phpversion(), '4.3.0', '<')) - if ( get_magic_quotes_gpc() ) - return $dbConn->quote(stripslashes($string)); - else - return $dbConn->quote($string); + if ( version_compare(phpversion(), '5.4', '<=') and get_magic_quotes_gpc() ) + return $dbConn->quote(stripslashes($string)); else - if ( get_magic_quotes_gpc() ) - return $dbConn->quote(stripslashes($string)); - else - return $dbConn->quote($string); + return $dbConn->quote($string); } function dbQuery($sql, $params=NULL) { From 0de6396a5b41d37c724e43a1a14380f070392045 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 7 Dec 2019 12:39:28 -0500 Subject: [PATCH 042/330] Test for null in user before testing for access in CanEdit et all --- web/includes/auth.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/includes/auth.php b/web/includes/auth.php index 4fc39d30e..f958463c3 100644 --- a/web/includes/auth.php +++ b/web/includes/auth.php @@ -220,19 +220,19 @@ function generateAuthHash($useRemoteAddr, $force=false) { function visibleMonitor($mid) { global $user; - return ( empty($user['MonitorIds']) || in_array($mid, explode(',', $user['MonitorIds'])) ); + return ( $user && empty($user['MonitorIds']) || in_array($mid, explode(',', $user['MonitorIds'])) ); } function canView($area, $mid=false) { global $user; - return ( ($user[$area] == 'View' || $user[$area] == 'Edit') && ( !$mid || visibleMonitor($mid) ) ); + return ( $user && ($user[$area] == 'View' || $user[$area] == 'Edit') && ( !$mid || visibleMonitor($mid) ) ); } function canEdit($area, $mid=false) { global $user; - return ( $user[$area] == 'Edit' && ( !$mid || visibleMonitor($mid) )); + return ( $user && ($user[$area] == 'Edit') && ( !$mid || visibleMonitor($mid) )); } function userFromSession() { From 86fc8526219a3dad78465543f5818ddb2f78212d Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 8 Dec 2019 10:59:50 -0500 Subject: [PATCH 043/330] bump version in zoneminder.spec --- distros/redhat/zoneminder.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index e319f4c8f..e49b3dd16 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -23,7 +23,7 @@ %global _hardened_build 1 Name: zoneminder -Version: 1.33.14 +Version: 1.33.15 Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons From 2aef547f374a6ab4103c4d5ef7caf2e7a0fa1b60 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 8 Dec 2019 11:01:46 -0500 Subject: [PATCH 044/330] add changelog about bump to 1.33.15 --- distros/redhat/zoneminder.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index e49b3dd16..2773a4ad0 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -411,6 +411,9 @@ EOF %dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload %changelog +* Sun Dec 08 2019 Isaac Connor - 1.33.15-1 +- Bump to 1.33.15 Development + * Sun Aug 11 2019 Andrew Bauer - 1.33.14-1 - Bump to 1.33.13 Development From ed417a49b4a3892abbceb11100bae4add0c32737 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 8 Dec 2019 11:21:38 -0500 Subject: [PATCH 045/330] increase logspopup width to eliminate scrollbars --- web/skins/classic/js/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/js/base.js b/web/skins/classic/js/base.js index 24f5d9a22..4ecc4c234 100644 --- a/web/skins/classic/js/base.js +++ b/web/skins/classic/js/base.js @@ -46,7 +46,7 @@ var popupSizes = { 'group': {'width': 760, 'height': 600}, 'groups': {'width': 540, 'height': 420}, 'image': {'addWidth': 48, 'addHeight': 80}, - 'log': {'width': 1080, 'height': 720}, + 'log': {'width': 1180, 'height': 720}, 'login': {'width': 720, 'height': 480}, 'logout': {'width': 260, 'height': 150}, 'monitor': {'width': 800, 'height': 780}, From 3bd0525e6445c22a3c661b6801482ca0e778c213 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 8 Dec 2019 14:27:07 -0500 Subject: [PATCH 046/330] escape column names for mysql8 --- web/includes/actions/function.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/includes/actions/function.php b/web/includes/actions/function.php index ebdc416fc..00e4e21f7 100644 --- a/web/includes/actions/function.php +++ b/web/includes/actions/function.php @@ -39,7 +39,7 @@ if ( $action == 'function' ) { $oldFunction = $monitor['Function']; $oldEnabled = $monitor['Enabled']; if ( $newFunction != $oldFunction || $newEnabled != $oldEnabled ) { - dbQuery('UPDATE Monitors SET Function=?, Enabled=? WHERE Id=?', + dbQuery('UPDATE Monitors SET `Function`=?, `Enabled`=? WHERE `Id`=?', array($newFunction, $newEnabled, $mid)); $monitor['Function'] = $newFunction; From ea89ebf15087fec2c83a7fe736db1be34006b971 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 8 Dec 2019 21:33:29 -0500 Subject: [PATCH 047/330] more mysql8 fixes --- web/includes/actions/state.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/includes/actions/state.php b/web/includes/actions/state.php index 9799cdec3..0f7a9e9a5 100644 --- a/web/includes/actions/state.php +++ b/web/includes/actions/state.php @@ -31,19 +31,19 @@ if ( $action == 'state' ) { } } else if ( $action == 'save' ) { if ( !empty($_REQUEST['runState']) || !empty($_REQUEST['newState']) ) { - $sql = 'SELECT Id,Function,Enabled FROM Monitors ORDER BY Id'; + $sql = 'SELECT `Id`,`Function`,`Enabled` FROM Monitors ORDER BY Id'; $definitions = array(); - foreach( dbFetchAll($sql) as $monitor ) { + foreach ( dbFetchAll($sql) as $monitor ) { $definitions[] = $monitor['Id'].':'.$monitor['Function'].':'.$monitor['Enabled']; } $definition = join(',', $definitions); if ( $_REQUEST['newState'] ) $_REQUEST['runState'] = $_REQUEST['newState']; - dbQuery('REPLACE INTO States SET Name=?, Definition=?', array($_REQUEST['runState'],$definition)); + dbQuery('REPLACE INTO `States` SET `Name`=?, `Definition`=?', array($_REQUEST['runState'],$definition)); } } else if ( $action == 'delete' ) { if ( isset($_REQUEST['runState']) ) - dbQuery('DELETE FROM States WHERE Name=?', array($_REQUEST['runState'])); + dbQuery('DELETE FROM `States` WHERE `Name`=?', array($_REQUEST['runState'])); } $view = 'console'; ?> From c6813fecd5bc7172a158f35a93c93c620cbc98f3 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 10 Dec 2019 10:14:32 -0500 Subject: [PATCH 048/330] handle new values for Orientation enum. Spacing, quotes. Handle uppercase HTTP in ControlAddress. --- .../lib/ZoneMinder/Control/SkyIPCam7xx.pm | 112 ++++++++---------- 1 file changed, 51 insertions(+), 61 deletions(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm index 7175d1e84..ebbaf3a8a 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm @@ -1,6 +1,6 @@ # ========================================================================== # -# ZoneMinder Airlink SkyIPCam AICN747/AICN747W Control Protocol Module, $Date: 2008-09-13 17:30:29 +0000 (Sat, 13 Sept 2008) $, $Revision: 2229 $ +# ZoneMinder Airlink SkyIPCam AICN747/AICN747W Control Protocol Module # Copyright (C) 2008 Brian Rudy (brudyNO@SPAMpraecogito.com) # # This program is free software; you can redistribute it and/or @@ -43,8 +43,6 @@ our @ISA = qw(ZoneMinder::Control); use ZoneMinder::Logger qw(:all); use ZoneMinder::Config qw(:all); -use Time::HiRes qw( usleep ); - sub open { my $self = shift; @@ -52,58 +50,50 @@ sub open { use LWP::UserAgent; $self->{ua} = LWP::UserAgent->new; - $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION ); + $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION); $self->{state} = 'open'; } -sub printMsg { - my $self = shift; - my $msg = shift; - my $msg_len = length($msg); - - Debug( $msg."[".$msg_len."]" ); -} - sub sendCmd { my $self = shift; my $cmd = shift; my $result = undef; - printMsg( $cmd, "Tx" ); + $self->printMsg($cmd, 'Tx'); my $url; - if ( $self->{Monitor}->{ControlAddress} =~ /^http/ ) { + if ( $self->{Monitor}->{ControlAddress} =~ /^http/i ) { $url = $self->{Monitor}->{ControlAddress}.$cmd; } else { $url = 'http://'.$self->{Monitor}->{ControlAddress}.$cmd; - } # en dif - my $req = HTTP::Request->new( GET=>$url ); + } # end if + my $req = HTTP::Request->new(GET=>$url); my $res = $self->{ua}->request($req); if ( $res->is_success ) { $result = !undef; } else { - Error( "Error check failed: '".$res->status_line()."'" ); + Error('Error check failed: \''.$res->status_line().'\''); } - return( $result ); + return $result; } sub reset { my $self = shift; - Debug( "Camera Reset" ); - my $cmd = "/admin/ptctl.cgi?move=reset"; - $self->sendCmd( $cmd ); + Debug('Camera Reset'); + my $cmd = '/admin/ptctl.cgi?move=reset'; + $self->sendCmd($cmd); } sub moveMap { my $self = shift; my $params = shift; - my $xcoord = $self->getParam( $params, 'xcoord' ); - my $ycoord = $self->getParam( $params, 'ycoord' ); + my $xcoord = $self->getParam($params, 'xcoord'); + my $ycoord = $self->getParam($params, 'ycoord'); my $hor = $xcoord * 100 / $self->{Monitor}->{Width}; my $ver = $ycoord * 100 / $self->{Monitor}->{Height}; @@ -125,81 +115,81 @@ sub moveMap { elsif ( $hor > 50 ) { # right $horSteps = (($hor - 50) / 50) * $maxhor; - $horDir = "right"; + $horDir = 'right'; } # Vertical movement if ( $ver < 50 ) { # up $verSteps = ((50 - $ver) / 50) * $maxver; - $verDir = "up"; + $verDir = 'up'; } elsif ( $ver > 50 ) { # down $verSteps = (($ver - 50) / 50) * $maxver; - $verDir = "down"; + $verDir = 'down'; } my $v = int($verSteps); my $h = int($horSteps); - Debug( "Move Map to $xcoord,$ycoord, hor=$h $horDir, ver=$v $verDir"); + Debug("Move Map to $xcoord,$ycoord, hor=$h $horDir, ver=$v $verDir"); my $cmd = "/cgi/admin/ptctrl.cgi?action=movedegree&Cmd=$horDir&Degree=$h"; - $self->sendCmd( $cmd ); + $self->sendCmd($cmd); $cmd = "/cgi/admin/ptctrl.cgi?action=movedegree&Cmd=$verDir&Degree=$v"; - $self->sendCmd( $cmd ); + $self->sendCmd($cmd); } sub moveRelUp { my $self = shift; my $params = shift; - my $step = $self->getParam( $params, 'tiltstep' ); - Debug( "Step Up $step" ); - my $cmd = "/admin/ptctl.cgi?move=up"; - $self->sendCmd( $cmd ); + my $step = $self->getParam($params, 'tiltstep'); + Debug("Step Up $step"); + my $cmd = '/admin/ptctl.cgi?move=up'; + $self->sendCmd($cmd); } sub moveRelDown { my $self = shift; my $params = shift; - my $step = $self->getParam( $params, 'tiltstep' ); - Debug( "Step Down $step" ); - my $cmd = "/admin/ptctl.cgi?move=down"; - $self->sendCmd( $cmd ); + my $step = $self->getParam($params, 'tiltstep'); + Debug("Step Down $step"); + my $cmd = '/admin/ptctl.cgi?move=down'; + $self->sendCmd($cmd); } sub moveRelLeft { my $self = shift; my $params = shift; - my $step = $self->getParam( $params, 'panstep' ); + my $step = $self->getParam($params, 'panstep'); - if ( $self->{Monitor}->{Orientation} eq "hori" ) { - Debug( "Stepping Right because flipped horizontally " ); - $self->sendCmd( "/admin/ptctl.cgi?move=right" ); + if ( $self->{Monitor}->{Orientation} eq 'FLIP_HORI' ) { + Debug('Stepping Right because flipped horizontally'); + $self->sendCmd('/admin/ptctl.cgi?move=right'); } else { - Debug( "Step Left" ); - $self->sendCmd( "/admin/ptctl.cgi?move=left" ); + Debug('Step Left'); + $self->sendCmd('/admin/ptctl.cgi?move=left'); } } sub moveRelRight { my $self = shift; my $params = shift; - my $step = $self->getParam( $params, 'panstep' ); - if ( $self->{Monitor}->{Orientation} eq "hori" ) { - Debug( "Stepping Left because flipped horizontally " ); - $self->sendCmd( "/admin/ptctl.cgi?move=left" ); + my $step = $self->getParam($params, 'panstep'); + if ( $self->{Monitor}->{Orientation} eq 'FLIP_HORI' ) { + Debug('Stepping Left because flipped horizontally'); + $self->sendCmd('/admin/ptctl.cgi?move=left'); } else { - Debug( "Step Right" ); - $self->sendCmd( "/admin/ptctl.cgi?move=right" ); + Debug('Step Right'); + $self->sendCmd('/admin/ptctl.cgi?move=right'); } } sub presetClear { my $self = shift; my $params = shift; - my $preset = $self->getParam( $params, 'preset' ); - Debug( "Clear Preset $preset" ); + my $preset = $self->getParam($params, 'preset'); + Debug("Clear Preset $preset"); #my $cmd = "/axis-cgi/com/ptz.cgi?removeserverpresetno=$preset"; #$self->sendCmd( $cmd ); } @@ -207,26 +197,26 @@ sub presetClear { sub presetSet { my $self = shift; my $params = shift; - my $preset = $self->getParam( $params, 'preset' ); - Debug( "Set Preset $preset" ); - my $cmd = "/admin/ptctl.cgi?position=" . ($preset - 1) . "&positionname=zm$preset"; + my $preset = $self->getParam($params, 'preset'); + Debug("Set Preset $preset"); + my $cmd = '/admin/ptctl.cgi?position=' . ($preset - 1) . "&positionname=zm$preset"; $self->sendCmd( $cmd ); } sub presetGoto { my $self = shift; my $params = shift; - my $preset = $self->getParam( $params, 'preset' ); - Debug( "Goto Preset $preset" ); - my $cmd = "/admin/ptctl.cgi?move=p" . ($preset - 1); - $self->sendCmd( $cmd ); + my $preset = $self->getParam($params, 'preset'); + Debug("Goto Preset $preset"); + my $cmd = '/admin/ptctl.cgi?move=p'.($preset - 1); + $self->sendCmd($cmd); } sub presetHome { my $self = shift; - Debug( "Home Preset" ); - my $cmd = "/admin/ptctl.cgi?move=h"; - $self->sendCmd( $cmd ); + Debug('Home Preset'); + my $cmd = '/admin/ptctl.cgi?move=h'; + $self->sendCmd($cmd); } 1; From bedc61a34765ce596ae7c85edf87a8359507c7c0 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 13 Dec 2019 11:49:55 -0500 Subject: [PATCH 049/330] handle dbFetchNext on null result more gracefully --- web/includes/database.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/includes/database.php b/web/includes/database.php index eab70f47f..0cb674a0a 100644 --- a/web/includes/database.php +++ b/web/includes/database.php @@ -212,6 +212,10 @@ function dbFetch($sql, $col=false) { } function dbFetchNext($result, $col=false) { + if ( !$result ) { + ZM\Error("dbFetchNext called on null result."); + return false; + } if ( $dbRow = $result->fetch(PDO::FETCH_ASSOC) ) return $col ? $dbRow[$col] : $dbRow; return false; From d2a23e4822994bded5cea96ad1421e92f51e157e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 13 Dec 2019 11:50:11 -0500 Subject: [PATCH 050/330] add possing port to Monitor->UrlToIndex --- web/includes/Monitor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index a9be54405..3814a3944 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -467,8 +467,8 @@ private $status_fields = array( return $source; } // end function Source - public function UrlToIndex() { - return $this->Server()->UrlToIndex(); + public function UrlToIndex($port=null) { + return $this->Server()->UrlToIndex($port); //ZM_MIN_STREAMING_PORT ? (ZM_MIN_STREAMING_PORT+$this->Id()) : null); } From 0bbbbb302e8fa29763726b48b18ca51006aa8c56 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 13 Dec 2019 11:51:07 -0500 Subject: [PATCH 051/330] add default for Units in new zone --- web/skins/classic/views/zone.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php index e72eb43cf..6b5801744 100644 --- a/web/skins/classic/views/zone.php +++ b/web/skins/classic/views/zone.php @@ -69,6 +69,7 @@ if ( !isset($newZone) ) { 'Id' => 0, 'Name' => translate('New'), 'Type' => 'Active', + 'Units' => 'Pixels', 'MonitorId' => $monitor->Id(), 'NumCoords' => 4, 'Coords' => sprintf('%d,%d %d,%d, %d,%d %d,%d', $minX, $minY, $maxX, $minY, $maxX, $maxY, $minX, $maxY), From 0dbc1ef15c3ca31a5c0f85c8221b680699db59e4 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 13 Dec 2019 11:51:55 -0500 Subject: [PATCH 052/330] Use multiport when talking monitor stream on montage --- web/skins/classic/views/js/montage.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/montage.js.php b/web/skins/classic/views/js/montage.js.php index f2dea53bf..c39d7311d 100644 --- a/web/skins/classic/views/js/montage.js.php +++ b/web/skins/classic/views/js/montage.js.php @@ -35,7 +35,7 @@ monitorData[monitorData.length] = { 'connKey': connKey() ?>, 'width': ViewWidth() ?>, 'height':ViewHeight() ?>, - 'url': 'UrlToIndex() ?>', + 'url': 'UrlToIndex( $monitor->Id() + ZM_MIN_STREAMING_PORT) ?>', 'onclick': function(){createPopup( '?view=watch&mid=Id() ?>', 'zmWatchId() ?>', 'watch', ViewWidth(), $monitor->PopupScale() ); ?>, ViewHeight(), $monitor->PopupScale() ); ?> );}, 'type': 'Type() ?>', 'refresh': 'Refresh() ?>' From b24e912050ccf24cede190fe368ab19b34dcca99 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 13 Dec 2019 17:46:56 -0500 Subject: [PATCH 053/330] Use ZM\Server::find_one for loading server so that it gets cached. Use a single regexp to determine config line validity instead of two for efficiency --- web/includes/config.php.in | 57 ++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/web/includes/config.php.in b/web/includes/config.php.in index dd3439680..ef1bf4a16 100644 --- a/web/includes/config.php.in +++ b/web/includes/config.php.in @@ -33,9 +33,9 @@ $configFile = ZM_CONFIG; $localConfigFile = basename($configFile); if ( file_exists( $localConfigFile ) && filesize( $localConfigFile ) > 0 ) { if ( php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR']) ) - print( "Warning, overriding installed $localConfigFile file with local copy\n" ); + print("Warning, overriding installed $localConfigFile file with local copy\n"); else - error_log( "Warning, overriding installed $localConfigFile file with local copy" ); + error_log("Warning, overriding installed $localConfigFile file with local copy"); $configFile = $localConfigFile; } @@ -49,19 +49,19 @@ if ( is_dir($configSubFolder) ) { if ( is_readable($configSubFolder) ) { foreach ( glob("$configSubFolder/*.conf") as $filename ) { //error_log("processing $filename"); - $configvals = array_replace($configvals, process_configfile($filename) ); + $configvals = array_replace($configvals, process_configfile($filename)); } } else { - error_log( "WARNING: ZoneMinder configuration subfolder found but is not readable. Check folder permissions on $configSubFolder." ); + error_log("WARNING: ZoneMinder configuration subfolder found but is not readable. Check folder permissions on $configSubFolder."); } } else { - error_log( "WARNING: ZoneMinder configuration subfolder found but is not a directory. Check $configSubFolder." ); + error_log("WARNING: ZoneMinder configuration subfolder found but is not a directory. Check $configSubFolder."); } # Now that our array our finalized, define each key => value # pair in the array as a constant -foreach( $configvals as $key => $value) { - define( $key, $value ); +foreach ( $configvals as $key => $value ) { + define($key, $value); } // @@ -135,8 +135,8 @@ define( 'SCALE_BASE', 100 ); // The additional scalin define( 'STRF_FMT_DATETIME_DB', '%Y-%m-%d %H:%M:%S' ); // Strftime format for database queries, don't change define( 'MYSQL_FMT_DATETIME_SHORT', '%y/%m/%d %H:%i:%S' ); // MySQL date_format shorter format for dates with time -require_once( 'database.php' ); -require_once( 'logger.php' ); +require_once('database.php'); +require_once('logger.php'); loadConfig(); ZM\Logger::fetch()->initialise(); @@ -165,28 +165,30 @@ function loadConfig( $defineConsts=true ) { $result = $dbConn->query('SELECT Name,Value FROM Config'); if ( !$result ) echo mysql_error(); - while( $row = dbFetchNext( $result ) ) { + while( $row = dbFetchNext($result) ) { if ( $defineConsts ) - define( $row['Name'], $row['Value'] ); + define($row['Name'], $row['Value']); $config[$row['Name']] = $row; } } # end function loadConfig // For Human-readability, use ZM_SERVER_HOST or ZM_SERVER_NAME in zm.conf, and convert it here to a ZM_SERVER_ID if ( ! defined('ZM_SERVER_ID') ) { + require_once('Server.php'); if ( defined('ZM_SERVER_NAME') and ZM_SERVER_NAME ) { - $server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_NAME)); - if ( ! $server_id ) { + # Use Server lookup so that it caches + $Server = ZM\Server::find_one(array('Name'=>ZM_SERVER_NAME)); + if ( !$Server ) { Error('Invalid Multi-Server configration detected. ZM_SERVER_NAME set to ' . ZM_SERVER_NAME . ' in zm.conf, but no corresponding entry found in Servers table.'); } else { - define( 'ZM_SERVER_ID', $server_id ); + define('ZM_SERVER_ID', $Server->Id()); } } else if ( defined('ZM_SERVER_HOST') and ZM_SERVER_HOST ) { - $server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_HOST)); - if ( ! $server_id ) { + $Server = ZM\Server::find_one(array('Name'=>ZM_SERVER_HOST)); + if ( ! $Server ) { Error('Invalid Multi-Server configration detected. ZM_SERVER_HOST set to ' . ZM_SERVER_HOST . ' in zm.conf, but no corresponding entry found in Servers table.'); } else { - define( 'ZM_SERVER_ID', $server_id ); + define('ZM_SERVER_ID', $Server->Id()); } } } @@ -197,21 +199,22 @@ function process_configfile($configFile) { if ( is_readable( $configFile ) ) { $configvals = array(); - $cfg = fopen( $configFile, 'r') or Error("Could not open config file: $configFile."); + $cfg = fopen($configFile, 'r') or Error("Could not open config file: $configFile."); while ( !feof($cfg) ) { - $str = fgets( $cfg, 256 ); - if ( preg_match( '/^\s*$/', $str )) + $str = fgets($cfg, 256); + if ( preg_match('/^\s*(#.*)?$/', $str) ) { continue; - elseif ( preg_match( '/^\s*#/', $str )) - continue; - elseif ( preg_match( '/^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/', $str, $matches )) + } else if ( preg_match( '/^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/', $str, $matches )) { $configvals[$matches[1]] = $matches[2]; + } else { + Error("Malformed line in config $configFile\n$str"); + } } - fclose( $cfg ); - return( $configvals ); + fclose($cfg); + return $configvals; } else { - error_log( "WARNING: ZoneMinder configuration file found but is not readable. Check file permissions on $configFile." ); - return( false ); + error_log("WARNING: ZoneMinder configuration file found but is not readable. Check file permissions on $configFile."); + return false; } } From 5fcd6361bc2e6ecf3b7ac4f80f200c4fb13bf26c Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 13 Dec 2019 17:47:18 -0500 Subject: [PATCH 054/330] fix segfault reading frames for .mp4 in zms --- src/zm_ffmpeg_input.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zm_ffmpeg_input.cpp b/src/zm_ffmpeg_input.cpp index ab7cbe8d3..bed9f9fed 100644 --- a/src/zm_ffmpeg_input.cpp +++ b/src/zm_ffmpeg_input.cpp @@ -138,7 +138,7 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id) { frame = zm_av_frame_alloc(); } ret = zm_send_packet_receive_frame(context, frame, packet); - if ( ret <= 0 ) { + if ( ret < 0 ) { Error("Unable to decode frame at frame %d: %s, continuing", streams[packet.stream_index].frame_count, av_make_error_string(ret).c_str()); zm_av_packet_unref(&packet); From 18ed90d1477cc800d2a5c4b11e73c46428cc4b7e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 13 Dec 2019 17:47:51 -0500 Subject: [PATCH 055/330] remove second hit to db to load storage areas with no serverid --- web/skins/classic/includes/functions.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php index 5abd519cf..60558f8e8 100644 --- a/web/skins/classic/includes/functions.php +++ b/web/skins/classic/includes/functions.php @@ -389,8 +389,8 @@ if ( (!ZM_OPT_USE_AUTH) or $user ) {
  • trending_up :
    • storage 90 ? ' class="warning"' : '' ).'>'.translate('DB').':'.$connections.'/'.$max_connections.''; ?> @@ -398,8 +398,12 @@ if ( (!ZM_OPT_USE_AUTH) or $user ) { Path()] = $area; + if ( ! $area->ServerId() ) { + $storage_areas_with_no_server_id[] = $area; + } } $func = function($S){ $class = ''; @@ -415,9 +419,9 @@ if ( (!ZM_OPT_USE_AUTH) or $user ) { '; }; #$func = function($S){ return ''.$S->Name() . ': ' . $S->disk_usage_percent().'%' . ''; }; if ( count($storage_areas) > 4 ) - $storage_areas = ZM\Storage::find( array('ServerId'=>null) ); + $storage_areas = $storage_areas_with_no_server_id; if ( count($storage_areas) <= 4 ) - echo implode( ', ', array_map ( $func, $storage_areas ) ); + echo implode(', ', array_map($func, $storage_areas)); echo ' ' . ZM_PATH_MAP .': '. getDiskPercent(ZM_PATH_MAP).'%'; ?> From 5b7efb2b3392c144d1d4f148ab38331a0019089f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 13 Dec 2019 17:48:22 -0500 Subject: [PATCH 056/330] fix mouseover streaming in chrome when adblocker disabled --- web/skins/classic/views/js/events.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js index ca7f7c7ec..e32281c81 100644 --- a/web/skins/classic/views/js/events.js +++ b/web/skins/classic/views/js/events.js @@ -146,10 +146,12 @@ if ( openFilterWindow ) { function thumbnail_onmouseover(event) { var img = event.target; + img.src = ''; img.src = img.getAttribute('stream_src'); } function thumbnail_onmouseout(event) { var img = event.target; + img.src = ''; img.src = img.getAttribute('still_src'); } From 16a73d6d5a3212706e5fd7c2e944ddbea7fcc99c Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 13 Dec 2019 18:12:33 -0500 Subject: [PATCH 057/330] don't seek back when not neccesary --- src/zm_ffmpeg_input.cpp | 21 ++++++++++++++++++--- src/zm_ffmpeg_input.h | 1 + 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/zm_ffmpeg_input.cpp b/src/zm_ffmpeg_input.cpp index bed9f9fed..352de347c 100644 --- a/src/zm_ffmpeg_input.cpp +++ b/src/zm_ffmpeg_input.cpp @@ -10,6 +10,7 @@ FFmpeg_Input::FFmpeg_Input() { FFMPEGInit(); streams = NULL; frame = NULL; + last_seek_request = -1; } FFmpeg_Input::~FFmpeg_Input() { @@ -102,7 +103,6 @@ int FFmpeg_Input::Open(const char *filepath) { } // end int FFmpeg_Input::Open( const char * filepath ) AVFrame *FFmpeg_Input::get_frame(int stream_id) { - Debug(1, "Getting frame from stream %d", stream_id); int frameComplete = false; AVPacket packet; @@ -144,6 +144,8 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id) { zm_av_packet_unref(&packet); av_frame_free(&frame); continue; + } else { + zm_dump_frame(frame, "resulting frame"); } frameComplete = 1; @@ -175,9 +177,20 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id, double at) { } // Have to grab a frame to update our current frame to know where we are get_frame(stream_id); - } // end if ! frame + } // end if ! frame - if ( frame->pts > seek_target ) { + if ( !frame ) { + Warning("Unable to get frame."); + return NULL; + } + + if ( + (last_seek_request >= 0) + && + (last_seek_request > seek_target ) + && + (frame->pts > seek_target) + ) { zm_dump_frame(frame, "frame->pts > seek_target, seek backwards"); // our frame must be beyond our seek target. so go backwards to before it if ( ( ret = av_seek_frame(input_format_context, stream_id, seek_target, @@ -191,6 +204,8 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id, double at) { zm_dump_frame(frame, "frame->pts > seek_target, got"); } // end if frame->pts > seek_target + last_seek_request = seek_target; + // Seeking seems to typically seek to a keyframe, so then we have to decode until we get the frame we want. if ( frame->pts <= seek_target ) { zm_dump_frame(frame, "pts <= seek_target"); diff --git a/src/zm_ffmpeg_input.h b/src/zm_ffmpeg_input.h index 2f524ac45..900f14d4a 100644 --- a/src/zm_ffmpeg_input.h +++ b/src/zm_ffmpeg_input.h @@ -42,6 +42,7 @@ class FFmpeg_Input { int audio_stream_id; AVFormatContext *input_format_context; AVFrame *frame; + int64_t last_seek_request; }; #endif From 4d9d4ba9573c084661f8895d26711b0964457cb9 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 15 Dec 2019 10:35:43 -0500 Subject: [PATCH 058/330] Do not allow deletion of archived events. --- web/includes/functions.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/includes/functions.php b/web/includes/functions.php index aea0c8b14..93e30fb85 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -409,6 +409,11 @@ ZM\Logger::Debug("Event type: " . gettype($event)); global $user; + if ( $event->Archived() ) { + ZM\Info('Cannot delete Archived event.'); + return; + } # end if Archived + if ( $user['Events'] == 'Edit' ) { $event->delete(); } # CAN EDIT From 5f006421cc2fe86112bd4bc2b81f713cb3a4398e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 15 Dec 2019 15:31:40 -0500 Subject: [PATCH 059/330] fix #2771. Correct relationship from hasMany to hasAndBelongsToMany for Monitors in Group Modelel. Use save Assiociated in Controller, and add code to handle backwards compatibility by turning MonitorIds into the appropriate Monitor array --- web/api/app/Controller/GroupsController.php | 18 +++++++++++++----- web/api/app/Model/Group.php | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/web/api/app/Controller/GroupsController.php b/web/api/app/Controller/GroupsController.php index 6f0a88300..5d19b5d98 100644 --- a/web/api/app/Controller/GroupsController.php +++ b/web/api/app/Controller/GroupsController.php @@ -77,16 +77,24 @@ class GroupsController extends AppController { } $this->Group->create(); - if ( $this->Group->save($this->request->data) ) { + + if ( $this->request->data['Group']['MonitorIds'] and ! isset($this->request->data['Monitor']) ) { + $this->request->data['Monitor'] = explode(',', $this->request->data['Group']['MonitorIds']); + unset($this->request->data['Group']['MonitorIds']); + } + if ( $this->Group->saveAssociated($this->request->data, array('atomic'=>true)) ) { return $this->flash( __('The group has been saved.'), array('action' => 'index') ); - } - } - $monitors = $this->Group->Monitor->find('list'); + } else { + ZM\Error("Failed to save Group"); + debug($this->Group->invalidFields()); + } + } # end if post + $monitors = $this->Group->Monitor->find('list'); $this->set(compact('monitors')); - } + } # end add /** * edit method diff --git a/web/api/app/Model/Group.php b/web/api/app/Model/Group.php index 108f9b9c7..8d8f533ca 100644 --- a/web/api/app/Model/Group.php +++ b/web/api/app/Model/Group.php @@ -59,7 +59,7 @@ class Group extends AppModel { * * @var array */ - public $hasMany = array( + public $hasAndBelongsToMany = array( 'Monitor' => array( 'className' => 'Monitor', 'joinTable' => 'Groups_Monitors', From 3b12b67b4a4a604be7f6adbe4b203853974b19e3 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 18 Dec 2019 10:40:51 -0500 Subject: [PATCH 060/330] fix eslint --- web/skins/classic/views/js/export.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/skins/classic/views/js/export.js b/web/skins/classic/views/js/export.js index 73e81ab4a..d553f9385 100644 --- a/web/skins/classic/views/js/export.js +++ b/web/skins/classic/views/js/export.js @@ -4,7 +4,7 @@ function configureExportButton(element) { var form = element.form; var eventCount = 0; - document.querySelectorAll('input[name="eids[]"]').forEach(function(el){ + document.querySelectorAll('input[name="eids[]"]').forEach(function(el) { if ( el.checked ) { eventCount ++; } @@ -43,7 +43,6 @@ function exportProgress() { } function exportResponse(respObj, respText) { - clearInterval(exportTimer); if ( respObj.result != 'Ok' ) { $('exportProgressTicker').set('text', respObj.message); From 34354f587177600cf0427299a12a4b3633795018 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 18 Dec 2019 12:13:00 -0500 Subject: [PATCH 061/330] Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab. --- db/zm_create.sql.in | 1 + db/zm_update-1.33.16.sql | 12 ++ distros/redhat/zoneminder.spec | 2 +- version | 2 +- web/includes/Monitor.php | 211 ++++++++++--------- web/skins/classic/css/base/views/monitor.css | 4 + web/skins/classic/views/monitor.php | 56 +++-- 7 files changed, 158 insertions(+), 130 deletions(-) create mode 100644 db/zm_update-1.33.16.sql diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index 44eb1a048..d4efb5317 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -434,6 +434,7 @@ DROP TABLE IF EXISTS `Monitors`; CREATE TABLE `Monitors` ( `Id` int(10) unsigned NOT NULL auto_increment, `Name` varchar(64) NOT NULL default '', + `Notes` TEXT NOT NULL default '', `ServerId` int(10) unsigned, `StorageId` smallint(5) unsigned default 0, `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local', diff --git a/db/zm_update-1.33.16.sql b/db/zm_update-1.33.16.sql new file mode 100644 index 000000000..aacfd9425 --- /dev/null +++ b/db/zm_update-1.33.16.sql @@ -0,0 +1,12 @@ + +SET @s = (SELECT IF( + (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE() + AND table_name = 'Monitors' + AND column_name = 'Notes' + ) > 0, + "SELECT 'Column Notes already exists in Monitors'", + "ALTER TABLE `Monitors` ADD `Notes` TEXT NOT NULL default '' AFTER `Name`" + )); + +PREPARE stmt FROM @s; +EXECUTE stmt; diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index 2773a4ad0..ffaa075a3 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -23,7 +23,7 @@ %global _hardened_build 1 Name: zoneminder -Version: 1.33.15 +Version: 1.33.16 Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons diff --git a/version b/version index 63984dc0b..c0bd57583 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.33.15 +1.33.16 diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index 1353f375b..cc51926fd 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -9,111 +9,112 @@ require_once('Storage.php'); class Monitor extends ZM_Object { protected static $table = 'Monitors'; -protected $defaults = array( - 'Id' => null, - 'Name' => '', - 'ServerId' => 0, - 'StorageId' => 0, - 'Type' => 'Ffmpeg', - 'Function' => 'Mocord', - 'Enabled' => array('type'=>'boolean','default'=>1), - 'LinkedMonitors' => array('type'=>'set', 'default'=>null), - 'Triggers' => array('type'=>'set','default'=>''), - 'Device' => '', - 'Channel' => 0, - 'Format' => '0', - 'V4LMultiBuffer' => null, - 'V4LCapturesPerFrame' => 1, - 'Protocol' => null, - 'Method' => '', - 'Host' => null, - 'Port' => '', - 'SubPath' => '', - 'Path' => null, - 'Options' => null, - 'User' => null, - 'Pass' => null, - // These are NOT NULL default 0 in the db, but 0 is not a valid value. FIXME - 'Width' => null, - 'Height' => null, - 'Colours' => 4, - 'Palette' => '0', - 'Orientation' => null, - 'Deinterlacing' => 0, - 'DecoderHWAccelName' => null, - 'DecoderHWAccelDevice' => null, - 'SaveJPEGs' => 3, - 'VideoWriter' => '0', - 'OutputCodec' => null, - 'OutputContainer' => null, - 'EncoderParameters' => "# Lines beginning with # are a comment \n# For changing quality, use the crf option\n# 1 is best, 51 is worst quality\n#crf=23\n", - 'RecordAudio' => array('type'=>'boolean', 'default'=>0), - 'RTSPDescribe' => array('type'=>'boolean','default'=>0), - 'Brightness' => -1, - 'Contrast' => -1, - 'Hue' => -1, - 'Colour' => -1, - 'EventPrefix' => 'Event-', - 'LabelFormat' => '%N - %d/%m/%y %H:%M:%S', - 'LabelX' => 0, - 'LabelY' => 0, - 'LabelSize' => 1, - 'ImageBufferCount' => 100, - 'WarmupCount' => 0, - 'PreEventCount' => 0, - 'PostEventCount' => 0, - 'StreamReplayBuffer' => 0, - 'AlarmFrameCount' => 1, - 'SectionLength' => 600, - 'MinSectionLength' => 10, - 'FrameSkip' => 0, - 'MotionFrameSkip' => 0, - 'AnalysisFPSLimit' => null, - 'AnalysisUpdateDelay' => 0, - 'MaxFPS' => null, - 'AlarmMaxFPS' => null, - 'FPSReportInterval' => 100, - 'RefBlendPerc' => 6, - 'AlarmRefBlendPerc' => 6, - 'Controllable' => array('type'=>'boolean','default'=>0), - 'ControlId' => null, - 'ControlDevice' => null, - 'ControlAddress' => null, - 'AutoStopTimeout' => null, - 'TrackMotion' => array('type'=>'boolean','default'=>0), - 'TrackDelay' => null, - 'ReturnLocation' => -1, - 'ReturnDelay' => null, - 'DefaultRate' => 100, - 'DefaultScale' => 100, - 'SignalCheckPoints' => 0, - 'SignalCheckColour' => '#0000BE', - 'WebColour' => 'red', - 'Exif' => array('type'=>'boolean','default'=>0), - 'Sequence' => null, - 'TotalEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), - 'TotalEventDiskSpace' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), - 'HourEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), - 'HourEventDiskSpace' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), - 'DayEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), - 'DayEventDiskSpace' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), - 'WeekEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), - 'WeekEventDiskSpace' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), - 'MonthEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), - 'MonthEventDiskSpace' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), - 'ArchivedEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), - 'ArchivedEventDiskSpace' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), - 'ZoneCount' => 0, - 'Refresh' => null, - 'DefaultCodec' => 'auto', - 'GroupIds' => array('default'=>array(), 'do_not_update'=>1), -); -private $status_fields = array( - 'Status' => null, - 'AnalysisFPS' => null, - 'CaptureFPS' => null, - 'CaptureBandwidth' => null, -); + protected $defaults = array( + 'Id' => null, + 'Name' => '', + 'Notes' => '', + 'ServerId' => 0, + 'StorageId' => 0, + 'Type' => 'Ffmpeg', + 'Function' => 'Mocord', + 'Enabled' => array('type'=>'boolean','default'=>1), + 'LinkedMonitors' => array('type'=>'set', 'default'=>null), + 'Triggers' => array('type'=>'set','default'=>''), + 'Device' => '', + 'Channel' => 0, + 'Format' => '0', + 'V4LMultiBuffer' => null, + 'V4LCapturesPerFrame' => 1, + 'Protocol' => null, + 'Method' => '', + 'Host' => null, + 'Port' => '', + 'SubPath' => '', + 'Path' => null, + 'Options' => null, + 'User' => null, + 'Pass' => null, + // These are NOT NULL default 0 in the db, but 0 is not a valid value. FIXME + 'Width' => null, + 'Height' => null, + 'Colours' => 4, + 'Palette' => '0', + 'Orientation' => null, + 'Deinterlacing' => 0, + 'DecoderHWAccelName' => null, + 'DecoderHWAccelDevice' => null, + 'SaveJPEGs' => 3, + 'VideoWriter' => '0', + 'OutputCodec' => null, + 'OutputContainer' => null, + 'EncoderParameters' => "# Lines beginning with # are a comment \n# For changing quality, use the crf option\n# 1 is best, 51 is worst quality\n#crf=23\n", + 'RecordAudio' => array('type'=>'boolean', 'default'=>0), + 'RTSPDescribe' => array('type'=>'boolean','default'=>0), + 'Brightness' => -1, + 'Contrast' => -1, + 'Hue' => -1, + 'Colour' => -1, + 'EventPrefix' => 'Event-', + 'LabelFormat' => '%N - %d/%m/%y %H:%M:%S', + 'LabelX' => 0, + 'LabelY' => 0, + 'LabelSize' => 1, + 'ImageBufferCount' => 100, + 'WarmupCount' => 0, + 'PreEventCount' => 0, + 'PostEventCount' => 0, + 'StreamReplayBuffer' => 0, + 'AlarmFrameCount' => 1, + 'SectionLength' => 600, + 'MinSectionLength' => 10, + 'FrameSkip' => 0, + 'MotionFrameSkip' => 0, + 'AnalysisFPSLimit' => null, + 'AnalysisUpdateDelay' => 0, + 'MaxFPS' => null, + 'AlarmMaxFPS' => null, + 'FPSReportInterval' => 100, + 'RefBlendPerc' => 6, + 'AlarmRefBlendPerc' => 6, + 'Controllable' => array('type'=>'boolean','default'=>0), + 'ControlId' => null, + 'ControlDevice' => null, + 'ControlAddress' => null, + 'AutoStopTimeout' => null, + 'TrackMotion' => array('type'=>'boolean','default'=>0), + 'TrackDelay' => null, + 'ReturnLocation' => -1, + 'ReturnDelay' => null, + 'DefaultRate' => 100, + 'DefaultScale' => 100, + 'SignalCheckPoints' => 0, + 'SignalCheckColour' => '#0000BE', + 'WebColour' => 'red', + 'Exif' => array('type'=>'boolean','default'=>0), + 'Sequence' => null, + 'TotalEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), + 'TotalEventDiskSpace' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), + 'HourEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), + 'HourEventDiskSpace' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), + 'DayEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), + 'DayEventDiskSpace' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), + 'WeekEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), + 'WeekEventDiskSpace' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), + 'MonthEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), + 'MonthEventDiskSpace' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), + 'ArchivedEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), + 'ArchivedEventDiskSpace' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), + 'ZoneCount' => 0, + 'Refresh' => null, + 'DefaultCodec' => 'auto', + 'GroupIds' => array('default'=>array(), 'do_not_update'=>1), + ); + private $status_fields = array( + 'Status' => null, + 'AnalysisFPS' => null, + 'CaptureFPS' => null, + 'CaptureBandwidth' => null, + ); public function Control() { if ( !property_exists($this, 'Control') ) { diff --git a/web/skins/classic/css/base/views/monitor.css b/web/skins/classic/css/base/views/monitor.css index 2b41e7d06..217b2f374 100644 --- a/web/skins/classic/css/base/views/monitor.css +++ b/web/skins/classic/css/base/views/monitor.css @@ -9,6 +9,10 @@ width: 100%; } +textarea, +input[name="newMonitor[Name]"] { + width: 100%; +} input[name="newMonitor[Width]"], input[name="newMonitor[Height]"] { width: 80px; diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index 03e4ce1f8..df3718735 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -40,8 +40,8 @@ if ( !empty($_REQUEST['mid']) ) { if ( $monitor and ZM_OPT_X10 ) $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['mid'])); } -if ( !$monitor ) { +if ( !$monitor ) { $nextId = getTableAutoInc('Monitors'); if ( isset($_REQUEST['dupId']) ) { $monitor = new ZM\Monitor($_REQUEST['dupId']); @@ -67,7 +67,6 @@ if ( ZM_OPT_X10 && empty($x10Monitor) ) { function fourcc($a, $b, $c, $d) { return ord($a) | (ord($b) << 8) | (ord($c) << 16) | (ord($d) << 24); } - if ( isset($_REQUEST['newMonitor']) ) { # Update the monitor object with whatever has been set so far. $monitor->set($_REQUEST['newMonitor']); @@ -371,13 +370,6 @@ $label_size = array( 'Large' => 2 ); -$savejpegopts = array( - 'Disabled' => 0, - 'Frames only' => 1, - 'Analysis images only (if available)' => 2, - 'Frames + Analysis images (if available)' => 3, - ); - $codecs = array( 'auto' => translate('Auto'), 'MP4' => translate('MP4'), @@ -459,8 +451,8 @@ foreach ( $tabs as $name=>$value ) { if ( $tab != 'general' ) { ?> + - GroupIds() as $group_id ) { @@ -529,6 +521,7 @@ if ( $tab != 'source' ) { } if ( $tab != 'storage' ) { ?> + @@ -612,6 +605,10 @@ switch ( $tab ) {     + + + + - - - - @@ -921,7 +906,32 @@ if ( $monitor->Type() == 'Local' ) { } case 'storage' : ?> - + + + + + + + + + + + @@ -273,6 +290,11 @@ for ( $i=0; $i < count($terms); $i++ ) { ?> + + + @@ -409,7 +431,7 @@ if ( ZM_OPT_MESSAGE ) {
    - + 0) { //add bracket select to all rows + if ( brackets > 0 ) { //add bracket select to all rows var obrSelect = $j('').attr('name', queryPrefix + rowNum + '][obr]').attr('id', queryPrefix + rowNum + '][obr]'); var cbrSelect = $j('').attr('name', queryPrefix + rowNum + '][cbr]').attr('id', queryPrefix + rowNum + '][cbr]'); obrSelect.append(''); cbrSelect.append(''); } @@ -176,7 +178,7 @@ function parseRows(rows) { inputTds.eq(5).html(' '); } - if (rows.length == 1) { + if ( rows.length == 1 ) { inputTds.eq(6).find(':input[value="-"]').prop('disabled', true); //enable/disable remove row button } else { inputTds.eq(6).find(':input[value="-"]').prop('disabled', false); @@ -184,7 +186,7 @@ function parseRows(rows) { var attr = inputTds.eq(2).children().val(); - if ( attr == "Archived") { //Archived types + if ( attr == 'Archived' ) { //Archived types inputTds.eq(3).html('equal to'); var archiveSelect = $j('').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]'); for (var i = 0; i < archiveTypes.length; i++) { @@ -192,6 +194,18 @@ function parseRows(rows) { } var archiveVal = inputTds.eq(4).children().val(); inputTds.eq(4).html(archiveSelect).children().val(archiveVal).chosen({width: "101%"}); + } else if ( attr == 'AlarmedZoneId' ) { + var zoneSelect = $j('').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]'); + for ( monitor_id in monitors ) { + for ( zone_id in zones ) { + var zone = zones[zone_id]; + if ( monitor_id == zone.MonitorId ) { + zoneSelect.append(''); + } + } // end foreach zone + } // end foreach monitor + var zoneVal = inputTds.eq(4).children().val(); + inputTds.eq(4).html(zoneSelect).children().val(zoneVal).chosen({width: "101%"}); } else if ( attr.indexOf('Weekday') >= 0 ) { //Weekday selection var weekdaySelect = $j('').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]'); for (var i = 0; i < weekdays.length; i++) { @@ -222,18 +236,27 @@ function parseRows(rows) { inputTds.eq(4).html(storageSelect).children().val(storageVal).chosen({width: "101%"}); } else if ( attr == 'MonitorName' ) { //Monitor names var monitorSelect = $j('').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]'); - for (var key in monitors) { - monitorSelect.append(''); + for ( var monitor_id in monitors ) { + monitorSelect.append(''); } var monitorVal = inputTds.eq(4).children().val(); inputTds.eq(4).html(monitorSelect).children().val(monitorVal); - } else { //Reset to regular text field and operator for everything that isn't special + } else { // Reset to regular text field and operator for everything that isn't special +if ( 0 ) { + // We don't actually do anything different in terms of operators. So why do it for text? var opSelect = $j('').attr('name', queryPrefix + rowNum + '][op]').attr('id', queryPrefix + rowNum + '][op]'); - for (var key in opTypes) { - opSelect.append(''); - } var opVal = inputTds.eq(3).children().val(); - inputTds.eq(3).html(opSelect).children().val(opVal).chosen({width: "101%"}); + if ( ! opVal ) { + // Default to equals so that something gets selected + console.log("No value for operator. Defaulting to ="); + opVal = '='; + } + for ( var key in opTypes ) { + opSelect.append(''); + } + inputTds.eq(3).html(opSelect).children().val(opVal).chosen({width: "101%"}); +} + var textInput = $j('').attr('type', 'text').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]'); var textVal = inputTds.eq(4).children().val(); inputTds.eq(4).html(textInput).children().val(textVal); @@ -253,7 +276,7 @@ function parseRows(rows) { term[2] = rowNum; inputTds.eq(2).children().eq(0).attr('name', 'filter'+stringFilter(term)); inputTds.eq(2).children().eq(0).attr('id', 'filter'+stringFilter(term)); - }//End for each term/row + } // end foreach term/row history.replaceState(null, null, '?view=filter&' + $j('#contentForm').serialize()); } diff --git a/web/skins/classic/views/js/filter.js.php b/web/skins/classic/views/js/filter.js.php index 15db50a32..31cd939a0 100644 --- a/web/skins/classic/views/js/filter.js.php +++ b/web/skins/classic/views/js/filter.js.php @@ -10,6 +10,7 @@ var states = ; var servers = ; var storageareas = ; var monitors = ; +var zones = ; var errorBrackets = ''; var errorValue = ''; diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js index 00130f108..3a491941b 100644 --- a/web/skins/classic/views/js/montage.js +++ b/web/skins/classic/views/js/montage.js @@ -464,6 +464,7 @@ function initPage() { // Start the fps and status updates. give a random delay so that we don't assault the server var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout ); +console.log("delay: " + delay); monitors[i].start(delay); var interval = monitors[i].refresh; diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php index 4e216f380..0d3571523 100644 --- a/web/skins/classic/views/montagereview.php +++ b/web/skins/classic/views/montagereview.php @@ -62,6 +62,17 @@ ob_end_clean(); $filter = array(); if ( isset($_REQUEST['filter']) ) { $filter = $_REQUEST['filter']; + + # Try to guess min/max time from filter + foreach ( $filter['Query'] as $term ) { + if ( $term['attr'] == 'StartDateTime' ) { + if ( $term['op'] == '<=' or $term['op'] == '<' ) { + $maxTime = $term['val']; + } else if ( $term['op'] == '>=' or $term['op'] == '>' ) { + $minTime = $term['val']; + } + } + } } else { if ( isset($_REQUEST['minTime']) && isset($_REQUEST['maxTime']) && (count($displayMonitors) != 0) ) { From a84031f819203583c8cda835f9c52e39c37d570c Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 19 Dec 2019 09:25:22 -0500 Subject: [PATCH 065/330] TEXT fields cannot have default values --- db/zm_create.sql.in | 2 +- db/zm_update-1.33.16.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index d4efb5317..c9b2b6ea1 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -434,7 +434,7 @@ DROP TABLE IF EXISTS `Monitors`; CREATE TABLE `Monitors` ( `Id` int(10) unsigned NOT NULL auto_increment, `Name` varchar(64) NOT NULL default '', - `Notes` TEXT NOT NULL default '', + `Notes` TEXT, `ServerId` int(10) unsigned, `StorageId` smallint(5) unsigned default 0, `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local', diff --git a/db/zm_update-1.33.16.sql b/db/zm_update-1.33.16.sql index aacfd9425..87058e3f8 100644 --- a/db/zm_update-1.33.16.sql +++ b/db/zm_update-1.33.16.sql @@ -5,7 +5,7 @@ SET @s = (SELECT IF( AND column_name = 'Notes' ) > 0, "SELECT 'Column Notes already exists in Monitors'", - "ALTER TABLE `Monitors` ADD `Notes` TEXT NOT NULL default '' AFTER `Name`" + "ALTER TABLE `Monitors` ADD `Notes` TEXT AFTER `Name`" )); PREPARE stmt FROM @s; From bcda92058eef2db2d202687939556c65bad18d98 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 20 Dec 2019 14:56:01 -0500 Subject: [PATCH 066/330] proper way to make cakephp filter by group. Make Group containable, always add the join --- web/api/app/Controller/MonitorsController.php | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php index eb229975b..07167b33a 100644 --- a/web/api/app/Controller/MonitorsController.php +++ b/web/api/app/Controller/MonitorsController.php @@ -36,7 +36,7 @@ class MonitorsController extends AppController { * @return void */ public function index() { - $this->Monitor->recursive = 1; + $this->Monitor->recursive = 0; if ( $this->request->params['named'] ) { $this->FilterComponent = $this->Components->load('Filter'); @@ -50,28 +50,19 @@ class MonitorsController extends AppController { $conditions['Monitor.Id' ] = $allowedMonitors; } - $find_array = array('conditions'=>&$conditions,'contain'=>array('Group')); - if ( isset($conditions['`GroupId` ']) ) { - $find_array['joins'] = array( + $find_array = array( + 'conditions' => &$conditions, + 'contain' => array('Group'), + 'joins' => array( array( 'table' => 'Groups_Monitors', - 'type' => 'inner', + 'type' => 'inner', 'conditions' => array( 'Groups_Monitors.MonitorId = Monitor.Id', - 'Groups_Monitors.GroupId' => $conditions['`GroupId` '] ), ), - //array( - //'table' => 'Groups', - //'type' => 'inner', - //'conditions' => array( - //'Groups.Id = Groups_Monitors.GroupId', - //'Groups.Id' => $this->request->params['GroupId'], - //), - //) - ); - unset($conditions['`GroupId` ']); - } + ) + ); $monitors = $this->Monitor->find('all',$find_array); $this->set(array( 'monitors' => $monitors, From d25a91ad1394efb260873b15ac510e7ca7f67414 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 20 Dec 2019 14:56:14 -0500 Subject: [PATCH 067/330] Make Group containable --- web/api/app/Model/Group.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/api/app/Model/Group.php b/web/api/app/Model/Group.php index 8d8f533ca..04d783b14 100644 --- a/web/api/app/Model/Group.php +++ b/web/api/app/Model/Group.php @@ -77,4 +77,5 @@ class Group extends AppModel { 'counterQuery' => '' ), ); + var $actsAs = array( 'Containable' ); } From fc017893bcba7973542b6ea9f3c2c088d8dfc944 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 20 Dec 2019 16:09:34 -0500 Subject: [PATCH 068/330] Sort the log filtering options. Fixes #2756 --- web/ajax/log.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/web/ajax/log.php b/web/ajax/log.php index ef2e450f2..36a29adc3 100644 --- a/web/ajax/log.php +++ b/web/ajax/log.php @@ -41,7 +41,7 @@ function buildLogQuery($action) { } foreach ( $filter as $field=>$value ) { - if ( ! in_array($field, $filterFields) ) { + if ( !in_array($field, $filterFields) ) { ZM\Error("'$field' is not in valid filter fields " . print_r($filterField,true)); continue; } @@ -58,7 +58,7 @@ function buildLogQuery($action) { $sql .= ' ORDER BY '.$sortField.' '.$sortOrder.' LIMIT '.$limit; return array('sql'=>$sql, 'values'=>$values); -} +} # function buildLogQuery($action) switch ( $_REQUEST['task'] ) { case 'create' : @@ -70,14 +70,16 @@ switch ( $_REQUEST['task'] ) { $string = $_POST['message']; $file = !empty($_POST['file']) ? preg_replace( '/\w+:\/\/[\w.:]+\//', '', $_POST['file'] ) : ''; - if ( !empty( $_POST['line'] ) ) + if ( !empty( $_POST['line'] ) ) { $line = validInt($_POST['line']); - else + } else { $line = NULL; + } $levels = array_flip(ZM\Logger::$codes); - if ( !isset($levels[$_POST['level']]) ) + if ( !isset($levels[$_POST['level']]) ) { ZM\Panic('Unexpected logger level '.$_POST['level']); + } $level = $levels[$_POST['level']]; ZM\Logger::fetch()->logPrint($level, $string, $file, $line); } @@ -141,6 +143,10 @@ switch ( $_REQUEST['task'] ) { $logs[] = $log; } + foreach ( $options as $field => $values ) { + asort($options[$field]); + } + $available = count($logs); ajaxResponse( array( 'updated' => preg_match('/%/', DATE_FMT_CONSOLE_LONG)?strftime(DATE_FMT_CONSOLE_LONG):date(DATE_FMT_CONSOLE_LONG), From 23dde04725045fe38e2f687782e9439211aac5e1 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 20 Dec 2019 16:10:30 -0500 Subject: [PATCH 069/330] remove timeout on changing runstate. --- web/skins/classic/views/js/state.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/state.js b/web/skins/classic/views/js/state.js index 7165c690c..e8b4db36d 100644 --- a/web/skins/classic/views/js/state.js +++ b/web/skins/classic/views/js/state.js @@ -54,7 +54,7 @@ $j(document).ready(function() { url: thisUrl, data: formData, dataType: 'html', - enocde: true + timeout: 0 }).done(function(data) { location.reload(); }); From 5a45835006df7532ef5a313849617fc14f4f8a8a Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 20 Dec 2019 16:11:10 -0500 Subject: [PATCH 070/330] break up long lines --- web/skins/classic/views/log.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/web/skins/classic/views/log.php b/web/skins/classic/views/log.php index 7dd83ef2a..044a3e788 100644 --- a/web/skins/classic/views/log.php +++ b/web/skins/classic/views/log.php @@ -122,9 +122,12 @@ xhtmlHeaders(__FILE__, translate('SystemLog') );
    - - - + + + + + +
    From 63d20a1514003a7cf83a2ac8dd6f1276641bdee8 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 20 Dec 2019 16:11:24 -0500 Subject: [PATCH 071/330] Move hidden inputs to top of form --- web/skins/classic/views/state.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/skins/classic/views/state.php b/web/skins/classic/views/state.php index 16c7708ed..b5c069600 100644 --- a/web/skins/classic/views/state.php +++ b/web/skins/classic/views/state.php @@ -25,6 +25,10 @@ if ( !canEdit('System') ) { ?>
    From 6a39893c1dfe69075468fa9310d09010b56b64ba Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 31 Dec 2019 19:11:14 -0500 Subject: [PATCH 104/330] include i elements in data-on-click --- web/skins/classic/js/skin.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js index 5ccddf96b..a85281d2d 100644 --- a/web/skins/classic/js/skin.js +++ b/web/skins/classic/js/skin.js @@ -175,12 +175,13 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() { }); // 'data-on-click' calls the global function in the attribute value with no arguments when a click happens. - document.querySelectorAll("a[data-on-click], button[data-on-click], input[data-on-click]").forEach(function attachOnClick(el) { + document.querySelectorAll("i[data-on-click], a[data-on-click], button[data-on-click], input[data-on-click]").forEach(function attachOnClick(el) { var fnName = el.getAttribute("data-on-click"); if ( !window[fnName] ) { console.error("Nothing found to bind to " + fnName + " on element " + el.name); return; - } + } + el.onclick = function() { window[fnName](); }; From a7b23f5c39e730f86f7383b4e159013a8848367e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 31 Dec 2019 19:12:31 -0500 Subject: [PATCH 105/330] add esnotification to log lines to ignore in logcheck --- misc/logcheck | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/logcheck b/misc/logcheck index e59948e86..820108a66 100644 --- a/misc/logcheck +++ b/misc/logcheck @@ -28,3 +28,4 @@ zmtelemetry\[[[:digit:]]+\]: INF \[Telemetry data uploaded successfully.\]$ zmtelemetry\[[[:digit:]]+\]: INF \[Sending data to ZoneMinder Telemetry server.\]$ zmtelemetry\[[[:digit:]]+\]: INF \[Collec?ting data to send to ZoneMinder Telemetry server.\]$ web_php\[[[:digit:]]+\]: INF \[Login successful for user "[[:alnum:]]+"\]$ +zmeventnotification\[[[:digit:]]+\]: INF From 98f7fb63b907bf83dab8a9f8fc596800dc2d4d8a Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 31 Dec 2019 19:24:51 -0600 Subject: [PATCH 106/330] fix eslint errors --- web/skins/classic/js/skin.js | 2 +- web/skins/classic/views/js/monitor.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js index a85281d2d..9e705bbc3 100644 --- a/web/skins/classic/js/skin.js +++ b/web/skins/classic/js/skin.js @@ -180,7 +180,7 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() { if ( !window[fnName] ) { console.error("Nothing found to bind to " + fnName + " on element " + el.name); return; - } + } el.onclick = function() { window[fnName](); diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js index b24f6a1b3..3f962ebfb 100644 --- a/web/skins/classic/views/js/monitor.js +++ b/web/skins/classic/views/js/monitor.js @@ -141,8 +141,8 @@ function initPage() { function change_WebColour() { $j('#WebSwatch').css( - 'backgroundColor', - $j('input[name="newMonitor[WebColour]"]').val() + 'backgroundColor', + $j('input[name="newMonitor[WebColour]"]').val() ); } @@ -159,7 +159,7 @@ function random_WebColour() { var new_colour = getRandomColour(); $j('input[name="newMonitor[WebColour]"]').val(new_colour); $j('#WebSwatch').css( - 'backgroundColor', new_colour + 'backgroundColor', new_colour ); } From 60d45d967ffe9b6ac29d85aef29540b2945d975f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 2 Jan 2020 10:17:07 -0500 Subject: [PATCH 107/330] test for existence of selected checkboxes in post data because if none are selected, the array won't exist --- web/skins/classic/views/options.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php index c01209b74..2d1bb7ad2 100644 --- a/web/skins/classic/views/options.php +++ b/web/skins/classic/views/options.php @@ -110,8 +110,6 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*',GLOB_ONLYDIR)) as $ - - @@ -319,23 +317,28 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*',GLOB_ONLYDIR)) as $ } function updateSelected() { + # Turn them all off, then selectively turn the checked ones back on dbQuery('UPDATE `Users` SET `APIEnabled`=0'); - foreach ( $_REQUEST["tokenUids"] as $markUid ) { - $minTime = time(); - dbQuery('UPDATE `Users` SET `TokenMinExpiry`=? WHERE `Id`=?', array($minTime, $markUid)); + + if ( isset($_REQUEST['tokenUids']) ) { + foreach ( $_REQUEST['tokenUids'] as $markUid ) { + $minTime = time(); + dbQuery('UPDATE `Users` SET `TokenMinExpiry`=? WHERE `Id`=?', array($minTime, $markUid)); + } } - foreach ( $_REQUEST["apiUids"] as $markUid ) { - dbQuery('UPDATE `Users` SET `APIEnabled`=1 WHERE `Id`=?', array($markUid)); - + if ( isset($_REQUEST['apiUids']) ) { + foreach ( $_REQUEST['apiUids'] as $markUid ) { + dbQuery('UPDATE `Users` SET `APIEnabled`=1 WHERE `Id`=?', array($markUid)); + } } echo ''.translate('Updated').''; } - if ( array_key_exists('revokeAllTokens',$_POST) ) { + if ( array_key_exists('revokeAllTokens', $_POST) ) { revokeAllTokens(); } - if ( array_key_exists('updateSelected',$_POST) ) { + if ( array_key_exists('updateSelected', $_POST) ) { updateSelected(); } ?> From 399508b21174dd63f5631f046a68f725f6cdbe47 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Thu, 2 Jan 2020 10:25:48 -0500 Subject: [PATCH 108/330] fix JWT access token always being 1 hr --- web/api/app/Controller/HostController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/api/app/Controller/HostController.php b/web/api/app/Controller/HostController.php index 300352949..7ddba57df 100644 --- a/web/api/app/Controller/HostController.php +++ b/web/api/app/Controller/HostController.php @@ -136,7 +136,7 @@ class HostController extends AppController { }*/ $access_issued_at = time(); - $access_ttl = (ZM_AUTH_HASH_TTL || 2) * 3600; + $access_ttl = max(ZM_AUTH_HASH_TTL,1) * 3600; // by default access token will expire in 2 hrs // you can change it by changing the value of ZM_AUTH_HASH_TLL From 9d57be4c9ec9df7b456ffe05529591b15dc6d5e7 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 2 Jan 2020 16:24:43 -0500 Subject: [PATCH 109/330] google code style, remove redundant code matching parent. Don't re-instantiate UA. --- .../lib/ZoneMinder/Control/Amcrest_HTTP.pm | 384 +++++++----------- 1 file changed, 152 insertions(+), 232 deletions(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm index e95f86cba..71ea894dc 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm @@ -1,6 +1,6 @@ # ========================================================================== # -# ZoneMinder Acrest HTTP API Control Protocol Module, 20180214, Rev 3.0 +# ZoneMinder Amcrest HTTP API Control Protocol Module, 20180214, Rev 3.0 # # Change Log # @@ -8,7 +8,7 @@ # - Fixes incorrect method names # - Updates control sequences to Amcrest HTTP Protocol API v 2.12 # - Extends control features -# +# # Rev 2.0: # - Fixed installation instructions text, no changes to functionality. # @@ -38,6 +38,7 @@ use Time::HiRes qw( usleep ); require ZoneMinder::Base; require ZoneMinder::Control; +require LWP::UserAgent; our @ISA = qw(ZoneMinder::Control); @@ -50,130 +51,64 @@ our @ISA = qw(ZoneMinder::Control); use ZoneMinder::Logger qw(:all); use ZoneMinder::Config qw(:all); -sub new -{ - my $class = shift; - my $id = shift; - my $self = ZoneMinder::Control->new( $id ); - bless( $self, $class ); - srand( time() ); - return $self; +sub new { + my $class = shift; + my $id = shift; + my $self = ZoneMinder::Control->new($id); + bless($self, $class); + return $self; } -our $AUTOLOAD; +sub open { + my $self = shift; -sub AUTOLOAD -{ - my $self = shift; - my $class = ref($self) || croak( "$self not object" ); - my $name = $AUTOLOAD; - $name =~ s/.*://; - Debug( "Received command: $name" ); - if ( exists($self->{$name}) ) - { - return( $self->{$name} ); - } - Fatal( "Can't access $name member of object of class $class" ); + $self->loadMonitor(); + my $user; + my $password; + + if ( $self->{Monitor}->{ControlAddress} =~ /(.*):(.*)@(.*)/ ) { + $user = $1; + $password = $2; + $$self{address} = $3; + } + + $self->{ua} = LWP::UserAgent->new; + $self->{ua}->credentials($$self{address}, 'Login to ' . $self->{Monitor}->{ControlDevice}, $user, $password); + $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION); + $self->{state} = 'open'; } -sub open -{ - my $self = shift; - - $self->loadMonitor(); - $self->{state} = 'open'; +sub close { + my $self = shift; + $self->{state} = 'closed'; } -sub initUA -{ - my $self = shift; - my $user = undef; - my $password = undef; - my $address = undef; +sub sendCmd { + my $self = shift; + my $cmd = shift; + my $result = undef; - if ( $self->{Monitor}->{ControlAddress} =~ /(.*):(.*)@(.*)/ ) - { - $user = $1; - $password = $2; - $address = $3; - } + $self->printMsg($cmd, 'Tx'); - use LWP::UserAgent; - $self->{ua} = LWP::UserAgent->new; - $self->{ua}->credentials("$address", "Login to " . $self->{Monitor}->{ControlDevice}, "$user", "$password"); - $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION ); + my $req = HTTP::Request->new( GET=>"http://$$self{address}/$cmd" ); + my $res = $self->{ua}->request($req); + + if ( $res->is_success ) { + $result = !undef; + # Command to camera appears successful, write Info item to log + Info('Camera control: \''.$res->status_line().'\' for URL '.$self->{Monitor}->{ControlAddress}.'/'.$cmd); + # TODO: Add code to retrieve $res->message_decode or some such. Then we could do things like check the camera status. + } else { + Error('Camera control command FAILED: \''.$res->status_line().'\' for URL '.$self->{Monitor}->{ControlAddress}.'/'.$cmd); + } + + return $result; } -sub destroyUA -{ - my $self = shift; - - $self->{ua} = undef; -} - -sub close -{ - my $self = shift; - $self->{state} = 'closed'; -} - -sub printMsg -{ - my $self = shift; - my $msg = shift; - my $msg_len = length($msg); - - Debug( $msg."[".$msg_len."]" ); -} - -sub sendCmd -{ - my $self = shift; - my $cmd = shift; - my $result = undef; - - destroyUA($self); - initUA($self); - - my $user = undef; - my $password = undef; - my $address = undef; - - if ( $self->{Monitor}->{ControlAddress} =~ /(.*):(.*)@(.*)/ ) - { - $user = $1; - $password = $2; - $address = $3; - } - - printMsg( $cmd, "Tx" ); - - my $req = HTTP::Request->new( GET=>"http://$address/$cmd" ); - my $res = $self->{ua}->request($req); - - if ( $res->is_success ) - { - $result = !undef; - # Command to camera appears successful, write Info item to log - Info( "Camera control: '".$res->status_line()."' for URL ".$self->{Monitor}->{ControlAddress}."/$cmd" ); - # TODO: Add code to retrieve $res->message_decode or some such. Then we could do things like check the camera status. - } - else - { - Error( "Camera control command FAILED: '".$res->status_line()."' for URL ".$self->{Monitor}->{ControlAddress}."/$cmd" ); - } - - return( $result ); -} - -sub reset -{ - my $self = shift; - # This reboots the camera effectively resetting it - Debug( "Camera Reset" ); - $self->sendCmd( 'cgi-bin/magicBox.cgi?action=reboot' ); - ##FIXME: Exit is a bad idea as it appears to cause zmc to run away. - #Exit (0); +sub reset { + my $self = shift; + # This reboots the camera effectively resetting it + $self->sendCmd('cgi-bin/magicBox.cgi?action=reboot'); } # NOTE: I'm putting this in, but absolute camera movement does not seem to be well supported in the classic skin ATM. @@ -184,163 +119,148 @@ sub reset sub moveAbs ## Up, Down, Left, Right, etc. ??? Doesn't make sense here... { - my $self = shift; - my $pan_degrees = shift || 0; - my $tilt_degrees = shift || 0; - my $speed = shift || 1; - Debug( "Move ABS" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1='.$pan_degrees.'&arg2='.$tilt_degrees.'&arg3=0&arg4='.$speed ); + my $self = shift; + my $pan_degrees = shift || 0; + my $tilt_degrees = shift || 0; + my $speed = shift || 1; + Debug('Move ABS'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1='.$pan_degrees.'&arg2='.$tilt_degrees.'&arg3=0&arg4='.$speed); } -sub moveConUp -{ - my $self = shift; - Debug( "Move Up" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=Up&channel=0&arg1=0&arg2=1&arg3=0' ); - usleep (500); ##XXX Should this be passed in as a "speed" parameter? - $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=Up&channel=0&arg1=0&arg2=1&arg3=0' ); +sub moveConUp { + my $self = shift; + Debug('Move Up'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=Up&channel=0&arg1=0&arg2=1&arg3=0'); + usleep(500); ##XXX Should this be passed in as a "speed" parameter? + $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=Up&channel=0&arg1=0&arg2=1&arg3=0'); } -sub moveConDown -{ - my $self = shift; - Debug( "Move Down" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=Down&channel=0&arg1=0&arg2=1&arg3=0' ); - usleep (500); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=Down&channel=0&arg1=0&arg2=1&arg3=0' ); +sub moveConDown { + my $self = shift; + Debug('Move Down'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=Down&channel=0&arg1=0&arg2=1&arg3=0'); + usleep(500); + $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=Down&channel=0&arg1=0&arg2=1&arg3=0'); } -sub moveConLeft -{ - my $self = shift; - Debug( "Move Left" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=Left&channel=0&arg1=0&arg2=1&arg3=0' ); - usleep (500); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=Left&channel=0&arg1=0&arg2=1&arg3=0' ); +sub moveConLeft { + my $self = shift; + Debug('Move Left'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=Left&channel=0&arg1=0&arg2=1&arg3=0'); + usleep(500); + $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=Left&channel=0&arg1=0&arg2=1&arg3=0'); } -sub moveConRight -{ - my $self = shift; - Debug( "Move Right" ); -# $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1=270&arg2=5&arg3=0' ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=Right&channel=0&arg1=0&arg2=1&arg3=0' ); - usleep (500); - Debug( "Move Right Stop" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=Right&channel=0&arg1=0&arg2=1&arg3=0' ); +sub moveConRight { + my $self = shift; + Debug('Move Right'); + # $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1=270&arg2=5&arg3=0' ); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=Right&channel=0&arg1=0&arg2=1&arg3=0'); + usleep(500); + Debug('Move Right Stop'); + $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=Right&channel=0&arg1=0&arg2=1&arg3=0'); } -sub moveConUpRight -{ - my $self = shift; - Debug( "Move Diagonally Up Right" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=RightUp&channel=0&arg1=1&arg2=1&arg3=0' ); - usleep (500); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=RightUp&channel=0&arg1=0&arg2=1&arg3=0' ); +sub moveConUpRight { + my $self = shift; + Debug('Move Diagonally Up Right'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=RightUp&channel=0&arg1=1&arg2=1&arg3=0'); + usleep(500); + $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=RightUp&channel=0&arg1=0&arg2=1&arg3=0'); } -sub moveConDownRight -{ - my $self = shift; - Debug( "Move Diagonally Down Right" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=RightDown&channel=0&arg1=1&arg2=1&arg3=0' ); - usleep (500); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=RightDown&channel=0&arg1=0&arg2=1&arg3=0' ); +sub moveConDownRight { + my $self = shift; + Debug('Move Diagonally Down Right'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=RightDown&channel=0&arg1=1&arg2=1&arg3=0'); + usleep(500); + $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=RightDown&channel=0&arg1=0&arg2=1&arg3=0'); } -sub moveConUpLeft -{ - my $self = shift; - Debug( "Move Diagonally Up Left" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=LeftUp&channel=0&arg1=1&arg2=1&arg3=0' ); - usleep (500); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=LeftUp&channel=0&arg1=0&arg2=1&arg3=0' ); +sub moveConUpLeft { + my $self = shift; + Debug('Move Diagonally Up Left'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=LeftUp&channel=0&arg1=1&arg2=1&arg3=0'); + usleep(500); + $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=LeftUp&channel=0&arg1=0&arg2=1&arg3=0'); } -sub moveConDownLeft -{ - my $self = shift; - Debug( "Move Diagonally Down Left" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=LeftDown&channel=0&arg1=1&arg2=1&arg3=0' ); - usleep (500); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&code=LeftDown&channel=0&arg1=0&arg2=1&arg3=0' ); +sub moveConDownLeft { + my $self = shift; + Debug('Move Diagonally Down Left'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=LeftDown&channel=0&arg1=1&arg2=1&arg3=0'); + usleep (500); + $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=LeftDown&channel=0&arg1=0&arg2=1&arg3=0'); } # Stop is not "correctly" implemented as control_functions.php translates this to "Center" # So we'll just send the camera to 0* Horz, 0* Vert, zoom out; Also, Amcrest does not seem to # support a generic stop-all-current-action command. -sub moveStop -{ - my $self = shift; - Debug( "Move Stop/Center" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1=0&arg2=0&arg3=0&arg4=1' ); +sub moveStop { + my $self = shift; + Debug('Move Stop/Center'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1=0&arg2=0&arg3=0&arg4=1'); } # Move Camera to Home Position # The current API does not support a Home per se, so we'll just send the camera to preset #1 # NOTE: It goes without saying that the user must have set up preset #1 for this to work. -sub presetHome -{ - my $self = shift; - Debug( "Home Preset" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&channel=0&code=GotoPreset&&arg1=0&arg2=1&arg3=0&arg4=0' ); +sub presetHome { + my $self = shift; + Debug('Home Preset'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&channel=0&code=GotoPreset&&arg1=0&arg2=1&arg3=0&arg4=0'); } -sub presetGoto -{ - my $self = shift; - my $params = shift; - my $preset = $self->getParam( $params, 'preset' ); - Debug( "Go To Preset $preset" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&channel=0&code=GotoPreset&&arg1=0&arg2='.$preset.'&arg3=0&arg4=0' ); +sub presetGoto { + my $self = shift; + my $params = shift; + my $preset = $self->getParam($params, 'preset'); + Debug("Go To Preset $preset"); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&channel=0&code=GotoPreset&&arg1=0&arg2='.$preset.'&arg3=0&arg4=0'); } -sub presetSet -{ - my $self = shift; - my $params = shift; - my $preset = $self->getParam( $params, 'preset' ); - Debug( "Set Preset" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&channel=0&code=SetPreset&arg1=0&arg2='.$preset.'&arg3=0&arg4=0' ); +sub presetSet { + my $self = shift; + my $params = shift; + my $preset = $self->getParam($params, 'preset'); + Debug('Set Preset'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&channel=0&code=SetPreset&arg1=0&arg2='.$preset.'&arg3=0&arg4=0'); } # NOTE: This does not appear to be implemented in the classic skin. But we'll leave it here for later. -sub moveMap -{ - my $self = shift; - my $params = shift; +sub moveMap { + my $self = shift; + my $params = shift; - my $xcoord = $self->getParam( $params, 'xcoord', $self->{Monitor}{Width}/2 ); - my $ycoord = $self->getParam( $params, 'ycoord', $self->{Monitor}{Height}/2 ); - # if the camera is mounted upside down, you may have to inverse these coordinates - # just use 360 minus pan instead of pan, 90 minus tilt instead of tilt - # Convert xcoord into pan position 0 to 359 - my $pan = int(360 * $xcoord / $self->{Monitor}{Width}); - # Convert ycoord into tilt position 0 to 89 - my $tilt = 90 - int(90 * $ycoord / $self->{Monitor}{Height}); - # Now get the following url: - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1='.$pan.'&arg2='.$tilt.'&arg3=1&arg4=1'); + my $xcoord = $self->getParam( $params, 'xcoord', $self->{Monitor}{Width}/2 ); + my $ycoord = $self->getParam( $params, 'ycoord', $self->{Monitor}{Height}/2 ); + # if the camera is mounted upside down, you may have to inverse these coordinates + # just use 360 minus pan instead of pan, 90 minus tilt instead of tilt + # Convert xcoord into pan position 0 to 359 + my $pan = int(360 * $xcoord / $self->{Monitor}{Width}); + # Convert ycoord into tilt position 0 to 89 + my $tilt = 90 - int(90 * $ycoord / $self->{Monitor}{Height}); + # Now get the following url: + $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1='.$pan.'&arg2='.$tilt.'&arg3=1&arg4=1'); } -sub zoomConTele -{ - my $self = shift; - Debug( "Zoom continuous tele" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&channel=0&code=ZoomTele&arg1=0&arg2=0&arg3=0&arg4=0' ); - usleep (100000); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&channel=0&code=ZoomTele&arg1=0&arg2=0&arg3=0&arg4=0' ); +sub zoomConTele { + my $self = shift; + Debug('Zoom continuous tele'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&channel=0&code=ZoomTele&arg1=0&arg2=0&arg3=0&arg4=0'); + usleep(100000); + $self->sendCmd('cgi-bin/ptz.cgi?action=stop&channel=0&code=ZoomTele&arg1=0&arg2=0&arg3=0&arg4=0'); } -sub zoomConWide -{ - my $self = shift; - Debug( "Zoom continuous wide" ); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&channel=0&code=ZoomWide&arg1=0&arg2=0&arg3=0&arg4=0' ); - usleep (100000); - $self->sendCmd( 'cgi-bin/ptz.cgi?action=stop&channel=0&code=ZoomWide&arg1=0&arg2=0&arg3=0&arg4=0' ); +sub zoomConWide { + my $self = shift; + Debug('Zoom continuous wide'); + $self->sendCmd('cgi-bin/ptz.cgi?action=start&channel=0&code=ZoomWide&arg1=0&arg2=0&arg3=0&arg4=0'); + usleep (100000); + $self->sendCmd('cgi-bin/ptz.cgi?action=stop&channel=0&code=ZoomWide&arg1=0&arg2=0&arg3=0&arg4=0'); } 1; @@ -355,7 +275,7 @@ ZoneMinder::Control::Amcrest_HTTP - Amcrest camera control =head1 DESCRIPTION -This module contains the implementation of the Amcrest Camera +This module contains the implementation of the Amcrest Camera controllable SDK API. NOTE: This module implements interaction with the camera in clear text. From 1d24e022bb9877e2cd17fa99adc075a740e36dca Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 2 Jan 2020 16:45:27 -0500 Subject: [PATCH 110/330] Add realm detection --- .../lib/ZoneMinder/Control/Amcrest_HTTP.pm | 51 +++++++++++++++++-- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm index 71ea894dc..3fd36a0c4 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm @@ -63,18 +63,63 @@ sub open { my $self = shift; $self->loadMonitor(); - my $user; + my $username; my $password; + my $realm = 'Login to ' . $self->{Monitor}->{ControlDevice}; if ( $self->{Monitor}->{ControlAddress} =~ /(.*):(.*)@(.*)/ ) { - $user = $1; + $username = $1; $password = $2; $$self{address} = $3; } $self->{ua} = LWP::UserAgent->new; - $self->{ua}->credentials($$self{address}, 'Login to ' . $self->{Monitor}->{ControlDevice}, $user, $password); + $self->{ua}->credentials($$self{address}, $realm, $username, $password); $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION); + + # Detect REALM + my $res = $self->{ua}->get($$self{address}.'/cgi-bin/ptz.cgi'); + + if ( $res->is_success ) { + $self->{state} = 'open'; + return; + } + + if ( $res->status_line() eq '401 Unauthorized' ) { + + my $headers = $res->headers(); + foreach my $k ( keys %$headers ) { + Debug("Initial Header $k => $$headers{$k}"); + } + + if ( $$headers{'www-authenticate'} ) { + my ( $auth, $tokens ) = $$headers{'www-authenticate'} =~ /^(\w+)\s+(.*)$/; + if ( $tokens =~ /\w+="([^"]+)"/i ) { + if ( $realm ne $1 ) { + $realm = $1; + Debug("Changing REALM to $realm"); + $self->{ua}->credentials($$self{address}, $realm, $username, $password); + $res = $self->{ua}->get($$self{address}.'/cgi-bin/ptz.cgi'); + if ( $res->is_success() ) { + $self->{state} = 'open'; + return; + } + Error('Authentication still failed after updating REALM' . $res->status_line); + $headers = $res->headers(); + foreach my $k ( keys %$headers ) { + Debug("Initial Header $k => $$headers{$k}"); + } # end foreach + } else { + Error('Authentication failed, not a REALM problem'); + } + } else { + Error('Failed to match realm in tokens'); + } # end if + } else { + Debug('No headers line'); + } # end if headers + } # end if $res->status_line() eq '401 Unauthorized' + $self->{state} = 'open'; } From 06f846c88b2029e5e1b96b58f44f507eb24f55f6 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 2 Jan 2020 16:52:09 -0500 Subject: [PATCH 111/330] add php-json to depends --- distros/ubuntu1604/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/ubuntu1604/control b/distros/ubuntu1604/control index 7e57c98a8..1b7b96320 100644 --- a/distros/ubuntu1604/control +++ b/distros/ubuntu1604/control @@ -74,7 +74,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} ,libfile-slurp-perl ,mysql-client | mariadb-client | virtual-mysql-client ,perl-modules - ,php5-mysql | php-mysql, php5-gd | php-gd , php5-apcu | php-apcu , php-apc | php-apcu-bc + ,php5-mysql | php-mysql, php5-gd | php-gd , php5-apcu | php-apcu , php-apc | php-apcu-bc, php-json ,policykit-1 ,rsyslog | system-log-daemon ,zip From e9815bf9c7373a4e1744290074ae6ec23a18afe2 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 2 Jan 2020 16:54:50 -0500 Subject: [PATCH 112/330] add ZM Namespace to Error calls --- web/includes/config.php.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/includes/config.php.in b/web/includes/config.php.in index ef1bf4a16..909a10e15 100644 --- a/web/includes/config.php.in +++ b/web/includes/config.php.in @@ -179,14 +179,14 @@ if ( ! defined('ZM_SERVER_ID') ) { # Use Server lookup so that it caches $Server = ZM\Server::find_one(array('Name'=>ZM_SERVER_NAME)); if ( !$Server ) { - Error('Invalid Multi-Server configration detected. ZM_SERVER_NAME set to ' . ZM_SERVER_NAME . ' in zm.conf, but no corresponding entry found in Servers table.'); + ZM\Error('Invalid Multi-Server configration detected. ZM_SERVER_NAME set to ' . ZM_SERVER_NAME . ' in zm.conf, but no corresponding entry found in Servers table.'); } else { define('ZM_SERVER_ID', $Server->Id()); } } else if ( defined('ZM_SERVER_HOST') and ZM_SERVER_HOST ) { $Server = ZM\Server::find_one(array('Name'=>ZM_SERVER_HOST)); if ( ! $Server ) { - Error('Invalid Multi-Server configration detected. ZM_SERVER_HOST set to ' . ZM_SERVER_HOST . ' in zm.conf, but no corresponding entry found in Servers table.'); + ZM\Error('Invalid Multi-Server configration detected. ZM_SERVER_HOST set to ' . ZM_SERVER_HOST . ' in zm.conf, but no corresponding entry found in Servers table.'); } else { define('ZM_SERVER_ID', $Server->Id()); } @@ -199,7 +199,7 @@ function process_configfile($configFile) { if ( is_readable( $configFile ) ) { $configvals = array(); - $cfg = fopen($configFile, 'r') or Error("Could not open config file: $configFile."); + $cfg = fopen($configFile, 'r') or ZM\Error("Could not open config file: $configFile."); while ( !feof($cfg) ) { $str = fgets($cfg, 256); if ( preg_match('/^\s*(#.*)?$/', $str) ) { @@ -207,7 +207,7 @@ function process_configfile($configFile) { } else if ( preg_match( '/^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/', $str, $matches )) { $configvals[$matches[1]] = $matches[2]; } else { - Error("Malformed line in config $configFile\n$str"); + ZM\Error("Malformed line in config $configFile\n$str"); } } fclose($cfg); From d42e9beddc934c956c0398b42fcb81866b63d7cf Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 2 Jan 2020 17:03:52 -0500 Subject: [PATCH 113/330] Add warnings when the type of movement is not selected --- web/includes/Control.php | 51 ++++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/web/includes/Control.php b/web/includes/Control.php index 39c259092..2121061b1 100644 --- a/web/includes/Control.php +++ b/web/includes/Control.php @@ -128,12 +128,16 @@ class Control extends ZM_Object { $cmds['PresetHome'] = 'presetHome'; if ( $this->CanZoom() ) { - if ( $this->CanZoomCon() ) + if ( $this->CanZoomCon() ) { $cmds['ZoomRoot'] = 'zoomCon'; - elseif ( $this->CanZoomRel() ) + } else if ( $this->CanZoomRel() ) { $cmds['ZoomRoot'] = 'zoomRel'; - elseif ( $this->CanZoomAbs() ) + } else if ( $this->CanZoomAbs() ) { $cmds['ZoomRoot'] = 'zoomAbs'; + } else { + $cmds['ZoomRoot'] = ''; + Error('No zoom type selected. Please select Continuous, Relative, Absolute'); + } $cmds['ZoomTele'] = $cmds['ZoomRoot'].'Tele'; $cmds['ZoomWide'] = $cmds['ZoomRoot'].'Wide'; $cmds['ZoomStop'] = 'zoomStop'; @@ -142,12 +146,16 @@ class Control extends ZM_Object { } if ( $this->CanFocus() ) { - if ( $this->CanFocusCon() ) + if ( $this->CanFocusCon() ) { $cmds['FocusRoot'] = 'focusCon'; - elseif ( $this->CanFocusRel() ) + } else if ( $this->CanFocusRel() ) { $cmds['FocusRoot'] = 'focusRel'; - elseif ( $this->CanFocusAbs() ) + } else if ( $this->CanFocusAbs() ) { $cmds['FocusRoot'] = 'focusAbs'; + } else { + $cmds['FocusRoot'] = ''; + Error('No focus type selected. Please select Continuous, Relative, Absolute'); + } $cmds['FocusFar'] = $cmds['FocusRoot'].'Far'; $cmds['FocusNear'] = $cmds['FocusRoot'].'Near'; $cmds['FocusStop'] = 'focusStop'; @@ -156,12 +164,16 @@ class Control extends ZM_Object { } if ( $this->CanIris() ) { - if ( $this->CanIrisCon() ) + if ( $this->CanIrisCon() ) { $cmds['IrisRoot'] = 'irisCon'; - elseif ( $this->CanIrisRel() ) + } else if ( $this->CanIrisRel() ) { $cmds['IrisRoot'] = 'irisRel'; - elseif ( $this->CanIrisAbs() ) + } else if ( $this->CanIrisAbs() ) { $cmds['IrisRoot'] = 'irisAbs'; + } else { + $cmds['IrisRoot'] = ''; + Error('No iris type selected. Please select Continuous, Relative, Absolute'); + } $cmds['IrisOpen'] = $cmds['IrisRoot'].'Open'; $cmds['IrisClose'] = $cmds['IrisRoot'].'Close'; $cmds['IrisStop'] = 'irisStop'; @@ -170,12 +182,16 @@ class Control extends ZM_Object { } if ( $this->CanWhite() ) { - if ( $this->CanWhiteCon() ) + if ( $this->CanWhiteCon() ) { $cmds['WhiteRoot'] = 'whiteCon'; - elseif ( $this->CanWhiteRel() ) + } else if ( $this->CanWhiteRel() ) { $cmds['WhiteRoot'] = 'whiteRel'; - elseif ( $this->CanWhiteAbs() ) + } else if ( $this->CanWhiteAbs() ) { $cmds['WhiteRoot'] = 'whiteAbs'; + } else { + Error('No White type selected. Please select Continuous, Relative, Absolute'); + $cmds['WhiteRoot'] = ''; + } $cmds['WhiteIn'] = $cmds['WhiteRoot'].'In'; $cmds['WhiteOut'] = $cmds['WhiteRoot'].'Out'; $cmds['WhiteAuto'] = 'whiteAuto'; @@ -183,12 +199,16 @@ class Control extends ZM_Object { } if ( $this->CanGain() ) { - if ( $this->CanGainCon() ) + if ( $this->CanGainCon() ) { $cmds['GainRoot'] = 'gainCon'; - elseif ( $this->CanGainRel() ) + } else if ( $this->CanGainRel() ) { $cmds['GainRoot'] = 'gainRel'; - elseif ( $this->CanGainAbs() ) + } else if ( $this->CanGainAbs() ) { $cmds['GainRoot'] = 'gainAbs'; + } else { + Error('No Gain type selected'); + $cmds['GainRoot'] = ''; + } $cmds['GainUp'] = $cmds['GainRoot'].'Up'; $cmds['GainDown'] = $cmds['GainRoot'].'Down'; $cmds['GainAuto'] = 'gainAuto'; @@ -207,6 +227,7 @@ class Control extends ZM_Object { $cmds['Center'] = $cmds['PresetHome']; } else { $cmds['MoveRoot'] = ''; + Error('No move type selected. Please select Continuous, Relative, Absolute'); } $cmds['MoveUp'] = $cmds['MoveRoot'].'Up'; From 0b3776dbf089466c5f13b8658b2dc2505acf71e5 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 3 Jan 2020 15:57:29 -0500 Subject: [PATCH 114/330] change text inputs to number inputs, cleanups --- web/skins/classic/views/controlcap.php | 197 +++++++++++-------------- 1 file changed, 86 insertions(+), 111 deletions(-) diff --git a/web/skins/classic/views/controlcap.php b/web/skins/classic/views/controlcap.php index bc48d05e4..20eb02ca3 100644 --- a/web/skins/classic/views/controlcap.php +++ b/web/skins/classic/views/controlcap.php @@ -18,40 +18,30 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // -if ( !canEdit( 'Control' ) ) -{ - $view = "error"; - return; +if ( !canEdit('Control') ) { + $view = 'error'; + return; } $tabs = array(); -$tabs["main"] = translate('Main'); -$tabs["move"] = translate('Move'); -$tabs["pan"] = translate('Pan'); -$tabs["tilt"] = translate('Tilt'); -$tabs["zoom"] = translate('Zoom'); -$tabs["focus"] = translate('Focus'); -$tabs["white"] = translate('White'); -$tabs["iris"] = translate('Iris'); -$tabs["presets"] = translate('Presets'); +$tabs['main'] = translate('Main'); +$tabs['move'] = translate('Move'); +$tabs['pan'] = translate('Pan'); +$tabs['tilt'] = translate('Tilt'); +$tabs['zoom'] = translate('Zoom'); +$tabs['focus'] = translate('Focus'); +$tabs['white'] = translate('White'); +$tabs['iris'] = translate('Iris'); +$tabs['presets'] = translate('Presets'); -if ( isset($_REQUEST['tab']) ) - $tab = validHtmlStr($_REQUEST['tab']); -else - $tab = "main"; +$tab = isset($_REQUEST['tab']) ? validHtmlStr($_REQUEST['tab']) :'main'; -if ( isset( $_REQUEST['newControl'] ) ) -{ +if ( isset($_REQUEST['newControl']) ) { $newControl = $_REQUEST['newControl']; -} -else -{ - if ( !empty($_REQUEST['cid']) ) - { - $control = dbFetchOne( 'SELECT * FROM Controls WHERE Id = ?', NULL, array($_REQUEST['cid'] ) ); - } - else - { +} else { + if ( !empty($_REQUEST['cid']) ) { + $control = dbFetchOne('SELECT * FROM Controls WHERE Id = ?', NULL, array($_REQUEST['cid'])); + } else { $control = array( 'Name' => translate('New'), 'Type' => "Local", @@ -166,16 +156,12 @@ xhtmlHeaders(__FILE__, translate('ControlCap')." - ".$newControl['Name'] );
      $value ) -{ - if ( $tab == $name ) - { +foreach ( $tabs as $name=>$value ) { + if ( $tab == $name ) { ?>
      • $value ) @@ -201,8 +186,7 @@ if ( $tab != 'main' ) @@ -212,8 +196,7 @@ if ( $tab != 'move' ) @@ -227,8 +210,7 @@ if ( $tab != 'pan' ) @@ -242,8 +224,7 @@ if ( $tab != 'tilt' ) @@ -258,8 +239,7 @@ if ( $tab != 'zoom' ) @@ -275,8 +255,7 @@ if ( $tab != 'focus' ) @@ -292,8 +271,7 @@ if ( $tab != 'iris' ) @@ -309,8 +287,7 @@ if ( $tab != 'gain' ) @@ -326,8 +303,7 @@ if ( $tab != 'white' ) @@ -336,19 +312,17 @@ if ( $tab != 'presets' ) -
    Id()] = $Server->Name(); } echo htmlSelect( 'newMonitor[ServerId]', $servers, $monitor->ServerId() ); -?> -
    -'Default'); - foreach ( ZM\Storage::find(NULL, array('order'=>'lower(Name)')) as $Storage ) { - $storage_areas[$Storage->Id()] = $Storage->Name(); - } - echo htmlSelect('newMonitor[StorageId]', $storage_areas, $monitor->StorageId()); ?>
    +'Default'); + foreach ( ZM\Storage::find(NULL, array('order'=>'lower(Name)')) as $Storage ) { + $storage_areas[$Storage->Id()] = $Storage->Name(); + } + echo htmlSelect('newMonitor[StorageId]', $storage_areas, $monitor->StorageId()); +?> +
    + 'Disabled', + 1 => 'Frames only', + 2 => 'Analysis images only (if available)', + 3 => 'Frames + Analysis images (if available)', + ); + echo htmlSelect('newMonitor[SaveJPEGs]', $savejpegopts, $monitor->SaveJPEGs()); +?> +
    Date: Wed, 18 Dec 2019 19:03:37 -0500 Subject: [PATCH 062/330] Do not set defaults in Object->set(). This allows us to set an empty timestamp. --- web/includes/Object.php | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/web/includes/Object.php b/web/includes/Object.php index 6a82ec37f..1c17ce312 100644 --- a/web/includes/Object.php +++ b/web/includes/Object.php @@ -158,14 +158,24 @@ class ZM_Object { # perhaps should turn into a comma-separated string $this->{$k} = implode(',', $v); } else if ( is_string($v) ) { - if ( $v == '' and array_key_exists($k, $this->defaults) ) { - if ( is_array($this->defaults[$k]) ) +if ( 0 ) { +# Remarking this out. We are setting a value, not asking for a default to be set. +# So don't do defaults here, do them somewhere else + if ( ($v == null) and array_key_exists($k, $this->defaults) ) { +Logger::Debug("$k => Have default for $v: "); + if ( is_array($this->defaults[$k]) ) { $this->{$k} = $this->defaults[$k]['default']; - else - $this->{$k} = $this->defaults[$k]; - } else { - $this->{$k} = trim($v); + } else { + $this->{$k} = $this->defaults[$k]; + Logger::Debug("$k => Have default for $v: " . $this->{$k}); + } + } else { + $this->{$k} = trim($v); } +} else { + $this->{$k} = trim($v); +} + } else if ( is_integer($v) ) { $this->{$k} = $v; } else if ( is_bool($v) ) { From 67cc9faa8c7b7fb1e00bb8ede19430565c98caa8 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 18 Dec 2019 19:05:06 -0500 Subject: [PATCH 063/330] remove contentForm id from form in state view which isn't used and conflicts if it is used anywhere else. --- web/skins/classic/views/state.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/state.php b/web/skins/classic/views/state.php index 12180000d..16c7708ed 100644 --- a/web/skins/classic/views/state.php +++ b/web/skins/classic/views/state.php @@ -24,7 +24,7 @@ if ( !canEdit('System') ) { } ?> From 845f35fe006232be377b914c3fa85ae531b0da23 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 26 Dec 2019 15:57:25 -0500 Subject: [PATCH 084/330] Fix cases of check before creating dirs. Add chmod so they are only readable by web user. Fix MonitorName => Monitor->Name() --- .../classic/includes/export_functions.php | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php index 02d0d86dd..e6749e426 100644 --- a/web/skins/classic/includes/export_functions.php +++ b/web/skins/classic/includes/export_functions.php @@ -113,17 +113,17 @@ function exportEventDetail($event, $exportFrames, $exportImages) { - + - + - +
    Id() ?>
    Name()) ?>
    MonitorName()) ?> (MonitorId() ?>)
    Monitor()->Name()) ?> (MonitorId() ?>)
    Cause()) ?>
    Notes()) ?>
    StartTime()) ) ?>
    StartTime())) ?>
    Length() ?>
    Frames() ?>
    AlarmFrames() ?>
    TotScore() ?>
    AvgScore() ?>
    MaxScore() ?>
    Archived()?translate('Yes'):translate('No') ?>
    Archived()?'Yes':'No') ?>
    @@ -850,10 +850,10 @@ function exportEvents( ) { if ( !canView('Events') ) { - ZM\Error("You do not have permission to view events."); + ZM\Error('You do not have permission to view events.'); return false; } else if ( empty($eids) ) { - ZM\Error("Attempt to export an empty list of events."); + ZM\Error('Attempt to export an empty list of events.'); return false; } @@ -863,23 +863,23 @@ function exportEvents( } # Ensure that we are going to be able to do this. - if ( ! file_exists(ZM_DIR_EXPORTS) ) { - if ( ! mkdir(ZM_DIR_EXPORTS) ) { - ZM\Fatal("Can't create exports dir at '".ZM_DIR_EXPORTS."'"); - } + # TODO should ensure that permissions are restrictive + if ( ! ( mkdir(ZM_DIR_EXPORTS) or file_exists(ZM_DIR_EXPORTS) ) ) { + ZM\Fatal('Can\'t create exports dir at \''.ZM_DIR_EXPORTS.'\''); } + chmod(ZM_DIR_EXPORTS, 0700); $export_dir = ZM_DIR_EXPORTS.'/zmExport_'.$connkey; # Ensure that we are going to be able to do this. - if ( ! file_exists($export_dir) ) { - if ( ! mkdir($export_dir) ) { - ZM\Fatal("Can't create exports dir at '$export_dir'"); - } else { - ZM\Logger::Debug("Successfully created dir '$export_dir'"); - } + if ( ! ( mkdir($export_dir) or file_exists($export_dir) ) ) { + ZM\Fatal("Can't create exports dir at '$export_dir'"); + } else { + ZM\Logger::Debug("Successfully created dir '$export_dir'"); } - if ( !chdir($export_dir) ) + chmod($export_dir, 0700); + if ( !chdir($export_dir) ) { ZM\Fatal("Can't chdir to $export_dir"); + } $export_root = 'zmExport'; $export_listFile = 'zmFileList.txt'; @@ -889,12 +889,13 @@ function exportEvents( if ( !is_array($eids) ) { $eids = array($eids); } - ZM\Logger::Debug("Eids: " . print_r($eids,true)); + ZM\Logger::Debug('Eids: ' . print_r($eids,true)); foreach ( $eids as $eid ) { $event = new ZM\Event($eid); $event_dir = $export_dir.'/'.$event->Id(); - if ( !mkdir($event_dir) ) + if ( !(mkdir($event_dir) or file_exists($event_dir) ) ) { ZM\Error("Can't mkdir $event_dir"); + } $event_exportFileList = exportFileList($event, $exportDetail, $exportFrames, $exportImages, $exportVideo, $exportMisc); ZM\Logger::Debug("File list for event $eid " . print_r($event_exportFileList, true)); $exportFileList = array_merge($exportFileList,$event_exportFileList); @@ -904,12 +905,12 @@ function exportEvents( ZM\Logger::Debug('cp -as '.$event->Path().'/../'.$file.' '.$export_dir.'/'.$file); exec('cp -as '.$event->Path().'/../'.$file.' '.$export_dir.'/'.$file); } - } + } # end foreach event // create an master image if ( $exportImages ) { if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/jquery.js', $export_dir.'/jquery.js') ) - ZM\Error("Failed linking jquery.js"); + ZM\Error('Failed linking jquery.js'); //if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/video.js', $export_dir.'/video.js') ) //Error("Failed linking video.js"); @@ -960,12 +961,12 @@ function exportEvents( @unlink($archive); $command .= ' zmExport_' . $connkey.'/'; - ZM\Logger::Debug("Command is $command"); exec($command, $output, $status); if ( $status ) { ZM\Error("Command '$command' returned with status $status"); - if ( isset($output[0]) ) - ZM\Error("First line of output is '".$output[0]."'"); + if ( isset($output[0]) ) { + ZM\Error('First line of output is \''.$output[0].'\''); + } return false; } From 3bc1543f9e1f3f2352a5663fcec496d11b7692a1 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Thu, 26 Dec 2019 19:36:33 -0600 Subject: [PATCH 085/330] build rpms on every commit --- utils/packpack/startpackpack.sh | 50 +++++++++++++++------------------ 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh index 4721e6480..e6b68f66d 100755 --- a/utils/packpack/startpackpack.sh +++ b/utils/packpack/startpackpack.sh @@ -293,43 +293,37 @@ if [ "${TRAVIS}" == "true" ]; then fi checksanity -# We don't want to build packages for all supported distros after every commit -# Only build all packages when executed via cron -# See https://docs.travis-ci.com/user/cron-jobs/ - # Steps common to Redhat distros if [ "${OS}" == "el" ] || [ "${OS}" == "fedora" ]; then - if [ "${TRAVIS_EVENT_TYPE}" == "cron" ] || [ "${TRAVIS}" != "true" ]; then - commonprep - echo "Begin Redhat build..." + commonprep + echo "Begin Redhat build..." - setrpmpkgname + setrpmpkgname - ln -sfT distros/redhat rpm + ln -sfT distros/redhat rpm - # The rpm specfile requires the Crud submodule folder to be empty - rm -rf web/api/app/Plugin/Crud - mkdir web/api/app/Plugin/Crud + # The rpm specfile requires the Crud submodule folder to be empty + rm -rf web/api/app/Plugin/Crud + mkdir web/api/app/Plugin/Crud - reporpm="rpmfusion-free-release" - dlurl="https://download1.rpmfusion.org/free/${OS}/${reporpm}-${DIST}.noarch.rpm" + reporpm="rpmfusion-free-release" + dlurl="https://download1.rpmfusion.org/free/${OS}/${reporpm}-${DIST}.noarch.rpm" - # Give our downloaded repo rpm a common name so redhat_package.mk can find it - if [ -n "$dlurl" ] && [ $? -eq 0 ]; then - echo "Retrieving ${reporpm} repo rpm..." - curl $dlurl > build/external-repo.noarch.rpm - else - echo "ERROR: Failed to retrieve ${reporpm} repo rpm..." - echo "Download url was: $dlurl" - exit 1 - fi - - setrpmchangelog - - echo "Starting packpack..." - execpackpack + # Give our downloaded repo rpm a common name so redhat_package.mk can find it + if [ -n "$dlurl" ] && [ $? -eq 0 ]; then + echo "Retrieving ${reporpm} repo rpm..." + curl $dlurl > build/external-repo.noarch.rpm + else + echo "ERROR: Failed to retrieve ${reporpm} repo rpm..." + echo "Download url was: $dlurl" + exit 1 fi + setrpmchangelog + + echo "Starting packpack..." + execpackpack + # Steps common to Debian based distros elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ] || [ "${OS}" == "raspbian" ]; then commonprep From 28a6e7199223d72af06952c7e695c4144ac13d2e Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 27 Dec 2019 09:04:02 -0600 Subject: [PATCH 086/330] deploy raspbian builds to debian target folder --- utils/packpack/rsync_xfer.sh | 53 ++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/utils/packpack/rsync_xfer.sh b/utils/packpack/rsync_xfer.sh index a912079e0..9d9a16056 100755 --- a/utils/packpack/rsync_xfer.sh +++ b/utils/packpack/rsync_xfer.sh @@ -2,7 +2,7 @@ # We don't deploy during eslint checks, so exit immediately if [ "${DIST}" == "eslint" ]; then - exit 0 + exit 0 fi # Check to see if this script has access to all the commands it needs @@ -17,33 +17,26 @@ for CMD in sshfs rsync find fusermount mkdir; do fi done -# See https://docs.travis-ci.com/user/cron-jobs/ -# -# TO-DO: Deploy after ever commit for rpm builds after pacakge signing & repo creation is containerized -# -if [ "${TRAVIS_EVENT_TYPE}" == "cron" ] || [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ]; then - - if [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ]; then - targetfolder="debian/master/mini-dinstall/incoming" - else - targetfolder="travis" - fi - - echo - echo "Target subfolder set to $targetfolder" - echo - - echo "Running \$(rsync -v -e 'ssh -vvv' build/*.{rpm,deb,dsc,tar.xz,changes} zmrepo@zmrepo.zoneminder.com:${targetfolder}/ 2>&1)" - rsync -v --ignore-missing-args -e 'ssh -vvv' build/*.{rpm,deb,dsc,tar.xz,changes} zmrepo@zmrepo.zoneminder.com:${targetfolder}/ 2>&1 - if [ "$?" -eq 0 ]; then - echo - echo "Files copied successfully." - echo - else - echo - echo "ERROR: Attempt to rsync to zmrepo.zoneminder.com failed!" - echo "See log output for details." - echo - exit 99 - fi +if [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ] || [ "${OS}" == "raspbian" ]; then + targetfolder="debian/master/mini-dinstall/incoming" +else + targetfolder="travis" +fi + +echo +echo "Target subfolder set to $targetfolder" +echo + +echo "Running \$(rsync -v -e 'ssh -vvv' build/*.{rpm,deb,dsc,tar.xz,changes} zmrepo@zmrepo.zoneminder.com:${targetfolder}/ 2>&1)" +rsync -v --ignore-missing-args -e 'ssh -vvv' build/*.{rpm,deb,dsc,tar.xz,changes} zmrepo@zmrepo.zoneminder.com:${targetfolder}/ 2>&1 +if [ "$?" -eq 0 ]; then + echo + echo "Files copied successfully." + echo +else + echo + echo "ERROR: Attempt to rsync to zmrepo.zoneminder.com failed!" + echo "See log output for details." + echo + exit 99 fi From 77f026a3895c15f4deed75849acc063bdf754faf Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 27 Dec 2019 09:12:49 -0600 Subject: [PATCH 087/330] exclude external-repo.noarch.rpm during deployments --- utils/packpack/rsync_xfer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/packpack/rsync_xfer.sh b/utils/packpack/rsync_xfer.sh index 9d9a16056..c4b6f93e1 100755 --- a/utils/packpack/rsync_xfer.sh +++ b/utils/packpack/rsync_xfer.sh @@ -28,7 +28,7 @@ echo "Target subfolder set to $targetfolder" echo echo "Running \$(rsync -v -e 'ssh -vvv' build/*.{rpm,deb,dsc,tar.xz,changes} zmrepo@zmrepo.zoneminder.com:${targetfolder}/ 2>&1)" -rsync -v --ignore-missing-args -e 'ssh -vvv' build/*.{rpm,deb,dsc,tar.xz,changes} zmrepo@zmrepo.zoneminder.com:${targetfolder}/ 2>&1 +rsync -v --ignore-missing-args --exclude 'external-repo.noarch.rpm' -e 'ssh -vvv' build/*.{rpm,deb,dsc,tar.xz,changes} zmrepo@zmrepo.zoneminder.com:${targetfolder}/ 2>&1 if [ "$?" -eq 0 ]; then echo echo "Files copied successfully." From 276428be59211b985206a2cd541943e3e2783618 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 27 Dec 2019 16:39:24 -0600 Subject: [PATCH 088/330] el8 needs php-json --- distros/redhat/zoneminder.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index ffaa075a3..6715f7b26 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -14,11 +14,16 @@ # This will tell zoneminder's cmake process we are building against a known distro %global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}} -# Fedora >= 25 needs apcu backwards compatibility module -%if 0%{?fedora} >= 25 +# Fedora needs apcu backwards compatibility module +%if 0%{?fedora} %global with_apcu_bc 1 %endif +# Newer php's keep json functions in a subpackage +%if 0%{?fedora} || 0%{?rhel} >= 8 +%global with_php_json 1 +%endif + # The default for everything but el7 these days %global _hardened_build 1 @@ -105,7 +110,7 @@ Summary: Common files for ZoneMinder, not tied to a specific web server Requires: php-mysqli Requires: php-common Requires: php-gd -%{?fedora:Requires: php-json} +%{?with_php_json:Requires: php-json} Requires: php-pecl-apcu %{?with_apcu_bc:Requires: php-pecl-apcu-bc} Requires: cambozola From 0aa82a74ecb064f2826311002c56ccc9c534c4d1 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Fri, 27 Dec 2019 17:13:13 -0600 Subject: [PATCH 089/330] remove support for f29 builds --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f6c2dea02..59a62888d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,6 @@ install: env: - SMPFLAGS=-j4 OS=el DIST=7 - SMPFLAGS=-j4 OS=el DIST=8 DOCKER_REPO=knnniggett/packpack - - SMPFLAGS=-j4 OS=fedora DIST=29 - SMPFLAGS=-j4 OS=fedora DIST=30 - SMPFLAGS=-j4 OS=fedora DIST=31 - SMPFLAGS=-j4 OS=ubuntu DIST=trusty DOCKER_REPO=iconzm/packpack From 00cedc92d2ca07861f5f25d9370b91825b87d3e6 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sat, 28 Dec 2019 08:37:16 -0600 Subject: [PATCH 090/330] fix typo --- src/zm_ffmpeg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp index 6b6036db5..c0a3d6bb0 100644 --- a/src/zm_ffmpeg.cpp +++ b/src/zm_ffmpeg.cpp @@ -81,7 +81,7 @@ void FFMPEGInit() { av_log_set_callback(log_libav_callback); Info("Enabling ffmpeg logs, as LOG_DEBUG+LOG_FFMPEG are enabled in options"); } else { - Info("Not enabling ffmpeg logs, as LOG_FFMPEG and/or LOG_DEBUG is disabled in options, or this monitor not part of your debug targets"); + Info("Not enabling ffmpeg logs, as LOG_FFMPEG and/or LOG_DEBUG is disabled in options, or this monitor is not part of your debug targets"); av_log_set_level(AV_LOG_QUIET); } #if !LIBAVFORMAT_VERSION_CHECK(58, 9, 0, 64, 0) From 2301103da5db7cb835cdac7b8b1e42fe16e97f22 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sat, 28 Dec 2019 09:49:42 -0600 Subject: [PATCH 091/330] use small, non-zero values, for image buffer & pre & post buffers --- web/includes/Monitor.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index cc51926fd..ad0247a1b 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -59,10 +59,10 @@ class Monitor extends ZM_Object { 'LabelX' => 0, 'LabelY' => 0, 'LabelSize' => 1, - 'ImageBufferCount' => 100, + 'ImageBufferCount' => 20, 'WarmupCount' => 0, - 'PreEventCount' => 0, - 'PostEventCount' => 0, + 'PreEventCount' => 5, + 'PostEventCount' => 5, 'StreamReplayBuffer' => 0, 'AlarmFrameCount' => 1, 'SectionLength' => 600, From bbcd1846e7b42571690f57a3520a96e7e13eefda Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 29 Dec 2019 12:44:30 -0500 Subject: [PATCH 092/330] Fix hang caused by using %d instead of PRIu64 in formatting string --- src/zm_ffmpeg.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp index c0a3d6bb0..f0b3dc76e 100644 --- a/src/zm_ffmpeg.cpp +++ b/src/zm_ffmpeg.cpp @@ -291,17 +291,18 @@ static void zm_log_fps(double d, const char *postfix) { #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0) void zm_dump_codecpar ( const AVCodecParameters *par ) { - Debug(1, "Dumping codecpar codec_type(%d) codec_id(%d %s) codec_tag(%d) width(%d) height(%d) bit_rate(%d) format(%d = %s)", - par->codec_type, - par->codec_id, - avcodec_get_name(par->codec_id), - par->codec_tag, - par->width, - par->height, - par->bit_rate, - par->format, - ((AVPixelFormat)par->format == AV_PIX_FMT_NONE ? "none" : av_get_pix_fmt_name((AVPixelFormat)par->format)) -); + Debug(1, "Dumping codecpar codec_type(%d %s) codec_id(%d %s) codec_tag(%" PRIu32 ") width(%d) height(%d) bit_rate(%" PRIu64 ") format(%d %s)", + par->codec_type, + av_get_media_type_string(par->codec_type), + par->codec_id, + avcodec_get_name(par->codec_id), + par->codec_tag, + par->width, + par->height, + par->bit_rate, + par->format, + (((AVPixelFormat)par->format == AV_PIX_FMT_NONE) ? "none" : av_get_pix_fmt_name((AVPixelFormat)par->format)) + ); } #endif From 2581b8619524e3c3556a41720b334b985c016f19 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 29 Dec 2019 12:44:59 -0500 Subject: [PATCH 093/330] add more content to the error message when can't sws_scale. Also fix problem when using 32bit on arm instead of 24bit, apparently 0 is a valid return result from sws_scale. Also change the alignment in av_image_fill_arrays. At some point we cahnged it to 32bit aligned, but in 1.32 we didn't align at all. Not sure if it matters . --- src/zm_ffmpeg_camera.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index ef4dfc057..cdb8a40b7 100644 --- a/src/zm_ffmpeg_camera.cpp +++ b/src/zm_ffmpeg_camera.cpp @@ -1089,7 +1089,7 @@ int FfmpegCamera::transfer_to_image( #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0) int size = av_image_fill_arrays( output_frame->data, output_frame->linesize, - directbuffer, imagePixFormat, width, height, 32); + directbuffer, imagePixFormat, width, height, 1); if ( size < 0 ) { Error("Problem setting up data pointers into image %s", av_make_error_string(size).c_str()); @@ -1128,8 +1128,8 @@ int FfmpegCamera::transfer_to_image( mConvertContext, input_frame->data, input_frame->linesize, 0, mVideoCodecContext->height, output_frame->data, output_frame->linesize); - if ( ret <= 0 ) { - Error("Unable to convert format %u %s linesize %d height %d to format %u %s linesize %d at frame %d codec %u %s : code: %d", + if ( ret < 0 ) { + Error("Unable to convert format %u %s linesize %d height %d to format %u %s linesize %d at frame %d codec %u %s lines %d: code: %d", input_frame->format, av_get_pix_fmt_name((AVPixelFormat)input_frame->format), input_frame->linesize, mVideoCodecContext->height, imagePixFormat, @@ -1137,6 +1137,7 @@ int FfmpegCamera::transfer_to_image( output_frame->linesize, frameCount, mVideoCodecContext->pix_fmt, av_get_pix_fmt_name(mVideoCodecContext->pix_fmt), + mVideoCodecContext->height, ret ); return -1; From b5e3dbd415fa8c59eec9bc8e2261ef4dde2754fb Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 29 Dec 2019 12:52:34 -0500 Subject: [PATCH 094/330] put back 32bit alignment with a comment as to why --- src/zm_ffmpeg_camera.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index cdb8a40b7..6578b0b2d 100644 --- a/src/zm_ffmpeg_camera.cpp +++ b/src/zm_ffmpeg_camera.cpp @@ -1087,9 +1087,10 @@ int FfmpegCamera::transfer_to_image( return -1; } #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0) + // From what I've read, we should align the linesizes to 32bit so that ffmpeg can use SIMD instructions too. int size = av_image_fill_arrays( output_frame->data, output_frame->linesize, - directbuffer, imagePixFormat, width, height, 1); + directbuffer, imagePixFormat, width, height, 32); if ( size < 0 ) { Error("Problem setting up data pointers into image %s", av_make_error_string(size).c_str()); From ce7b62c825a949c4d9446f32737fac51332870f8 Mon Sep 17 00:00:00 2001 From: adam Date: Sun, 29 Dec 2019 14:13:49 -0600 Subject: [PATCH 095/330] Fixed unquoted variable which was failing to correctly detect error case This was discovered when there was a DNS failure (it's always DNS) and it caused a syntax error on line 178. I changed it to use -z to check for a zero length string, as suggested by the man page. Putting $VERSION in double quotes would also be a valid fix. Here's what the script looks like when it fails: ./do_debian_package.sh --snapshot=stable --type=local --interactive=no Doing local build Defaulting to bionic for distribution Defaulting to ZoneMinder upstream git fatal: not a git repository (or any of the parent directories): .git fatal: not a git repository (or any of the parent directories): .git Latest stable branch is git clone https://github.com/ZoneMinder/ZoneMinder.git ZoneMinder_zoneminder_release Cloning into 'ZoneMinder_zoneminder_release'... fatal: unable to access 'https://github.com/ZoneMinder/ZoneMinder.git/': Could not resolve host: github.com ./do_debian_package.sh: line 172: cd: ZoneMinder_zoneminder_release: No such file or directory fatal: not a git repository (or any of the parent directories): .git cat: ZoneMinder_zoneminder_release/version: No such file or directory ./do_debian_package.sh: line 178: [: ==: unary operator expected Doing local release zoneminder_ mv: cannot stat 'ZoneMinder_zoneminder_release': No such file or directory Error status code is: 0 Setting up build dir failed. --- utils/do_debian_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh index 3e20b303a..b60996a78 100755 --- a/utils/do_debian_package.sh +++ b/utils/do_debian_package.sh @@ -175,7 +175,7 @@ cd ../ VERSION=`cat ${GITHUB_FORK}_zoneminder_release/version` -if [ $VERSION == "" ]; then +if [ -z "$VERSION" ]; then exit 1; fi; if [ "$SNAPSHOT" != "stable" ] && [ "$SNAPSHOT" != "" ]; then From f065daf940e1a70e9f762d88f3d6ce86058dac13 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 29 Dec 2019 16:46:30 -0500 Subject: [PATCH 096/330] spacing, move some variables deeper in scope, merge fprintf calls --- src/zm_monitorstream.cpp | 194 +++++++++++++++++++++------------------ 1 file changed, 106 insertions(+), 88 deletions(-) diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp index 0c71b5c61..49d617f7d 100644 --- a/src/zm_monitorstream.cpp +++ b/src/zm_monitorstream.cpp @@ -1,21 +1,21 @@ // // ZoneMinder Monitor Class Implementation, $Date$, $Revision$ // Copyright (C) 2001-2008 Philip Coombes -// +// // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. -// +// // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// +// #include "zm.h" #include "zm_db.h" @@ -73,7 +73,7 @@ bool MonitorStream::checkSwapPath(const char *path, bool create_path) { return false; } return true; -} // end bool MonitorStream::checkSwapPath( const char *path, bool create_path ) +} // end bool MonitorStream::checkSwapPath( const char *path, bool create_path ) void MonitorStream::processCommand(const CmdMsg *msg) { Debug( 2, "Got message, type %d, msg %d", msg->msg_type, msg->msg_data[0] ); @@ -265,7 +265,7 @@ void MonitorStream::processCommand(const CmdMsg *msg) { //status_data.enabled = monitor->shared_data->active; status_data.enabled = monitor->trigger_data->trigger_state!=Monitor::TRIGGER_OFF; status_data.forced = monitor->trigger_data->trigger_state==Monitor::TRIGGER_ON; - Debug(2, "Buffer Level:%d, Delayed:%d, Paused:%d, Rate:%d, delay:%.3f, Zoom:%d, Enabled:%d Forced:%d", + Debug(2, "Buffer Level:%d, Delayed:%d, Paused:%d, Rate:%d, delay:%.3f, Zoom:%d, Enabled:%d Forced:%d", status_data.buffer_level, status_data.delayed, status_data.paused, @@ -327,7 +327,7 @@ bool MonitorStream::sendFrame(const char *filepath, struct timeval *timestamp) { // Calculate how long it takes to actually send the frame struct timeval frameStartTime; gettimeofday(&frameStartTime, NULL); - + fputs("--ZoneMinderFrame\r\nContent-Type: image/jpeg\r\n", stdout); fprintf(stdout, "Content-Length: %d\r\n\r\n", img_buffer_size); if ( fwrite(img_buffer, img_buffer_size, 1, stdout) != 1 ) { @@ -383,7 +383,7 @@ bool MonitorStream::sendFrame(Image *image, struct timeval *timestamp) { // Calculate how long it takes to actually send the frame struct timeval frameStartTime; gettimeofday(&frameStartTime, NULL); - + fputs("--ZoneMinderFrame\r\n", stdout); switch( type ) { case STREAM_JPEG : @@ -412,7 +412,7 @@ bool MonitorStream::sendFrame(Image *image, struct timeval *timestamp) { } fprintf(stdout, "Content-Length: %d\r\n\r\n", img_buffer_size); if ( fwrite(img_buffer, img_buffer_size, 1, stdout) != 1 ) { - if ( !zm_terminate ) { + if ( !zm_terminate ) { // If the pipe was closed, we will get signalled SIGPIPE to exit, which will set zm_terminate Warning("Unable to send stream frame: %s", strerror(errno)); } @@ -430,7 +430,7 @@ bool MonitorStream::sendFrame(Image *image, struct timeval *timestamp) { Warning("Frame send time %d msec too slow, throttling maxfps to %.2f", frameSendTime, maxfps); } - } + } // Not mpeg last_frame_sent = TV_2_FLOAT(now); return true; } // end bool MonitorStream::sendFrame( Image *image, struct timeval *timestamp ) @@ -455,7 +455,7 @@ void MonitorStream::runStream() { fputs("Content-Type: multipart/x-mixed-replace;boundary=ZoneMinderFrame\r\n\r\n", stdout); // point to end which is theoretically not a valid value because all indexes are % image_buffer_count - unsigned int last_read_index = monitor->image_buffer_count; + unsigned int last_read_index = monitor->image_buffer_count; time_t stream_start_time; time(&stream_start_time); @@ -474,22 +474,21 @@ void MonitorStream::runStream() { Image *paused_image = NULL; struct timeval paused_timestamp; - // 15 is the max length for the swap path suffix, /zmswap-whatever, assuming max 6 digits for monitor id - const int max_swap_len_suffix = 15; - - int swap_path_length = staticConfig.PATH_SWAP.length() + 1; // +1 for NULL terminator - int subfolder1_length = snprintf(NULL, 0, "/zmswap-m%d", monitor->Id()) + 1; - int subfolder2_length = snprintf(NULL, 0, "/zmswap-q%06d", connkey) + 1; - int total_swap_path_length = swap_path_length + subfolder1_length + subfolder2_length; - if ( connkey && ( playback_buffer > 0 ) ) { + // 15 is the max length for the swap path suffix, /zmswap-whatever, assuming max 6 digits for monitor id + const int max_swap_len_suffix = 15; + + int swap_path_length = staticConfig.PATH_SWAP.length() + 1; // +1 for NULL terminator + int subfolder1_length = snprintf(NULL, 0, "/zmswap-m%d", monitor->Id()) + 1; + int subfolder2_length = snprintf(NULL, 0, "/zmswap-q%06d", connkey) + 1; + int total_swap_path_length = swap_path_length + subfolder1_length + subfolder2_length; if ( total_swap_path_length + max_swap_len_suffix > PATH_MAX ) { Error("Swap Path is too long. %d > %d ", total_swap_path_length+max_swap_len_suffix, PATH_MAX); } else { swap_path = staticConfig.PATH_SWAP; - Debug( 3, "Checking swap path folder: %s", swap_path.c_str() ); + Debug(3, "Checking swap path folder: %s", swap_path.c_str()); if ( checkSwapPath(swap_path.c_str(), true) ) { swap_path += stringtf("/zmswap-m%d", monitor->Id()); @@ -509,8 +508,8 @@ void MonitorStream::runStream() { } else { Debug(2, "Assigning temporary buffer"); temp_image_buffer = new SwapImage[temp_image_buffer_count]; - memset( temp_image_buffer, 0, sizeof(*temp_image_buffer)*temp_image_buffer_count ); - Debug( 2, "Assigned temporary buffer" ); + memset(temp_image_buffer, 0, sizeof(*temp_image_buffer)*temp_image_buffer_count); + Debug(2, "Assigned temporary buffer"); } } } else { @@ -525,7 +524,7 @@ void MonitorStream::runStream() { Debug(1, "Using %.3f for fps instead of current fps %.3f", capture_max_fps, capture_fps); capture_fps = capture_max_fps; } - + if ( capture_fps < 1 ) { max_secs_since_last_sent_frame = 10/capture_fps; Debug(1, "Adjusting max_secs_since_last_sent_frame to %.2f from current fps %.2f", @@ -562,7 +561,7 @@ void MonitorStream::runStream() { touch(sock_path_lock); last_comm_update = now; } - } // end if connkey + } // end if connkey if ( paused ) { if ( !was_paused ) { @@ -589,7 +588,7 @@ void MonitorStream::runStream() { } else { if ( !paused ) { int temp_index = MOD_ADD(temp_read_index, 0, temp_image_buffer_count); - //Debug( 3, "tri: %d, ti: %d", temp_read_index, temp_index ); + // Debug( 3, "tri: %d, ti: %d", temp_read_index, temp_index ); SwapImage *swap_image = &temp_image_buffer[temp_index]; if ( !swap_image->valid ) { @@ -597,51 +596,61 @@ void MonitorStream::runStream() { delayed = true; temp_read_index = MOD_ADD(temp_read_index, (replay_rate>=0?-1:1), temp_image_buffer_count); } else { - //Debug( 3, "siT: %f, lfT: %f", TV_2_FLOAT( swap_image->timestamp ), TV_2_FLOAT( last_frame_timestamp ) ); - double expected_delta_time = ((TV_2_FLOAT( swap_image->timestamp ) - TV_2_FLOAT( last_frame_timestamp )) * ZM_RATE_BASE)/replay_rate; - double actual_delta_time = TV_2_FLOAT( now ) - last_frame_sent; + // Debug( 3, "siT: %f, lfT: %f", TV_2_FLOAT( swap_image->timestamp ), TV_2_FLOAT( last_frame_timestamp ) ); + double expected_delta_time = ((TV_2_FLOAT(swap_image->timestamp) - TV_2_FLOAT(last_frame_timestamp)) * ZM_RATE_BASE)/replay_rate; + double actual_delta_time = TV_2_FLOAT(now) - last_frame_sent; - //Debug( 3, "eDT: %.3lf, aDT: %.3f, lFS:%.3f, NOW:%.3f", expected_delta_time, actual_delta_time, last_frame_sent, TV_2_FLOAT( now ) ); + // Debug( 3, "eDT: %.3lf, aDT: %.3f, lFS:%.3f, NOW:%.3f", expected_delta_time, actual_delta_time, last_frame_sent, TV_2_FLOAT( now ) ); // If the next frame is due if ( actual_delta_time > expected_delta_time ) { - //Debug( 2, "eDT: %.3lf, aDT: %.3f", expected_delta_time, actual_delta_time ); + // Debug( 2, "eDT: %.3lf, aDT: %.3f", expected_delta_time, actual_delta_time ); if ( temp_index%frame_mod == 0 ) { - Debug( 2, "Sending delayed frame %d", temp_index ); + Debug(2, "Sending delayed frame %d", temp_index); // Send the next frame - if ( ! sendFrame(temp_image_buffer[temp_index].file_name, &temp_image_buffer[temp_index].timestamp) ) + if ( ! sendFrame(temp_image_buffer[temp_index].file_name, &temp_image_buffer[temp_index].timestamp) ) { zm_terminate = true; + } memcpy(&last_frame_timestamp, &(swap_image->timestamp), sizeof(last_frame_timestamp)); - //frame_sent = true; + // frame_sent = true; } temp_read_index = MOD_ADD(temp_read_index, (replay_rate>0?1:-1), temp_image_buffer_count); } } } else if ( step != 0 ) { - temp_read_index = MOD_ADD( temp_read_index, (step>0?1:-1), temp_image_buffer_count ); + temp_read_index = MOD_ADD(temp_read_index, (step>0?1:-1), temp_image_buffer_count); SwapImage *swap_image = &temp_image_buffer[temp_read_index]; // Send the next frame - if ( !sendFrame( temp_image_buffer[temp_read_index].file_name, &temp_image_buffer[temp_read_index].timestamp ) ) + if ( !sendFrame( + temp_image_buffer[temp_read_index].file_name, + &temp_image_buffer[temp_read_index].timestamp + ) ) { zm_terminate = true; - memcpy( &last_frame_timestamp, &(swap_image->timestamp), sizeof(last_frame_timestamp) ); - //frame_sent = true; + } + memcpy( + &last_frame_timestamp, + &(swap_image->timestamp), + sizeof(last_frame_timestamp) + ); + // frame_sent = true; step = 0; } else { //paused? int temp_index = MOD_ADD(temp_read_index, 0, temp_image_buffer_count); - double actual_delta_time = TV_2_FLOAT( now ) - last_frame_sent; - if ( got_command || actual_delta_time > 5 ) { + double actual_delta_time = TV_2_FLOAT(now) - last_frame_sent; + if ( got_command || (actual_delta_time > 5) ) { // Send keepalive Debug(2, "Sending keepalive frame %d", temp_index); // Send the next frame - if ( !sendFrame( temp_image_buffer[temp_index].file_name, &temp_image_buffer[temp_index].timestamp ) ) + if ( !sendFrame(temp_image_buffer[temp_index].file_name, &temp_image_buffer[temp_index].timestamp) ) { zm_terminate = true; - //frame_sent = true; + } + // frame_sent = true; } - } // end if (!paused) or step or paused - } // end if have exceeded buffer or not + } // end if (!paused) or step or paused + } // end if have exceeded buffer or not if ( temp_read_index == temp_write_index ) { // Go back to live viewing @@ -652,16 +661,16 @@ void MonitorStream::runStream() { delayed = false; replay_rate = ZM_RATE_BASE; } - } // end if ( buffered_playback && delayed ) + } // end if ( buffered_playback && delayed ) if ( last_read_index != monitor->shared_data->last_write_index ) { // have a new image to send - int index = monitor->shared_data->last_write_index % monitor->image_buffer_count; // % shouldn't be neccessary + int index = monitor->shared_data->last_write_index % monitor->image_buffer_count; // % shouldn't be neccessary if ( (frame_mod == 1) || ((frame_count%frame_mod) == 0) ) { if ( !paused && !delayed ) { last_read_index = monitor->shared_data->last_write_index; Debug(2, "index: %d: frame_mod: %d frame count: %d paused(%d) delayed(%d)", - index, frame_mod, frame_count, paused, delayed ); + index, frame_mod, frame_count, paused, delayed); // Send the next frame Monitor::Snapshot *snap = &monitor->image_buffer[index]; @@ -670,9 +679,13 @@ void MonitorStream::runStream() { Debug(2, "sendFrame failed, quiting."); zm_terminate = true; } - // Perhaps we should use NOW instead. - memcpy(&last_frame_timestamp, snap->timestamp, sizeof(last_frame_timestamp)); - //frame_sent = true; + // Perhaps we should use NOW instead. + memcpy( + &last_frame_timestamp, + snap->timestamp, + sizeof(last_frame_timestamp) + ); + // frame_sent = true; temp_read_index = temp_write_index; } else { @@ -697,7 +710,7 @@ void MonitorStream::runStream() { if ( !sendFrame(paused_image, &paused_timestamp) ) zm_terminate = true; } else { - Debug(2, "Would have sent keepalive frame, but had no paused_image "); + Debug(2, "Would have sent keepalive frame, but had no paused_image"); } } // end if actual_delta_time > 5 } // end if change in zoom @@ -718,27 +731,27 @@ void MonitorStream::runStream() { temp_index); temp_image_buffer[temp_index].valid = true; } - memcpy( &(temp_image_buffer[temp_index].timestamp), monitor->image_buffer[index].timestamp, sizeof(temp_image_buffer[0].timestamp) ); - monitor->image_buffer[index].image->WriteJpeg( temp_image_buffer[temp_index].file_name, config.jpeg_file_quality ); - temp_write_index = MOD_ADD( temp_write_index, 1, temp_image_buffer_count ); + memcpy(&(temp_image_buffer[temp_index].timestamp), monitor->image_buffer[index].timestamp, sizeof(temp_image_buffer[0].timestamp)); + monitor->image_buffer[index].image->WriteJpeg(temp_image_buffer[temp_index].file_name, config.jpeg_file_quality); + temp_write_index = MOD_ADD(temp_write_index, 1, temp_image_buffer_count); if ( temp_write_index == temp_read_index ) { // Go back to live viewing - Warning( "Exceeded temporary buffer, resuming live play" ); + Warning("Exceeded temporary buffer, resuming live play"); paused = false; delayed = false; replay_rate = ZM_RATE_BASE; } } else { - Warning( "Unable to store frame as timestamp invalid" ); + Warning("Unable to store frame as timestamp invalid"); } } else { - Warning( "Unable to store frame as shared memory invalid" ); + Warning("Unable to store frame as shared memory invalid"); } } // end if buffered playback frame_count++; } else { Debug(3, "Waiting for capture last_write_index=%u", monitor->shared_data->last_write_index); - } // end if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index ) + } // end if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index ) unsigned long sleep_time = (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2))); Debug(3, "Sleeping for (%d)", sleep_time); @@ -755,10 +768,10 @@ void MonitorStream::runStream() { break; } } - if ( ! last_frame_sent ) { + if ( !last_frame_sent ) { // If we didn't capture above, because frame_mod was bad? Then last_frame_sent will not have a value. last_frame_sent = now.tv_sec; - Warning("no last_frame_sent. Shouldn't happen. frame_mod was (%d) frame_count (%d) ", + Warning("no last_frame_sent. Shouldn't happen. frame_mod was (%d) frame_count (%d)", frame_mod, frame_count); } else if ( (!paused) @@ -799,9 +812,9 @@ void MonitorStream::runStream() { } } } - globfree( &pglob ); + globfree(&pglob); if ( rmdir(swap_path.c_str()) < 0 ) { - Error( "Can't rmdir '%s': %s", swap_path.c_str(), strerror(errno) ); + Error("Can't rmdir '%s': %s", swap_path.c_str(), strerror(errno)); } } // end if checking for swap_path } // end if buffered_playback @@ -809,7 +822,7 @@ void MonitorStream::runStream() { closeComms(); } // end MonitorStream::runStream -void MonitorStream::SingleImage( int scale ) { +void MonitorStream::SingleImage(int scale) { int img_buffer_size = 0; static JOCTET img_buffer[ZM_MAX_IMAGE_SIZE]; Image scaled_image; @@ -817,42 +830,45 @@ void MonitorStream::SingleImage( int scale ) { Image *snap_image = snap->image; if ( scale != ZM_SCALE_BASE ) { - scaled_image.Assign( *snap_image ); - scaled_image.Scale( scale ); + scaled_image.Assign(*snap_image); + scaled_image.Scale(scale); snap_image = &scaled_image; } if ( !config.timestamp_on_capture ) { - monitor->TimestampImage( snap_image, snap->timestamp ); + monitor->TimestampImage(snap_image, snap->timestamp); } - snap_image->EncodeJpeg( img_buffer, &img_buffer_size ); - - fprintf( stdout, "Content-Length: %d\r\n", img_buffer_size ); - fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" ); - fwrite( img_buffer, img_buffer_size, 1, stdout ); + snap_image->EncodeJpeg(img_buffer, &img_buffer_size); + + fprintf(stdout, + "Content-Length: %d\r\n" + "Content-Type: image/jpeg\r\n\r\n", + img_buffer_size); + fwrite(img_buffer, img_buffer_size, 1, stdout); } -void MonitorStream::SingleImageRaw( int scale ) { +void MonitorStream::SingleImageRaw(int scale) { Image scaled_image; Monitor::Snapshot *snap = monitor->getSnapshot(); Image *snap_image = snap->image; if ( scale != ZM_SCALE_BASE ) { - scaled_image.Assign( *snap_image ); - scaled_image.Scale( scale ); + scaled_image.Assign(*snap_image); + scaled_image.Scale(scale); snap_image = &scaled_image; } if ( !config.timestamp_on_capture ) { - monitor->TimestampImage( snap_image, snap->timestamp ); + monitor->TimestampImage(snap_image, snap->timestamp); } - - fprintf( stdout, "Content-Length: %d\r\n", snap_image->Size() ); - fprintf( stdout, "Content-Type: image/x-rgb\r\n\r\n" ); - fwrite( snap_image->Buffer(), snap_image->Size(), 1, stdout ); + + fprintf(stdout, + "Content-Length: %d\r\n" + "Content-Type: image/x-rgb\r\n\r\n", + snap_image->Size()); + fwrite(snap_image->Buffer(), snap_image->Size(), 1, stdout); } - #ifdef HAVE_ZLIB_H -void MonitorStream::SingleImageZip( int scale ) { +void MonitorStream::SingleImageZip(int scale) { unsigned long img_buffer_size = 0; static Bytef img_buffer[ZM_MAX_IMAGE_SIZE]; Image scaled_image; @@ -861,17 +877,19 @@ void MonitorStream::SingleImageZip( int scale ) { Image *snap_image = snap->image; if ( scale != ZM_SCALE_BASE ) { - scaled_image.Assign( *snap_image ); - scaled_image.Scale( scale ); + scaled_image.Assign(*snap_image); + scaled_image.Scale(scale); snap_image = &scaled_image; } if ( !config.timestamp_on_capture ) { - monitor->TimestampImage( snap_image, snap->timestamp ); + monitor->TimestampImage(snap_image, snap->timestamp); } - snap_image->Zip( img_buffer, &img_buffer_size ); - - fprintf( stdout, "Content-Length: %ld\r\n", img_buffer_size ); - fprintf( stdout, "Content-Type: image/x-rgbz\r\n\r\n" ); - fwrite( img_buffer, img_buffer_size, 1, stdout ); + snap_image->Zip(img_buffer, &img_buffer_size); + + fprintf(stdout, + "Content-Length: %ld\r\n" + "Content-Type: image/x-rgbz\r\n\r\n", + img_buffer_size); + fwrite(img_buffer, img_buffer_size, 1, stdout); } #endif // HAVE_ZLIB_H From 8796f009730a3fa9cff62878ff4ae685bb0179ab Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 30 Dec 2019 07:27:30 -0600 Subject: [PATCH 097/330] move raspbian builds to native arm hardware Build time was just under 40 minutes in Travis. Moving this build to remote arm build host for quicker build time. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 59a62888d..7cfe96854 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,6 @@ env: - SMPFLAGS=-j4 OS=ubuntu DIST=disco ARCH=i386 - SMPFLAGS=-j4 OS=debian DIST=buster ARCH=i386 - SMPFLAGS=-j4 OS=debian DIST=stretch ARCH=i386 - - SMPFLAGS=-j4 OS=raspbian DIST=stretch ARCH=armhf DOCKER_REPO=knnniggett/packpack - SMPFLAGS=-j4 OS=eslint DIST=eslint compiler: From ec76ffe7202f2518938ffaee9d0f6e42b0ba1939 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 30 Dec 2019 08:53:34 -0600 Subject: [PATCH 098/330] update redhat README's --- distros/redhat/readme/README | 10 +++------- distros/redhat/readme/README.httpd | 25 +++++++++++++++---------- distros/redhat/readme/README.nginx | 20 ++++++++++++++------ 3 files changed, 32 insertions(+), 23 deletions(-) diff --git a/distros/redhat/readme/README b/distros/redhat/readme/README index 0b3e4bb9c..f0fff828f 100644 --- a/distros/redhat/readme/README +++ b/distros/redhat/readme/README @@ -22,14 +22,10 @@ What's New switching between httpd <-> nginx requires manaully changing ownership of all event folders and the php session folder after the change. -4. If you have installed ZoneMinder from the FedBerry repositories, this build - of ZoneMinder has support for Raspberry Pi hardware acceleration when using - ffmpeg. Unforunately, there is a problem with the same hardware acceleration - when using libvlc. Consequently, libvlc support in this build of ZoneMinder - has been disabled until the problem is resolved. See the following bug - report for details: https://trac.videolan.org/vlc/ticket/18594 +4. The timezone must now be set from the ZoneMinder web console. See the + appropriate README, mentioned in the next step, for details. -5. Continue on to the next README that corresponds to the chosen webserver: +6. Continue on to the next README that corresponds to your chosen webserver: README.httpd - Follow these steps when using Apache README.nginx - Follow these steps when using Nginx diff --git a/distros/redhat/readme/README.httpd b/distros/redhat/readme/README.httpd index 5301850df..1ba0ee688 100644 --- a/distros/redhat/readme/README.httpd +++ b/distros/redhat/readme/README.httpd @@ -36,20 +36,17 @@ NOTE: EL7 users should replace "dnf" with "yum" in the instructions below. sudo chown root:apache *.conf sudo chmod 640 *.conf -4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local - timezone. PHP will complain loudly if this is not set, or if it is set - incorrectly, and these complaints will show up in the zoneminder logging - system as errors. +4. Manually setting the timezone in /etc/php.ini is deprecated. - If you are not sure of the proper timezone specification to use, look at - http://php.net/date.timezone + Instead, navigate to Options -> System from the ZoneMinder web console. + Do this after completing step 10, below. + + Note that timezone errors will appear in the ZoneMinder log until this + has been completed. 5. Disable SELinux - We currently do not have the resources to create and maintain an accurate - SELinux policy for ZoneMinder on Fedora. We will gladly accept pull - reqeusts from anyone who wishes to do the work. In the meantime, SELinux - will need to be disabled or put into permissive mode. + SELinux must be disabled or put into permissive mode. This is not optional! To immediately disbale SELinux for the current seesion, issue the following from the command line: @@ -166,3 +163,11 @@ Upgrades sudo systemctl restart httpd sudo systemctl start zoneminder +6. Manually setting the timezone in /etc/php.ini is deprecated. + + Instead, navigate to Options -> System from the ZoneMinder web console. + Do this now. + + Note that timezone errors will appear in the ZoneMinder log until this + has been completed. + diff --git a/distros/redhat/readme/README.nginx b/distros/redhat/readme/README.nginx index cca4e72c2..8bc3bbdc1 100644 --- a/distros/redhat/readme/README.nginx +++ b/distros/redhat/readme/README.nginx @@ -34,13 +34,13 @@ New installs sudo chown root:nginx *.conf sudo chmod 640 *.conf -4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local - timezone. PHP will complain loudly if this is not set, or if it is set - incorrectly, and these complaints will show up in the zoneminder logging - system as errors. +4. Manually setting the timezone in /etc/php.ini is deprecated. - If you are not sure of the proper timezone specification to use, look at - http://php.net/date.timezone + Instead, navigate to Options -> System from the ZoneMinder web console. + Do this after completing step 10, below. + + Note that timezone errors will appear in the ZoneMinder log until this + has been completed. 5. Disable SELinux @@ -169,3 +169,11 @@ Upgrades sudo systemctl restart php-fpm sudo systemctl start zoneminder +6. Manually setting the timezone in /etc/php.ini is deprecated. + + Instead, navigate to Options -> System from the ZoneMinder web console. + Do this now. + + Note that timezone errors will appear in the ZoneMinder log until this + has been completed. + From 2c76c1266408dd49be089d564c8af83d6a9d4e7d Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 30 Dec 2019 22:18:55 -0500 Subject: [PATCH 099/330] Fix export to include files when using DEEP scheme. Also make it more efficient --- .../classic/includes/export_functions.php | 61 +++++++++---------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php index e6749e426..8ce0fba5a 100644 --- a/web/skins/classic/includes/export_functions.php +++ b/web/skins/classic/includes/export_functions.php @@ -226,13 +226,13 @@ function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) { ?> @@ -247,7 +247,7 @@ function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) { if ( $Monitor->VideoWriter() == '2' ) { # Passthrough $Rotation = $event->Orientation(); - if ( in_array($event->Orientation(),array('90','270')) ) + if ( in_array($event->Orientation(),array('ROTATE_90','ROTATE_270')) ) $Zoom = $event->Height()/$event->Width(); } ?> @@ -280,7 +280,7 @@ function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) {
     
     
    + onmousedown="slide(event,'horizontal', Width()-20)?>, 1, , ,0, 'imageslider_display_id');"> 
    @@ -618,10 +618,10 @@ function exportEventImagesMaster($eids) {

    Master

    $eids)); + + foreach ($events as $event) { //get monitor id and event id - $event = new ZM\Event($eid); $eventMonitorId[$eid] = $event->MonitorId(); $eventPath[$eid] = $event->Relative_Path(); } @@ -653,20 +653,18 @@ function exportEventImagesMaster($eids) {

    All

    "; echo '

    Monitor: ' . $monitorNames[$monitor_id] . '

    '; - foreach ( $eids as $eid ) { - $Event = new ZM\Event($eid); - if ( $Event->MonitorId() == $monitor_id ) { - eventlist_html($Event); + foreach ( $events as $event ) { + if ( $event->MonitorId() == $monitor_id ) { + eventlist_html($event); } # end if its the right monitor } # end foreach event echo ''; @@ -780,7 +778,7 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex } fwrite($fp, exportEventDetail($event, $exportFrames, $exportImages)); fclose($fp); - $exportFileList[$file] = $event->Id().'/'.$file; + $exportFileList[$file] = $file; } if ( $exportFrames ) { $file = 'zmEventFrames.html'; @@ -789,7 +787,7 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex } fwrite($fp, exportEventFrames($event, $exportDetail, $exportImages)); fclose($fp); - $exportFileList[$file] = $event->Id().'/'.$file; + $exportFileList[$file] = $file; } if ( $exportImages ) { @@ -797,7 +795,7 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex $myfilelist = array(); foreach ( $files as $file ) { if ( preg_match('/-(?:capture|analyse).jpg$/', $file ) ) { - $myfilelist[$file] = $exportFileList[$file] = $event->Id().'/'.$file; + $myfilelist[$file] = $exportFileList[$file] = $file; } else { $filesLeft[$file] = $file; } @@ -806,12 +804,12 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex // create an image slider if ( !empty($myfilelist) ) { - $file = $event->Id().'/zmEventImages.html'; + $file = 'zmEventImages.html'; if ( !($fp = fopen($file, 'w')) ) ZM\Fatal("Can't open event images export file '$file'"); fwrite($fp, exportEventImages($event, $exportDetail, $exportFrames, $myfilelist)); fclose($fp); - $exportFileList[$file] = $event->Id().'/'.$file; + $exportFileList[$file] = $file; } } # end if exportImages @@ -819,7 +817,7 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex $filesLeft = array(); foreach ( $files as $file ) { if ( preg_match('/\.(?:mpg|mpeg|mov|swf|mp4|mkv|avi|asf|3gp)$/', $file) ) { - $exportFileList[$file] = $event->Id().'/'.$file; + $exportFileList[$file] = $file; } else { $filesLeft[$file] = $file; } @@ -829,7 +827,7 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex if ( $exportMisc ) { foreach ( $files as $file ) { - $exportFileList[$file] = $event->Id().'/'.$file; + $exportFileList[$file] = $file; } $files = array(); } @@ -863,7 +861,6 @@ function exportEvents( } # Ensure that we are going to be able to do this. - # TODO should ensure that permissions are restrictive if ( ! ( mkdir(ZM_DIR_EXPORTS) or file_exists(ZM_DIR_EXPORTS) ) ) { ZM\Fatal('Can\'t create exports dir at \''.ZM_DIR_EXPORTS.'\''); } @@ -900,10 +897,12 @@ function exportEvents( ZM\Logger::Debug("File list for event $eid " . print_r($event_exportFileList, true)); $exportFileList = array_merge($exportFileList,$event_exportFileList); foreach ( $event_exportFileList as $file ) { - if ( preg_match('/\.html$/', $file ) ) + if ( preg_match('/\.html$/', $file) ) continue; - ZM\Logger::Debug('cp -as '.$event->Path().'/../'.$file.' '.$export_dir.'/'.$file); - exec('cp -as '.$event->Path().'/../'.$file.' '.$export_dir.'/'.$file); + #exec('cp -as '.$event->Path().'/../'.$file.' '.$export_dir.'/'.$file, $output, $return); + $cmd = 'cp -as '.$event->Path().'/'.$file.' '.$export_dir.'/'.$event->Id().'/'.$file. ' 2>&1'; + exec($cmd, $output, $return); + ZM\Logger::Debug($cmd.' return code: '.$return.' output: '.print_r($output,true)); } } # end foreach event From 77cfb7c190b579631a48c93d7ea24c7e4593f60e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 31 Dec 2019 12:42:49 -0500 Subject: [PATCH 100/330] fix spacing --- web/includes/Monitor.php | 88 ++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index ad0247a1b..abc39859b 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -473,53 +473,53 @@ class Monitor extends ZM_Object { //ZM_MIN_STREAMING_PORT ? (ZM_MIN_STREAMING_PORT+$this->Id()) : null); } -public function sendControlCommand($command) { - // command is generally a command option list like --command=blah but might be just the word quit + public function sendControlCommand($command) { + // command is generally a command option list like --command=blah but might be just the word quit - $options = array(); - # Convert from a command line params to an option array - foreach ( explode(' ', $command) as $option ) { - if ( preg_match('/--([^=]+)(?:=(.+))?/', $option, $matches) ) { - $options[$matches[1]] = $matches[2]?$matches[2]:1; - } else if ( $option != '' and $option != 'quit' ) { - Warning("Ignored command for zmcontrol $option in $command"); - } - } - if ( !count($options) ) { - if ( $command == 'quit' ) { - $options['command'] = 'quit'; - } else { - Warning("No commands to send to zmcontrol from $command"); - return false; - } - } - - if ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) { - # Local - Logger::Debug('Trying to send options ' . print_r($options, true)); - - $optionString = jsonEncode($options); - Logger::Debug("Trying to send options $optionString"); - // Either connects to running zmcontrol.pl or runs zmcontrol.pl to send the command. - $socket = socket_create(AF_UNIX, SOCK_STREAM, 0); - if ( $socket < 0 ) { - Error('socket_create() failed: '.socket_strerror($socket)); - return false; - } - $sockFile = ZM_PATH_SOCKS.'/zmcontrol-'.$this->{'Id'}.'.sock'; - if ( @socket_connect($socket, $sockFile) ) { - if ( !socket_write($socket, $optionString) ) { - Error('Can\'t write to control socket: '.socket_strerror(socket_last_error($socket))); - return false; + $options = array(); + # Convert from a command line params to an option array + foreach ( explode(' ', $command) as $option ) { + if ( preg_match('/--([^=]+)(?:=(.+))?/', $option, $matches) ) { + $options[$matches[1]] = $matches[2]?$matches[2]:1; + } else if ( $option != '' and $option != 'quit' ) { + Warning("Ignored command for zmcontrol $option in $command"); } - } else if ( $command != 'quit' ) { - $command = ZM_PATH_BIN.'/zmcontrol.pl '.$command.' --id='.$this->{'Id'}; - - // Can't connect so use script - $ctrlOutput = exec(escapeshellcmd($command)); } - socket_close($socket); - } else if ( $this->ServerId() ) { + if ( !count($options) ) { + if ( $command == 'quit' ) { + $options['command'] = 'quit'; + } else { + Warning("No commands to send to zmcontrol from $command"); + return false; + } + } + + if ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) { + # Local + Logger::Debug('Trying to send options ' . print_r($options, true)); + + $optionString = jsonEncode($options); + Logger::Debug("Trying to send options $optionString"); + // Either connects to running zmcontrol.pl or runs zmcontrol.pl to send the command. + $socket = socket_create(AF_UNIX, SOCK_STREAM, 0); + if ( $socket < 0 ) { + Error('socket_create() failed: '.socket_strerror($socket)); + return false; + } + $sockFile = ZM_PATH_SOCKS.'/zmcontrol-'.$this->{'Id'}.'.sock'; + if ( @socket_connect($socket, $sockFile) ) { + if ( !socket_write($socket, $optionString) ) { + Error('Can\'t write to control socket: '.socket_strerror(socket_last_error($socket))); + return false; + } + } else if ( $command != 'quit' ) { + $command = ZM_PATH_BIN.'/zmcontrol.pl '.$command.' --id='.$this->{'Id'}; + + // Can't connect so use script + $ctrlOutput = exec(escapeshellcmd($command)); + } + socket_close($socket); + } else if ( $this->ServerId() ) { $Server = $this->Server(); $url = ZM_BASE_PROTOCOL . '://'.$Server->Hostname().'/zm/api/monitors/daemonControl/'.$this->{'Id'}.'/'.$mode.'/zmcontrol.json'; From 8913341140e1ed4f109d10d8eec1513265ae3c00 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 31 Dec 2019 12:44:41 -0500 Subject: [PATCH 101/330] Bump default for WATCH_MAX_DELAY to 45 seconds. Many cameras take even over 30 seconds to obtain the first image. I find 45 to be a reasonable default --- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in index 31fafc1bc..47bee17da 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in +++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in @@ -2468,7 +2468,7 @@ our @options = ( }, { name => 'ZM_WATCH_MAX_DELAY', - default => '5', + default => '45', description => 'The maximum delay allowed since the last captured image', help => q` The zmwatch daemon checks the image capture performance of the From 66ff60294151d414e05cf543e03f560e11072a8e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 31 Dec 2019 12:50:03 -0500 Subject: [PATCH 102/330] change default for file logging to be debug, which results in INF unless debug messages are turned on. Also clear LOG_DEBUG_FILE because it is designed to be a temporary debugging tool, and isn't all that useful at that. --- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in index 47bee17da..cd93dfe15 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in +++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in @@ -1127,7 +1127,7 @@ our @options = ( }, { name => 'ZM_LOG_LEVEL_FILE', - default => '-5', + default => '1', description => 'Save logging output to component files', help => q` ZoneMinder logging is now more integrated between @@ -1312,7 +1312,7 @@ our @options = ( }, { name => 'ZM_LOG_DEBUG_FILE', - default => '@ZM_LOGDIR@/zm_debug.log+', + default => '', description => 'Where extra debug is output to', help => q` This option allows you to specify a different target for debug From 714d30452845d99fd15b65428a6b225902766e0f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 31 Dec 2019 19:10:29 -0500 Subject: [PATCH 103/330] Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation --- web/includes/Monitor.php | 2 +- web/includes/functions.php | 10 +++++----- web/skins/classic/views/js/monitor.js | 27 +++++++++++++++++++++++++++ web/skins/classic/views/monitor.php | 7 +++++-- 4 files changed, 38 insertions(+), 8 deletions(-) diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index abc39859b..4575d2ab6 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -89,7 +89,7 @@ class Monitor extends ZM_Object { 'DefaultScale' => 100, 'SignalCheckPoints' => 0, 'SignalCheckColour' => '#0000BE', - 'WebColour' => 'red', + 'WebColour' => '#ff0000', 'Exif' => array('type'=>'boolean','default'=>0), 'Sequence' => null, 'TotalEvents' => array('type'=>'integer', 'default'=>null, 'do_not_update'=>1), diff --git a/web/includes/functions.php b/web/includes/functions.php index c4853a7dc..42dc56c30 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -2610,12 +2610,12 @@ function html_radio($name, $values, $selected=null, $options=array(), $attrs=arr return $html; } # end sub html_radio -function random_color_part() { - return str_pad( dechex( mt_rand( 0, 255 ) ), 2, '0', STR_PAD_LEFT); -} -function random_color() { - return random_color_part() . random_color_part() . random_color_part(); +function random_colour() { + return '#'. + str_pad( dechex( mt_rand( 0, 255 ) ), 2, '0', STR_PAD_LEFT). + str_pad( dechex( mt_rand( 0, 255 ) ), 2, '0', STR_PAD_LEFT). + str_pad( dechex( mt_rand( 0, 255 ) ), 2, '0', STR_PAD_LEFT); } ?> diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js index 9d1fc7d7b..b24f6a1b3 100644 --- a/web/skins/classic/views/js/monitor.js +++ b/web/skins/classic/views/js/monitor.js @@ -131,9 +131,36 @@ function initPage() { document.querySelectorAll('select[name="newMonitor[ControlId]"]').forEach(function(el) { el.onchange = window['loadLocations'].bind(el, el); }); + document.querySelectorAll('input[name="newMonitor[WebColour]"]').forEach(function(el) { + el.onchange = window['change_WebColour'].bind(el); + }); $j('.chosen').chosen(); } // end function initPage() +function change_WebColour() { + $j('#WebSwatch').css( + 'backgroundColor', + $j('input[name="newMonitor[WebColour]"]').val() + ); +} + +function getRandomColour() { + var letters = '0123456789ABCDEF'; + var colour = '#'; + for (var i = 0; i < 6; i++) { + colour += letters[Math.floor(Math.random() * 16)]; + } + return colour; +} + +function random_WebColour() { + var new_colour = getRandomColour(); + $j('input[name="newMonitor[WebColour]"]').val(new_colour); + $j('#WebSwatch').css( + 'backgroundColor', new_colour + ); +} + window.addEventListener('DOMContentLoaded', initPage); diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index df3718735..63089dd51 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -54,6 +54,7 @@ if ( !$monitor ) { $monitor = new ZM\Monitor(); } # end if $_REQUEST['dupID'] $monitor->Name(translate('Monitor').'-'.$nextId); + $monitor->WebColour(random_colour()); } # end if $_REQUEST['mid'] if ( ZM_OPT_X10 && empty($x10Monitor) ) { @@ -1112,15 +1113,17 @@ if ( canEdit('Control') ) {
    - +     
    - +      + sync +
    +
    - -translate('Local'), 'Remote'=>translate('Remote'), 'Ffmpeg'=>translate('Ffmpeg'), 'Libvlc'=>translate('Libvlc'), 'cURL'=>"cURL"); -?> - + + @@ -373,15 +347,15 @@ switch ( $tab ) { ?> - - - - + + + + - - + + - + - - - - + + + + - - + + - + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - - - - + + + + - - + + - +
    translate('Local'), 'Remote'=>translate('Remote'), 'Ffmpeg'=>translate('Ffmpeg'), 'Libvlc'=>translate('Libvlc'), 'cURL'=>'cURL'); + echo buildSelect('newControl[Type]', $types); ?>
    checked="checked"/>
    checked="checked"/>
    checked="checked">
    checked="checked"/>
    checked="checked"/>
    checked="checked">
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    checked="checked"/>
    - disabled="disabled"/> + +
    From c4aaa33beaa0a29be4df6c89b6b6eac76923eb6c Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 3 Jan 2020 15:57:51 -0500 Subject: [PATCH 115/330] add widths for number inputs on controlcap view --- web/skins/classic/css/base/views/controlcap.css | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 web/skins/classic/css/base/views/controlcap.css diff --git a/web/skins/classic/css/base/views/controlcap.css b/web/skins/classic/css/base/views/controlcap.css new file mode 100644 index 000000000..ed9a664e7 --- /dev/null +++ b/web/skins/classic/css/base/views/controlcap.css @@ -0,0 +1,4 @@ + +input[type="number"] { + width: 70px; +} From 158e26bb2594a576089421fc260b390c08a0b2c2 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 3 Jan 2020 15:58:02 -0500 Subject: [PATCH 116/330] split long lines --- web/skins/classic/css/base/views/controlcaps.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/web/skins/classic/css/base/views/controlcaps.css b/web/skins/classic/css/base/views/controlcaps.css index 1a2783fd7..d860d88ae 100644 --- a/web/skins/classic/css/base/views/controlcaps.css +++ b/web/skins/classic/css/base/views/controlcaps.css @@ -1,3 +1,9 @@ -#content table.major .colCanMove, #content table.major .colCanZoom, #content table.major .colCanFocus, #content table.major .colCanIris, #content table.major .colCanWhiteBal, #content table.major .colHasPresets { +#content table.major .colCanMove, +#content table.major .colCanZoom, +#content table.major .colCanFocus, +#content table.major .colCanIris, +#content table.major .colCanWhiteBal, +#content table.major .colHasPresets { text-align: center; } + From f572c4092a5ee20bc43756ba2422853bd7b75a67 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 3 Jan 2020 15:58:57 -0500 Subject: [PATCH 117/330] add checks for Zoom, Focus, White, Iris movement types --- web/skins/classic/views/js/controlcap.js | 124 +++++++++++++++++++++-- 1 file changed, 117 insertions(+), 7 deletions(-) diff --git a/web/skins/classic/views/js/controlcap.js b/web/skins/classic/views/js/controlcap.js index c52ab3dd5..a94f14acd 100644 --- a/web/skins/classic/views/js/controlcap.js +++ b/web/skins/classic/views/js/controlcap.js @@ -3,21 +3,131 @@ function validateForm( form ) { // If "Can Move" is enabled, then the end user must also select at least one of the other check boxes (excluding Can Move Diagonally) if ( form.elements['newControl[CanMove]'].checked ) { - if ( !(form.elements['newControl[CanMoveCon]'].checked || form.elements['newControl[CanMoveRel]'].checked || form.elements['newControl[CanMoveAbs]'].checked || form.elements['newControl[CanMoveMap]'].checked) ) { - errors[errors.length] = "In addition to \"Can Move\", you also must select at least one of: \"Can Move Mapped\", \"Can Move Absolute\", \"Can Move Relative\", or \"Can Move Continuous\""; + if ( !( + form.elements['newControl[CanMoveCon]'].checked + || + form.elements['newControl[CanMoveRel]'].checked + || + form.elements['newControl[CanMoveAbs]'].checked + || + form.elements['newControl[CanMoveMap]'].checked + ) ) { + errors[errors.length] = 'In addition to "Can Move", you also must select at least one of: "Can Move Mapped", "Can Move Absolute", "Can Move Relative", or "Can Move Continuous"'; } } else { // Now lets check for the opposite condition. If any of the boxes below Can Move are checked, but Can Move is not checked then signal an error - if ( form.elements['newControl[CanMoveCon]'].checked || form.elements['newControl[CanMoveRel]'].checked || form.elements['newControl[CanMoveAbs]'].checked || form.elements['newControl[CanMoveMap]'].checked || form.elements['newControl[CanMoveDiag]'].checked ) { - errors[errors.length] = "\"Can Move\" must also be selected if any one of the movement types are sleceted"; + if ( form.elements['newControl[CanMoveCon]'].checked + || + form.elements['newControl[CanMoveRel]'].checked + || + form.elements['newControl[CanMoveAbs]'].checked + || + form.elements['newControl[CanMoveMap]'].checked + || + form.elements['newControl[CanMoveDiag]'].checked + ) { + errors[errors.length] = '"Can Move" must also be selected if any one of the movement types are selected.'; + } + } + // If "Can Zoom" is enabled, then the end user must also select at least one of the other check boxes + if ( form.elements['newControl[CanZoom]'].checked ) { + if ( !( + form.elements['newControl[CanZoomCon]'].checked + || + form.elements['newControl[CanZoomRel]'].checked + || + form.elements['newControl[CanZoomAbs]'].checked + ) ) { + errors[errors.length] = 'In addition to "Can Zoom", you also must select at least one of: "Can Zoom Absolute", "Can Zoom Relative", or "Can Zoom Continuous"'; + } + } else { + // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error + + if ( form.elements['newControl[CanZoomCon]'].checked + || + form.elements['newControl[CanZoomRel]'].checked + || + form.elements['newControl[CanZoomAbs]'].checked + ) { + errors[errors.length] = '"Can Move" must also be selected if any one of the zoom types are selected.'; + } + } + // If "Can Zoom" is enabled, then the end user must also select at least one of the other check boxes + if ( form.elements['newControl[CanFocus]'].checked ) { + if ( !( + form.elements['newControl[CanFocusCon]'].checked + || + form.elements['newControl[CanFocusRel]'].checked + || + form.elements['newControl[CanFocusAbs]'].checked + ) ) { + errors[errors.length] = 'In addition to "Can Focus", you also must select at least one of: "Can Focus Absolute", "Can Focus Relative", or "Can Focus Continuous"'; + } + } else { + // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error + + if ( form.elements['newControl[CanFocusCon]'].checked + || + form.elements['newControl[CanFocusRel]'].checked + || + form.elements['newControl[CanFocusAbs]'].checked + ) { + errors[errors.length] = '"Can Focus" must also be selected if any one of the focus types are selected.'; + } + } + // If "Can White" is enabled, then the end user must also select at least one of the other check boxes + if ( form.elements['newControl[CanWhite]'].checked ) { + if ( !( + form.elements['newControl[CanWhiteCon]'].checked + || + form.elements['newControl[CanWhiteRel]'].checked + || + form.elements['newControl[CanWhiteAbs]'].checked + ) ) { + errors[errors.length] = 'In addition to "Can White Balance", you also must select at least one of: "Can White Bal Absolute", "Can White Bal Relative", or "Can White Bal Continuous"'; + } + } else { + // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error + + if ( form.elements['newControl[CanWhiteCon]'].checked + || + form.elements['newControl[CanWhiteRel]'].checked + || + form.elements['newControl[CanWhiteAbs]'].checked + ) { + errors[errors.length] = '"Can White Balance" must also be selected if any one of the white balance types are selected.'; + } + } + + // If "Can Iris" is enabled, then the end user must also select at least one of the other check boxes + if ( form.elements['newControl[CanIris]'].checked ) { + if ( !( + form.elements['newControl[CanIrisCon]'].checked + || + form.elements['newControl[CanIrisRel]'].checked + || + form.elements['newControl[CanIrisAbs]'].checked + ) ) { + errors[errors.length] = 'In addition to "Can Iris", you also must select at least one of: "Can Iris Absolute", "Can Iris Relative", or "Can Iris Continuous"'; + } + } else { + // Now lets check for the opposite condition. If any of the boxes below Can Zoom are checked, but Can Zoom is not checked then signal an error + + if ( form.elements['newControl[CanIrisCon]'].checked + || + form.elements['newControl[CanIrisRel]'].checked + || + form.elements['newControl[CanIrisAbs]'].checked + ) { + errors[errors.length] = '"Can Iris" must also be selected if any one of the iris types are selected.'; } } if ( errors.length ) { - alert( errors.join( "\n" ) ); - return ( false ); + alert(errors.join("\n")); + return false; } - return ( true ); + return true; } From 0a495395b06b2ddd3471b2841055f91db23b237b Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 3 Jan 2020 16:34:46 -0500 Subject: [PATCH 118/330] Restore Gain tab --- web/skins/classic/views/controlcap.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/skins/classic/views/controlcap.php b/web/skins/classic/views/controlcap.php index 20eb02ca3..68ab25b60 100644 --- a/web/skins/classic/views/controlcap.php +++ b/web/skins/classic/views/controlcap.php @@ -30,6 +30,7 @@ $tabs['pan'] = translate('Pan'); $tabs['tilt'] = translate('Tilt'); $tabs['zoom'] = translate('Zoom'); $tabs['focus'] = translate('Focus'); +$tabs['gain'] = translate('Gain'); $tabs['white'] = translate('White'); $tabs['iris'] = translate('Iris'); $tabs['presets'] = translate('Presets'); From e951b0af1cb097dc58d322c19b45680a07b39bbc Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 3 Jan 2020 16:35:04 -0500 Subject: [PATCH 119/330] add code to set default value for checkboxes --- web/includes/actions/controlcap.php | 59 +++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/web/includes/actions/controlcap.php b/web/includes/actions/controlcap.php index eec3ffd8b..ad4985f11 100644 --- a/web/includes/actions/controlcap.php +++ b/web/includes/actions/controlcap.php @@ -28,6 +28,65 @@ if ( $action == 'controlcap' ) { require_once('includes/Control.php'); $Control = new ZM\Control( !empty($_REQUEST['cid']) ? $_REQUEST['cid'] : null ); + $field_defaults = array( + 'CanWake' => 0, + 'CanSleep' => 0, + 'CanReset' => 0, + 'CanReboot' => 0, + 'CanMove' => 0, + 'CanMoveDiag' => 0, + 'CanMoveMap' => 0, + 'CanMoveRel' => 0, + 'CanMoveAbs' => 0, + 'CanMoveCon' => 0, + 'CanPan' => 0, + 'HasPanSpeed' => 0, + 'HasTurboPan' => 0, + 'CanTilt' => 0, + 'HasTiltSpeed' => 0, + 'HasTurboTilt' => 0, + 'CanZoom' => 0, + 'CanZoomRel' => 0, + 'CanZoomAbs' => 0, + 'CanZoomCon' => 0, + 'HasZoomSpeed' => 0, + 'CanFocus' => 0, + 'CanAutoFocus' => 0, + 'CanFocusRel' => 0, + 'CanFocusAbs' => 0, + 'CanFocusCon' => 0, + 'HasFocusSpeed' => 0, + 'CanGain' => 0, + 'CanAutoGain' => 0, + 'CanGainRel' => 0, + 'CanGainAbs' => 0, + 'CanGainCon' => 0, + 'HasGainSpeed' => 0, + 'CanWhite' => 0, + 'CanAutoWhite' => 0, + 'CanWhiteRel' => 0, + 'CanWhiteAbs' => 0, + 'CanWhiteCon' => 0, + 'HasWhiteSpeed' => 0, + 'CanIris' => 0, + 'CanAutoIris' => 0, + 'CanIrisRel' => 0, + 'CanIrisAbs' => 0, + 'CanIrisCon' => 0, + 'HasIrisSpeed' => 0, + 'HasPresets' => 0, + 'HasHomePreset' => 0, + 'CanSetPresets' => 0, + ); + + # Checkboxes don't return an element in the POST data, so won't be present in newControl. + # So force a value for these fields + foreach ( $field_defaults as $field => $value ) { + if ( ! (isset($_REQUEST['newControl'][$field]) and $_REQUEST['newControl'][$field]) ) { + $_REQUEST['newControl'][$field] = $value; + } + } # end foreach type + //$changes = getFormChanges( $control, $_REQUEST['newControl'], $types, $columns ); $Control->save($_REQUEST['newControl']); $refreshParent = true; From 7fdf6165d52c2f4ccf5a3ede3c9bd62fa4501d22 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 3 Jan 2020 17:08:11 -0500 Subject: [PATCH 120/330] Fix case in var name --- web/skins/classic/views/js/montagereview.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/montagereview.js.php b/web/skins/classic/views/js/montagereview.js.php index ecea1ba6f..526ce0bb5 100644 --- a/web/skins/classic/views/js/montagereview.js.php +++ b/web/skins/classic/views/js/montagereview.js.php @@ -18,7 +18,7 @@ var speedIndex=; // for history, and fps for live, and dynamically determined (in ms) var currentDisplayInterval=; -var playSecsperInterval=1; // How many seconds of recorded image we play per refresh determined by speed (replay rate) and display interval; (default=1 if coming from live) +var playSecsPerInterval=1; // How many seconds of recorded image we play per refresh determined by speed (replay rate) and display interval; (default=1 if coming from live) var timerInterval; // milliseconds between interrupts var timerObj; // object to hold timer interval; var freeTimeLastIntervals=[]; // Percentage of current interval used in loading most recent image From 0fb806d9d750c0a6aa9767439f23dd52b30a091e Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sat, 4 Jan 2020 15:30:32 -0600 Subject: [PATCH 121/330] Allow aarch64 as a valid build architecture --- utils/packpack/startpackpack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh index e6b68f66d..4af3cc161 100755 --- a/utils/packpack/startpackpack.sh +++ b/utils/packpack/startpackpack.sh @@ -30,7 +30,7 @@ checksanity () { ARCH="x86_64" fi - if [[ "${ARCH}" != "x86_64" && "${ARCH}" != "i386" && "${ARCH}" != "armhf" ]]; then + if [[ "${ARCH}" != "x86_64" && "${ARCH}" != "i386" && "${ARCH}" != "armhf" && "${ARCH}" != "aarch64" ]]; then echo echo "ERROR: Unsupported architecture specified \"${ARCH}\"." echo From 00f8a450dee9928bf3a71a460bb67b3fe56553f5 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 5 Jan 2020 14:59:25 -0500 Subject: [PATCH 122/330] spaces and quotes --- web/skins/classic/views/js/event.js | 157 ++++++++++++++-------------- 1 file changed, 79 insertions(+), 78 deletions(-) diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index 76fc47c79..f7da1341a 100644 --- a/web/skins/classic/views/js/event.js +++ b/web/skins/classic/views/js/event.js @@ -57,7 +57,7 @@ function setAlarmCues(data) { function renderAlarmCues(containerEl) { if ( !( cueFrames && cueFrames.length ) ) { - console.log("No cue frames for event"); + console.log('No cue frames for event'); return; } // This uses the Delta of the last frame to get the length of the event. I can't help but wonder though @@ -139,7 +139,7 @@ function setButtonState( element, butClass ) { element.disabled = false; } } else { - console.log("Element was null in setButtonState"); + console.log('Element was null in setButtonState'); } } @@ -211,7 +211,7 @@ var lastEventId = 0; var zmsBroke = false; //Use alternate navigation if zms has crashed function getCmdResponse( respObj, respText ) { - if ( checkStreamForErrors("getCmdResponse", respObj) ) { + if ( checkStreamForErrors('getCmdResponse', respObj) ) { console.log('Got an error from getCmdResponse'); console.log(respObj); console.log(respText); @@ -541,9 +541,9 @@ var scroll = null; var currEventId = null; var CurEventDefVideoPath = null; -function getEventResponse( respObj, respText ) { - if ( checkStreamForErrors( "getEventResponse", respObj ) ) { - console.log("getEventResponse: errors" ); +function getEventResponse(respObj, respText) { + if ( checkStreamForErrors('getEventResponse', respObj) ) { + console.log('getEventResponse: errors'); return; } @@ -582,7 +582,7 @@ function getEventResponse( respObj, respText ) { //eventImg.setStyles( { 'width': eventData.width, 'height': eventData.height } ); if ( vid && CurEventDefVideoPath ) { vid.src({type: 'video/mp4', src: CurEventDefVideoPath}); //Currently mp4 is all we use - console.log("getEventResponse"); + console.log('getEventResponse'); initialAlarmCues(eventData.Id);//ajax and render, new event addVideoTimingTrack(vid, LabelFormat, eventData.MonitorName, eventData.Length, eventData.StartTime); CurEventDefVideoPath = null; @@ -644,7 +644,7 @@ var frameBatch = 40; function loadEventThumb( event, frame, loadImage ) { var thumbImg = $('eventThumb'+frame.FrameId); if ( !thumbImg ) { - console.error( "No holder found for frame "+frame.FrameId ); + console.error('No holder found for frame '+frame.FrameId); return; } var img = new Asset.image( imagePrefix+frame.EventId+"&fid="+frame.FrameId, @@ -666,31 +666,31 @@ function loadEventThumb( event, frame, loadImage ) { ); } -function loadEventImage( event, frame ) { - console.debug( "Loading "+event.Id+"/"+frame.FrameId ); +function loadEventImage(event, frame) { + console.debug('Loading '+event.Id+'/'+frame.FrameId); var eventImg = $('eventImage'); var thumbImg = $('eventThumb'+frame.FrameId); - if ( eventImg.getProperty( 'src' ) != thumbImg.getProperty( 'src' ) ) { + if ( eventImg.getProperty('src') != thumbImg.getProperty('src') ) { var eventImagePanel = $('eventImagePanel'); - if ( eventImagePanel.getStyle( 'display' ) != 'none' ) { - var lastThumbImg = $('eventThumb'+eventImg.getProperty( 'alt' )); + if ( eventImagePanel.getStyle('display') != 'none' ) { + var lastThumbImg = $('eventThumb'+eventImg.getProperty('alt')); lastThumbImg.removeClass('selected'); - lastThumbImg.setOpacity( 1.0 ); + lastThumbImg.setOpacity(1.0); } - $('eventImageBar').setStyle( 'width', event.Width ); - if ( frame.Type=='Alarm' ) { - $('eventImageStats').removeClass( 'hidden' ); + $('eventImageBar').setStyle('width', event.Width); + if ( frame.Type == 'Alarm' ) { + $('eventImageStats').removeClass('hidden'); } else { - $('eventImageStats').addClass( 'hidden' ); + $('eventImageStats').addClass('hidden'); } - thumbImg.addClass( 'selected' ); - thumbImg.setOpacity( 0.5 ); + thumbImg.addClass('selected'); + thumbImg.setOpacity(0.5); - if ( eventImagePanel.getStyle( 'display' ) == 'none' ) { - eventImagePanel.setOpacity( 0 ); - eventImagePanel.setStyle( 'display', 'inline-block' ); + if ( eventImagePanel.getStyle('display') == 'none' ) { + eventImagePanel.setOpacity(0); + eventImagePanel.setStyle('display', 'inline-block'); new Fx.Tween( eventImagePanel, {duration: 500, transition: Fx.Transitions.Sine} ).start( 'opacity', 0, 1 ); } @@ -702,29 +702,29 @@ function loadEventImage( event, frame ) { 'height': $j('#eventThumbs').height() - $j('#eventImageBar').outerHeight(true)-10 } ); - $('eventImageNo').set( 'text', frame.FrameId ); + $('eventImageNo').set('text', frame.FrameId); $('prevImageBtn').disabled = (frame.FrameId==1); $('nextImageBtn').disabled = (frame.FrameId==event.Frames); } } function hideEventImageComplete() { - var thumbImg = $('eventThumb'+$('eventImage').getProperty( 'alt' )); + var thumbImg = $('eventThumb'+$('eventImage').getProperty('alt')); if ( thumbImg ) { thumbImg.removeClass('selected'); - thumbImg.setOpacity( 1.0 ); + thumbImg.setOpacity(1.0); } else { - console.log("Unable to find eventThumb at " + 'eventThumb'+$('eventImage').getProperty( 'alt' ) ); + console.log('Unable to find eventThumb at eventThumb'+$('eventImage').getProperty('alt')); } $('prevImageBtn').disabled = true; $('nextImageBtn').disabled = true; - $('eventImagePanel').setStyle( 'display', 'none' ); - $('eventImageStats').addClass( 'hidden' ); + $('eventImagePanel').setStyle('display', 'none'); + $('eventImageStats').addClass('hidden'); } function hideEventImage() { - if ( $('eventImagePanel').getStyle( 'display' ) != 'none' ) { - new Fx.Tween( $('eventImagePanel'), {duration: 500, transition: Fx.Transitions.Sine, onComplete: hideEventImageComplete} ).start( 'opacity', 1, 0 ); + if ( $('eventImagePanel').getStyle('display') != 'none' ) { + new Fx.Tween( $('eventImagePanel'), {duration: 500, transition: Fx.Transitions.Sine, onComplete: hideEventImageComplete} ).start('opacity', 1, 0); } } @@ -751,15 +751,15 @@ function resetEventStills() { } } -function getFrameResponse( respObj, respText ) { - if ( checkStreamForErrors( "getFrameResponse", respObj ) ) { +function getFrameResponse(respObj, respText) { + if ( checkStreamForErrors('getFrameResponse', respObj) ) { return; } var frame = respObj.frameimage; if ( !eventData ) { - console.error( "No event "+frame.EventId+" found" ); + console.error('No event '+frame.EventId+' found'); return; } @@ -769,21 +769,21 @@ function getFrameResponse( respObj, respText ) { eventData['frames'][frame.FrameId] = frame; - loadEventThumb( eventData, frame, respObj.loopback=="true" ); + loadEventThumb(eventData, frame, respObj.loopback=="true"); } var frameReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'chain', onSuccess: getFrameResponse} ); function frameQuery( eventId, frameId, loadImage ) { var parms = "view=request&request=status&entity=frameimage&id[0]="+eventId+"&id[1]="+frameId+"&loopback="+loadImage; - frameReq.send( parms ); + frameReq.send(parms); } var currFrameId = null; function checkFrames( eventId, frameId, loadImage ) { if ( !eventData ) { - console.error( "No event "+eventId+" found" ); + console.error("No event "+eventId+" found"); return; } @@ -804,29 +804,30 @@ function checkFrames( eventId, frameId, loadImage ) { for ( var fid = loFid; fid <= hiFid; fid++ ) { if ( !$('eventThumb'+fid) ) { - var img = new Element( 'img', {'id': 'eventThumb'+fid, 'src': 'graphics/transparent.png', 'alt': fid, 'class': 'placeholder'} ); - img.addEvent( 'click', function() { - eventData['frames'][fid] = null; checkFrames( eventId, fid ); - } ); - frameQuery( eventId, fid, loadImage && (fid == frameId) ); - var imgs = $('eventThumbs').getElements( 'img' ); + var img = new Element('img', {'id': 'eventThumb'+fid, 'src': 'graphics/transparent.png', 'alt': fid, 'class': 'placeholder'}); + img.addEvent('click', function() { + eventData['frames'][fid] = null; + checkFrames(eventId, fid); + }); + frameQuery(eventId, fid, loadImage && (fid == frameId)); + var imgs = $('eventThumbs').getElements('img'); var injected = false; if ( fid < imgs.length ) { - img.inject( imgs[fid-1], 'before' ); + img.inject(imgs[fid-1], 'before'); injected = true; } else { injected = imgs.some( function( thumbImg, index ) { - if ( parseInt(img.getProperty( 'alt' )) < parseInt(thumbImg.getProperty( 'alt' )) ) { - img.inject( thumbImg, 'before' ); - return ( true ); + if ( parseInt(img.getProperty('alt')) < parseInt(thumbImg.getProperty('alt')) ) { + img.inject(thumbImg, 'before'); + return true; } - return ( false ); + return false; } ); } if ( !injected ) { - img.inject( $('eventThumbs') ); + img.inject($('eventThumbs')); } var scale = parseInt(img.getStyle('height')); img.setStyles( { @@ -923,7 +924,7 @@ function deleteEvent() { getActResponse(respObj, respText); // We must wait for the deletion to happen before navigating to the next // event or this request will be cancelled. - streamNext( true ); + streamNext(true); }, }); deleteReq.send("view=request&request=event&id="+eventData.Id+"&action=delete"); @@ -931,43 +932,43 @@ function deleteEvent() { function renameEvent() { var newName = $('eventName').get('value'); - actQuery( 'rename', {eventName: newName} ); + actQuery('rename', {eventName: newName}); } function editEvent() { - createPopup( '?view=eventdetail&eid='+eventData.Id, 'zmEventDetail', 'eventdetail' ); + createPopup('?view=eventdetail&eid='+eventData.Id, 'zmEventDetail', 'eventdetail'); } function exportEvent() { - createPopup( '?view=export&eid='+eventData.Id, 'zmExport', 'export' ); + createPopup('?view=export&eid='+eventData.Id, 'zmExport', 'export'); } function archiveEvent() { - actQuery( 'archive' ); + actQuery('archive'); } function unarchiveEvent() { - actQuery( 'unarchive' ); + actQuery('unarchive'); } function showEventFrames() { - createPopup( '?view=frames&eid='+eventData.Id, 'zmFrames', 'frames', WEB_LIST_THUMB_WIDTH, WEB_LIST_THUMB_HEIGHT ); + createPopup('?view=frames&eid='+eventData.Id, 'zmFrames', 'frames', WEB_LIST_THUMB_WIDTH, WEB_LIST_THUMB_HEIGHT); } function showStream() { - $('eventStills').addClass( 'hidden' ); - $('eventVideo').removeClass( 'hidden' ); + $('eventStills').addClass('hidden'); + $('eventVideo').removeClass('hidden'); - $('stillsEvent').removeClass( 'hidden' ); - $('streamEvent').addClass( 'hidden' ); + $('stillsEvent').removeClass('hidden'); + $('streamEvent').addClass('hidden'); streamMode = 'video'; if (scale == 'auto') changeScale(); } function showStills() { - $('eventStills').removeClass( 'hidden' ); - $('eventVideo').addClass( 'hidden' ); + $('eventStills').removeClass('hidden'); + $('eventVideo').addClass('hidden'); if (vid && ( vid.paused != true ) ) { // Pause the video @@ -978,14 +979,14 @@ function showStills() { //playButton.innerHTML = "Play"; } - $('stillsEvent').addClass( 'hidden' ); - $('streamEvent').removeClass( 'hidden' ); + $('stillsEvent').addClass('hidden'); + $('streamEvent').removeClass('hidden'); streamMode = 'stills'; pauseClicked(); if ( !scroll ) { - scroll = new Fx.Scroll( 'eventThumbs', { + scroll = new Fx.Scroll('eventThumbs', { wait: false, duration: 500, offset: {'x': 0, 'y': 0}, @@ -999,17 +1000,17 @@ function showStills() { function showFrameStats() { var fid = $('eventImageNo').get('text'); - createPopup( '?view=stats&eid='+eventData.Id+'&fid='+fid, 'zmStats', 'stats', eventData.Width, eventData.Height ); + createPopup('?view=stats&eid='+eventData.Id+'&fid='+fid, 'zmStats', 'stats', eventData.Width, eventData.Height); } function videoEvent() { - createPopup( '?view=video&eid='+eventData.Id, 'zmVideo', 'video', eventData.Width, eventData.Height ); + createPopup('?view=video&eid='+eventData.Id, 'zmVideo', 'video', eventData.Width, eventData.Height); } // Called on each event load because each event can be a different width function drawProgressBar() { var barWidth = $j('#evtStream').width(); - $j('#progressBar').css( 'width', barWidth ); + $j('#progressBar').css('width', barWidth); } // Shows current stream progress. @@ -1032,8 +1033,8 @@ function progressBarNav() { function handleClick( event ) { var target = event.target; - if (vid) { - if (target.id != 'videoobj') return; //ignore clicks on control bar + if ( vid ) { + if (target.id != 'videoobj') return; // ignore clicks on control bar var x = event.offsetX; var y = event.offsetY; } else { @@ -1041,9 +1042,9 @@ function handleClick( event ) { var y = event.page.y - $(target).getTop(); } - if (event.shift || event.shiftKey) {//handle both jquery and mootools + if ( event.shift || event.shiftKey ) { // handle both jquery and mootools streamPan(x, y); - } else if (vid && event.ctrlKey) { //allow zoom out by control click. useful in fullscreen + } else if ( vid && event.ctrlKey ) { // allow zoom out by control click. useful in fullscreen vjsPanZoom('zoomOut', x, y); } else { streamZoomIn(x, y); @@ -1072,7 +1073,7 @@ function initPage() { } } else { progressBarNav(); - streamCmdTimer = streamQuery.delay( 250 ); + streamCmdTimer = streamQuery.delay(250); if ( canStreamNative ) { var imageFeed = $('imageFeed'); if ( !imageFeed ) { @@ -1082,16 +1083,16 @@ function initPage() { if ( !streamImg ) { streamImg = imageFeed.getElement('object'); } - $(streamImg).addEvent( 'click', function( event ) { - handleClick( event ); - } ); + $(streamImg).addEvent('click', function(event) { + handleClick(event); + }); } } } nearEventsQuery(eventData.Id); initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues - if (scale == "auto") changeScale(); + if ( scale == 'auto' ) changeScale(); } // Kick everything off -window.addEventListener( 'DOMContentLoaded', initPage ); +window.addEventListener('DOMContentLoaded', initPage); From 2956e5e156a2d69451d78deb9f553bae674eae59 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sun, 5 Jan 2020 14:30:33 -0600 Subject: [PATCH 123/330] use dnf rather than yum for newer redhat distros --- utils/packpack/startpackpack.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh index 4af3cc161..6a51e2995 100755 --- a/utils/packpack/startpackpack.sh +++ b/utils/packpack/startpackpack.sh @@ -9,7 +9,7 @@ # General sanity checks checksanity () { # Check to see if this script has access to all the commands it needs - for CMD in set echo curl git ln mkdir rmdir cat patch; do + for CMD in set echo curl git ln mkdir rmdir cat patch sed; do type $CMD 2>&1 > /dev/null if [ $? -ne 0 ]; then @@ -298,6 +298,11 @@ if [ "${OS}" == "el" ] || [ "${OS}" == "fedora" ]; then commonprep echo "Begin Redhat build..." + # Newer Redhat distros use dnf package manager rather than yum + if [ "${DIST}" -gt "7" ]; then + sed -i 's\yum\dnf\' utils/packpack/redhat_package.mk + fi + setrpmpkgname ln -sfT distros/redhat rpm From 05ac82b0bb5c8494414d342dc903392915ab4e22 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 5 Jan 2020 17:27:45 -0500 Subject: [PATCH 124/330] Handle failure to init hwdevice when trying to use hwaccel. --- src/zm_ffmpeg_camera.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index ef4dfc057..c9dec7e05 100644 --- a/src/zm_ffmpeg_camera.cpp +++ b/src/zm_ffmpeg_camera.cpp @@ -517,17 +517,17 @@ int FfmpegCamera::OpenFfmpeg() { Debug(1, "Selected hw_pix_fmt %d %s", hw_pix_fmt, av_get_pix_fmt_name(hw_pix_fmt)); - mVideoCodecContext->get_format = get_hw_format; - ret = av_hwdevice_ctx_create(&hw_device_ctx, type, (hwaccel_device != "" ? hwaccel_device.c_str(): NULL), NULL, 0); if ( ret < 0 ) { Error("Failed to create hwaccel device."); - return -1; + hw_pix_fmt = AV_PIX_FMT_NONE; + } else { + Debug(1, "Created hwdevice for %s", hwaccel_device.c_str()); + mVideoCodecContext->get_format = get_hw_format; + mVideoCodecContext->hw_device_ctx = av_buffer_ref(hw_device_ctx); + hwFrame = zm_av_frame_alloc(); } - Debug(1, "Created hwdevice for %s", hwaccel_device.c_str()); - mVideoCodecContext->hw_device_ctx = av_buffer_ref(hw_device_ctx); - hwFrame = zm_av_frame_alloc(); } else { Debug(1, "Failed to setup hwaccel."); } @@ -537,7 +537,7 @@ int FfmpegCamera::OpenFfmpeg() { #else Warning("HWAccel support not compiled in."); #endif - } // end if hwacel_name + } // end if hwaccel_name // Open the codec #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0) From c3641df531dbb6e3fc054c3e7873c4ad564ecb91 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 5 Jan 2020 17:30:06 -0500 Subject: [PATCH 125/330] spaces --- web/includes/Monitor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index 4575d2ab6..b725963f2 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -510,7 +510,7 @@ class Monitor extends ZM_Object { if ( @socket_connect($socket, $sockFile) ) { if ( !socket_write($socket, $optionString) ) { Error('Can\'t write to control socket: '.socket_strerror(socket_last_error($socket))); - return false; + return false; } } else if ( $command != 'quit' ) { $command = ZM_PATH_BIN.'/zmcontrol.pl '.$command.' --id='.$this->{'Id'}; @@ -544,7 +544,7 @@ class Monitor extends ZM_Object { } } catch ( Exception $e ) { Error("Except $e thrown trying to restart zma"); - return false; + return false; } } else { Error('Server not assigned to Monitor in a multi-server setup. Please assign a server to the Monitor.'); From 6ac26ec1aa73bf4ee1af040b1f12dabe7fb5a299 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 5 Jan 2020 17:33:53 -0500 Subject: [PATCH 126/330] quotes --- web/skins/classic/views/js/watch.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js index b6127a68d..c151ba3ec 100644 --- a/web/skins/classic/views/js/watch.js +++ b/web/skins/classic/views/js/watch.js @@ -44,17 +44,17 @@ function changeScale() { newHeight = monitorHeight * scale / SCALE_BASE; } - Cookie.write( 'zmWatchScale'+monitorId, scale, {duration: 10*365} ); + Cookie.write('zmWatchScale'+monitorId, scale, {duration: 10*365}); /*Stream could be an applet so can't use moo tools*/ var streamImg = $('liveStream'+monitorId); if ( streamImg ) { - streamImg.style.width = newWidth + "px"; - streamImg.style.height = newHeight + "px"; + streamImg.style.width = newWidth + 'px'; + streamImg.style.height = newHeight + 'px'; streamImg.src = streamImg.src.replace(/scale=\d+/i, 'scale='+(scale== 'auto' ? autoScale : scale)); } else { - console.error("No element found for liveStream."); + console.error('No element found for liveStream.'); } } @@ -64,17 +64,17 @@ var lastAlarmState = STATE_IDLE; function setAlarmState( currentAlarmState ) { alarmState = currentAlarmState; - var stateClass = ""; + var stateClass = ''; if ( alarmState == STATE_ALARM ) { - stateClass = "alarm"; + stateClass = 'alarm'; } else if ( alarmState == STATE_ALERT ) { - stateClass = "alert"; + stateClass = 'alert'; } - $('stateValue').set( 'text', stateStrings[alarmState] ); + $('stateValue').set('text', stateStrings[alarmState]); if ( stateClass ) { - $('stateValue').setProperty( 'class', stateClass ); + $('stateValue').setProperty('class', stateClass); } else { - $('stateValue').removeProperty( 'class' ); + $('stateValue').removeProperty('class'); } var isAlarmed = ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ); @@ -114,7 +114,7 @@ function setAlarmState( currentAlarmState ) { } if ( monitorType != 'WebSite' ) { - var streamCmdParms = "view=request&request=stream&connkey="+connKey; + var streamCmdParms = 'view=request&request=stream&connkey='+connKey; if ( auth_hash ) { streamCmdParms += '&auth='+auth_hash; } @@ -141,7 +141,7 @@ function getStreamCmdFailure(xhr) { console.log(xhr); } function getStreamCmdResponse(respObj, respText) { - watchdogOk("stream"); + watchdogOk('stream'); if ( streamCmdTimer ) { streamCmdTimer = clearTimeout(streamCmdTimer); } From 71581831b5ca487894eb0997ce00dd405f0566d7 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 5 Jan 2020 17:34:27 -0500 Subject: [PATCH 127/330] fix problem with the clone button material icon. Apparently file_copy doesn't work, so use content_copy instead despite it not being listed in the material icons --- web/skins/classic/views/console.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index 8d8b08ff6..b910b11fa 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -187,7 +187,8 @@ getBodyTopHTML(); Date: Sun, 5 Jan 2020 17:34:40 -0500 Subject: [PATCH 128/330] controlcap needs to be larger --- web/skins/classic/js/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/js/base.js b/web/skins/classic/js/base.js index 4ecc4c234..48747b98d 100644 --- a/web/skins/classic/js/base.js +++ b/web/skins/classic/js/base.js @@ -29,7 +29,7 @@ var popupSizes = { 'console': {'width': 750, 'height': 312}, 'control': {'width': 480, 'height': 480}, 'controlcaps': {'width': 780, 'height': 320}, - 'controlcap': {'width': 400, 'height': 400}, + 'controlcap': {'width': 600, 'height': 500}, 'cycle': {'addWidth': 32, 'minWidth': 384, 'addHeight': 62}, 'device': {'width': 260, 'height': 150}, 'devices': {'width': 400, 'height': 240}, From 2f1b725ee4f81d4119a707a10185cf9b269b3909 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 7 Jan 2020 11:01:02 -0500 Subject: [PATCH 129/330] quote SQL for mysql8 --- web/skins/classic/includes/functions.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php index 60558f8e8..328b63833 100644 --- a/web/skins/classic/includes/functions.php +++ b/web/skins/classic/includes/functions.php @@ -290,12 +290,12 @@ if ( $user and $user['Username'] ) { # zmaudit can clean the logs, but if we aren't running it, then we should clean them regularly if ( preg_match('/^\d+$/', ZM_LOG_DATABASE_LIMIT) ) { # Number of lines, instead of an interval - $rows = dbFetchOne('SELECT Count(*) AS Rows FROM Logs', 'Rows'); + $rows = dbFetchOne('SELECT Count(*) AS `Rows` FROM `Logs`', 'Rows'); if ( $rows > ZM_LOG_DATABASE_LIMIT ) { - dbQuery('DELETE low_priority FROM Logs ORDER BY TimeKey ASC LIMIT ?', array($rows - ZM_LOG_DATABASE_LIMIT)); + dbQuery('DELETE low_priority FROM `Logs` ORDER BY `TimeKey` ASC LIMIT ?', array($rows - ZM_LOG_DATABASE_LIMIT)); } } else if ( preg_match('/^\d\s*(hour|minute|day|week|month|year)$/', ZM_LOG_DATABASE_LIMIT, $matches) ) { - dbQuery('DELETE FROM Logs WHERE TimeKey < unix_timestamp( NOW() - interval '.ZM_LOG_DATABASE_LIMIT.') LIMIT 100'); + dbQuery('DELETE FROM `Logs` WHERE `TimeKey` < unix_timestamp( NOW() - interval '.ZM_LOG_DATABASE_LIMIT.') LIMIT 100'); } else { ZM\Error('Potentially invalid value for ZM_LOG_DATABASE_LIMIT: ' . ZM_LOG_DATABASE_LIMIT); } From 61bc0ddd0a0761a7d6ff0c90617f5fe7f241efbf Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 7 Jan 2020 11:01:53 -0500 Subject: [PATCH 130/330] add missing t and merge some lines --- web/skins/classic/views/options.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php index 2d1bb7ad2..0a0d99286 100644 --- a/web/skins/classic/views/options.php +++ b/web/skins/classic/views/options.php @@ -276,15 +276,10 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*',GLOB_ONLYDIR)) as $ Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Path()), $canEdit ) ?> Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Type()), $canEdit ) ?> Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Scheme()), $canEdit ) ?> - Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Server()->Name()), $canEdit ) ?> - - disk_used_space()) . ' of ' . human_filesize($Storage->disk_total_space()) -?> - + Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Server()->Name()), $canEdit ) ?> + disk_used_space()) . ' of ' . human_filesize($Storage->disk_total_space()) ?> Events()).' using '.human_filesize($Storage->event_disk_space()) ?> - Events()) or !$canEdit ) { ?> disabled="disabled"Events()) ? ' title="Can\' delete as long as there are events stored here."' : ''?>/> + Events()) or !$canEdit ) { ?> disabled="disabled"Events()) ? ' title="Can\'t delete as long as there are events stored here."' : ''?>/> From b85cf7d8a1eb8dd78cc5fc8ffe4ef1734940c6af Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 7 Jan 2020 11:03:45 -0500 Subject: [PATCH 131/330] include error message when complaining about failing to create the hwaccell device --- src/zm_ffmpeg_camera.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index fafbf4c75..3cc634e7d 100644 --- a/src/zm_ffmpeg_camera.cpp +++ b/src/zm_ffmpeg_camera.cpp @@ -520,7 +520,7 @@ int FfmpegCamera::OpenFfmpeg() { ret = av_hwdevice_ctx_create(&hw_device_ctx, type, (hwaccel_device != "" ? hwaccel_device.c_str(): NULL), NULL, 0); if ( ret < 0 ) { - Error("Failed to create hwaccel device."); + Error("Failed to create hwaccel device. %s",av_make_error_string(ret).c_str()); hw_pix_fmt = AV_PIX_FMT_NONE; } else { Debug(1, "Created hwdevice for %s", hwaccel_device.c_str()); @@ -529,7 +529,7 @@ int FfmpegCamera::OpenFfmpeg() { hwFrame = zm_av_frame_alloc(); } } else { - Debug(1, "Failed to setup hwaccel."); + Debug(1, "Failed to find suitable hw_pix_fmt."); } #else Debug(1, "AVCodec not new enough for hwaccel"); From c3f8d9c364065ad063c8a8ea71c2586604ce7429 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 7 Jan 2020 12:08:08 -0500 Subject: [PATCH 132/330] add php5-json as a dependency --- distros/ubuntu1604/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/ubuntu1604/control b/distros/ubuntu1604/control index 1b7b96320..ef138a3ba 100644 --- a/distros/ubuntu1604/control +++ b/distros/ubuntu1604/control @@ -74,7 +74,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} ,libfile-slurp-perl ,mysql-client | mariadb-client | virtual-mysql-client ,perl-modules - ,php5-mysql | php-mysql, php5-gd | php-gd , php5-apcu | php-apcu , php-apc | php-apcu-bc, php-json + ,php5-mysql | php-mysql, php5-gd | php-gd , php5-apcu | php-apcu , php-apc | php-apcu-bc, php-json | php5-json ,policykit-1 ,rsyslog | system-log-daemon ,zip From 971d62f60dc5be80b6ec14e12181a342eaf8829a Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 7 Jan 2020 12:09:34 -0500 Subject: [PATCH 133/330] encode the telemetry to utf-8 before sending. Fixes #2800 --- scripts/zmtelemetry.pl.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in index efd5e735e..9b5e7c89d 100644 --- a/scripts/zmtelemetry.pl.in +++ b/scripts/zmtelemetry.pl.in @@ -23,6 +23,7 @@ use strict; use bytes; +use utf8; @EXTRA_PERL_LIB@ use ZoneMinder; @@ -34,6 +35,7 @@ use Sys::MemInfo qw(totalmem); use Sys::CPU qw(cpu_count); use POSIX qw(strftime uname); use JSON::MaybeXS; +use Encode; $ENV{PATH} = '/bin:/usr/bin:/usr/local/bin'; $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL}; @@ -166,7 +168,7 @@ sub sendData { $req->header('content-length' => length($msg)); $req->header('connection' => 'Close'); - $req->content($msg); + $req->content(encode('UTF-8',$msg)); my $resp = $ua->request($req); my $resp_msg = $resp->decoded_content; From c0443f694abe5130469f09061f2f48757d5d9d01 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 7 Jan 2020 12:24:39 -0500 Subject: [PATCH 134/330] I think we need .buildinfo as well --- utils/packpack/rsync_xfer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/packpack/rsync_xfer.sh b/utils/packpack/rsync_xfer.sh index c4b6f93e1..9f273ca96 100755 --- a/utils/packpack/rsync_xfer.sh +++ b/utils/packpack/rsync_xfer.sh @@ -27,7 +27,7 @@ echo echo "Target subfolder set to $targetfolder" echo -echo "Running \$(rsync -v -e 'ssh -vvv' build/*.{rpm,deb,dsc,tar.xz,changes} zmrepo@zmrepo.zoneminder.com:${targetfolder}/ 2>&1)" +echo "Running \$(rsync -v -e 'ssh -vvv' build/*.{rpm,deb,dsc,tar.xz,buildinfo,changes} zmrepo@zmrepo.zoneminder.com:${targetfolder}/ 2>&1)" rsync -v --ignore-missing-args --exclude 'external-repo.noarch.rpm' -e 'ssh -vvv' build/*.{rpm,deb,dsc,tar.xz,changes} zmrepo@zmrepo.zoneminder.com:${targetfolder}/ 2>&1 if [ "$?" -eq 0 ]; then echo From 1865df3fe00a898bcaf565b26b2fc541729f8333 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 7 Jan 2020 17:08:07 -0500 Subject: [PATCH 135/330] remove some debug, add some parenthesis to ensure logic works as intended --- web/ajax/stream.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/web/ajax/stream.php b/web/ajax/stream.php index 910b18cb5..575eaef39 100644 --- a/web/ajax/stream.php +++ b/web/ajax/stream.php @@ -119,13 +119,11 @@ if ( sem_acquire($semaphore,1) !== false ) { switch ( $data['type'] ) { case MSG_DATA_WATCH : $data = unpack('ltype/imonitor/istate/dfps/ilevel/irate/ddelay/izoom/Cdelayed/Cpaused/Cenabled/Cforced', $msg); - ZM\Logger::Debug('FPS: ' . $data['fps']); $data['fps'] = round( $data['fps'], 2 ); - ZM\Logger::Debug('FPS: ' . $data['fps'] ); $data['rate'] /= RATE_BASE; $data['delay'] = round( $data['delay'], 2 ); $data['zoom'] = round( $data['zoom']/SCALE_BASE, 1 ); - if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == 'hashed' ) { + if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') ) { $time = time(); // Regenerate auth hash after half the lifetime of the hash if ( (!isset($_SESSION['AuthHashGeneratedAt'])) or ( $_SESSION['AuthHashGeneratedAt'] < $time - (ZM_AUTH_HASH_TTL * 1800) ) ) { @@ -144,7 +142,7 @@ if ( sem_acquire($semaphore,1) !== false ) { } $data['rate'] /= RATE_BASE; $data['zoom'] = round( $data['zoom']/SCALE_BASE, 1 ); - if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == 'hashed' ) { + if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') ) { $time = time(); // Regenerate auth hash after half the lifetime of the hash if ( (!isset($_SESSION['AuthHashGeneratedAt'])) or ( $_SESSION['AuthHashGeneratedAt'] < $time - (ZM_AUTH_HASH_TTL * 1800) ) ) { From 0571909d05c8361679964858eada7d8e1791f8ce Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 7 Jan 2020 17:08:29 -0500 Subject: [PATCH 136/330] add remote_IP to log entries on php side --- web/includes/logger.php | 146 +++++++++++++++++++++------------------- 1 file changed, 77 insertions(+), 69 deletions(-) diff --git a/web/includes/logger.php b/web/includes/logger.php index 3aa8f891b..7404891b6 100644 --- a/web/includes/logger.php +++ b/web/includes/logger.php @@ -274,7 +274,7 @@ class Logger { } } } - return( $this->databaseLevel ); + return $this->databaseLevel; } public function fileLevel( $fileLevel ) { @@ -288,7 +288,7 @@ class Logger { $this->openFile(); } } - return( $this->fileLevel ); + return $this->fileLevel; } public function weblogLevel( $weblogLevel ) { @@ -303,7 +303,7 @@ class Logger { $this->weblogLevel = $weblogLevel; } } - return( $this->weblogLevel ); + return $this->weblogLevel; } public function syslogLevel( $syslogLevel ) { @@ -317,30 +317,31 @@ class Logger { $this->openSyslog(); } } - return( $this->syslogLevel ); + return $this->syslogLevel; } private function openSyslog() { - openlog( $this->id, LOG_PID|LOG_NDELAY, LOG_LOCAL1 ); + openlog($this->id, LOG_PID|LOG_NDELAY, LOG_LOCAL1); } private function closeSyslog() { closelog(); } - private function logFile( $logFile ) { - if ( preg_match( '/^(.+)\+$/', $logFile, $matches ) ) + private function logFile($logFile) { + if ( preg_match('/^(.+)\+$/', $logFile, $matches) ) { $this->logFile = $matches[1].'.'.getmypid(); - else + } else { $this->logFile = $logFile; + } } private function openFile() { if ( !$this->useErrorLog ) { - if ( $this->logFd = fopen( $this->logFile, 'a+' ) ) { - if ( strnatcmp( phpversion(), '5.2.0' ) >= 0 ) { + if ( $this->logFd = fopen($this->logFile, 'a+') ) { + if ( strnatcmp(phpversion(), '5.2.0') >= 0 ) { $error = error_get_last(); - trigger_error( "Can't open log file '$logFile': ".$error['message'].' @ '.$error['file'].'/'.$error['line'], E_USER_ERROR ); + trigger_error("Can't open log file '$logFile': ".$error['message'].' @ '.$error['file'].'/'.$error['line'], E_USER_ERROR); } $this->fileLevel = self::NOLOG; } @@ -349,73 +350,80 @@ class Logger { private function closeFile() { if ( $this->logFd ) - fclose( $this->logFd ); + fclose($this->logFd); } public function logPrint( $level, $string, $file=NULL, $line=NULL ) { - if ( $level <= $this->effectiveLevel ) { - $string = preg_replace( '/[\r\n]+$/', '', $string ); - $code = self::$codes[$level]; + if ( $level > $this->effectiveLevel ) { + return; + } - $time = gettimeofday(); - $message = sprintf( '%s.%06d %s[%d].%s [%s]', strftime( '%x %H:%M:%S', $time['sec'] ), $time['usec'], $this->id, getmypid(), $code, $string ); + $string = preg_replace('/[\r\n]+$/', '', $string); + $code = self::$codes[$level]; - if ( is_null($file) ) { - if ( $this->useErrorLog || $this->databaseLevel > self::NOLOG ) { - $backTrace = debug_backtrace(); - $file = $backTrace[1]['file']; - $line = $backTrace[1]['line']; - if ( $this->hasTerm ) - $rootPath = getcwd(); - else - $rootPath = $_SERVER['DOCUMENT_ROOT']; - $file = preg_replace( '/^'.addcslashes($rootPath,'/').'\/?/', '', $file ); - } - } + $time = gettimeofday(); + $message = sprintf('%s.%06d %s[%d].%s [%s] [%s]', strftime('%x %H:%M:%S', $time['sec']), $time['usec'], $this->id, getmypid(), $code, $_SERVER['REMOTE_ADDR'], $string); - if ( $this->useErrorLog ) - $message .= ' at '.$file.' line '.$line; - else - $message = $message; - - if ( $level <= $this->termLevel ) + if ( is_null($file) ) { + if ( $this->useErrorLog || $this->databaseLevel > self::NOLOG ) { + $backTrace = debug_backtrace(); + $file = $backTrace[1]['file']; + $line = $backTrace[1]['line']; if ( $this->hasTerm ) - print( $message."\n" ); + $rootPath = getcwd(); else - print( preg_replace( "/\n/", '
    ', htmlspecialchars($message) ).'
    ' ); - - if ( $level <= $this->fileLevel ) - if ( $this->useErrorLog ) { - if ( !error_log( $message."\n", 3, $this->logFile ) ) { - if ( strnatcmp( phpversion(), '5.2.0' ) >= 0 ) { - $error = error_get_last(); - trigger_error( "Can't write to log file '".$this->logFile."': ".$error['message'].' @ '.$error['file'].'/'.$error['line'], E_USER_ERROR ); - } - } - } elseif ( $this->logFd ) { - fprintf( $this->logFd, $message."\n" ); - } - - $message = $code.' ['.$string.']'; - if ( $level <= $this->syslogLevel ) - syslog( self::$syslogPriorities[$level], $message ); - if ( $level <= $this->databaseLevel ) { - try { - global $dbConn; - $sql = 'INSERT INTO Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) values ( ?, ?, ?, ?, ?, ?, ?, ? )'; - $stmt = $dbConn->prepare( $sql ); - $result = $stmt->execute( array( sprintf( '%d.%06d', $time['sec'], $time['usec'] ), $this->id, getmypid(), $level, $code, $string, $file, $line ) ); - } catch(PDOException $ex) { - $this->databaseLevel = self::NOLOG; - Error("Can't write log entry '$sql': ". $ex->getMessage()); - } + $rootPath = $_SERVER['DOCUMENT_ROOT']; + $file = preg_replace('/^'.addcslashes($rootPath,'/').'\/?/', '', $file); } - // This has to be last as trigger_error can be fatal - if ( $level <= $this->weblogLevel ) { - if ( $this->useErrorLog ) - error_log( $message, 0 ); - else - trigger_error( $message, self::$phpErrorLevels[$level] ); + } + + if ( $this->useErrorLog ) { + $message .= ' at '.$file.' line '.$line; + } else { + $message = $message; + } + + if ( $level <= $this->termLevel ) { + if ( $this->hasTerm ) + print($message."\n"); + else + print(preg_replace("/\n/", '
    ', htmlspecialchars($message) ).'
    '); + } + + if ( $level <= $this->fileLevel ) { + if ( $this->useErrorLog ) { + if ( !error_log($message."\n", 3, $this->logFile) ) { + if ( strnatcmp(phpversion(), '5.2.0') >= 0 ) { + $error = error_get_last(); + trigger_error("Can't write to log file '".$this->logFile."': ".$error['message'].' @ '.$error['file'].'/'.$error['line'], E_USER_ERROR); + } + } + } else if ( $this->logFd ) { + fprintf($this->logFd, $message."\n"); + } + } + + $message = $code.' ['.$string.']'; + if ( $level <= $this->syslogLevel ) + syslog( self::$syslogPriorities[$level], $message ); + + if ( $level <= $this->databaseLevel ) { + try { + global $dbConn; + $sql = 'INSERT INTO Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )'; + $stmt = $dbConn->prepare($sql); + $result = $stmt->execute(array(sprintf('%d.%06d', $time['sec'], $time['usec']), $this->id, getmypid(), $level, $code, $string, $file, $line)); + } catch(PDOException $ex) { + $this->databaseLevel = self::NOLOG; + Error("Can't write log entry '$sql': ". $ex->getMessage()); + } + } + // This has to be last as trigger_error can be fatal + if ( $level <= $this->weblogLevel ) { + if ( $this->useErrorLog ) { + error_log($message, 0); + } else { + trigger_error($message, self::$phpErrorLevels[$level]); } } } From c64de372a720e7651dddb8c03ac3b38d06037dcd Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 7 Jan 2020 17:08:57 -0500 Subject: [PATCH 137/330] when auth_hash changes, update various CmdParms --- web/skins/classic/views/js/watch.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js index c151ba3ec..1dc756a0e 100644 --- a/web/skins/classic/views/js/watch.js +++ b/web/skins/classic/views/js/watch.js @@ -229,12 +229,19 @@ function getStreamCmdResponse(respObj, respText) { } // end if canEditMonitors if ( streamStatus.auth ) { + auth_hash = streamStatus.auth; console.log("Have a new auth hash" + streamStatus.auth); // Try to reload the image stream. var streamImg = $('liveStream'); if ( streamImg ) { streamImg.src = streamImg.src.replace(/auth=\w+/i, 'auth='+streamStatus.auth); } + streamCmdParms = streamCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth); + statusCmdParms = statusCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth); + eventCmdParms = eventCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth); + actParms = actParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth); + controlParms = controlParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth); + } // end if have a new auth hash } // end if respObj.status } else { @@ -473,6 +480,9 @@ function getActResponse( respObj, respText ) { function deleteEvent( event, eventId ) { var actParms = "view=request&request=event&action=delete&id="+eventId; + if ( auth_hash ) { + actParms += '&auth='+auth_hash; + } var actReq = new Request.JSON( { url: thisUrl, method: 'post', From f13a7199e1603952b17eece324a1b8bbc816e19e Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 7 Jan 2020 21:53:55 -0600 Subject: [PATCH 138/330] fix eslint --- web/skins/classic/views/js/watch.js | 1 - 1 file changed, 1 deletion(-) diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js index 1dc756a0e..242ec80f0 100644 --- a/web/skins/classic/views/js/watch.js +++ b/web/skins/classic/views/js/watch.js @@ -241,7 +241,6 @@ function getStreamCmdResponse(respObj, respText) { eventCmdParms = eventCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth); actParms = actParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth); controlParms = controlParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth); - } // end if have a new auth hash } // end if respObj.status } else { From 28a4bef6baf5afc125922534758a5f7c284a45f1 Mon Sep 17 00:00:00 2001 From: Alex Porosanu Date: Thu, 9 Jan 2020 21:58:23 +0200 Subject: [PATCH 139/330] fix tar invocation for *BSD platforms "--xform" switch is not supported by tar on BSD platforms i.e. *BSD, MacOS, etc. As such, use "-s" switch on these platforms, with a similar regexp. --- web/skins/classic/includes/export_functions.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php index 8ce0fba5a..d43c697e3 100644 --- a/web/skins/classic/includes/export_functions.php +++ b/web/skins/classic/includes/export_functions.php @@ -940,6 +940,8 @@ function exportEvents( $archive = ''; if ( $exportFormat == 'tar' ) { $archive = ZM_DIR_EXPORTS.'/'.$export_root.($connkey?'_'.$connkey:'').'.tar'; + $version = shell_exec('tar -v'); + $command = 'tar --create --dereference'; if ( $exportCompressed ) { $archive .= '.gz'; @@ -947,8 +949,11 @@ function exportEvents( $exportFormat .= '.gz'; } if ( $exportStructure == 'flat' ) { - //strip file paths if we - $command .= " --xform='s#^.+/##x'"; + if (preg_match("/BSD/i", $version)) { + $command .= " -s '#^.*/##'"; + } else { + $command .= " --xform='s#^.+/##x'"; + } } $command .= ' --file='.escapeshellarg($archive); } elseif ( $exportFormat == 'zip' ) { From ef4ecd40fbd6e03a6958d7543735f7a7ddd461a0 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 10 Jan 2020 12:44:59 -0500 Subject: [PATCH 140/330] Set defaults before saving Objects --- web/includes/Object.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/web/includes/Object.php b/web/includes/Object.php index 1c17ce312..9f29aed88 100644 --- a/web/includes/Object.php +++ b/web/includes/Object.php @@ -110,8 +110,9 @@ class ZM_Object { public static function _find_one($class, $parameters = array(), $options = array() ) { global $object_cache; - if ( ! isset($object_cache[$class]) ) + if ( ! isset($object_cache[$class]) ) { $object_cache[$class] = array(); + } $cache = &$object_cache[$class]; if ( ( count($parameters) == 1 ) and @@ -290,6 +291,16 @@ Logger::Debug("$k => Have default for $v: "); $this->set($new_values); } + foreach ( $this->defaults as $field => $default ) { + if ( (!array_key_exists($field, $this)) or empty($this->{$field}) ) { + if ( is_array($default) ) { + $this->{$field} = $default['default']; + } else { + $this->{$field} = $default; + } + } + } + $fields = array_filter( $this->defaults, function($v) { From d433590f74663d5db6a09416c15c08cfbce16da7 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 10 Jan 2020 12:45:30 -0500 Subject: [PATCH 141/330] use find_one in stead of new to use Cached Server --- web/includes/Monitor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index b725963f2..a15e88d2d 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -128,7 +128,7 @@ class Monitor extends ZM_Object { } public function Server() { - return new Server($this->{'ServerId'}); + return Server::find_one(array('Id'=>$this->{'ServerId'})); } public function __call($fn, array $args){ From f61f6eaf7dda79ec31c5031747ea277c5e9f6d71 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 10 Jan 2020 12:45:47 -0500 Subject: [PATCH 142/330] remove line cutnpasted erroneously --- web/includes/actions/monitor.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php index 823a06ff2..f1223a6f9 100644 --- a/web/includes/actions/monitor.php +++ b/web/includes/actions/monitor.php @@ -219,7 +219,6 @@ if ( $action == 'monitor' ) { } else { ZM\Error('Error saving new Monitor.'); - $error_message = dbError($sql); return; } } From f8e54ba6e30781db0fd592636fd5d05350e4a522 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 10 Jan 2020 16:41:22 -0500 Subject: [PATCH 143/330] spacing, quotes --- .../lib/ZoneMinder/Control/AxisV2.pm | 497 ++++++++---------- 1 file changed, 226 insertions(+), 271 deletions(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm index d63236c86..b870c46e4 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm @@ -1,6 +1,6 @@ # ========================================================================== # -# ZoneMinder Axis version 2 API Control Protocol Module, $Date$, $Revision$ +# ZoneMinder Axis version 2 API Control Protocol Module # Copyright (C) 2001-2008 Philip Coombes # # This program is free software; you can redistribute it and/or @@ -46,346 +46,301 @@ use Time::HiRes qw( usleep ); sub open { - my $self = shift; + my $self = shift; - $self->loadMonitor(); + $self->loadMonitor(); - use LWP::UserAgent; - $self->{ua} = LWP::UserAgent->new; - $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION ); + use LWP::UserAgent; + $self->{ua} = LWP::UserAgent->new; + $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION); - $self->{state} = 'open'; + $self->{state} = 'open'; } -sub printMsg -{ - my $self = shift; - my $msg = shift; - my $msg_len = length($msg); +sub sendCmd { + my $self = shift; + my $cmd = shift; - Debug( $msg."[".$msg_len."]" ); + my $result = undef; + + $self->printMsg($cmd, 'Tx'); + + #print( "http://$address/$cmd\n" ); + my $req = HTTP::Request->new(GET=>'http://'.$self->{Monitor}->{ControlAddress}.'/'.$cmd); + my $res = $self->{ua}->request($req); + + if ( $res->is_success ) { + $result = !undef; + } else { + Error('Error check failed: \''.$res->status_line().'\''); + } + + return $result; } -sub sendCmd -{ - my $self = shift; - my $cmd = shift; - - my $result = undef; - - printMsg( $cmd, "Tx" ); - - #print( "http://$address/$cmd\n" ); - my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" ); - my $res = $self->{ua}->request($req); - - if ( $res->is_success ) - { - $result = !undef; - } - else - { - Error( "Error check failed: '".$res->status_line()."'" ); - } - - return( $result ); +sub cameraReset { + my $self = shift; + Debug('Camera Reset'); + my $cmd = '/axis-cgi/admin/restart.cgi'; + $self->sendCmd($cmd); } -sub cameraReset -{ - my $self = shift; - Debug( "Camera Reset" ); - my $cmd = "/axis-cgi/admin/restart.cgi"; - $self->sendCmd( $cmd ); +sub moveConUp { + my $self = shift; + Debug('Move Up'); + my $cmd = '/axis-cgi/com/ptz.cgi?move=up'; + $self->sendCmd($cmd); } -sub moveConUp -{ - my $self = shift; - Debug( "Move Up" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=up"; - $self->sendCmd( $cmd ); +sub moveConDown { + my $self = shift; + Debug('Move Down'); + my $cmd = '/axis-cgi/com/ptz.cgi?move=down'; + $self->sendCmd($cmd); } -sub moveConDown -{ - my $self = shift; - Debug( "Move Down" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=down"; - $self->sendCmd( $cmd ); +sub moveConLeft { + my $self = shift; + Debug('Move Left'); + my $cmd = '/axis-cgi/com/ptz.cgi?move=left'; + $self->sendCmd($cmd); } -sub moveConLeft -{ - my $self = shift; - Debug( "Move Left" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=left"; - $self->sendCmd( $cmd ); +sub moveConRight { + my $self = shift; + Debug('Move Right'); + my $cmd = '/axis-cgi/com/ptz.cgi?move=right'; + $self->sendCmd($cmd); } -sub moveConRight -{ - my $self = shift; - Debug( "Move Right" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=right"; - $self->sendCmd( $cmd ); +sub moveConUpRight { + my $self = shift; + Debug('Move Up/Right'); + my $cmd = '/axis-cgi/com/ptz.cgi?move=upright'; + $self->sendCmd($cmd); } -sub moveConUpRight -{ - my $self = shift; - Debug( "Move Up/Right" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=upright"; - $self->sendCmd( $cmd ); +sub moveConUpLeft { + my $self = shift; + Debug('Move Up/Left'); + my $cmd = '/axis-cgi/com/ptz.cgi?move=upleft'; + $self->sendCmd($cmd); } -sub moveConUpLeft -{ - my $self = shift; - Debug( "Move Up/Left" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=upleft"; - $self->sendCmd( $cmd ); +sub moveConDownRight { + my $self = shift; + Debug('Move Down/Right'); + my $cmd = '/axis-cgi/com/ptz.cgi?move=downright'; + $self->sendCmd( $cmd ); } -sub moveConDownRight -{ - my $self = shift; - Debug( "Move Down/Right" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=downright"; - $self->sendCmd( $cmd ); +sub moveConDownLeft { + my $self = shift; + Debug('Move Down/Left'); + my $cmd = '/axis-cgi/com/ptz.cgi?move=downleft'; + $self->sendCmd($cmd); } -sub moveConDownLeft -{ - my $self = shift; - Debug( "Move Down/Left" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=downleft"; - $self->sendCmd( $cmd ); +sub moveMap { + my $self = shift; + my $params = shift; + my $xcoord = $self->getParam($params, 'xcoord'); + my $ycoord = $self->getParam($params, 'ycoord'); + Debug("Move Map to $xcoord,$ycoord"); + my $cmd = "/axis-cgi/com/ptz.cgi?center=$xcoord,$ycoord&imagewidth=".$self->{Monitor}->{Width}.'&imageheight='.$self->{Monitor}->{Height}; + $self->sendCmd($cmd); } -sub moveMap -{ - my $self = shift; - my $params = shift; - my $xcoord = $self->getParam( $params, 'xcoord' ); - my $ycoord = $self->getParam( $params, 'ycoord' ); - Debug( "Move Map to $xcoord,$ycoord" ); - my $cmd = "/axis-cgi/com/ptz.cgi?center=$xcoord,$ycoord&imagewidth=".$self->{Monitor}->{Width}."&imageheight=".$self->{Monitor}->{Height}; - $self->sendCmd( $cmd ); +sub moveRelUp { + my $self = shift; + my $params = shift; + my $step = $self->getParam($params, 'tiltstep'); + Debug("Step Up $step"); + my $cmd = '/axis-cgi/com/ptz.cgi?rtilt='.$step; + $self->sendCmd($cmd); } -sub moveRelUp -{ - my $self = shift; - my $params = shift; - my $step = $self->getParam( $params, 'tiltstep' ); - Debug( "Step Up $step" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rtilt=$step"; - $self->sendCmd( $cmd ); +sub moveRelDown { + my $self = shift; + my $params = shift; + my $step = $self->getParam($params, 'tiltstep'); + Debug("Step Down $step"); + my $cmd = '/axis-cgi/com/ptz.cgi?rtilt=-'.$step; + $self->sendCmd($cmd); } -sub moveRelDown -{ - my $self = shift; - my $params = shift; - my $step = $self->getParam( $params, 'tiltstep' ); - Debug( "Step Down $step" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rtilt=-$step"; - $self->sendCmd( $cmd ); +sub moveRelLeft { + my $self = shift; + my $params = shift; + my $step = $self->getParam($params, 'panstep'); + Debug("Step Left $step"); + my $cmd = '/axis-cgi/com/ptz.cgi?rpan=-'.$step; + $self->sendCmd($cmd); } -sub moveRelLeft -{ - my $self = shift; - my $params = shift; - my $step = $self->getParam( $params, 'panstep' ); - Debug( "Step Left $step" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$step"; - $self->sendCmd( $cmd ); +sub moveRelRight { + my $self = shift; + my $params = shift; + my $step = $self->getParam($params, 'panstep'); + Debug("Step Right $step"); + my $cmd = '/axis-cgi/com/ptz.cgi?rpan='$step; + $self->sendCmd($cmd); } -sub moveRelRight -{ - my $self = shift; - my $params = shift; - my $step = $self->getParam( $params, 'panstep' ); - Debug( "Step Right $step" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$step"; - $self->sendCmd( $cmd ); +sub moveRelUpRight { + my $self = shift; + my $params = shift; + my $panstep = $self->getParam($params, 'panstep'); + my $tiltstep = $self->getParam($params, 'tiltstep'); + Debug("Step Up/Right $tiltstep/$panstep"); + my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$panstep&rtilt=$tiltstep"; + $self->sendCmd($cmd); } -sub moveRelUpRight -{ - my $self = shift; - my $params = shift; - my $panstep = $self->getParam( $params, 'panstep' ); - my $tiltstep = $self->getParam( $params, 'tiltstep' ); - Debug( "Step Up/Right $tiltstep/$panstep" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$panstep&rtilt=$tiltstep"; - $self->sendCmd( $cmd ); +sub moveRelUpLeft { + my $self = shift; + my $params = shift; + my $panstep = $self->getParam($params, 'panstep'); + my $tiltstep = $self->getParam($params, 'tiltstep'); + Debug("Step Up/Left $tiltstep/$panstep"); + my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$panstep&rtilt=$tiltstep"; + $self->sendCmd($cmd); } -sub moveRelUpLeft -{ - my $self = shift; - my $params = shift; - my $panstep = $self->getParam( $params, 'panstep' ); - my $tiltstep = $self->getParam( $params, 'tiltstep' ); - Debug( "Step Up/Left $tiltstep/$panstep" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$panstep&rtilt=$tiltstep"; - $self->sendCmd( $cmd ); +sub moveRelDownRight { + my $self = shift; + my $params = shift; + my $panstep = $self->getParam($params, 'panstep'); + my $tiltstep = $self->getParam($params, 'tiltstep'); + Debug("Step Down/Right $tiltstep/$panstep"); + my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$panstep&rtilt=-$tiltstep"; + $self->sendCmd($cmd); } -sub moveRelDownRight -{ - my $self = shift; - my $params = shift; - my $panstep = $self->getParam( $params, 'panstep' ); - my $tiltstep = $self->getParam( $params, 'tiltstep' ); - Debug( "Step Down/Right $tiltstep/$panstep" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$panstep&rtilt=-$tiltstep"; - $self->sendCmd( $cmd ); +sub moveRelDownLeft { + my $self = shift; + my $params = shift; + my $panstep = $self->getParam($params, 'panstep'); + my $tiltstep = $self->getParam($params, 'tiltstep'); + Debug("Step Down/Left $tiltstep/$panstep"); + my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$panstep&rtilt=-$tiltstep"; + $self->sendCmd($cmd); } -sub moveRelDownLeft -{ - my $self = shift; - my $params = shift; - my $panstep = $self->getParam( $params, 'panstep' ); - my $tiltstep = $self->getParam( $params, 'tiltstep' ); - Debug( "Step Down/Left $tiltstep/$panstep" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$panstep&rtilt=-$tiltstep"; - $self->sendCmd( $cmd ); +sub zoomRelTele { + my $self = shift; + my $params = shift; + my $step = $self->getParam($params, 'step'); + Debug('Zoom Tele'); + my $cmd = "/axis-cgi/com/ptz.cgi?rzoom=$step"; + $self->sendCmd($cmd); } -sub zoomRelTele -{ - my $self = shift; - my $params = shift; - my $step = $self->getParam( $params, 'step' ); - Debug( "Zoom Tele" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rzoom=$step"; - $self->sendCmd( $cmd ); +sub zoomRelWide { + my $self = shift; + my $params = shift; + my $step = $self->getParam($params, 'step'); + Debug('Zoom Wide'); + my $cmd = "/axis-cgi/com/ptz.cgi?rzoom=-$step"; + $self->sendCmd($cmd); } -sub zoomRelWide -{ - my $self = shift; - my $params = shift; - my $step = $self->getParam( $params, 'step' ); - Debug( "Zoom Wide" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rzoom=-$step"; - $self->sendCmd( $cmd ); +sub focusRelNear { + my $self = shift; + my $params = shift; + my $step = $self->getParam($params, 'step'); + Debug('Focus Near'); + my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=-$step"; + $self->sendCmd($cmd); } -sub focusRelNear -{ - my $self = shift; - my $params = shift; - my $step = $self->getParam( $params, 'step' ); - Debug( "Focus Near" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=-$step"; - $self->sendCmd( $cmd ); +sub focusRelFar { + my $self = shift; + my $params = shift; + my $step = $self->getParam($params, 'step'); + Debug('Focus Far'); + my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=$step"; + $self->sendCmd($cmd); } -sub focusRelFar -{ - my $self = shift; - my $params = shift; - my $step = $self->getParam( $params, 'step' ); - Debug( "Focus Far" ); - my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=$step"; - $self->sendCmd( $cmd ); +sub focusAuto { + my $self = shift; + Debug('Focus Auto'); + my $cmd = '/axis-cgi/com/ptz.cgi?autofocus=on'; + $self->sendCmd($cmd); } -sub focusAuto -{ - my $self = shift; - Debug( "Focus Auto" ); - my $cmd = "/axis-cgi/com/ptz.cgi?autofocus=on"; - $self->sendCmd( $cmd ); +sub focusMan { + my $self = shift; + Debug('Focus Manual'); + my $cmd = '/axis-cgi/com/ptz.cgi?autofocus=off'; + $self->sendCmd($cmd); } -sub focusMan -{ - my $self = shift; - Debug( "Focus Manual" ); - my $cmd = "/axis-cgi/com/ptz.cgi?autofocus=off"; - $self->sendCmd( $cmd ); +sub irisRelOpen { + my $self = shift; + my $params = shift; + my $step = $self->getParam($params, 'step'); + Debug('Iris Open'); + my $cmd = "/axis-cgi/com/ptz.cgi?riris=$step"; + $self->sendCmd($cmd); } -sub irisRelOpen -{ - my $self = shift; - my $params = shift; - my $step = $self->getParam( $params, 'step' ); - Debug( "Iris Open" ); - my $cmd = "/axis-cgi/com/ptz.cgi?riris=$step"; - $self->sendCmd( $cmd ); +sub irisRelClose { + my $self = shift; + my $params = shift; + my $step = $self->getParam($params, 'step'); + Debug('Iris Close'); + my $cmd = "/axis-cgi/com/ptz.cgi?riris=-$step"; + $self->sendCmd($cmd); } -sub irisRelClose -{ - my $self = shift; - my $params = shift; - my $step = $self->getParam( $params, 'step' ); - Debug( "Iris Close" ); - my $cmd = "/axis-cgi/com/ptz.cgi?riris=-$step"; - $self->sendCmd( $cmd ); +sub irisAuto { + my $self = shift; + Debug('Iris Auto'); + my $cmd = '/axis-cgi/com/ptz.cgi?autoiris=on'; + $self->sendCmd($cmd); } -sub irisAuto -{ - my $self = shift; - Debug( "Iris Auto" ); - my $cmd = "/axis-cgi/com/ptz.cgi?autoiris=on"; - $self->sendCmd( $cmd ); +sub irisMan { + my $self = shift; + Debug('Iris Manual'); + my $cmd = '/axis-cgi/com/ptz.cgi?autoiris=off'; + $self->sendCmd($cmd); } -sub irisMan -{ - my $self = shift; - Debug( "Iris Manual" ); - my $cmd = "/axis-cgi/com/ptz.cgi?autoiris=off"; - $self->sendCmd( $cmd ); +sub presetClear { + my $self = shift; + my $params = shift; + my $preset = $self->getParam($params, 'preset'); + Debug("Clear Preset $preset"); + my $cmd = "/axis-cgi/com/ptz.cgi?removeserverpresetno=$preset"; + $self->sendCmd($cmd); } -sub presetClear -{ - my $self = shift; - my $params = shift; - my $preset = $self->getParam( $params, 'preset' ); - Debug( "Clear Preset $preset" ); - my $cmd = "/axis-cgi/com/ptz.cgi?removeserverpresetno=$preset"; - $self->sendCmd( $cmd ); +sub presetSet { + my $self = shift; + my $params = shift; + my $preset = $self->getParam($params, 'preset'); + Debug("Set Preset $preset"); + my $cmd = "/axis-cgi/com/ptz.cgi?setserverpresetno=$preset"; + $self->sendCmd($cmd); } -sub presetSet -{ - my $self = shift; - my $params = shift; - my $preset = $self->getParam( $params, 'preset' ); - Debug( "Set Preset $preset" ); - my $cmd = "/axis-cgi/com/ptz.cgi?setserverpresetno=$preset"; - $self->sendCmd( $cmd ); +sub presetGoto { + my $self = shift; + my $params = shift; + my $preset = $self->getParam($params, 'preset'); + Debug("Goto Preset $preset"); + my $cmd = "/axis-cgi/com/ptz.cgi?gotoserverpresetno=$preset"; + $self->sendCmd($cmd); } -sub presetGoto -{ - my $self = shift; - my $params = shift; - my $preset = $self->getParam( $params, 'preset' ); - Debug( "Goto Preset $preset" ); - my $cmd = "/axis-cgi/com/ptz.cgi?gotoserverpresetno=$preset"; - $self->sendCmd( $cmd ); -} - -sub presetHome -{ - my $self = shift; - Debug( "Home Preset" ); - my $cmd = "/axis-cgi/com/ptz.cgi?move=home"; - $self->sendCmd( $cmd ); +sub presetHome { + my $self = shift; + Debug('Home Preset'); + my $cmd = '/axis-cgi/com/ptz.cgi?move=home'; + $self->sendCmd($cmd); } 1; From 6da998b0c028357c545c111a83f517c87bfbcf83 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 10 Jan 2020 16:42:18 -0500 Subject: [PATCH 144/330] code comments and parenthesis --- src/zm_logger.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp index 1b8afc517..1f52c86dc 100644 --- a/src/zm_logger.cpp +++ b/src/zm_logger.cpp @@ -156,6 +156,7 @@ void Logger::initialise(const std::string &id, const Options &options) { if ( options.mTerminalLevel != NOOPT ) tempTerminalLevel = options.mTerminalLevel; + // DEBUG1 == 1. So >= DEBUG1, we set to DEBUG9?! Why? if ( options.mDatabaseLevel != NOOPT ) tempDatabaseLevel = options.mDatabaseLevel; else @@ -359,7 +360,7 @@ Logger::Level Logger::databaseLevel(Logger::Level databaseLevel) { if ( databaseLevel > NOOPT ) { databaseLevel = limit(databaseLevel); if ( mDatabaseLevel != databaseLevel ) { - if ( databaseLevel > NOLOG && mDatabaseLevel <= NOLOG ) { + if ( (databaseLevel > NOLOG) && (mDatabaseLevel <= NOLOG) ) { // <= NOLOG would be NOOPT if ( !zmDbConnect() ) { databaseLevel = NOLOG; } From 5ee015873513dd929c797d6f0057738d05839ed8 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 10 Jan 2020 16:42:41 -0500 Subject: [PATCH 145/330] Set defaults for vars == '' --- web/includes/Object.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/includes/Object.php b/web/includes/Object.php index 9f29aed88..bf647c230 100644 --- a/web/includes/Object.php +++ b/web/includes/Object.php @@ -291,11 +291,13 @@ Logger::Debug("$k => Have default for $v: "); $this->set($new_values); } + # Set defaults. Note that we only replace "" with null, not other values + # because for example if we want to clear TimestampFormat, we clear it, but the default is a string value foreach ( $this->defaults as $field => $default ) { - if ( (!array_key_exists($field, $this)) or empty($this->{$field}) ) { + if ( (!array_key_exists($field, $this)) or ($this->{$field} == '') ) { if ( is_array($default) ) { $this->{$field} = $default['default']; - } else { + } else if ( $default == null ) { $this->{$field} = $default; } } From 9b2a5b2261b41afbe857bf324ba0ded2387ea656 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 10 Jan 2020 19:06:34 -0500 Subject: [PATCH 146/330] Add table column definitions so we can use perl code to actually create or update monitors --- scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm | 167 ++++++++++++++++++- 1 file changed, 165 insertions(+), 2 deletions(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm index 47ec7c557..963f75638 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm @@ -36,9 +36,172 @@ require ZoneMinder::Server; #our @ISA = qw(Exporter ZoneMinder::Base); use parent qw(ZoneMinder::Object); -use vars qw/ $table $primary_key /; +use vars qw/ $table $primary_key %fields $serial %defaults $debug/; $table = 'Monitors'; -$primary_key = 'Id'; +$serial = $primary_key = 'Id'; +%fields = map { $_ => $_ } qw( + Id + Name + Notes + ServerId + StorageId + Type + Function + Enabled + LinkedMonitors + Triggers + Device + Channel + Format + V4LMultiBuffer + V4LCapturesPerFrame + Protocol + Method + Host + Port + SubPath + Path + Options + User + Pass + Width + Height + Colours + Palette + Orientation + Deinterlacing + DecoderHWAccelName + DecoderHWAccelDevice + SaveJPEGs + VideoWriter + OutputCodec + OutputContainer + EncoderParameters + RecordAudio + RTSPDescribe + Brightness + Contrast + Hue + Colour + EventPrefix + LabelFormat + LabelX + LabelY + LabelSize + ImageBufferCount + WarmupCount + PreEventCount + PostEventCount + StreamReplayBuffer + AlarmFrameCount + SectionLength + MinSectionLength + FrameSkip + MotionFrameSkip + AnalysisFPSLimit + AnalysisUpdateDelay + MaxFPS + AlarmMaxFPS + FPSReportInterval + RefBlendPerc + AlarmRefBlendPerc + Controllable + ControlId + ControlDevice + ControlAddress + AutoStopTimeout + TrackMotion + TrackDelay + ReturnLocation + ReturnDelay + DefaultRate + DefaultScale + SignalCheckPoints + SignalCheckColour + WebColour + Exif + Sequence + ); + +%defaults = ( + ServerId => 0, + StorageId => 0, + Type => 'Ffmpeg', + Function => 'Mocord', + Enabled => 1, + LinkedMonitors => undef, + Device => '', + Channel => 0, + Format => 0, + V4LMultiBuffer => undef, + V4LCapturesPerFrame => 1, + Protocol => undef, + Method => '', + Host => undef, + Port => '', + SubPath => '', + Path => undef, + Options => undef, + User => undef, + Pass => undef, + Width => undef, + Height => undef, + Colours => 4, + Palette => 0, + Orientation => undef, + Deinterlacing => 0, + DecoderHWAccelName => undef, + DecoderHWAccelDevice => undef, + SaveJPEGs => 3, + VideoWriter => 0, + OutputCodec => undef, + OutputContainer => undef, + EncoderParameters => "# Lines beginning with # are a comment \n# For changing quality, use the crf option\n# 1 is best, 51 is worst quality\n#crf=23\n", + RecordAudio=>0, + RTSPDescribe=>0, + Brightness => -1, + Contrast => -1, + Hue => -1, + Colour => -1, + EventPrefix => 'Event-', + LabelFormat => '%N - %d/%m/%y %H:%M:%S', + LabelX => 0, + LabelY => 0, + LabelSize => 1, + ImageBufferCount => 20, + WarmupCount => 0, + PreEventCount => 5, + PostEventCount => 5, + StreamReplayBuffer => 0, + AlarmFrameCount => 1, + SectionLength => 600, + MinSectionLength => 10, + FrameSkip => 0, + MotionFrameSkip => 0, + AnalysisFPSLimit => undef, + AnalysisUpdateDelay => 0, + MaxFPS => undef, + AlarmMaxFPS => undef, + FPSReportInterval => 100, + RefBlendPerc => 6, + AlarmRefBlendPerc => 6, + Controllable => 0, + ControlId => undef, + ControlDevice => undef, + ControlAddress => undef, + AutoStopTimeout => undef, + TrackMotion => 0, + TrackDelay => undef, + ReturnLocation => -1, + ReturnDelay => undef, + DefaultRate => 100, + DefaultScale => 100, + SignalCheckPoints => 0, + SignalCheckColour => '#0000BE', + WebColour => '#ff0000', + Exif => 0, + Sequence => undef, + ); sub Server { return new ZoneMinder::Server( $_[0]{ServerId} ); From 6a4b66a792ebe71607df6a293f37e0eb16a5bb6b Mon Sep 17 00:00:00 2001 From: PrplHaz4 Date: Fri, 10 Jan 2020 19:44:06 -0500 Subject: [PATCH 147/330] add 3840x2160 4k UHD to monitor dropdown I think this is fairly common in consumer IP cams now... --- web/skins/classic/views/monitor.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index 63089dd51..fefeed34a 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -872,6 +872,7 @@ if ( $monitor->Type() != 'NVSocket' && $monitor->Type() != 'WebSite' ) { '1920x1080'=>'1920x1080 1080p', '2048x1536'=>'2048x1536 3MP', '2592x1944'=>'2592x1944 5MP', + '3840x2160'=>'3840x2160 4K UHD', ), $monitor->Width().'x'.$monitor->Height() ); ?> From 0c478c7962730b7b5300031460d7a2036160e363 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 10 Jan 2020 20:13:09 -0500 Subject: [PATCH 148/330] fix Monitor->Server --- web/includes/Monitor.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index a15e88d2d..9f6f75ffa 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -128,7 +128,14 @@ class Monitor extends ZM_Object { } public function Server() { - return Server::find_one(array('Id'=>$this->{'ServerId'})); + if ( !property_exists($this, 'Server') ) { + if ( $this->ServerId() ) + $_this->{'Server'} = Server::find_one(array('Id'=>$this->{'ServerId'})); + if ( !property_exists($this, 'Server') ) { + $this->{'Server'} = new Server(); + } + } + return $this->{'Server'}; } public function __call($fn, array $args){ From 398688550b68045782d4dedd63733b99e38f4549 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 10 Jan 2020 20:15:52 -0500 Subject: [PATCH 149/330] fixtypo --- web/includes/Monitor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index 9f6f75ffa..3505e83db 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -130,7 +130,7 @@ class Monitor extends ZM_Object { public function Server() { if ( !property_exists($this, 'Server') ) { if ( $this->ServerId() ) - $_this->{'Server'} = Server::find_one(array('Id'=>$this->{'ServerId'})); + $this->{'Server'} = Server::find_one(array('Id'=>$this->{'ServerId'})); if ( !property_exists($this, 'Server') ) { $this->{'Server'} = new Server(); } From 8dfe7460f348c60a749a3e167e76b457b0f35b6e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 11 Jan 2020 10:21:29 -0500 Subject: [PATCH 150/330] revert bogus change --- distros/ubuntu1604/conf/apache2/zoneminder.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/distros/ubuntu1604/conf/apache2/zoneminder.conf b/distros/ubuntu1604/conf/apache2/zoneminder.conf index 2b8bb37c6..e3164d36c 100644 --- a/distros/ubuntu1604/conf/apache2/zoneminder.conf +++ b/distros/ubuntu1604/conf/apache2/zoneminder.conf @@ -1,3 +1,11 @@ +# Remember to enable cgi mod (i.e. "a2enmod cgi"). +ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin" + + Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch + AllowOverride All + Require all granted + + # Order matters. This alias must come first. Alias /zm/cache /var/cache/zoneminder/cache @@ -23,14 +31,6 @@ Alias /zm /usr/share/zoneminder/www -# Remember to enable cgi mod (i.e. "a2enmod cgi"). -ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin" - - Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch - AllowOverride All - Require all granted - - # For better visibility, the following directives have been migrated from the # default .htaccess files included with the CakePHP project. # Parameters not set here are inherited from the parent directive above. From f6d10e84f297525c981907de3b5d2ed85429f62e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 12 Jan 2020 18:07:20 -0500 Subject: [PATCH 151/330] Fix basic auth. TUrn ControlAddress into a URI if it isn't one --- scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm index 62ce79b82..ddb1dbe54 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm @@ -51,8 +51,12 @@ sub open { my $self = shift; $self->loadMonitor(); + if ( $self->{Monitor}->{ControlAddress} !~ /^\w+:\/\// ) { + # Has no scheme at the beginning, so won't parse as a URI + $self->{Monitor}->{ControlAddress} = 'http://'.$self->{Monitor}->{ControlAddress}; + } my $uri = URI->new($self->{Monitor}->{ControlAddress}); - $ADDRESS = $uri->scheme.'://'.$uri->host().$uri->path().($uri->port()?':'.$uri->port():''); + $ADDRESS = $uri->scheme.'://'.$uri->authority().$uri->path().($uri->port()?':'.$uri->port():''); use LWP::UserAgent; $self->{ua} = LWP::UserAgent->new; From f7e23598187599785e1caccd79ac16469161cacf Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 13 Jan 2020 10:57:56 -0500 Subject: [PATCH 152/330] Implement a clear_cache function so that we can free up cached objects --- web/includes/Event.php | 4 ++++ web/includes/Object.php | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/web/includes/Event.php b/web/includes/Event.php index da633f439..2ed20f95e 100644 --- a/web/includes/Event.php +++ b/web/includes/Event.php @@ -47,6 +47,10 @@ class Event extends ZM_Object { return ZM_Object::_find_one(get_class(), $parameters, $options); } + public static function clear_cahce() { + return ZM_Object::_clear_cache(get_class()); + } + public function Storage( $new = null ) { if ( $new ) { $this->{'Storage'} = $new; diff --git a/web/includes/Object.php b/web/includes/Object.php index bf647c230..cc595cd74 100644 --- a/web/includes/Object.php +++ b/web/includes/Object.php @@ -128,6 +128,11 @@ class ZM_Object { return $results[0]; } + public static function _clear_cache($class) { + global $object_cache; + $object_cache[$class] = array(); + } + public static function Objects_Indexed_By_Id($class) { $results = array(); foreach ( ZM_Object::_find($class, null, array('order'=>'lower(Name)')) as $Object ) { From 0afcbe626c2d6249a8333573f991e79df2fbb29f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 13 Jan 2020 12:51:30 -0500 Subject: [PATCH 153/330] remove redundant logging line. Connect() will do the logging --- src/zm_remote_camera_http.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/zm_remote_camera_http.cpp b/src/zm_remote_camera_http.cpp index 96c3707ff..f725d17b9 100644 --- a/src/zm_remote_camera_http.cpp +++ b/src/zm_remote_camera_http.cpp @@ -1060,7 +1060,6 @@ int RemoteCameraHttp::PreCapture() { if ( sd < 0 ) { Connect(); if ( sd < 0 ) { - Error("Unable to connect to camera"); return -1; } mode = SINGLE_IMAGE; From 952526819271f4d233d124101b912c4b39e2a139 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 13 Jan 2020 12:52:34 -0500 Subject: [PATCH 154/330] Wait 5 seconds instead of 1 after failure to connect. Reduces error logs filling up db. --- src/zmc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zmc.cpp b/src/zmc.cpp index ad9dea406..511e019ab 100644 --- a/src/zmc.cpp +++ b/src/zmc.cpp @@ -350,7 +350,7 @@ int main(int argc, char *argv[]) { } if ( result < 0 ) { // Failure, try reconnecting - sleep(1); + sleep(5); break; } } // end while ! zm_terminate From 6cd76ee2ffc7bd8c882660a0d5cdd67e8a15087b Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 13 Jan 2020 12:53:05 -0500 Subject: [PATCH 155/330] Clear cache after loading Events so as to free ram. --- web/includes/Storage.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/includes/Storage.php b/web/includes/Storage.php index 286cec8da..a127acd2f 100644 --- a/web/includes/Storage.php +++ b/web/includes/Storage.php @@ -116,13 +116,14 @@ class Storage extends ZM_Object { $used = dbFetchOne('SELECT SUM(DiskSpace) AS DiskSpace FROM Events WHERE StorageId=? AND DiskSpace IS NOT NULL', 'DiskSpace', array($this->Id())); do { - # Do in batches of 1000 so as to not useup all ram + # Do in batches of 1000 so as to not useup all ram, Event will do caching though... $events = Event::find(array('StorageId'=>$this->Id(), 'DiskSpace'=>null), array('limit'=>1000)); foreach ( $events as $Event ) { $Event->Storage($this); // Prevent further db hit # DiskSpace will update the event $used += $Event->DiskSpace(); } #end foreach + Event::clear_cache(); } while ( count($events) == 1000 ); $this->{'DiskSpace'} = $used; } From b11815cfa91f636743081aba1c522122288a5285 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 13 Jan 2020 12:53:50 -0500 Subject: [PATCH 156/330] Introduce Storage->EventCount to get the # of events per storage without actually loading all events. --- web/includes/Storage.php | 7 +++++++ web/skins/classic/views/options.php | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/web/includes/Storage.php b/web/includes/Storage.php index 286cec8da..30b0767d3 100644 --- a/web/includes/Storage.php +++ b/web/includes/Storage.php @@ -58,6 +58,13 @@ class Storage extends ZM_Object { return $this->{'Events'}; } + public function EventCount() { + if ( (! property_exists($this, 'EventCount')) or (!$this->{'EventCount'}) ) { + $this->{'EventCount'} = dbFetchOne('SELECT COUNT(*) AS EventCount FROM Events WHERE StorageId=?', 'EventCount', array($this->Id())); + } + return $this->{'EventCount'}; + } + public function disk_usage_percent() { $path = $this->Path(); if ( ! $path ) { diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php index 0a0d99286..a5aead8ca 100644 --- a/web/skins/classic/views/options.php +++ b/web/skins/classic/views/options.php @@ -278,8 +278,8 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*',GLOB_ONLYDIR)) as $ Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Scheme()), $canEdit ) ?> Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Server()->Name()), $canEdit ) ?> disk_used_space()) . ' of ' . human_filesize($Storage->disk_total_space()) ?> - Events()).' using '.human_filesize($Storage->event_disk_space()) ?> - Events()) or !$canEdit ) { ?> disabled="disabled"Events()) ? ' title="Can\'t delete as long as there are events stored here."' : ''?>/> + EventCount().' using '.human_filesize($Storage->event_disk_space()) ?> + EventCount() or !$canEdit ) { ?> disabled="disabled"Eventount() ? ' title="Can\'t delete as long as there are events stored here."' : ''?>/> From 91acb775eb623e0b6e1949faef463e4fa6d93c86 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 13 Jan 2020 13:43:14 -0500 Subject: [PATCH 157/330] Fix Eventount to EventCount --- web/skins/classic/views/options.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php index a5aead8ca..82692fbaf 100644 --- a/web/skins/classic/views/options.php +++ b/web/skins/classic/views/options.php @@ -279,7 +279,7 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*',GLOB_ONLYDIR)) as $ Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Server()->Name()), $canEdit ) ?> disk_used_space()) . ' of ' . human_filesize($Storage->disk_total_space()) ?> EventCount().' using '.human_filesize($Storage->event_disk_space()) ?> - EventCount() or !$canEdit ) { ?> disabled="disabled"Eventount() ? ' title="Can\'t delete as long as there are events stored here."' : ''?>/> + EventCount() or !$canEdit ) { ?> disabled="disabled"EventCount() ? ' title="Can\'t delete as long as there are events stored here."' : ''?>/> From 9036b6db77350c6741a492fcddbafd48ea05ade5 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 13 Jan 2020 16:17:39 -0500 Subject: [PATCH 158/330] fix typo --- web/includes/Event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/includes/Event.php b/web/includes/Event.php index 2ed20f95e..7e038397a 100644 --- a/web/includes/Event.php +++ b/web/includes/Event.php @@ -47,7 +47,7 @@ class Event extends ZM_Object { return ZM_Object::_find_one(get_class(), $parameters, $options); } - public static function clear_cahce() { + public static function clear_cache() { return ZM_Object::_clear_cache(get_class()); } From d7dc7cdc47ac4f69e0c4dcc26c16bc85746cb1dd Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 13 Jan 2020 16:18:01 -0500 Subject: [PATCH 159/330] Add ServerId to database log entries in php --- web/includes/logger.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/includes/logger.php b/web/includes/logger.php index 7404891b6..fec205591 100644 --- a/web/includes/logger.php +++ b/web/includes/logger.php @@ -387,7 +387,7 @@ class Logger { if ( $this->hasTerm ) print($message."\n"); else - print(preg_replace("/\n/", '
    ', htmlspecialchars($message) ).'
    '); + print(preg_replace("/\n/", '
    ', htmlspecialchars($message)).'
    '); } if ( $level <= $this->fileLevel ) { @@ -410,9 +410,10 @@ class Logger { if ( $level <= $this->databaseLevel ) { try { global $dbConn; - $sql = 'INSERT INTO Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ? )'; + $sql = 'INSERT INTO `Logs` ( `TimeKey`, `Component`, `ServerId`, `Pid`, `Level`, `Code`, `Message`, `File`, `Line` ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ? )'; $stmt = $dbConn->prepare($sql); - $result = $stmt->execute(array(sprintf('%d.%06d', $time['sec'], $time['usec']), $this->id, getmypid(), $level, $code, $string, $file, $line)); + $result = $stmt->execute(array(sprintf('%d.%06d', $time['sec'], $time['usec']), $this->id, + (defined('ZM_SERVER_ID') ? ZM_SERVER_ID : null), getmypid(), $level, $code, $string, $file, $line)); } catch(PDOException $ex) { $this->databaseLevel = self::NOLOG; Error("Can't write log entry '$sql': ". $ex->getMessage()); From e4ba1fd432ffc4286d68771ca9b58456ab3910e9 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 13 Jan 2020 17:16:15 -0500 Subject: [PATCH 160/330] fix restarting zmcontrol on remote servers by passing object=filter as well --- web/includes/Filter.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/web/includes/Filter.php b/web/includes/Filter.php index 2ecf7b61e..8bccf3860 100644 --- a/web/includes/Filter.php +++ b/web/includes/Filter.php @@ -115,13 +115,17 @@ class Filter extends ZM_Object { public function control($command, $server_id=null) { $Servers = $server_id ? Server::find(array('Id'=>$server_id)) : Server::find(array('Status'=>'Running')); - if ( !count($Servers) and !$server_id ) { - # This will be the non-multi-server case - $Servers = array(new Server()); + if ( !count($Servers) ) { + if ( !$server_id ) { + # This will be the non-multi-server case + $Servers = array(new Server()); + } else { + Warning("Server not found for id $server_id"); + } } foreach ( $Servers as $Server ) { - if ( !defined('ZM_SERVER_ID') or !$Server->Id() or ZM_SERVER_ID==$Server->Id() ) { + if ( (!defined('ZM_SERVER_ID')) or (!$Server->Id()) or (ZM_SERVER_ID==$Server->Id()) ) { # Local Logger::Debug("Controlling filter locally $command for server ".$Server->Id()); daemonControl($command, 'zmfilter.pl', '--filter_id='.$this->{'Id'}.' --daemon'); @@ -139,7 +143,7 @@ class Filter extends ZM_Object { $url = '?user='.$_SESSION['username']; } } - $url .= '&view=filter&action=control&command='.$command.'&Id='.$this->Id().'&ServerId='.$Server->Id(); + $url .= '&view=filter&object=filter&action=control&command='.$command.'&Id='.$this->Id().'&ServerId='.$Server->Id(); Logger::Debug("sending command to $url"); $data = array(); if ( defined('ZM_ENABLE_CSRF_MAGIC') ) { From 02e9096d2b50c5c867e9c70acd0f5a5b16b5f6dc Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 13 Jan 2020 17:32:57 -0500 Subject: [PATCH 161/330] When saving an existing Filter and we are unchecking Background, need to stop the filter before saving. Remove dead code --- web/includes/actions/filter.php | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/web/includes/actions/filter.php b/web/includes/actions/filter.php index ae6bf3ddc..ac2435302 100644 --- a/web/includes/actions/filter.php +++ b/web/includes/actions/filter.php @@ -64,35 +64,12 @@ if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) { $_REQUEST['filter']['Background'] = empty($_REQUEST['filter']['Background']) ? 0 : 1; $_REQUEST['filter']['Concurrent'] = empty($_REQUEST['filter']['Concurrent']) ? 0 : 1; $changes = $filter->changes($_REQUEST['filter']); - ZM\Logger::Debug("Changes: " . print_r($changes,true)); - - if ( 0 ) { - $sql .= ', Query = '.dbEscape(jsonEncode($_REQUEST['filter']['Query'])); - $sql .= ', AutoArchive = '.(!empty($_REQUEST['filter']['AutoArchive']) ? 1 : 0); - $sql .= ', AutoVideo = '. ( !empty($_REQUEST['filter']['AutoVideo']) ? 1 : 0); - $sql .= ', AutoUpload = '. ( !empty($_REQUEST['filter']['AutoUpload']) ? 1 : 0); - $sql .= ', AutoEmail = '. ( !empty($_REQUEST['filter']['AutoEmail']) ? 1 : 0); - $sql .= ', AutoMessage = '. ( !empty($_REQUEST['filter']['AutoMessage']) ? 1 : 0); - $sql .= ', AutoExecute = '. ( !empty($_REQUEST['filter']['AutoExecute']) ? 1 : 0); - $sql .= ', AutoExecuteCmd = '.dbEscape($_REQUEST['filter']['AutoExecuteCmd']); - $sql .= ', AutoDelete = '. ( !empty($_REQUEST['filter']['AutoDelete']) ? 1 : 0); - if ( !empty($_REQUEST['filter']['AutoMove']) ? 1 : 0) { - $sql .= ', AutoMove = 1, AutoMoveTo='. validInt($_REQUEST['filter']['AutoMoveTo']); - } else { - $sql .= ', AutoMove = 0'; - } - $sql .= ', UpdateDiskSpace = '. ( !empty($_REQUEST['filter']['UpdateDiskSpace']) ? 1 : 0); - $sql .= ', Background = '. ( !empty($_REQUEST['filter']['Background']) ? 1 : 0); - $sql .= ', Concurrent = '. ( !empty($_REQUEST['filter']['Concurrent']) ? 1 : 0); - } + ZM\Logger::Debug('Changes: ' . print_r($changes,true)); if ( $_REQUEST['Id'] and ( $action == 'Save' ) ) { - if ( 0 ) { - dbQuery('UPDATE Filters SET '.$sql.' WHERE Id=?', array($_REQUEST['Id'])); - } - $filter->save($changes); if ( $filter->Background() ) $filter->control('stop'); + $filter->save($changes); } else { if ( $action == 'execute' ) { From 8b375de455e576b0c50f294dc29422409634507a Mon Sep 17 00:00:00 2001 From: Javier Gonzalez Date: Wed, 15 Jan 2020 20:31:05 +0100 Subject: [PATCH 162/330] Avoid duplicate Monitors in API --- web/api/app/Controller/MonitorsController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php index 789307795..92114a558 100644 --- a/web/api/app/Controller/MonitorsController.php +++ b/web/api/app/Controller/MonitorsController.php @@ -61,7 +61,8 @@ class MonitorsController extends AppController { 'Groups_Monitors.MonitorId = Monitor.Id', ), ), - ) + ), + 'group' => '`Monitor`.`Id`', ); $monitors = $this->Monitor->find('all',$find_array); $this->set(array( From d4bc0bf72bf90983bb06818f66ad6b9ff4100360 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 15 Jan 2020 17:31:06 -0500 Subject: [PATCH 163/330] bump version for release to 1.34.0 --- db/zm_update-1.34.0.sql | 5 +++++ distros/redhat/zoneminder.spec | 2 +- version | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 db/zm_update-1.34.0.sql diff --git a/db/zm_update-1.34.0.sql b/db/zm_update-1.34.0.sql new file mode 100644 index 000000000..b8bd3e4ed --- /dev/null +++ b/db/zm_update-1.34.0.sql @@ -0,0 +1,5 @@ +-- +-- This updates a 1.33.16 database to 1.34.0 +-- +-- No changes required +-- diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index 6715f7b26..d083bb244 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -28,7 +28,7 @@ %global _hardened_build 1 Name: zoneminder -Version: 1.33.16 +Version: 1.34.0 Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons diff --git a/version b/version index c0bd57583..2b17ffd50 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.33.16 +1.34.0 From 09f229883838eca2b5732b1ee10017c39119cacb Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 15 Jan 2020 19:02:40 -0500 Subject: [PATCH 164/330] return empty array instead of nothing in probeNetwork --- web/skins/classic/views/monitorprobe.php | 52 ++++++++++++------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/web/skins/classic/views/monitorprobe.php b/web/skins/classic/views/monitorprobe.php index 8fb626516..9cab32b3e 100644 --- a/web/skins/classic/views/monitorprobe.php +++ b/web/skins/classic/views/monitorprobe.php @@ -247,18 +247,18 @@ function probeNetwork() { $arp_command = ZM_PATH_ARP; $result = explode(' ', $arp_command); if ( !is_executable($result[0]) ) { - ZM\Error("ARP compatible binary not found or not executable by the web user account. Verify ZM_PATH_ARP points to a valid arp tool."); - return; + ZM\Error('ARP compatible binary not found or not executable by the web user account. Verify ZM_PATH_ARP points to a valid arp tool.'); + return $cameras; } $result = exec(escapeshellcmd($arp_command), $output, $status); if ( $status ) { ZM\Error("Unable to probe network cameras, status is '$status'"); - return; + return $cameras; } $monitors = array(); - foreach ( dbFetchAll("SELECT Id, Name, Host FROM Monitors WHERE Type = 'Remote' ORDER BY Host") as $monitor ) { + foreach ( dbFetchAll("SELECT `Id`, `Name`, `Host` FROM `Monitors` WHERE `Type` = 'Remote' ORDER BY `Host`") as $monitor ) { if ( preg_match('/^(.+)@(.+)$/', $monitor['Host'], $matches) ) { //echo "1: ".$matches[2]." = ".gethostbyname($matches[2])."
    "; $monitors[gethostbyname($matches[2])] = $monitor; @@ -277,29 +277,29 @@ function probeNetwork() { '78:a5:dd' => array('type'=>'Wansview','probeFunc'=>'probeWansview') ); - foreach ( $output as $line ) { - if ( !preg_match('/(\d+\.\d+\.\d+\.\d+).*(([0-9a-f]{2}:){5})/', $line, $matches) ) - continue; - $ip = $matches[1]; - $host = $ip; - $mac = $matches[2]; - //echo "I:$ip, H:$host, M:$mac
    "; - $macRoot = substr($mac,0,8); - if ( isset($macBases[$macRoot]) ) { - $macBase = $macBases[$macRoot]; - $camera = call_user_func($macBase['probeFunc'], $ip); - $sourceDesc = base64_encode(serialize($camera['monitor'])); - $sourceString = $camera['model'].' @ '.$host; - if ( isset($monitors[$ip]) ) { - $monitor = $monitors[$ip]; - $sourceString .= ' ('.$monitor['Name'].')'; - } else { - $sourceString .= ' - '.translate('Available'); - } - $cameras[$sourceDesc] = $sourceString; + foreach ( $output as $line ) { + if ( !preg_match('/(\d+\.\d+\.\d+\.\d+).*(([0-9a-f]{2}:){5})/', $line, $matches) ) + continue; + $ip = $matches[1]; + $host = $ip; + $mac = $matches[2]; + //echo "I:$ip, H:$host, M:$mac
    "; + $macRoot = substr($mac,0,8); + if ( isset($macBases[$macRoot]) ) { + $macBase = $macBases[$macRoot]; + $camera = call_user_func($macBase['probeFunc'], $ip); + $sourceDesc = base64_encode(serialize($camera['monitor'])); + $sourceString = $camera['model'].' @ '.$host; + if ( isset($monitors[$ip]) ) { + $monitor = $monitors[$ip]; + $sourceString .= ' ('.$monitor['Name'].')'; + } else { + $sourceString .= ' - '.translate('Available'); } - } # end foreach output line - return $cameras; + $cameras[$sourceDesc] = $sourceString; + } + } # end foreach output line + return $cameras; } # end function probeNetwork() $cameras = array(); From 6a43c2deb5e6b752eba60382b6d26885d613c7f9 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 16 Jan 2020 14:17:40 -0500 Subject: [PATCH 165/330] fix zoom_range to zoomout_range --- web/skins/classic/views/js/timeline.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/timeline.js b/web/skins/classic/views/js/timeline.js index 0b4715f75..8d3f01d4c 100644 --- a/web/skins/classic/views/js/timeline.js +++ b/web/skins/classic/views/js/timeline.js @@ -184,7 +184,7 @@ function tlZoomBounds( minTime, maxTime ) { } function tlZoomOut() { - location.replace('?view='+currentView+filterQuery+'&midTime='+midTime+'&range='+zoom_range); + location.replace('?view='+currentView+filterQuery+'&midTime='+midTime+'&range='+zoomout_range); } function tlPanLeft() { From 74b3ad6dd9a6e7bed2566c738f472fe4581d4b8f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 16 Jan 2020 14:33:37 -0500 Subject: [PATCH 166/330] add options help for HWACCEL options --- web/lang/en_gb.php | 8 ++++++++ web/skins/classic/views/monitor.php | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index a6f2fa488..ad4911a4d 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -981,6 +981,14 @@ $OLANG = array( "loglevel=debug" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug) ' ), + 'OPTIONS_DECODERHWACCELNAME' => array( + 'Help' => ' + This is equivalent to the ffmpeg -hwaccel command line option. With intel graphics support, use "vaapi". For NVIDIA cuda support use "cuda". To check for support, run ffmpeg -hwaccels on the command line.' + ), + 'OPTIONS_DECODERHWACCELDEVICE' => array( + 'Help' => ' + This is equivalent to the ffmpeg -hwaccel_device command line option. You should only have to specify this if you have multiple GPUs. A typical value for Intel VAAPI would be /dev/dri/renderD128.' + ), 'OPTIONS_RTSPTrans' => array( 'Help' => ' This sets the RTSP Transport Protocol for FFmpeg.~~ diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index fefeed34a..055a955fa 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -831,13 +831,13 @@ include('_monitor_source_nvsocket.php'); ?> - () + () - () + () From 4f2df830a828b8f073388f3aa59da27f8e9b2645 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 17 Jan 2020 09:17:05 -0500 Subject: [PATCH 167/330] fix inline js --- web/skins/classic/views/filter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php index 425e914c9..1f696dd70 100644 --- a/web/skins/classic/views/filter.php +++ b/web/skins/classic/views/filter.php @@ -217,7 +217,7 @@ for ( $i=0; $i < count($terms); $i++ ) { } ?> 2 ) { echo htmlSelect("filter[Query][terms][$i][obr]", $obracketTypes, $term['obr']); } else { ?>  - + 'checkValue')); ?> Date: Fri, 17 Jan 2020 09:17:29 -0500 Subject: [PATCH 168/330] fix delTerm button not being enabled because it is a button now, not an input --- web/skins/classic/views/js/filter.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js index cfc284ab2..4444db954 100644 --- a/web/skins/classic/views/js/filter.js +++ b/web/skins/classic/views/js/filter.js @@ -30,7 +30,6 @@ function validateForm( form ) { function updateButtons(element) { var form = element.form; - console.log(element); if ( element.type == 'checkbox' && element.checked ) { form.elements['executeButton'].disabled = false; } else { @@ -105,6 +104,7 @@ function submitToEvents( element ) { form.action = thisUrl + '?view=events'; history.replaceState(null, null, '?view=filter&' + $j(form).serialize()); } + function submitToMontageReview( element ) { var form = element.form; form.action = thisUrl + '?view=montagereview'; @@ -143,12 +143,12 @@ function deleteFilter( element ) { } function parseRows(rows) { - for (var rowNum = 0; rowNum < rows.length; rowNum++) { //Each row is a term + for ( var rowNum = 0; rowNum < rows.length; rowNum++ ) { //Each row is a term var queryPrefix = 'filter[Query][terms]['; var inputTds = rows.eq(rowNum).children(); - if (rowNum == 0) inputTds.eq(0).html(' '); //Remove and from first term - if (rowNum > 0) { //add and/or to 1+ + if ( rowNum == 0 ) inputTds.eq(0).html(' '); //Remove and from first term + if ( rowNum > 0 ) { //add and/or to 1+ var cnjVal = inputTds.eq(0).children().val(); var conjSelect = $j('').attr('name', queryPrefix + rowNum + '][cnj]').attr('id', queryPrefix + rowNum + '][cnj]'); $j.each(conjTypes, function(i) { @@ -172,19 +172,19 @@ function parseRows(rows) { inputTds.eq(1).html(obrSelect).children().val(obrVal); //Set bracket contents and assign saved value inputTds.eq(5).html(cbrSelect).children().val(cbrVal); } else { - inputTds.eq(1).html(' '); //Blank if there aren't enough terms for brackets + inputTds.eq(1).html(' '); // Blank if there aren't enough terms for brackets inputTds.eq(5).html(' '); } - if (rows.length == 1) { - inputTds.eq(6).find(':input[value="-"]').prop('disabled', true); //enable/disable remove row button + if ( rows.length == 1 ) { + inputTds.eq(6).find('button[data-on-click-this="delTerm"]').prop('disabled', true); //enable/disable remove row button } else { - inputTds.eq(6).find(':input[value="-"]').prop('disabled', false); + inputTds.eq(6).find('button[data-on-click-this="delTerm"]').prop('disabled', false); } var attr = inputTds.eq(2).children().val(); - if ( attr == "Archived") { //Archived types + if ( attr == "Archived" ) { //Archived types inputTds.eq(3).html('equal to'); var archiveSelect = $j('').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]'); for (var i = 0; i < archiveTypes.length; i++) { @@ -253,7 +253,7 @@ function parseRows(rows) { term[2] = rowNum; inputTds.eq(2).children().eq(0).attr('name', 'filter'+stringFilter(term)); inputTds.eq(2).children().eq(0).attr('id', 'filter'+stringFilter(term)); - }//End for each term/row + } // End for each term/row history.replaceState(null, null, '?view=filter&' + $j('#contentForm').serialize()); } From 86a2523498342d156868607e45bb8f7690110a4a Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 17 Jan 2020 12:30:26 -0500 Subject: [PATCH 169/330] break up a long line, add some parenthesis to clarify logic --- web/includes/logger.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/includes/logger.php b/web/includes/logger.php index fec205591..2b5463dfb 100644 --- a/web/includes/logger.php +++ b/web/includes/logger.php @@ -362,10 +362,12 @@ class Logger { $code = self::$codes[$level]; $time = gettimeofday(); - $message = sprintf('%s.%06d %s[%d].%s [%s] [%s]', strftime('%x %H:%M:%S', $time['sec']), $time['usec'], $this->id, getmypid(), $code, $_SERVER['REMOTE_ADDR'], $string); + $message = sprintf('%s.%06d %s[%d].%s [%s] [%s]', + strftime('%x %H:%M:%S', $time['sec']), $time['usec'], + $this->id, getmypid(), $code, $_SERVER['REMOTE_ADDR'], $string); if ( is_null($file) ) { - if ( $this->useErrorLog || $this->databaseLevel > self::NOLOG ) { + if ( $this->useErrorLog || ($this->databaseLevel > self::NOLOG) ) { $backTrace = debug_backtrace(); $file = $backTrace[1]['file']; $line = $backTrace[1]['line']; From 5b8e5eb3497b55b07235a18475c496a9fd69ed5b Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 17 Jan 2020 14:51:02 -0500 Subject: [PATCH 170/330] don't output duplicated js when css=base --- web/skins/classic/includes/functions.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php index 328b63833..1954712eb 100644 --- a/web/skins/classic/includes/functions.php +++ b/web/skins/classic/includes/functions.php @@ -30,7 +30,6 @@ function xhtmlHeaders($file, $title) { $skinCssPhpFile = getSkinFile('css/'.$css.'/skin.css.php'); - $skinJsFile = getSkinFile('js/skin.js'); $skinJsPhpFile = getSkinFile('js/skin.js.php'); $cssJsFile = getSkinFile('js/'.$css.'.js'); @@ -84,7 +83,6 @@ echo output_link_if_exists( array( 'css/base/views/'.$basename.'.css', 'js/dateTimePicker/jquery-ui-timepicker-addon.css', 'js/jquery-ui-1.12.1/jquery-ui.structure.min.css', - #'js/jquery-ui-1.12.1/jquery-ui.theme.min.css', ) ); if ( $css != 'base' ) @@ -95,8 +93,9 @@ if ( $css != 'base' ) ) ); ?> + - + - + + Date: Fri, 17 Jan 2020 15:06:46 -0600 Subject: [PATCH 171/330] fix eslint --- web/skins/classic/views/js/filter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js index 4444db954..a4d3a4bcd 100644 --- a/web/skins/classic/views/js/filter.js +++ b/web/skins/classic/views/js/filter.js @@ -253,7 +253,7 @@ function parseRows(rows) { term[2] = rowNum; inputTds.eq(2).children().eq(0).attr('name', 'filter'+stringFilter(term)); inputTds.eq(2).children().eq(0).attr('id', 'filter'+stringFilter(term)); - } // End for each term/row + } //End for each term/row history.replaceState(null, null, '?view=filter&' + $j('#contentForm').serialize()); } From 09929280899ad54a6037fd8f6fad4fe64acb4342 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sat, 18 Jan 2020 11:00:00 -0600 Subject: [PATCH 172/330] merge rpm changelog from RPMFusion --- distros/redhat/zoneminder.spec | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec index d083bb244..345139284 100644 --- a/distros/redhat/zoneminder.spec +++ b/distros/redhat/zoneminder.spec @@ -416,29 +416,20 @@ EOF %dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload %changelog -* Sun Dec 08 2019 Isaac Connor - 1.33.15-1 -- Bump to 1.33.15 Development +* Sat Jan 18 2020 Andrew Bauer - 1.34.0-1 +- 1.34.0 Release -* Sun Aug 11 2019 Andrew Bauer - 1.33.14-1 -- Bump to 1.33.13 Development +* Tue Dec 17 2019 Leigh Scott - 1.32.3-5 +- Mass rebuild for x264 -* Sun Jul 07 2019 Andrew Bauer - 1.33.12-1 -- Bump to 1.33.12 Development +* Wed Aug 07 2019 Leigh Scott - 1.32.3-4 +- Rebuild for new ffmpeg version -* Sun Jun 23 2019 Andrew Bauer - 1.33.9-1 -- Bump to 1.33.9 Development +* Tue Mar 12 2019 Sérgio Basto - 1.32.3-3 +- Mass rebuild for x264 -* Tue Apr 30 2019 Andrew Bauer - 1.33.8-1 -- Bump to 1.33.8 Development - -* Sun Apr 07 2019 Andrew Bauer - 1.33.6-1 -- Bump to 1.33.6 Development - -* Sat Mar 30 2019 Andrew Bauer - 1.33.4-1 -- Bump to 1.33.4 Development - -* Tue Dec 11 2018 Andrew Bauer - 1.33.0-1 -- Bump to 1.33.0 Development +* Tue Mar 05 2019 RPM Fusion Release Engineering - 1.32.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild * Sat Dec 08 2018 Andrew Bauer - 1.32.3-1 - 1.32.3 Release From 6c7f003198d4119cbd8c2086057e09923a37e017 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 18 Jan 2020 16:08:55 -0500 Subject: [PATCH 173/330] revert bogus change not including skin.js --- web/skins/classic/includes/functions.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php index 1954712eb..9f14d93d0 100644 --- a/web/skins/classic/includes/functions.php +++ b/web/skins/classic/includes/functions.php @@ -188,13 +188,9 @@ if ( $css != 'base' ) ?> - - + Date: Sat, 18 Jan 2020 16:09:33 -0500 Subject: [PATCH 174/330] allow filters to not have terms specified. We can't pass an empty array in a url, so we will just have to handle it. --- web/includes/functions.php | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/web/includes/functions.php b/web/includes/functions.php index 42dc56c30..8086e77df 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -1087,14 +1087,10 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&') { $validQueryConjunctionTypes = getFilterQueryConjunctionTypes(); $StorageArea = NULL; - $terms = isset($filter['Query']) ? $filter['Query']['terms'] : NULL; - if ( !isset($terms) ) { - $backTrace = debug_backtrace(); - ZM\Warning('No terms in filter'); - ZM\Warning(print_r($backTrace, true)); - ZM\Warning(print_r($filter, true)); - } - if ( isset($terms) && count($terms) ) { + # It is not possible to pass an empty array in the url, so we have to deal with there not being a terms field. + $terms = (isset($filter['Query']) and isset($filter['Query']['terms']) and is_array($filter['Query']['terms'])) ? $filter['Query']['terms'] : array(); + + if ( count($terms) ) { for ( $i = 0; $i < count($terms); $i++ ) { $term = $terms[$i]; @@ -1260,7 +1256,7 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&') { case 'StartDateTime': case 'EndDateTime': if ( $value != 'NULL' ) - $value = '\''.strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) ).'\''; + $value = '\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\''; break; case 'Date': case 'StartDate': @@ -1331,7 +1327,7 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&') { } // end if isset($term['attr']) if ( isset($term['cbr']) && (string)(int)$term['cbr'] == $term['cbr'] ) { $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][cbr]").'='.urlencode($term['cbr']); - $filter['sql'] .= ' '.str_repeat(')', $term['cbr']).' '; + $filter['sql'] .= ' '.str_repeat(')', $term['cbr']); $filter['fields'] .= "\n"; } } // end foreach term @@ -1341,7 +1337,8 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&') { $_SESSION['filter'] = $filter; } } else { - $filter['query'] = $querySep.urlencode('filter[Query][terms]=[]'); + $filter['query'] = $querySep; + #.urlencode('filter[Query][terms]=[]'); } // end if terms #if ( 0 ) { @@ -1354,7 +1351,7 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&') { #$filter['sql'] .= ' LIMIT ' . validInt($filter['Query']['limit']); #} #} -} +} // end function parseFilter(&$filter, $saveToSession=false, $querySep='&') // Please note that the filter is passed in by copy, so you need to use the return value from this function. // From ead52f30b1894a82a0630defdebece0dcc99bee6 Mon Sep 17 00:00:00 2001 From: Garrett Scott Date: Mon, 20 Jan 2020 00:44:20 -0800 Subject: [PATCH 175/330] Bug fix: Allows for inital/base install without the option MultiPort config value assigned --- web/skins/classic/views/js/montage.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/montage.js.php b/web/skins/classic/views/js/montage.js.php index c39d7311d..97eab55a2 100644 --- a/web/skins/classic/views/js/montage.js.php +++ b/web/skins/classic/views/js/montage.js.php @@ -35,7 +35,7 @@ monitorData[monitorData.length] = { 'connKey': connKey() ?>, 'width': ViewWidth() ?>, 'height':ViewHeight() ?>, - 'url': 'UrlToIndex( $monitor->Id() + ZM_MIN_STREAMING_PORT) ?>', + 'url': 'UrlToIndex( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>', 'onclick': function(){createPopup( '?view=watch&mid=Id() ?>', 'zmWatchId() ?>', 'watch', ViewWidth(), $monitor->PopupScale() ); ?>, ViewHeight(), $monitor->PopupScale() ); ?> );}, 'type': 'Type() ?>', 'refresh': 'Refresh() ?>' From dbdb13efd74918967221fbf80f00f177d297d61c Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 20 Jan 2020 11:02:43 -0500 Subject: [PATCH 176/330] Instead of passing query string in form post variables, store it in session so that it survives redirects. Fixes #2811 --- web/index.php | 10 ++++++++-- web/skins/classic/views/js/postlogin.js.php | 11 +++++++---- web/skins/classic/views/login.php | 1 - 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/web/index.php b/web/index.php index 83be992e8..a662b4223 100644 --- a/web/index.php +++ b/web/index.php @@ -152,8 +152,6 @@ if ( setcookie('zmCSS', $css, time()+3600*24*30*12*10); } -# Only one request can open the session file at a time, so let's close the session here to improve concurrency. -# Any file/page that sets session variables must re-open it. require_once('includes/lang.php'); @@ -186,6 +184,8 @@ if ( isset($_REQUEST['request']) ) $request = detaintPath($_REQUEST['request']); require_once('includes/auth.php'); +# Only one request can open the session file at a time, so let's close the session here to improve concurrency. +# Any file/page that sets session variables must re-open it. session_write_close(); foreach ( getSkinIncludes('skin.php') as $includeFile ) { @@ -242,6 +242,12 @@ if ( ZM_OPT_USE_AUTH and (!isset($user)) and ($view != 'login') and ($view != 'n ZM\Logger::Debug('Redirecting to login'); $view = 'none'; $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=login'; + if ( ! $request ) { + zm_session_start(); + $_SESSION['postLoginQuery'] = $_SERVER['QUERY_STRING']; + ZM\Error("postLoginQuery " . $_SESSION['postLoginQuery']); + session_write_close(); + } $request = null; } else if ( ZM_SHOW_PRIVACY && ($view != 'privacy') && ($view != 'options') && (!$request) && canEdit('System') ) { $view = 'none'; diff --git a/web/skins/classic/views/js/postlogin.js.php b/web/skins/classic/views/js/postlogin.js.php index 6fa681fad..75c241a91 100644 --- a/web/skins/classic/views/js/postlogin.js.php +++ b/web/skins/classic/views/js/postlogin.js.php @@ -11,12 +11,15 @@ ( function () { // Append '?(GET query)' to URL if the GET query is not empty. - var querySuffix = ""; + ?>'; if ( querySuffix == '?view=login' ) { // If we didn't redirect elsewhere, then don't show login page, go to console diff --git a/web/skins/classic/views/login.php b/web/skins/classic/views/login.php index 788f46163..76ebeafd8 100644 --- a/web/skins/classic/views/login.php +++ b/web/skins/classic/views/login.php @@ -7,7 +7,6 @@ xhtmlHeaders(__FILE__, translate('Login'));
    -