Merge pull request #2706 from connortechnology/fix_2705

Fix 2705

src/zm_file_camera.cpp

@@ -1,31 +1,27 @@
 //
 // ZoneMinder File Camera 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
-#include <sys/time.h>
-#include <syslog.h>
-#include <signal.h>
-#include <stdarg.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -45,8 +41,20 @@ FileCamera::FileCamera(
     int p_hue,
     int p_colour,
     bool p_capture,
-    bool p_record_audio
-    ) : Camera( p_id, FILE_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio )
+    bool p_record_audio)
+  : Camera(
+      p_id,
+      FILE_SRC,
+      p_width,
+      p_height,
+      p_colours,
+      ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours),
+      p_brightness,
+      p_contrast,
+      p_hue,
+      p_colour,
+      p_capture,
+      p_record_audio)
 {
   strncpy( path, p_path, sizeof(path)-1 );
   if ( capture ) {
@@ -62,8 +70,7 @@ FileCamera::~FileCamera() {
 
 void FileCamera::Initialise() {
   if ( !path[0] ) {
-    Error( "No path specified for file image" );
-    exit( -1 );
+    Fatal("No path specified for file image");
   }
 }
 
@@ -72,21 +79,25 @@ void FileCamera::Terminate() {
 
 int FileCamera::PreCapture() {
   struct stat statbuf;
-  if ( stat( path, &statbuf ) < 0 ) {
-    Error( "Can't stat %s: %s", path, strerror(errno) );
-    return( -1 );
+  if ( stat(path, &statbuf) < 0 ) {
+    Error("Can't stat %s: %s", path, strerror(errno));
+    return -1;
   }
+  bytes += statbuf.st_size;
 
+  // This waits until 1 second has passed since it was modified. Effectively limiting fps to 60.
+  // Which is kinda bogus. If we were writing to this jpg constantly faster than we are monitoring it here
+  // we would never break out of this loop
   while ( (time(0) - statbuf.st_mtime) < 1 ) {
-    usleep( 100000 );
+    usleep(100000);
   }
-  return( 0 );
+  return 0;
 }
 
-int FileCamera::Capture( Image &image ) {
-  return( image.ReadJpeg( path, colours, subpixelorder )?1:-1 );
+int FileCamera::Capture(Image &image) {
+  return image.ReadJpeg(path, colours, subpixelorder)?1:-1;
 }
 
 int FileCamera::PostCapture() {
-    return( 0 );
+  return 0;
 }

web/includes/actions/user.php

@@ -37,7 +37,6 @@ if ( $action == 'user' ) {
    
     if ( $_REQUEST['newUser']['Password'] ) {
       $changes['Password'] = 'Password = '.$pass_hash;
-      ZM\Info('PASS CMD='.$changes['Password']);
     } else {
       unset($changes['Password']);
     }
@@ -47,7 +46,7 @@ if ( $action == 'user' ) {
         dbQuery('UPDATE Users SET '.implode(', ', $changes).' WHERE Id = ?', array($_REQUEST['uid']));
         # If we are updating the logged in user, then update our session user data.
         if ( $user and ( $dbUser['Username'] == $user['Username'] ) )
-          userLogin($dbUser['Username'], $dbUser['Password']);
+          generateAuthHash(ZM_AUTH_HASH_IPS);
       } else {
         dbQuery('INSERT INTO Users SET '.implode(', ', $changes));
       }
@@ -71,13 +70,13 @@ if ( $action == 'user' ) {
 
     if ( !empty($_REQUEST['newUser']['Password']) ) {
       $changes['Password'] = 'Password = '.$pass_hash;
-    }
-      
-    else
+    } else {
       unset($changes['Password']);
+    }
     if ( count($changes) ) {
       dbQuery('UPDATE Users SET '.implode(', ', $changes).' WHERE Id=?', array($uid));
       $refreshParent = true;
+      generateAuthHash(ZM_AUTH_HASH_IPS);
     }
     $view = 'none';
   }