Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas

CMakeLists.txt

@@ -172,7 +172,7 @@ set(ZM_PATH_ARP "" CACHE PATH
     "Full path to compatible arp binary. Leave empty for automatic detection.")
 set(ZM_CONFIG_DIR "/${CMAKE_INSTALL_SYSCONFDIR}" CACHE PATH 
     "Location of ZoneMinder configuration, default system config directory")
-set(ZM_CONFIG_SUBDIR "${ZM_CONFIG_DIR}/zm/conf.d" CACHE PATH 
+set(ZM_CONFIG_SUBDIR "${ZM_CONFIG_DIR}/conf.d" CACHE PATH 
     "Location of ZoneMinder configuration subfolder, default: ZM_CONFIG_DIR/conf.d")
 set(ZM_EXTRA_LIBS "" CACHE STRING 
     "A list of optional libraries, separated by semicolons, e.g. ssl;theora")

src/zm_ffmpeg_camera.cpp

@@ -832,6 +832,11 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
               startTime,
               this->getMonitor());
         } // end if record_audio
+        if ( ! videoStore->open() ) {
+          delete videoStore;
+          videoStore = NULL;
+
+        } else {
           strcpy(oldDirectory, event_file);
           monitor->SetVideoWriterEventId( last_event_id );
 
@@ -864,6 +869,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
             delete queued_packet;
           } // end while packets in the packetqueue
           Debug(2, "Wrote %d queued packets", packet_count );
+        }
       } // end if ! was recording
 
     } else {

src/zm_logger.cpp

@@ -193,6 +193,13 @@ void Logger::initialise( const std::string &id, const Options &options ) {
         }
       }
     } // end foreach target
+  } else {
+    // if we don't have debug turned on, then the max effective log level is INFO
+    if ( tempSyslogLevel > INFO ) tempSyslogLevel = INFO;
+    if ( tempFileLevel > INFO ) tempFileLevel = INFO;
+    if ( tempTermLevel > INFO ) tempTermLevel = INFO;
+    if ( tempDatabaseLevel > INFO ) tempDatabaseLevel = INFO;
+    if ( tempLevel > INFO ) tempLevel = INFO;
   } // end if config.log_debug
 
 

src/zm_videostore.cpp

@@ -279,12 +279,25 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
     }
   }  // end if audio_in_stream
 
+
+  video_last_pts = 0;
+  video_last_dts = 0;
+  audio_last_pts = 0;
+  audio_last_dts = 0;
+  video_next_pts = 0;
+  video_next_dts = 0;
+  audio_next_pts = 0;
+  audio_next_dts = 0;
+}  // VideoStore::VideoStore
+
+bool VideoStore::open() {
   /* open the out file, if needed */
   if (!(out_format->flags & AVFMT_NOFILE)) {
     ret = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE, NULL, NULL);
     if (ret < 0) {
-      Fatal("Could not open out file '%s': %s\n", filename,
+      Error("Could not open out file '%s': %s\n", filename,
             av_make_error_string(ret).c_str());
+      return false;
     }
   }
 
@@ -310,18 +323,11 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
   if (ret < 0) {
     Error("Error occurred when writing out file header to %s: %s\n",
           filename, av_make_error_string(ret).c_str());
+    return false;
   }
   if (opts) av_dict_free(&opts);
-
-  video_last_pts = 0;
-  video_last_dts = 0;
-  audio_last_pts = 0;
-  audio_last_dts = 0;
-  video_next_pts = 0;
-  video_next_dts = 0;
-  audio_next_pts = 0;
-  audio_next_dts = 0;
-}  // VideoStore::VideoStore
+  return true;
+}
 
 VideoStore::~VideoStore() {
   if (audio_out_codec) {

src/zm_videostore.h

@@ -78,6 +78,7 @@ public:
       AVStream *audio_in_stream,
       int64_t nStartTime,
       Monitor * p_monitor);
+  bool  open();
 	~VideoStore();
 
   int writeVideoFramePacket( AVPacket *pkt );

web/includes/Group.php

@@ -0,0 +1,88 @@
+<?php
+
+class Group {
+
+public $defaults = array(
+    'Id'              =>  null,
+    'Name'            =>  '',
+    'MonitorIds'      =>  '',
+);
+
+  public function __construct( $IdOrRow=NULL ) {
+    $row = NULL;
+    if ( $IdOrRow ) {
+      if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
+        $row = dbFetchOne( 'SELECT * FROM Groups WHERE Id=?', NULL, array( $IdOrRow ) );
+        if ( ! $row ) {
+          Error('Unable to load Group record for Id=' . $IdOrRow );
+        }
+      } elseif ( is_array( $IdOrRow ) ) {
+        $row = $IdOrRow;
+      } else {
+        $backTrace = debug_backtrace();
+        $file = $backTrace[1]['file'];
+        $line = $backTrace[1]['line'];
+        Error("Unknown argument passed to Group Constructor from $file:$line)");
+        Error("Unknown argument passed to Group Constructor ($IdOrRow)");
+        return;
+      }
+    } # end if isset($IdOrRow)
+
+    if ( $row ) {
+      foreach ($row as $k => $v) {
+        $this->{$k} = $v;
+      }
+    }
+  } // 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 ) ) {
+      $this->{$fn} = $this->defaults{$fn};
+      return $this->{$fn};
+    } else {
+
+      $backTrace = debug_backtrace();
+      $file = $backTrace[1]['file'];
+      $line = $backTrace[1]['line'];
+      Warning( "Unknown function call Group->$fn from $file:$line" );
+    }
+  }
+
+  public static function find_all() {
+    $filters = array();
+    $result = dbQuery( 'SELECT * FROM Groups ORDER BY Name');
+    $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Group' );
+    foreach ( $results as $row => $obj ) {
+      $filters[] = $obj;
+    }
+    return $filters;
+  }
+
+  public function delete() {
+    dbQuery( 'DELETE FROM Groups WHERE Id = ?', array($this->{'Id'}) );
+  } # end function delete()
+
+  public function set( $data ) {
+    foreach ($data as $k => $v) {
+      if ( is_array( $v ) ) {
+        $this->{$k} = $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;
+      }
+    }
+  }
+} # end class
+
+?>

