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

2018-11-23 11:11:58 -05:00 · 2018-11-23 11:11:58 -05:00 · 9e5d119bd8
parent 0546c54f5a dea5db9dd9
commit 9e5d119bd8
24 changed files with 161 additions and 47 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -1,23 +1,43 @@
-You should only file an issue if you found a bug.  Feature and enhancement requests, general discussions and support questions should occur in one of the following areas:
+**THIS FORUM IS FOR BUG REPORTS ONLY**
+
+Do not post feature or enhancement requests, general discussions or support questions here.
+
+Feature and enhancement requests, general discussions, and support questions should occur in one of the following areas:

 - The [ZoneMinder-Chat Slack channel](https://zoneminder-chat.herokuapp.com/)
 - The [ZoneMinder Forum](https://forums.zoneminder.com/)

-**Do not post feature or enhancement requests, general discussions or support questions here.**
-
 Docker related issues should be posted here: https://github.com/ZoneMinder/zmdockerfiles

-Make sure you are running the latest version of ZoneMinder before reporting an issue.
+In order to submit a bug report, please populate the fields below. This is required.

-**ZoneMinder Version (`zmaudit.pl -v`):**
+**Describe Your Environment**
+- Version of ZoneMinder [release version, development version, or commit]
+- How you installed ZoneMinder [e.g. PPA, RPMFusion, from-source, etc]
+- Full name and version of OS

-**Are you using a development snapshot / git checkout?  If so, what is the latest commit? (`git rev-parse HEAD`):**
+**If the issue concerns a camera**
+- Make and Model
+- frame rate
+- resolution
+- ZoneMinder Source Type:

-**Linux Distribution and Version (`cat /etc/os-release` or `cat /etc/redhat-release`):**
+**Describe the bug**
+A clear and concise description of what the bug is.

-**If the issue concerns a camera, provide the make, model, frame rate, resolution and ZoneMinder Source Type:**
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error

-**Relevant log lines:**
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Debug Logs**
 ```
-log lines here
+
+<insert debug logs here, please make sure they are within the ``` quotes so they are formatted properly>
+
 ```
--- a/.github/config.yml
+++ b/.github/config.yml
@ -0,0 +1,21 @@
+# Configuration for welcome - https://github.com/behaviorbot/welcome
+
+# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
+
+# Comment to be posted to on first time issues
+newIssueWelcomeComment: >
+  Thanks for opening your first issue here! Just a reminder, this forum is for Bug Reports only. Be sure to follow the issue template!
+
+# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
+
+# Comment to be posted to on PRs from first time contributors in your repository
+#newPRWelcomeComment: >
+#  Thanks for opening this pull request! Please check out our contributing guidelines.
+
+# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
+
+# Comment to be posted to on pull requests merged by a first time user
+#firstPRMergeComment: >
+#  Congrats on merging your first pull request! We here at behaviorbot are proud of you! 
+
+# It is recommend to include as many gifs and emojis as possible
--- a/.github/no-response.yml
+++ b/.github/no-response.yml
@ -0,0 +1,13 @@
+# Configuration for probot-no-response - https://github.com/probot/no-response
+
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 7
+# Label requiring a response
+responseRequiredLabel: more-information-needed
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  to our request for more information from the original author. With only the
+  information that is currently in the issue, we don't have enough information
+  to take action. Please reach out if you have or find the answers we need so
+  that we can investigate further.
--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@ -15,11 +15,11 @@ endif((NOT ZM_TARGET_DISTRO MATCHES "^fc") AND (ZM_WEB_USER STREQUAL "nginx"))

 # Configure the zoneminder service files
 configure_file(systemd/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
+configure_file(nginx/zoneminder.php-fpm.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.php-fpm.conf @ONLY)
+configure_file(nginx/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.nginx.conf @ONLY)
 if(ZM_WEB_USER STREQUAL "nginx")
    configure_file(nginx/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
-    configure_file(nginx/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
    configure_file(nginx/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY)
-    configure_file(nginx/zoneminder.php-fpm.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.php-fpm.conf @ONLY)
    configure_file(nginx/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/readme/README COPYONLY)
 else(ZM_WEB_USER STREQUAL "nginx")
    configure_file(systemd/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
@ -55,10 +55,8 @@ install(FILES misc/redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INST
 # Install zoneminder service files
 install(FILES zoneminder.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES zoneminder.conf DESTINATION /etc/zm/www PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
-
-if(ZM_WEB_USER STREQUAL "nginx")
-    install(FILES zoneminder.php-fpm.conf DESTINATION /etc/php-fpm.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME zoneminder.conf)
-endif(ZM_WEB_USER STREQUAL "nginx")
+install(FILES zoneminder.php-fpm.conf DESTINATION /etc/zm/www PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+install(FILES zoneminder.nginx.conf DESTINATION /etc/zm/www PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)

 install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES zoneminder.tmpfiles DESTINATION /usr/lib/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
--- a/distros/redhat/nginx/zoneminder.php-fpm.conf.in
+++ b/distros/redhat/nginx/zoneminder.php-fpm.conf.in
@ -1,3 +1,5 @@
+; This config file is needed when using ZoneMinder with web servers other
+; than Apache. You can ignore this file if you are using Apache web server.
 ; Change the user and group of the default pool to the web server account
 [www]

--- a/distros/redhat/systemd/zoneminder.logrotate.in
+++ b/distros/redhat/systemd/zoneminder.logrotate.in
@ -2,7 +2,11 @@
    missingok
    notifempty
    sharedscripts
+    delaycompress
+    compress
    postrotate
-        @BINDIR@/zmpkg.pl logrot 2> /dev/null > /dev/null || :
+        @BINDIR@/zmpkg.pl logrot > /dev/null 2>/dev/null || true
    endscript
+    daily
+    rotate 7
 }
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@ -264,13 +264,10 @@ EOF
 %config(noreplace) %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm/conf.d/*.conf
 %ghost %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm/conf.d/zmcustom.conf

-%config(noreplace) %attr(644,root,root) /etc/zm/www/zoneminder.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/zm/www/zoneminder.conf
+%config(noreplace) %{_sysconfdir}/zm/www/zoneminder.php-fpm.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zoneminder

-%if 0%{?with_nginx}
-%config(noreplace) %{_sysconfdir}/php-fpm.d/zoneminder.conf
-%endif
-
 %{_tmpfilesdir}/zoneminder.conf
 %{_unitdir}/zoneminder.service
 %{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCAMIOS.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCAMIOS.pm
@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # ==========================================================================
 #
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Reolink.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Reolink.pm
@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # ==========================================================================
 #
--- a/scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # ==========================================================================
 #
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@ -531,6 +531,19 @@ MAIN: while( $loop ) {
          next;
        }
        Debug("Event $db_event is not in fs. Should have been at ".$Event->Path());
+        # Check for existence in other Storage Areas
+        foreach my $Storage ( ZoneMinder::Storage->find( ( $$Event{StorageId} ? ( 'Id !='=>$$Event{StorageId}  ) : () ) ) ) {
+          my $path = $Storage->Path().'/'.$Event->RelativePath();
+          if ( -e $path ) {
+            Info("Event $$Event{Id} found at $path instead of $$Event{Path}");
+            if ( confirm() ) {
+              $Event->save({StorageId=>$$Storage{Id}});
+              last;
+            }
+          } else {
+            Debug("$$Event{Id} Not found at $path");
+          }
+        }
        if ( $Event->Archived() ) {
          Warning("Event $$Event{Id} is Archived. Taking no further action on it.");
          next;
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@ -441,7 +441,7 @@ sub start {

    $dbh = zmDbConnect(1);
    # This logReinit is required.  Not sure why.
-    #logReinit();
+    logReinit();

    $process->{pid} = $cpid;
    $process->{started} = time();
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@ -174,7 +174,7 @@ Event::Event(
        Error("Can't mkdir %s: %s", path, strerror(errno));
    }
  } else {
-    path_ptr += snprintf(path, sizeof(path), "/%" PRIu64, id);
+    snprintf(path, sizeof(path), "/%" PRIu64, id);
    if ( mkdir(path, 0755) ) {
      if ( errno != EEXIST )
        Error("Can't mkdir %s: %s", path, strerror(errno));
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@ -24,6 +24,38 @@

 #if HAVE_LIBAVCODEC || HAVE_LIBAVUTIL || HAVE_LIBSWSCALE

+void log_libav_callback( void *ptr, int level, const char *fmt, va_list vargs ) {
+  Logger *log = Logger::fetch();
+  int log_level = 0;
+  if ( level == AV_LOG_QUIET ) { // -8
+    log_level = Logger::NOLOG;
+  } else if ( level == AV_LOG_PANIC ) { //0
+    log_level = Logger::PANIC;
+  } else if ( level == AV_LOG_FATAL ) { // 8
+    log_level = Logger::FATAL;
+  } else if ( level == AV_LOG_ERROR ) { // 16
+    log_level = Logger::ERROR;
+  } else if ( level == AV_LOG_WARNING ) { //24
+    log_level = Logger::WARNING;
+  } else if ( level == AV_LOG_INFO ) { //32
+    log_level = Logger::INFO;
+  } else if ( level == AV_LOG_VERBOSE ) { //40
+    log_level = Logger::DEBUG1;
+  } else if ( level == AV_LOG_DEBUG ) { //48
+    log_level = Logger::DEBUG2;
+  } else if ( level == AV_LOG_TRACE ) {
+    log_level = Logger::DEBUG8;
+  } else if ( level == AV_LOG_MAX_OFFSET ) {
+    log_level = Logger::DEBUG9;
+  } else {
+    Error("Unknown log level %d", level);
+  }
+
+  if ( log ) {
+    log->logPrint(false, __FILE__, __LINE__, log_level, fmt, vargs);
+  }
+}
+
 void FFMPEGInit() {
  static bool bInit = false;

@ -32,6 +64,7 @@ void FFMPEGInit() {
      av_log_set_level( AV_LOG_DEBUG ); 
    else
      av_log_set_level( AV_LOG_QUIET ); 
+    av_log_set_callback(log_libav_callback); 
 #if LIBAVCODEC_VERSION_CHECK(58, 18, 0, 64, 0)
 #else
    av_register_all();
--- a/src/zm_logger.cpp
+++ b/src/zm_logger.cpp
@ -581,6 +581,7 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
  }
 }

+
 void logInit(const char *name, const Logger::Options &options) {
  if ( !Logger::smInstance )
    Logger::smInstance = new Logger();
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@ -47,7 +47,11 @@ function CORSHeaders() {
      return;
    }
    foreach( $Servers as $Server ) {
-      if ( preg_match('/^(https?:\/\/)?'.preg_quote($Server->Hostname(),'/').'/', $_SERVER['HTTP_ORIGIN']) ) {
+      if (
+        preg_match('/^(https?:\/\/)?'.preg_quote($Server->Hostname(),'/').'/i', $_SERVER['HTTP_ORIGIN'])
+        or
+        preg_match('/^(https?:\/\/)?'.preg_quote($Server->Name(),'/').'/i', $_SERVER['HTTP_ORIGIN'])
+      ) {
        $valid = true;
        Logger::Debug("Setting Access-Controll-Allow-Origin from " . $_SERVER['HTTP_ORIGIN']);
        header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
--- a/web/skins/classic/js/base.js
+++ b/web/skins/classic/js/base.js
@ -40,7 +40,7 @@ var popupSizes = {
    'export':       { 'width': 400, 'height': 340 },
    'filter':       { 'width': 900, 'height': 700 },
    'frame':        { 'addWidth': 32, 'minWidth': 384, 'addHeight': 200 },
-    'frames':       { 'width': 600, 'height': 600 },
+    'frames':       { 'addWidth': 600, 'addHeight': 600 },
    'function':     { 'width': 350, 'height': 260 },
    'group':        { 'width': 760, 'height': 600 },
    'groups':       { 'width': 540, 'height': 420 },
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //

-if ( !canView( 'Events' ) ) {
+if ( !canView('Events') ) {
  $view = 'error';
  return;
 }
@ -29,7 +29,7 @@ $eid = validInt($_REQUEST['eid']);
 if ( !empty($_REQUEST['fid']) )
  $fid = validInt($_REQUEST['fid']);

-$Event = new Event( $eid );
+$Event = new Event($eid);
 $Monitor = $Event->Monitor();

 if ( !empty($fid) ) {
@ -39,7 +39,7 @@ if ( !empty($fid) ) {
 } else {
  $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventId = ? AND Score = ?', NULL, array( $eid, $Event->MaxScore() ) );
 }
-$Frame = new Frame( $frame );
+$Frame = new Frame($frame);

 $maxFid = $Event->Frames();

@ -91,10 +91,10 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id()." - ".$Frame->Frame
        <?php if ( canEdit( 'Events' ) ) { ?><a href="?view=none&amp;action=delete&amp;markEid=<?php echo $Event->Id() ?>"><?php echo translate('Delete') ?></a><?php } ?>
        <a href="#" onclick="closeWindow(); return( false );"><?php echo translate('Close') ?></a>
      </div>
-      <div id="scaleControl"><label for="scale"><?php echo translate('Scale') ?></label><?php echo buildSelect( "scale", $scales, "changeScale();" ); ?></div>
-      <h2><?php echo translate('Frame') ?> <?php echo $Event->Id()."-".$Frame->FrameId()." (".$Frame->Score().")" ?></h2>
-       <input type="hidden" name="base_width" id="base_width" value="<?php echo $Event->Width(); ?>"/>
-       <input type="hidden" name="base_height" id="base_height" value="<?php echo $Event->Height(); ?>"/>
+      <div id="scaleControl"><label for="scale"><?php echo translate('Scale') ?></label><?php echo buildSelect('scale', $scales, 'changeScale();'); ?></div>
+      <h2><?php echo translate('Frame') ?> <?php echo $Event->Id().'-'.$Frame->FrameId().' ('.$Frame->Score().')' ?></h2>
+      <input type="hidden" name="base_width" id="base_width" value="<?php echo $Event->Width(); ?>"/>
+      <input type="hidden" name="base_height" id="base_height" value="<?php echo $Event->Height(); ?>"/>
    </form>
    </div>
    <div id="content">
@ -109,11 +109,13 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id()." - ".$Frame->Frame
      </p>
      <p id="controls">
 <?php if ( $Frame->FrameId() > 1 ) { ?>
-        <a id="firstLink" href="?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $firstFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>"><?php echo translate('First') ?></a>
-        <a id="prevLink" href="?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $prevFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>"><?php echo translate('Prev') ?></a>
-<?php } if ( $Frame->FrameId() < $maxFid ) { ?>
-        <a id="nextLink" href="?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $nextFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>"><?php echo translate('Next') ?></a>
-        <a id="lastLink" href="?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $lastFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>"><?php echo translate('Last') ?></a>
+        <button type="button" id="firstLink" onclick="window.location='?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $firstFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>';"><?php echo translate('First') ?></button>
+        <button type="button" id="prevLink" onclick="window.location='?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $prevFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>';"><?php echo translate('Prev') ?></button>
+<?php
+      }
+      if ( $Frame->FrameId() < $maxFid ) { ?>
+        <button type="button" id="nextLink" onclick="window.location='?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $nextFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>';"><?php echo translate('Next') ?></button>
+        <button type="button" id="lastLink" onclick="window.location='?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $lastFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>';"><?php echo translate('Last') ?></button>
 <?php } ?>
      </p>
 <?php if (file_exists ($dImagePath)) { ?>
--- a/web/skins/classic/views/frames.php
+++ b/web/skins/classic/views/frames.php
@ -18,11 +18,11 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //

-if ( !canView( 'Events' ) ) {
+if ( !canView('Events') ) {
  $view = 'error';
  return;
 }
-require_once( 'includes/Frame.php' );
+require_once('includes/Frame.php');
 $Event = new Event( $_REQUEST['eid'] );

 $sql = 'SELECT *, unix_timestamp( TimeStamp ) AS UnixTimeStamp FROM Frames WHERE EventID = ? ORDER BY FrameId';
@ -30,7 +30,7 @@ $frames = dbFetchAll( $sql, NULL, array( $_REQUEST['eid'] ) );

 $focusWindow = true;

-xhtmlHeaders(__FILE__, translate('Frames')." - ".$Event->Id() );
+xhtmlHeaders(__FILE__, translate('Frames').' - '.$Event->Id() );
 ?>
 <body>
  <div id="page">
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@ -887,7 +887,7 @@ function unarchiveEvent() {
 }

 function showEventFrames() {
-  createPopup( '?view=frames&eid='+eventData.Id, 'zmFrames', 'frames' );
+  createPopup( '?view=frames&eid='+eventData.Id, 'zmFrames', 'frames', WEB_LIST_THUMB_WIDTH, WEB_LIST_THUMB_HEIGHT );
 }

 function showStream() {
--- a/web/skins/classic/views/js/event.js.php
+++ b/web/skins/classic/views/js/event.js.php
@ -55,3 +55,5 @@ var streamMode = '<?php echo $streamMode ?>';
 //
 var deleteString = "<?php echo translate('Delete') ?>";
 var causeString = "<?php echo translate('AttrCause') ?>";
+var WEB_LIST_THUMB_WIDTH = '<?php echo ZM_WEB_LIST_THUMB_WIDTH ?>';
+var WEB_LIST_THUMB_HEIGHT = '<?php echo ZM_WEB_LIST_THUMB_HEIGHT ?>';
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@ -481,6 +481,8 @@ function setAlarmState( currentAlarmState ) {
 }

 var streamCmdParms = "view=request&request=stream&connkey="+connKey;
+if ( auth_hash )
+    streamCmdParms += '&auth='+auth_hash;
 var streamCmdReq = new Request.JSON( {
  url: monitorUrl,
  method: 'get',
@ -562,6 +564,8 @@ function streamCmdQuery() {
 }

 var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate";
+if ( auth_hash )
+    statusCmdParms += '&auth='+auth_hash;
 var statusCmdReq = new Request.JSON( {
  url: monitorUrl,
  method: 'get',
--- a/web/skins/classic/views/storage.php
+++ b/web/skins/classic/views/storage.php
@ -15,7 +15,7 @@
 //
 // 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //

 if ( !canEdit( 'System' ) ) {
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@ -71,7 +71,7 @@ if ( !isset($newZone) ) {
      'Type'  =>  'Active',
      'MonitorId' => $monitor->Id(),
      'NumCoords' => 4,
-      'Coords' => sprintf("%d,%d %d,%d, %d,%d %d,%d", $minX, $minY, $maxX, $minY, $maxX, $maxY, $minX, $maxY),
+      'Coords' => sprintf('%d,%d %d,%d, %d,%d %d,%d', $minX, $minY, $maxX, $minY, $maxX, $maxY, $minX, $maxY),
      'Area' => $monitor->Width() * $monitor->Height(),
      'AlarmRGB' => 0xff0000,
      'CheckMethod' => 'Blobs',