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

db/zm_update-1.30.10.sql

@@ -0,0 +1,9 @@
+-- This updates a 1.30.9 database to 1.30.10
+--
+-- Alter type of Messages column from VARCHAR(255) to TEXT
+--
+
+-- ALTER TABLE Logs ALTER  Message DROP DEFAULT;
+ALTER TABLE Logs MODIFY Message TEXT NOT NULL;
+
+ALTER TABLE Config MODIFY DefaultValue TEXT;

distros/fedora/zoneminder.f25.spec

@@ -83,7 +83,7 @@ too much degradation of performance.
 
 %build
 %cmake \
-	-DZM_TARGET_DISTRO="%{dist}" \
+	-DZM_TARGET_DISTRO="fc%{fedora}" \
 %{?_without_ffmpeg:-DZM_NO_FFMPEG=ON} \
 %{?_without_x10:-DZM_NO_X10=ON} \
 	.

distros/ubuntu1604/control

@@ -38,7 +38,7 @@ Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,javascript-common
-        ,libav-tools | ffmpeg
+        ,ffmpeg | libav-tools
         ,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
         ,libdbd-mysql-perl
         ,libphp-serialization-perl

src/zm_logger.cpp

@@ -553,15 +553,15 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
         if (tid < 0 ) // Thread/Process id
 #else
 #ifdef HAVE_SYSCALL
-	#ifdef __FreeBSD_kernel__
+  #ifdef __FreeBSD_kernel__
         if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
 
-	# else
-	// SOLARIS doesn't have SYS_gettid; don't assume
+  # else
+  // SOLARIS doesn't have SYS_gettid; don't assume
         #ifdef SYS_gettid
         if ( (tid = syscall(SYS_gettid)) < 0 ) // Thread/Process id
         #endif // SYS_gettid
-	#endif
+  #endif
 #endif // HAVE_SYSCALL
 #endif
         tid = getpid(); // Process id
@@ -615,12 +615,14 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
             char escapedString[(strlen(syslogStart)*2)+1];
 
             mysql_real_escape_string( &mDbConnection, escapedString, syslogStart, strlen(syslogStart) );
-			
+      
             snprintf( sql, sizeof(sql), "insert into Logs ( TimeKey, Component, ServerId, Pid, Level, Code, Message, File, Line ) values ( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )", timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line );
             if ( mysql_query( &mDbConnection, sql ) )
             {
-                databaseLevel( NOLOG );
-				Error( "Can't insert log entry: %s", mysql_error( &mDbConnection ) );
+              Level tempDatabaseLevel = mDatabaseLevel;
+              databaseLevel( NOLOG );
+              Error( "Can't insert log entry: sql(%s) error(%s)", sql,  mysql_error( &mDbConnection ) );
+              databaseLevel(tempDatabaseLevel);
             }
         }
         if ( level <= mSyslogLevel )

version

@@ -1 +1 @@
-1.30.9
+1.30.10

web/skins/classic/views/events.php

@@ -185,8 +185,10 @@ foreach ( $events as $event )
               <th class="colTotScore"><a href="<?php echo sortHeader( 'TotScore' ) ?>"><?php echo translate('TotalBrScore') ?><?php echo sortTag( 'TotScore' ) ?></a></th>
               <th class="colAvgScore"><a href="<?php echo sortHeader( 'AvgScore' ) ?>"><?php echo translate('AvgBrScore') ?><?php echo sortTag( 'AvgScore' ) ?></a></th>
               <th class="colMaxScore"><a href="<?php echo sortHeader( 'MaxScore' ) ?>"><?php echo translate('MaxBrScore') ?><?php echo sortTag( 'MaxScore' ) ?></a></th>
+<?php if ( ZM_WEB_EVENT_DISK_SPACE ) { ?>
               <th class="colDiskSpace"><a href="<?php echo sortHeader( 'DiskSpace' ) ?>"><?php echo translate('DiskSpace') ?><?php echo sortTag( 'DiskSpace' ) ?></a></th>
 <?php
+			}
         if ( ZM_WEB_LIST_THUMBS )
         {
 ?>
@@ -212,8 +214,10 @@ foreach ( $events as $event )
               <td class="colTotScore"><?php echo $event->TotScore() ?></td>
               <td class="colAvgScore"><?php echo $event->AvgScore() ?></td>
               <td class="colMaxScore"><?php echo makePopupLink( '?view=frame&amp;eid='.$event->Id().'&amp;fid=0', 'zmImage', array( 'image', reScale( $event->Width(), $scale ), reScale( $event->Height(), $scale ) ), $event->MaxScore() ) ?></td>
+<?php if ( ZM_WEB_EVENT_DISK_SPACE ) { ?>
               <td class="colDiskSpace"><?php echo human_filesize( $event->DiskSpace() ) ?></td>
 <?php
+		}
     if ( ZM_WEB_LIST_THUMBS )
     {
         if ( $thumbData = $event->createListThumbnail() )