web/skins/classic/includes/functions.php

@@ -213,7 +213,7 @@ function getNavBarHTML() {
 <?php if ( ZM_OPT_X10 && canView( 'Devices' ) ) { ?>
 			<li><a href="?view=devices">Devices</a></li>
 <?php } ?>
-			<li><?php echo makePopupLink( '?view=groups', 'zmGroups', 'groups', sprintf( $CLANG['MonitorCount'], count($displayMonitors), zmVlang( $VLANG['Monitor'], count($displayMonitors) ) ).($group?' ('.$group['Name'].')':''), canView( 'Groups' ) ); ?></li>
+			<li><?php echo makePopupLink( '?view=groups', 'zmGroups', 'groups', 'Groups', canView( 'Groups' ) ); ?></li>
 			<li><a href="?view=filter">Filters</a></li>
 
 <?php 

web/skins/classic/views/js/montage.js

@@ -156,7 +156,6 @@ function changeSize() {
         src = src.replace(/height=[\.\d]+/i,'height='+height );
         src = src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
         streamImg.src = src;
-
       }
       streamImg.style.width = width? width + "px" : null;
       streamImg.style.height = height ? height + "px" : null;
@@ -210,6 +209,11 @@ function changeScale() {
   Cookie.write( 'zmMontageHeight', '', { duration: 10*365 } );
 }
 
+function changeGroup() {
+  var group_id = $('group').get('value');
+  Cookie.write( 'zmMontageGroup', group_id, { duration: 10*365 } );
+  window.location = window.location;
+}
 
 var monitors = new Array();
 function initPage() {

web/skins/classic/views/montage.php

@@ -24,10 +24,18 @@ if ( !canView( 'Stream' ) ) {
 }
 
 require_once( 'includes/Monitor.php' );
+require_once( 'includes/Group.php' );
 
 $groupSql = '';
+$group_id = null;
 if ( !empty($_REQUEST['group']) ) {
-  $row = dbFetchOne( 'SELECT * FROM Groups WHERE Id = ?', NULL, array($_REQUEST['group']) );
+  $group_id = $_REQUEST['group'];
+} elseif  ( isset( $_COOKIE['zmMontageGroup'] ) ) {
+  $group_id = $_COOKIE['zmMontageGroup'];
+}
+
+if ( $group_id ) {
+  $row = dbFetchOne( 'SELECT * FROM Groups WHERE Id = ?', NULL, array($group_id) );
   $sql = "SELECT * FROM Monitors WHERE Function != 'None' AND find_in_set( Id, '".$row['MonitorIds']."' ) ORDER BY Sequence";
 } else { 
   $sql = "SELECT * FROM Monitors WHERE Function != 'None' ORDER BY Sequence";
@@ -140,6 +148,17 @@ if ( $showZones ) {
       </div>
       <h2><?php echo translate('Montage') ?></h2>
       <div id="headerControl">
+        <span id="groupControl"><label><?php echo translate('Group') ?>:</label>
+<?php
+      $groups = array(0=>'All');
+      foreach ( Group::find_all() as $Group ) {
+        $groups[$Group->Id()] = $Group->Name();
+
+      }
+      echo htmlSelect( 'group', $groups, $group_id, 'changeGroup(this);' );
+?>
+</span>
+
         <span id="widthControl"><label><?php echo translate('Width') ?>:</label><?php echo htmlSelect( 'width', $widths, $options['width'], 'changeSize(this);' ); ?></span>
         <span id="heightControl"><label><?php echo translate('Height') ?>:</label><?php echo htmlSelect( 'height', $heights, $options['height'], 'changeSize(this);' ); ?></span>
         <span id="scaleControl"><label><?php echo translate('Scale') ?>:</label><?php echo htmlSelect( 'scale', $scales, $scale, 'changeScale(this);' ); ?></span>