diff --git a/web/includes/Event.php b/web/includes/Event.php index 96d511f81..0e072fb33 100644 --- a/web/includes/Event.php +++ b/web/includes/Event.php @@ -221,11 +221,11 @@ class Event { #$command ='ffmpeg -v 0 -i '.$videoPath.' -vf "select=gte(n\\,'.$frame['FrameId'].'),setpts=PTS-STARTPTS" '.$eventPath.'/'.$captImage; $command ='ffmpeg -ss '. $frame['Delta'] .' -i '.$videoPath.' -frames:v 1 '.$eventPath.'/'.$captImage; - Debug( "Running $command" ); + Logger::Debug( "Running $command" ); $output = array(); $retval = 0; exec( $command, $output, $retval ); - Debug("Retval: $retval, output: " . implode("\n", $output)); + Logger::Debug("Retval: $retval, output: " . implode("\n", $output)); } else { Error("Can't create frame images from video becuase there is no video file for this event (".$Event->DefaultVideo() ); } diff --git a/web/includes/database.php b/web/includes/database.php index 40cd8950b..dea9e4b8c 100644 --- a/web/includes/database.php +++ b/web/includes/database.php @@ -81,7 +81,7 @@ function dbLog( $sql, $update=false ) { global $dbLogLevel; $noExecute = $update && ($dbLogLevel >= DB_LOG_DEBUG); if ( $dbLogLevel > DB_LOG_OFF ) - Debug( "SQL-LOG: $sql".($noExecute?" (not executed)":"") ); + Logger::Debug( "SQL-LOG: $sql".($noExecute?" (not executed)":"") ); return( $noExecute ); } diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index b1d985e09..e34a24607 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -177,8 +177,8 @@ foreach( $displayMonitors as $monitor ) $zoneCount += $monitor['ZoneCount']; } -$seqUpFile = getSkinFile( 'graphics/seq-u.gif' ); -$seqDownFile = getSkinFile( 'graphics/seq-d.gif' ); +$seqUpFile = getSkinFile( 'graphics/seq-u.png' ); +$seqDownFile = getSkinFile( 'graphics/seq-d.png' ); $versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText':''; diff --git a/web/views/view_video.php b/web/views/view_video.php index 95d0d0c29..8cf590e9d 100644 --- a/web/views/view_video.php +++ b/web/views/view_video.php @@ -38,7 +38,7 @@ $path = ''; if ( ! empty($_REQUEST['eid'] ) ) { $Event = new Event( $_REQUEST['eid'] ); $path = $Event->Path().'/'.$Event->DefaultVideo(); - Debug("Path: $path"); + Logger::Debug("Path: $path"); } else { $errorText = "No video path"; } @@ -62,14 +62,14 @@ $end = $size-1; $length = $size; if ( isset( $_SERVER['HTTP_RANGE'] ) ) { - Debug("Using Range " . $_SERVER['HTTP_RANGE'] ); + Logger::Debug("Using Range " . $_SERVER['HTTP_RANGE'] ); if ( preg_match( '/bytes=\h*(\d+)-(\d*)[\D.*]?/i', $_SERVER['HTTP_RANGE'], $matches) ) { $begin = intval( $matches[1] ); if ( ! empty( $matches[2]) ) { $end = intval( $matches[2] ); } $length = $end - $begin + 1; - Debug("Using Range $begin $end size: $size, length: $length"); + Logger::Debug("Using Range $begin $end size: $size, length: $length"); } } # end if HTTP_RANGE