ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debconf_support

This commit is contained in:
Emmanuel Papin 2014-12-12 23:22:04 +01:00
parent cd0b85aaa6 9d9396c8bc
commit 82310dba51
100 changed files with 1691 additions and 1663 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -44,7 +44,7 @@ include (CheckTypeSize)
include (CheckStructHasMember) include (CheckStructHasMember)
# Configuration options # Configuration options
mark_as_advanced(FORCE ZM_EXTRA_LIBS ZM_MYSQL_ENGINE ZM_NO_MMAP CMAKE_INSTALL_FULL_BINDIR ZM_PERL_SUBPREFIX ZM_PERL_USE_PATH ZM_TARGET_DISTRO) mark_as_advanced(FORCE ZM_EXTRA_LIBS ZM_MYSQL_ENGINE ZM_NO_MMAP CMAKE_INSTALL_FULL_BINDIR ZM_PERL_SUBPREFIX ZM_PERL_USE_PATH ZM_TARGET_DISTRO ZM_CONFIG_DIR)
set(ZM_RUNDIR "/var/run/zm" CACHE PATH "Location of transient process files, default: /var/run/zm") set(ZM_RUNDIR "/var/run/zm" CACHE PATH "Location of transient process files, default: /var/run/zm")
set(ZM_SOCKDIR "/var/run/zm" CACHE PATH "Location of Unix domain socket files, default /var/run/zm") set(ZM_SOCKDIR "/var/run/zm" CACHE PATH "Location of Unix domain socket files, default /var/run/zm")
set(ZM_TMPDIR "/var/tmp/zm" CACHE PATH "Location of temporary files, default: /tmp/zm") set(ZM_TMPDIR "/var/tmp/zm" CACHE PATH "Location of temporary files, default: /tmp/zm")
@ -59,6 +59,7 @@ set(ZM_DB_PASS "zmpass" CACHE STRING "Password of ZoneMinder database user, defa
set(ZM_WEB_USER "" CACHE STRING "The user apache or the local web server runs on. Leave empty for automatic detection. If that fails, you can use this variable to force") set(ZM_WEB_USER "" CACHE STRING "The user apache or the local web server runs on. Leave empty for automatic detection. If that fails, you can use this variable to force")
set(ZM_WEB_GROUP "" CACHE STRING "The group apache or the local web server runs on, Leave empty to be the same as the web user") set(ZM_WEB_GROUP "" CACHE STRING "The group apache or the local web server runs on, Leave empty to be the same as the web user")
# Advanced # Advanced
set(ZM_CONFIG_DIR "/${CMAKE_INSTALL_SYSCONFDIR}" CACHE PATH "Location of ZoneMinder configuration, default system config directory")
set(ZM_EXTRA_LIBS "" CACHE STRING "A list of optional libraries, separated by semicolons, e.g. ssl;theora") set(ZM_EXTRA_LIBS "" CACHE STRING "A list of optional libraries, separated by semicolons, e.g. ssl;theora")
set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING "MySQL engine to use with database, default: InnoDB") set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING "MySQL engine to use with database, default: InnoDB")
set(ZM_NO_MMAP "OFF" CACHE BOOL "Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF") set(ZM_NO_MMAP "OFF" CACHE BOOL "Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF")
@ -490,6 +491,7 @@ endif(NOT POLKIT_FOUND)
# Some variables that zm expects # Some variables that zm expects
set(ZM_PID "${ZM_RUNDIR}/zm.pid") set(ZM_PID "${ZM_RUNDIR}/zm.pid")
set(ZM_CONFIG "${ZM_CONFIG_DIR}/zm.conf")
set(ZM_CONFIG "/${CMAKE_INSTALL_SYSCONFDIR}/zm.conf") set(ZM_CONFIG "/${CMAKE_INSTALL_SYSCONFDIR}/zm.conf")
set(VERSION "${zoneminder_VERSION}") set(VERSION "${zoneminder_VERSION}")
set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/zoneminder") set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/zoneminder")
@ -539,7 +541,7 @@ else(zmconfgen_result EQUAL 0)
endif(zmconfgen_result EQUAL 0) endif(zmconfgen_result EQUAL 0)
# Install zm.conf # Install zm.conf
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "/${CMAKE_INSTALL_SYSCONFDIR}") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
# Uninstall target # Uninstall target
configure_file( configure_file(

5
Makefile.am
View File

@ -3,8 +3,9 @@ AUTOMAKE_OPTIONS = foreign
# And these to the user and group of your webserver # And these to the user and group of your webserver
webuser = @WEB_USER@ webuser = @WEB_USER@
webgroup = @WEB_GROUP@ webgroup = @WEB_GROUP@
zmconfigdir = @ZM_CONFIG_DIR@
sysconf_DATA = \ zmconfig_DATA = \
zm.conf zm.conf
SUBDIRS = \ SUBDIRS = \
@ -20,7 +21,7 @@ EXTRA_DIST = \
# Yes, you are correct. This is a HACK! # Yes, you are correct. This is a HACK!
install-data-hook: install-data-hook:
( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) ) ( cd $(DESTDIR)$(zmconfigdir); chown $(webuser):$(webgroup) $(zmconfig_DATA); chmod 600 $(zmconfig_DATA) )
( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi ) ( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi )
( if ! test -e $(DESTDIR)$(ZM_SOCKDIR); then mkdir -p $(DESTDIR)$(ZM_SOCKDIR); fi; if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_SOCKDIR); chmod u+w $(DESTDIR)$(ZM_SOCKDIR); fi ) ( if ! test -e $(DESTDIR)$(ZM_SOCKDIR); then mkdir -p $(DESTDIR)$(ZM_SOCKDIR); fi; if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_SOCKDIR); chmod u+w $(DESTDIR)$(ZM_SOCKDIR); fi )
( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp" && test "$(DESTDIR)$(ZM_TMPDIR)" != "/var/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi ) ( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp" && test "$(DESTDIR)$(ZM_TMPDIR)" != "/var/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi )

10
configure.ac
View File

@ -46,6 +46,7 @@ AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
AC_ARG_VAR(ZM_SOCKDIR,[Location of Unix domain socket files, default /var/run/zm]) AC_ARG_VAR(ZM_SOCKDIR,[Location of Unix domain socket files, default /var/run/zm])
AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /var/tmp/zm]) AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /var/tmp/zm])
AC_ARG_VAR(ZM_LOGDIR,[Location of generated log files, default /var/log/zm]) AC_ARG_VAR(ZM_LOGDIR,[Location of generated log files, default /var/log/zm])
AC_ARG_VAR(ZM_CONFIG_DIR,[Location of ZoneMinder configuration, default system config directory])
if test "$ZM_DB_TYPE" == ""; then if test "$ZM_DB_TYPE" == ""; then
AC_SUBST(ZM_DB_TYPE,[mysql]) AC_SUBST(ZM_DB_TYPE,[mysql])
@ -80,6 +81,10 @@ fi
if test "$ZM_LOGDIR" == ""; then if test "$ZM_LOGDIR" == ""; then
AC_SUBST(ZM_LOGDIR,[/var/log/zm]) AC_SUBST(ZM_LOGDIR,[/var/log/zm])
fi fi
AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
if test "$ZM_CONFIG_DIR" == ""; then
AC_SUBST(ZM_CONFIG_DIR,[$SYSCONFDIR])
fi
LIB_ARCH=lib LIB_ARCH=lib
AC_ARG_WITH(libarch, AC_ARG_WITH(libarch,
@ -428,8 +433,9 @@ AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory]) AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE") AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid") AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory]) #AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf") #AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
AC_SUBST(ZM_CONFIG,"$ZM_CONFIG_DIR/zm.conf")
# Slight hack for non-standard perl install paths # Slight hack for non-standard perl install paths
if test "$prefix" != "NONE"; then if test "$prefix" != "NONE"; then

2
db/zm_create.sql.in
View File

@ -320,7 +320,7 @@ CREATE TABLE `Monitors` (
`Enabled` tinyint(3) unsigned NOT NULL default '1', `Enabled` tinyint(3) unsigned NOT NULL default '1',
`LinkedMonitors` varchar(255) NOT NULL default '', `LinkedMonitors` varchar(255) NOT NULL default '',
`Triggers` set('X10') NOT NULL default '', `Triggers` set('X10') NOT NULL default '',
`Device` varchar(64) NOT NULL default '', `Device` tinytext NOT NULL default '',
`Channel` tinyint(3) unsigned NOT NULL default '0', `Channel` tinyint(3) unsigned NOT NULL default '0',
`Format` int(10) unsigned NOT NULL default '0', `Format` int(10) unsigned NOT NULL default '0',
`V4LMultiBuffer` tinyint(1) unsigned, `V4LMultiBuffer` tinyint(1) unsigned,

1
db/zm_update-1.28.1.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE Monitors MODIFY Device tinytext;

65
scripts/ZoneMinder/lib/ZoneMinder/Control/TVIP862.pm
View File

@ -20,8 +20,6 @@
# This module contains the implementation of the Trendnet TV-IP672PI IP camera control # This module contains the implementation of the Trendnet TV-IP672PI IP camera control
# protocol. Also works or TV-IP862IC # protocol. Also works or TV-IP862IC
# #
#
#
# For Zoneminder 1.26+ # For Zoneminder 1.26+
# #
# Under control capability: # Under control capability:
@ -69,9 +67,10 @@ our @ISA = qw(ZoneMinder::Control);
# #
# Finally, the username is the username you'd like to authenticate as. # Finally, the username is the username you'd like to authenticate as.
# #
our $REALM = "TV-IP862IC"; our $REALM = 'TV-IP862IC';
our $USERNAME = "admin"; our $USERNAME = 'admin';
our $PASSWORD = '';
our $ADDRESS = '';
# ========================================================================== # ==========================================================================
# #
@ -82,8 +81,6 @@ our $USERNAME = "admin";
use ZoneMinder::Logger qw(:all); use ZoneMinder::Logger qw(:all);
use ZoneMinder::Config qw(:all); use ZoneMinder::Config qw(:all);
use Time::HiRes qw( usleep );
sub new sub new
{ {
my $class = shift; my $class = shift;
@ -112,13 +109,29 @@ sub AUTOLOAD
sub open sub open
{ {
my $self = shift; my $self = shift;
$self->loadMonitor(); $self->loadMonitor();
my ( $protocol, $username, $password, $address ) = $self->{Monitor}->{ControlAddress} =~ /^(https?:\/\/)?([^:]+):([^\/@]+)@(.*)$/;
if ( $username ) {
$USERNAME = $username;
$PASSWORD = $password;
$ADDRESS = $address;
} else {
Error( "Failed to parse auth from address");
$ADDRESS = $self->{Monitor}->{ControlAddress};
}
if ( ! $ADDRESS =~ /:/ ) {
Error( "You generally need to also specify the port. I will append :80" );
$ADDRESS .= ':80';
}
use LWP::UserAgent; use LWP::UserAgent;
$self->{ua} = LWP::UserAgent->new; $self->{ua} = LWP::UserAgent->new;
$self->{ua}->agent( "ZoneMinder Control Agent/".$ZoneMinder::Base::ZM_VERSION ); $self->{ua}->agent( "ZoneMinder Control Agent/".$ZoneMinder::Base::ZM_VERSION );
$self->{state} = 'open'; $self->{state} = 'open';
# credentials: ("ip:port" (no prefix!), realm (string), username (string), password (string)
Debug ( "sendCmd credentials control address:'".$ADDRESS."' realm:'" . $REALM . "' username:'" . $USERNAME . "' password:'".$PASSWORD."'");
$self->{ua}->credentials($ADDRESS,$REALM,$USERNAME,$PASSWORD);
} }
sub close sub close
@ -146,18 +159,10 @@ sub sendCmd
my $result = undef; my $result = undef;
Debug ( $cmd, "Tx" ); my $url = "http://".$ADDRESS."/cgi/ptdc.cgi?command=".$cmd;
my $req = HTTP::Request->new( GET=>$url );
my $ua = LWP::UserAgent->new(); Debug ("sendCmd command: " . $url );
my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/cgi/ptdc.cgi?command=".$cmd );
# credentials: ("ip:port" (no prefix!), realm (string), username (string), password (string)
$self->{ua}->credentials($self->{Monitor}->{ControlAddress},$REALM,$USERNAME,$self->{Monitor}->{ControlDevice});
Debug ( "sendCmd credentials control address:'".$self->{Monitor}->{ControlAddress}."' realm:'" . $REALM . "' username:'" . $USERNAME . "' password:'".$self->{Monitor}->{ControlDevice}."'");
Debug ("sendCmd command: " . $cmd);
my $res = $self->{ua}->request($req); my $res = $self->{ua}->request($req);
@ -165,10 +170,13 @@ sub sendCmd
$result = !undef; $result = !undef;
} else { } else {
if ( $res->status_line() eq '401 Unauthorized' ) { if ( $res->status_line() eq '401 Unauthorized' ) {
Error( "Error check failed, trying again: USERNAME: $USERNAME realm: $REALM password: " . $self->{Monitor}->{ControlDevice} ); Error( "Error check failed, trying again: USERNAME: $USERNAME realm: $REALM password: " . $PASSWORD );
Error("Content was " . $res->content() );
my $res = $self->{ua}->request($req); my $res = $self->{ua}->request($req);
if ( $res->is_success ) { if ( $res->is_success ) {
$result = !undef; $result = !undef;
} else {
Error("Content was " . $res->content() );
} }
} }
if ( ! $result ) { if ( ! $result ) {
@ -194,7 +202,6 @@ sub sendCmdPost
my $result = undef; my $result = undef;
if ($url eq undef) if ($url eq undef)
{ {
Error ("url passed to sendCmdPost is undefined."); Error ("url passed to sendCmdPost is undefined.");
@ -203,16 +210,11 @@ sub sendCmdPost
Debug ("sendCmdPost url: " . $url . " cmd: " . $cmd); Debug ("sendCmdPost url: " . $url . " cmd: " . $cmd);
my $ua = LWP::UserAgent->new(); my $req = HTTP::Request->new(POST => "http://".$ADDRESS.$url);
my $req = HTTP::Request->new(POST => "http://".$self->{Monitor}->{ControlAddress}.$url);
$req->content_type('application/x-www-form-urlencoded'); $req->content_type('application/x-www-form-urlencoded');
$req->content($cmd); $req->content($cmd);
$self->{ua}->credentials($self->{Monitor}->{ControlAddress},$REALM,$USERNAME,$self->{Monitor}->{ControlDevice}); Debug ( "sendCmdPost credentials control address:'".$ADDRESS."' realm:'" . $REALM . "' username:'" . $USERNAME . "' password:'".$PASSWORD."'");
Debug ( "sendCmdPost credentials control address:'".$self->{Monitor}->{ControlAddress}."' realm:'" . $REALM . "' username:'" . $USERNAME . "'
password:'".$self->{Monitor}->{ControlDevice}."'");
my $res = $self->{ua}->request($req); my $res = $self->{ua}->request($req);
@ -222,12 +224,11 @@ password:'".$self->{Monitor}->{ControlDevice}."'");
} }
else else
{ {
Error( "Error check failed: USERNAME: $USERNAME realm: $REALM password: " . $self->{Monitor}->{ControlDevice} ); Error( "sendCmdPost Error check failed: '".$res->status_line()."' cmd:'".$cmd."'" );
Error( "Error check failed: '".$res->status_line()."' cmd:'".$cmd."'" );
if ( $res->status_line() eq '401 Unauthorized' ) { if ( $res->status_line() eq '401 Unauthorized' ) {
Error( "Error check failed: USERNAME: $USERNAME realm: $REALM password: " . $self->{Monitor}->{ControlDevice} ); Error( "sendCmdPost Error check failed: USERNAME: $USERNAME realm: $REALM password: " . $PASSWORD );
} else { } else {
Error( "Error check failed: USERNAME: $USERNAME realm: $REALM password: " . $self->{Monitor}->{ControlDevice} ); Error( "sendCmdPost Error check failed: USERNAME: $USERNAME realm: $REALM password: " . $PASSWORD );
} # endif } # endif
} }

4
src/zmc.cpp
View File

@ -32,7 +32,11 @@ void Usage()
fprintf( stderr, "zmc -d <device_path> or -r <proto> -H <host> -P <port> -p <path> or -f <file_path> or -m <monitor_id>\n" ); fprintf( stderr, "zmc -d <device_path> or -r <proto> -H <host> -P <port> -p <path> or -f <file_path> or -m <monitor_id>\n" );
fprintf( stderr, "Options:\n" ); fprintf( stderr, "Options:\n" );
#if defined(BSD)
fprintf( stderr, " -d, --device <device_path> : For local cameras, device to access. E.g /dev/bktr0 etc\n" );
#else
fprintf( stderr, " -d, --device <device_path> : For local cameras, device to access. E.g /dev/video0 etc\n" ); fprintf( stderr, " -d, --device <device_path> : For local cameras, device to access. E.g /dev/video0 etc\n" );
#endif
fprintf( stderr, " -r <proto> -H <host> -P <port> -p <path> : For remote cameras\n" ); fprintf( stderr, " -r <proto> -H <host> -P <port> -p <path> : For remote cameras\n" );
fprintf( stderr, " -f, --file <file_path> : For local images, jpg file to access.\n" ); fprintf( stderr, " -f, --file <file_path> : For local images, jpg file to access.\n" );
fprintf( stderr, " -m, --monitor <monitor_id> : For sources associated with a single monitor\n" ); fprintf( stderr, " -m, --monitor <monitor_id> : For sources associated with a single monitor\n" );

6
src/zmu.cpp
View File

@ -138,6 +138,12 @@ bool ValidateAccess( User *user, int mon_id, int function )
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
if ( access(ZM_CONFIG, R_OK) != 0 )
{
fprintf( stderr, "Can't open %s: %s\n", ZM_CONFIG, strerror(errno) );
exit( -1 );
}
self = argv[0]; self = argv[0];
srand( getpid() * time( 0 ) ); srand( getpid() * time( 0 ) );

98
web/includes/functions.php
View File

@ -247,20 +247,20 @@ function outputVideoStream( $id, $src, $width, $height, $format, $title="" )
if ( isWindows() ) if ( isWindows() )
{ {
?> ?>
<object id="<?= $id ?>" width="<?= validNum($width) ?>" height="<?= validNum($height) ?>" <object id="<?php echo $id ?>" width="<?php echo validNum($width) ?>" height="<?php echo validNum($height) ?>"
classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95" classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902" codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902"
standby="Loading Microsoft Windows Media Player components..." standby="Loading Microsoft Windows Media Player components..."
type="<?= $mimeType ?>"> type="<?php echo $mimeType ?>">
<param name="FileName" value="<?= $src ?>"/> <param name="FileName" value="<?php echo $src ?>"/>
<param name="autoStart" value="1"/> <param name="autoStart" value="1"/>
<param name="showControls" value="0"/> <param name="showControls" value="0"/>
<embed type="<?= $mimeType ?>" <embed type="<?php echo $mimeType ?>"
pluginspage="http://www.microsoft.com/Windows/MediaPlayer/" pluginspage="http://www.microsoft.com/Windows/MediaPlayer/"
src="<?= $src ?>" src="<?php echo $src ?>"
name="<?= validHtmlStr($title) ?>" name="<?php echo validHtmlStr($title) ?>"
width="<?= validNum($width) ?>" width="<?php echo validNum($width) ?>"
height="<?= validInt($height) ?>" height="<?php echo validInt($height) ?>"
autostart="1" autostart="1"
showcontrols="0"> showcontrols="0">
</embed> </embed>
@ -273,19 +273,19 @@ showcontrols="0">
case "video/quicktime" : case "video/quicktime" :
{ {
?> ?>
<object id="<?= $id ?>" width="<?= $width ?>" height="<?= $height ?>" <object id="<?php echo $id ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"
classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
codebase="http://www.apple.com/qtactivex/qtplugin.cab" codebase="http://www.apple.com/qtactivex/qtplugin.cab"
type="<?= $mimeType ?>"> type="<?php echo $mimeType ?>">
<param name="src" value="<?= $src ?>"/> <param name="src" value="<?php echo $src ?>"/>
<param name="autoplay" VALUE="true"/> <param name="autoplay" VALUE="true"/>
<param name="controller" VALUE="false"/> <param name="controller" VALUE="false"/>
<embed type="<?= $mimeType ?>" <embed type="<?php echo $mimeType ?>"
src="<?= $src ?>" src="<?php echo $src ?>"
pluginspage="http://www.apple.com/quicktime/download/" pluginspage="http://www.apple.com/quicktime/download/"
name="<?= validHtmlStr($title) ?>" name="<?php echo validHtmlStr($title) ?>"
width="<?= validInt($width) ?>" width="<?php echo validInt($width) ?>"
height="<?= validInt($height) ?>" height="<?php echo validInt($height) ?>"
autoplay="true" autoplay="true"
controller="true"> controller="true">
</embed> </embed>
@ -297,19 +297,19 @@ controller="true">
case "application/x-shockwave-flash" : case "application/x-shockwave-flash" :
{ {
?> ?>
<object id="<?= $id ?>" width="<?= $width ?>" height="<?= $height ?>" <object id="<?php echo $id ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"
classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"
type="<?= $mimeType ?>"> type="<?php echo $mimeType ?>">
<param name="movie" value="<?= $src ?>"/> <param name="movie" value="<?php echo $src ?>"/>
<param name="quality" value="high"/> <param name="quality" value="high"/>
<param name="bgcolor" value="#ffffff"/> <param name="bgcolor" value="#ffffff"/>
<embed type="<?= $mimeType ?>" <embed type="<?php echo $mimeType ?>"
pluginspage="http://www.macromedia.com/go/getflashplayer" pluginspage="http://www.macromedia.com/go/getflashplayer"
src="<?= $src ?>" src="<?php echo $src ?>"
name="<?= validHtmlStr($title) ?>" name="<?php echo validHtmlStr($title) ?>"
width="<?= validInt($width) ?>" width="<?php echo validInt($width) ?>"
height="<?= validInt($height) ?>" height="<?php echo validInt($height) ?>"
quality="high" quality="high"
bgcolor="#ffffff"> bgcolor="#ffffff">
</embed> </embed>
@ -323,11 +323,11 @@ bgcolor="#ffffff">
if ( !$objectTag ) if ( !$objectTag )
{ {
?> ?>
<embed<?= isset($mimeType)?(' type="'.$mimeType.'"'):"" ?> <embed<?php echo isset($mimeType)?(' type="'.$mimeType.'"'):"" ?>
src="<?= $src ?>" src="<?php echo $src ?>"
name="<?= validHtmlStr($title) ?>" name="<?php echo validHtmlStr($title) ?>"
width="<?= validInt($width) ?>" width="<?php echo validInt($width) ?>"
height="<?= validInt($height) ?>" height="<?php echo validInt($height) ?>"
autostart="1" autostart="1"
autoplay="1" autoplay="1"
showcontrols="0" showcontrols="0"
@ -341,11 +341,11 @@ function outputImageStream( $id, $src, $width, $height, $title="" )
{ {
if ( canStreamIframe() ) { if ( canStreamIframe() ) {
?> ?>
<iframe id="<?= $id ?>" src="<?= $src ?>" alt="<?= validHtmlStr($title) ?>" width="<?= $width ?>" height="<?= $height ?>"/> <iframe id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo validHtmlStr($title) ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
<?php <?php
} else { } else {
?> ?>
<img id="<?= $id ?>" src="<?= $src ?>" alt="<?= validHtmlStr($title) ?>" width="<?= $width ?>" height="<?= $height ?>"/> <img id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo validHtmlStr($title) ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
<?php <?php
} }
} }
@ -353,9 +353,9 @@ function outputImageStream( $id, $src, $width, $height, $title="" )
function outputControlStream( $src, $width, $height, $monitor, $scale, $target ) function outputControlStream( $src, $width, $height, $monitor, $scale, $target )
{ {
?> ?>
<form name="ctrlForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>" target="<?= $target ?>"> <form name="ctrlForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" target="<?php echo $target ?>">
<input type="hidden" name="view" value="blank"> <input type="hidden" name="view" value="blank">
<input type="hidden" name="mid" value="<?= $monitor['Id'] ?>"> <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>">
<input type="hidden" name="action" value="control"> <input type="hidden" name="action" value="control">
<?php <?php
if ( $monitor['CanMoveMap'] ) if ( $monitor['CanMoveMap'] )
@ -377,8 +377,8 @@ function outputControlStream( $src, $width, $height, $monitor, $scale, $target )
<?php <?php
} }
?> ?>
<input type="hidden" name="scale" value="<?= $scale ?>"> <input type="hidden" name="scale" value="<?php echo $scale ?>">
<input type="image" src="<?= $src ?>" width="<?= $width ?>" height="<?= $height ?>"> <input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>">
</form> </form>
<?php <?php
} }
@ -386,14 +386,14 @@ function outputControlStream( $src, $width, $height, $monitor, $scale, $target )
function outputHelperStream( $id, $src, $width, $height, $title="" ) function outputHelperStream( $id, $src, $width, $height, $title="" )
{ {
?> ?>
<applet id="<?= $id ?>" code="com.charliemouse.cambozola.Viewer" <applet id="<?php echo $id ?>" code="com.charliemouse.cambozola.Viewer"
archive="<?= ZM_PATH_CAMBOZOLA ?>" archive="<?php echo ZM_PATH_CAMBOZOLA ?>"
align="middle" align="middle"
width="<?= $width ?>" width="<?php echo $width ?>"
height="<?= $height ?>" height="<?php echo $height ?>"
title="<?= $title ?>"> title="<?php echo $title ?>">
<param name="accessories" value="none"/> <param name="accessories" value="none"/>
<param name="url" value="<?= $src ?>"/> <param name="url" value="<?php echo $src ?>"/>
</applet> </applet>
<?php <?php
} }
@ -401,16 +401,16 @@ title="<?= $title ?>">
function outputImageStill( $id, $src, $width, $height, $title="" ) function outputImageStill( $id, $src, $width, $height, $title="" )
{ {
?> ?>
<img id="<?= $id ?>" src="<?= $src ?>" alt="<?= $title ?>" width="<?= $width ?>" height="<?= $height ?>"/> <img id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo $title ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
<?php <?php
} }
function outputControlStill( $src, $width, $height, $monitor, $scale, $target ) function outputControlStill( $src, $width, $height, $monitor, $scale, $target )
{ {
?> ?>
<form name="ctrlForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>" target="<?= $target ?>"> <form name="ctrlForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" target="<?php echo $target ?>">
<input type="hidden" name="view" value="blank"> <input type="hidden" name="view" value="blank">
<input type="hidden" name="mid" value="<?= $monitor['Id'] ?>"> <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>">
<input type="hidden" name="action" value="control"> <input type="hidden" name="action" value="control">
<?php <?php
if ( $monitor['CanMoveMap'] ) if ( $monitor['CanMoveMap'] )
@ -432,8 +432,8 @@ function outputControlStill( $src, $width, $height, $monitor, $scale, $target )
<?php <?php
} }
?> ?>
<input type="hidden" name="scale" value="<?= $scale ?>"> <input type="hidden" name="scale" value="<?php echo $scale ?>">
<input type="image" src="<?= $src ?>" width="<?= $width ?>" height="<?= $height ?>"> <input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>">
</form> </form>
<?php <?php
} }
@ -639,12 +639,12 @@ function buildSelect( $name, $contents, $behaviours=false )
} }
} }
?> ?>
<select name="<?= $name ?>" id="<?= $name ?>"<?= $behaviourText ?>> <select name="<?php echo $name ?>" id="<?php echo $name ?>"<?php echo $behaviourText ?>>
<?php <?php
foreach ( $contents as $contentValue => $contentText ) foreach ( $contents as $contentValue => $contentText )
{ {
?> ?>
<option value="<?= $contentValue ?>"<?php if ( $value == $contentValue ) { ?> selected="selected"<?php } ?>><?= validHtmlStr($contentText) ?></option> <option value="<?php echo $contentValue ?>"<?php if ( $value == $contentValue ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($contentText) ?></option>
<?php <?php
} }
?> ?>
@ -1645,7 +1645,7 @@ function sidField()
{ {
list( $sessname, $sessid ) = explode( "=", SID ); list( $sessname, $sessid ) = explode( "=", SID );
?> ?>
<input type="hidden" name="<?= $sessname ?>" value="<?= $sessid ?>"/> <input type="hidden" name="<?php echo $sessname ?>" value="<?php echo $sessid ?>"/>
<?php <?php
} }
} }

18
web/skins/classic/css/classic/control.css
View File

@ -91,39 +91,39 @@
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .upLeftBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .upLeftBtn {
background: url("../graphics/arrow-ul.gif") no-repeat 0 0; background: url("../../graphics/arrow-ul.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .upBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .upBtn {
background: url("../graphics/arrow-u.gif") no-repeat 0 0; background: url("../../graphics/arrow-u.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .upRightBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .upRightBtn {
background: url("../graphics/arrow-ur.gif") no-repeat 0 0; background: url("../../graphics/arrow-ur.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .leftBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .leftBtn {
background: url("../graphics/arrow-l.gif") no-repeat 0 0; background: url("../../graphics/arrow-l.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .centerBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .centerBtn {
background: url("../graphics/center.gif") no-repeat 0 0; background: url("../../graphics/center.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .rightBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .rightBtn {
background: url("../graphics/arrow-r.gif") no-repeat 0 0; background: url("../../graphics/arrow-r.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .downLeftBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .downLeftBtn {
background: url("../graphics/arrow-dl.gif") no-repeat 0 0; background: url("../../graphics/arrow-dl.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .downBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .downBtn {
background: url("../graphics/arrow-d.gif") no-repeat 0 0; background: url("../../graphics/arrow-d.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .downRightBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .downRightBtn {
background: url("../graphics/arrow-dr.gif") no-repeat 0 0; background: url("../../graphics/arrow-dr.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .powerControls { .ptzControls .controlsPanel .pantiltPanel .powerControls {

2
web/skins/classic/css/classic/views/control.css
View File

@ -1 +1 @@
@import url(../../css/control.css); @import url(../control.css);

44
web/skins/classic/css/classic/views/timeline.css.php
View File

@ -1,42 +1,42 @@
.chartSize { .chartSize {
width: <?= $chart['width'] ?>px; width: <?php echo $chart['width'] ?>px;
height: <?= $chart['height'] ?>px; height: <?php echo $chart['height'] ?>px;
} }
.graphSize { .graphSize {
width: <?= $chart['graph']['width'] ?>px; width: <?php echo $chart['graph']['width'] ?>px;
height: <?= $chart['graph']['height'] ?>px; height: <?php echo $chart['graph']['height'] ?>px;
} }
.graphHeight { .graphHeight {
height: <?= $chart['graph']['height'] ?>px; height: <?php echo $chart['graph']['height'] ?>px;
} }
.graphWidth { .graphWidth {
width: <?= $chart['graph']['width'] ?>px; width: <?php echo $chart['graph']['width'] ?>px;
} }
.imageSize { .imageSize {
width: <?= $chart['image']['width'] ?>px; width: <?php echo $chart['image']['width'] ?>px;
height: <?= $chart['image']['height'] ?>px; height: <?php echo $chart['image']['height'] ?>px;
} }
.imageHeight { .imageHeight {
height: <?= $chart['image']['height'] ?>px; height: <?php echo $chart['image']['height'] ?>px;
} }
.activitySize { .activitySize {
width: <?= $chart['graph']['width'] ?>px; width: <?php echo $chart['graph']['width'] ?>px;
height: <?= $chart['graph']['activityHeight'] ?>px; height: <?php echo $chart['graph']['activityHeight'] ?>px;
} }
.eventsSize { .eventsSize {
width: <?= $chart['graph']['width'] ?>px; width: <?php echo $chart['graph']['width'] ?>px;
height: <?= $chart['graph']['eventBarHeight'] ?>px; height: <?php echo $chart['graph']['eventBarHeight'] ?>px;
} }
.eventsHeight { .eventsHeight {
height: <?= $chart['graph']['eventBarHeight'] ?>px; height: <?php echo $chart['graph']['eventBarHeight'] ?>px;
} }
<?php <?php
if ( $mode == "overlay" ) if ( $mode == "overlay" )
@ -44,8 +44,8 @@ if ( $mode == "overlay" )
foreach ( array_keys($monitorIds) as $monitorId ) foreach ( array_keys($monitorIds) as $monitorId )
{ {
?> ?>
#chartPanel .eventsPos<?= $monitorId ?> { #chartPanel .eventsPos<?php echo $monitorId ?> {
top: <?= $chart['eventBars'][$monitorId]['top'] ?>px; top: <?php echo $chart['eventBars'][$monitorId]['top'] ?>px;
} }
<?php <?php
} }
@ -55,12 +55,12 @@ elseif ( $mode == "split" )
foreach ( array_keys($monitorIds) as $monitorId ) foreach ( array_keys($monitorIds) as $monitorId )
{ {
?> ?>
#chartPanel .activityPos<?= $monitorId ?> { #chartPanel .activityPos<?php echo $monitorId ?> {
top: <?= $char['activityBars'][$monitorId]['top'] ?>px; top: <?php echo $char['activityBars'][$monitorId]['top'] ?>px;
} }
#chartPanel .eventsPos<?= $monitorId ?> { #chartPanel .eventsPos<?php echo $monitorId ?> {
top: <?= $char['eventBars'][$monitorId]['top'] ?>px; top: <?php echo $char['eventBars'][$monitorId]['top'] ?>px;
} }
<?php <?php
} }
@ -69,8 +69,8 @@ elseif ( $mode == "split" )
foreach( array_keys($monEventSlots) as $monitorId ) foreach( array_keys($monEventSlots) as $monitorId )
{ {
?> ?>
.monitorColour<?= $monitorId ?> { .monitorColour<?php echo $monitorId ?> {
background-color: <?= $monitors[$monitorId]['WebColour'] ?>; background-color: <?php echo $monitors[$monitorId]['WebColour'] ?>;
} }
<?php <?php
} }

2
web/skins/classic/css/classic/views/watch.css
View File

@ -1,4 +1,4 @@
@import url(../../css/control.css); @import url(../control.css);
#menuBar { #menuBar {
margin: 6px auto 4px; margin: 6px auto 4px;

18
web/skins/classic/css/flat/control.css
View File

@ -91,39 +91,39 @@
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .upLeftBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .upLeftBtn {
background: url("../graphics/arrow-ul.gif") no-repeat 0 0; background: url("../../graphics/arrow-ul.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .upBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .upBtn {
background: url("../graphics/arrow-u.gif") no-repeat 0 0; background: url("../../graphics/arrow-u.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .upRightBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .upRightBtn {
background: url("../graphics/arrow-ur.gif") no-repeat 0 0; background: url("../../graphics/arrow-ur.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .leftBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .leftBtn {
background: url("../graphics/arrow-l.gif") no-repeat 0 0; background: url("../../graphics/arrow-l.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .centerBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .centerBtn {
background: url("../graphics/center.gif") no-repeat 0 0; background: url("../../graphics/center.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .rightBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .rightBtn {
background: url("../graphics/arrow-r.gif") no-repeat 0 0; background: url("../../graphics/arrow-r.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .downLeftBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .downLeftBtn {
background: url("../graphics/arrow-dl.gif") no-repeat 0 0; background: url("../../graphics/arrow-dl.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .downBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .downBtn {
background: url("../graphics/arrow-d.gif") no-repeat 0 0; background: url("../../graphics/arrow-d.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .pantiltControls .downRightBtn { .ptzControls .controlsPanel .pantiltPanel .pantiltControls .downRightBtn {
background: url("../graphics/arrow-dr.gif") no-repeat 0 0; background: url("../../graphics/arrow-dr.gif") no-repeat 0 0;
} }
.ptzControls .controlsPanel .pantiltPanel .powerControls { .ptzControls .controlsPanel .pantiltPanel .powerControls {

2
web/skins/classic/css/flat/views/control.css
View File

@ -1 +1 @@
@import url(../../css/control.css); @import url(../css/control.css);

44
web/skins/classic/css/flat/views/timeline.css.php
View File

@ -1,42 +1,42 @@
.chartSize { .chartSize {
width: <?= $chart['width'] ?>px; width: <?php echo $chart['width'] ?>px;
height: <?= $chart['height'] ?>px; height: <?php echo $chart['height'] ?>px;
} }
.graphSize { .graphSize {
width: <?= $chart['graph']['width'] ?>px; width: <?php echo $chart['graph']['width'] ?>px;
height: <?= $chart['graph']['height'] ?>px; height: <?php echo $chart['graph']['height'] ?>px;
} }
.graphHeight { .graphHeight {
height: <?= $chart['graph']['height'] ?>px; height: <?php echo $chart['graph']['height'] ?>px;
} }
.graphWidth { .graphWidth {
width: <?= $chart['graph']['width'] ?>px; width: <?php echo $chart['graph']['width'] ?>px;
} }
.imageSize { .imageSize {
width: <?= $chart['image']['width'] ?>px; width: <?php echo $chart['image']['width'] ?>px;
height: <?= $chart['image']['height'] ?>px; height: <?php echo $chart['image']['height'] ?>px;
} }
.imageHeight { .imageHeight {
height: <?= $chart['image']['height'] ?>px; height: <?php echo $chart['image']['height'] ?>px;
} }
.activitySize { .activitySize {
width: <?= $chart['graph']['width'] ?>px; width: <?php echo $chart['graph']['width'] ?>px;
height: <?= $chart['graph']['activityHeight'] ?>px; height: <?php echo $chart['graph']['activityHeight'] ?>px;
} }
.eventsSize { .eventsSize {
width: <?= $chart['graph']['width'] ?>px; width: <?php echo $chart['graph']['width'] ?>px;
height: <?= $chart['graph']['eventBarHeight'] ?>px; height: <?php echo $chart['graph']['eventBarHeight'] ?>px;
} }
.eventsHeight { .eventsHeight {
height: <?= $chart['graph']['eventBarHeight'] ?>px; height: <?php echo $chart['graph']['eventBarHeight'] ?>px;
} }
<?php <?php
if ( $mode == "overlay" ) if ( $mode == "overlay" )
@ -44,8 +44,8 @@ if ( $mode == "overlay" )
foreach ( array_keys($monitorIds) as $monitorId ) foreach ( array_keys($monitorIds) as $monitorId )
{ {
?> ?>
#chartPanel .eventsPos<?= $monitorId ?> { #chartPanel .eventsPos<?php echo $monitorId ?> {
top: <?= $chart['eventBars'][$monitorId]['top'] ?>px; top: <?php echo $chart['eventBars'][$monitorId]['top'] ?>px;
} }
<?php <?php
} }
@ -55,12 +55,12 @@ elseif ( $mode == "split" )
foreach ( array_keys($monitorIds) as $monitorId ) foreach ( array_keys($monitorIds) as $monitorId )
{ {
?> ?>
#chartPanel .activityPos<?= $monitorId ?> { #chartPanel .activityPos<?php echo $monitorId ?> {
top: <?= $char['activityBars'][$monitorId]['top'] ?>px; top: <?php echo $char['activityBars'][$monitorId]['top'] ?>px;
} }
#chartPanel .eventsPos<?= $monitorId ?> { #chartPanel .eventsPos<?php echo $monitorId ?> {
top: <?= $char['eventBars'][$monitorId]['top'] ?>px; top: <?php echo $char['eventBars'][$monitorId]['top'] ?>px;
} }
<?php <?php
} }
@ -69,8 +69,8 @@ elseif ( $mode == "split" )
foreach( array_keys($monEventSlots) as $monitorId ) foreach( array_keys($monEventSlots) as $monitorId )
{ {
?> ?>
.monitorColour<?= $monitorId ?> { .monitorColour<?php echo $monitorId ?> {
background-color: <?= $monitors[$monitorId]['WebColour'] ?>; background-color: <?php echo $monitors[$monitorId]['WebColour'] ?>;
} }
<?php <?php
} }

2
web/skins/classic/css/flat/views/watch.css
View File

@ -1,4 +1,4 @@
@import url(../../css/control.css); @import url(../css/control.css);
#menuBar { #menuBar {
margin: 6px auto 4px; margin: 6px auto 4px;

94
web/skins/classic/includes/control_functions.php
View File

@ -119,6 +119,8 @@ function getControlCommands( $monitor )
{ {
$cmds['MoveRoot'] = "moveAbs"; $cmds['MoveRoot'] = "moveAbs";
$cmds['Center'] = $cmds['PresetHome']; $cmds['Center'] = $cmds['PresetHome'];
} else {
$cmds['MoveRoot'] = '';
} }
$cmds['MoveUp'] = $cmds['MoveRoot']."Up"; $cmds['MoveUp'] = $cmds['MoveRoot']."Up";
@ -140,17 +142,17 @@ function controlFocus( $monitor, $cmds )
ob_start(); ob_start();
?> ?>
<div class="arrowControl focusControls"> <div class="arrowControl focusControls">
<div class="arrowLabel"><?= $SLANG['Near'] ?></div> <div class="arrowLabel"><?php echo $SLANG['Near'] ?></div>
<div class="longArrowBtn upBtn" onclick="controlCmd('<?= $cmds['FocusNear'] ?>',event,0,-1)"></div> <div class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['FocusNear'] ?>',event,0,-1)"></div>
<div class="arrowCenter"<?php if ( $monitor['CanFocusCon'] ) { ?> onclick="controlCmd('<?= $cmds['FocusStop'] ?>')"<?php } ?>><?= $SLANG['Focus'] ?></div> <div class="arrowCenter"<?php if ( $monitor['CanFocusCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['FocusStop'] ?>')"<?php } ?>><?php echo $SLANG['Focus'] ?></div>
<div class="longArrowBtn downBtn" onclick="controlCmd('<?= $cmds['FocusFar'] ?>',event,0,1)"></div> <div class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['FocusFar'] ?>',event,0,1)"></div>
<div class="arrowLabel"><?= $SLANG['Far'] ?></div> <div class="arrowLabel"><?php echo $SLANG['Far'] ?></div>
<?php <?php
if ( $monitor['CanAutoFocus'] ) if ( $monitor['CanAutoFocus'] )
{ {
?> ?>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Auto'] ?>" onclick="controlCmd('<?= $cmds['FocusAuto'] ?>')"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Auto'] ?>" onclick="controlCmd('<?php echo $cmds['FocusAuto'] ?>')"/>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Man'] ?>" onclick="controlCmd('<?= $cmds['FocusMan'] ?>')"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Man'] ?>" onclick="controlCmd('<?php echo $cmds['FocusMan'] ?>')"/>
<?php <?php
} }
?> ?>
@ -166,17 +168,17 @@ function controlZoom( $monitor, $cmds )
ob_start(); ob_start();
?> ?>
<div class="arrowControl zoomControls"> <div class="arrowControl zoomControls">
<div class="arrowLabel"><?= $SLANG['Tele'] ?></div> <div class="arrowLabel"><?php echo $SLANG['Tele'] ?></div>
<div class="longArrowBtn upBtn" onclick="controlCmd('<?= $cmds['ZoomTele'] ?>',event,0,-1)"></div> <div class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['ZoomTele'] ?>',event,0,-1)"></div>
<div class="arrowCenter"<?php if ( $monitor['CanZoomCon'] ) { ?> onclick="controlCmd('<?= $cmds['ZoomStop'] ?>')"<?php } ?>><?= $SLANG['Zoom'] ?></div> <div class="arrowCenter"<?php if ( $monitor['CanZoomCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['ZoomStop'] ?>')"<?php } ?>><?php echo $SLANG['Zoom'] ?></div>
<div class="longArrowBtn downBtn" onclick="controlCmd('<?= $cmds['ZoomWide'] ?>',event,0,1)"></div> <div class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['ZoomWide'] ?>',event,0,1)"></div>
<div class="arrowLabel"><?= $SLANG['Wide'] ?></div> <div class="arrowLabel"><?php echo $SLANG['Wide'] ?></div>
<?php <?php
if ( $monitor['CanAutoZoom'] ) if ( $monitor['CanAutoZoom'] )
{ {
?> ?>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Auto'] ?>" onclick="controlCmd('<?= $cmds['ZoomAuto'] ?>')"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Auto'] ?>" onclick="controlCmd('<?php echo $cmds['ZoomAuto'] ?>')"/>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Man'] ?>" onclick="controlCmd('<?= $cmds['ZoomMan'] ?>')"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Man'] ?>" onclick="controlCmd('<?php echo $cmds['ZoomMan'] ?>')"/>
<?php <?php
} }
?> ?>
@ -191,17 +193,17 @@ function controlIris( $monitor, $cmds )
ob_start(); ob_start();
?> ?>
<div class="arrowControl irisControls"> <div class="arrowControl irisControls">
<div class="arrowLabel"><?= $SLANG['Open'] ?></div> <div class="arrowLabel"><?php echo $SLANG['Open'] ?></div>
<div class="longArrowBtn upBtn" onclick="controlCmd('<?= $cmds['IrisOpen'] ?>',event,0,-1)"></div> <div class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['IrisOpen'] ?>',event,0,-1)"></div>
<div class="arrowCenter"<?php if ( $monitor['CanIrisCon'] ) { ?> onclick="controlCmd('<?= $cmds['IrisStop'] ?>')"<?php } ?>><?= $SLANG['Iris'] ?></div> <div class="arrowCenter"<?php if ( $monitor['CanIrisCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['IrisStop'] ?>')"<?php } ?>><?php echo $SLANG['Iris'] ?></div>
<div class="longArrowBtn downBtn" onclick="controlCmd('<?= $cmds['IrisClose'] ?>',event,0,1)"></div> <div class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['IrisClose'] ?>',event,0,1)"></div>
<div class="arrowLabel"><?= $SLANG['Close'] ?></div> <div class="arrowLabel"><?php echo $SLANG['Close'] ?></div>
<?php <?php
if ( $monitor['CanAutoIris'] ) if ( $monitor['CanAutoIris'] )
{ {
?> ?>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Auto'] ?>" onclick="controlCmd('<?= $cmds['IrisAuto'] ?>')"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Auto'] ?>" onclick="controlCmd('<?php echo $cmds['IrisAuto'] ?>')"/>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Man'] ?>" onclick="controlCmd('<?= $cmds['IrisMan'] ?>')"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Man'] ?>" onclick="controlCmd('<?php echo $cmds['IrisMan'] ?>')"/>
<?php <?php
} }
?> ?>
@ -217,17 +219,17 @@ function controlWhite( $monitor, $cmds )
ob_start(); ob_start();
?> ?>
<div class="arrowControl whiteControls"> <div class="arrowControl whiteControls">
<div class="arrowLabel"><?= $SLANG['In'] ?></div> <div class="arrowLabel"><?php echo $SLANG['In'] ?></div>
<div class="longArrowBtn upBtn" onclick="controlCmd('<?= $cmds['WhiteIn'] ?>',event,0,-1)"></div> <div class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['WhiteIn'] ?>',event,0,-1)"></div>
<div class="arrowCenter"<?php if ( $monitor['CanWhiteCon'] ) { ?> onclick="controlCmd('<?= $cmds['WhiteStop'] ?>')"<?php } ?>><?= $SLANG['White'] ?></div> <div class="arrowCenter"<?php if ( $monitor['CanWhiteCon'] ) { ?> onclick="controlCmd('<?php echo $cmds['WhiteStop'] ?>')"<?php } ?>><?php echo $SLANG['White'] ?></div>
<div class="longArrowBtn downBtn" onclick="controlCmd('<?= $cmds['WhiteOut'] ?>',event,0,1)"></div> <div class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['WhiteOut'] ?>',event,0,1)"></div>
<div class="arrowLabel"><?= $SLANG['Out'] ?></div> <div class="arrowLabel"><?php echo $SLANG['Out'] ?></div>
<?php <?php
if ( $monitor['CanAutoWhite'] ) if ( $monitor['CanAutoWhite'] )
{ {
?> ?>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Auto'] ?>" onclick="controlCmd('<?= $cmds['WhiteAuto'] ?>')"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Auto'] ?>" onclick="controlCmd('<?php echo $cmds['WhiteAuto'] ?>')"/>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Man'] ?>" onclick="controlCmd('<?= $cmds['WhiteMan'] ?>')"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Man'] ?>" onclick="controlCmd('<?php echo $cmds['WhiteMan'] ?>')"/>
<?php <?php
} }
?> ?>
@ -243,22 +245,22 @@ function controlPanTilt( $monitor, $cmds )
ob_start(); ob_start();
?> ?>
<div class="pantiltControls"> <div class="pantiltControls">
<div class="pantilLabel"><?= $SLANG['PanTilt'] ?></div> <div class="pantilLabel"><?php echo $SLANG['PanTilt'] ?></div>
<div class="pantiltButtons"> <div class="pantiltButtons">
<?php <?php
$hasPan = $monitor['CanPan']; $hasPan = $monitor['CanPan'];
$hasTilt = $monitor['CanTilt']; $hasTilt = $monitor['CanTilt'];
$hasDiag = $hasPan && $hasTilt && $monitor['CanMoveDiag']; $hasDiag = $hasPan && $hasTilt && $monitor['CanMoveDiag'];
?> ?>
<div class="arrowBtn upLeftBtn<?= $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?= $cmds['MoveUpLeft'] ?>',event,-1,-1)"></div> <div class="arrowBtn upLeftBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUpLeft'] ?>',event,-1,-1)"></div>
<div class="arrowBtn upBtn<?= $hasTilt?'':' invisible' ?>" onclick="controlCmd('<?= $cmds['MoveUp'] ?>',event,0,-1)"></div> <div class="arrowBtn upBtn<?php echo $hasTilt?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUp'] ?>',event,0,-1)"></div>
<div class="arrowBtn upRightBtn<?= $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?= $cmds['MoveUpRight'] ?>',event,1,-1)"></div> <div class="arrowBtn upRightBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUpRight'] ?>',event,1,-1)"></div>
<div class="arrowBtn leftBtn<?= $hasPan?'':' invisible' ?>" onclick="controlCmd('<?= $cmds['MoveLeft'] ?>',event,1,0)"></div> <div class="arrowBtn leftBtn<?php echo $hasPan?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveLeft'] ?>',event,1,0)"></div>
<div class="arrowBtn centerBtn" onclick="controlCmd('<?= $cmds['Center'] ?>')"></div> <div class="arrowBtn centerBtn" onclick="controlCmd('<?php echo $cmds['Center'] ?>')"></div>
<div class="arrowBtn rightBtn<?= $hasPan?'':' invisible' ?>" onclick="controlCmd('<?= $cmds['MoveRight'] ?>',event,1,0)"></div> <div class="arrowBtn rightBtn<?php echo $hasPan?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveRight'] ?>',event,1,0)"></div>
<div class="arrowBtn downLeftBtn<?= $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?= $cmds['MoveDownLeft'] ?>',event,-1,1)"></div> <div class="arrowBtn downLeftBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveDownLeft'] ?>',event,-1,1)"></div>
<div class="arrowBtn downBtn<?= $hasTilt?'':' invisible' ?>" onclick="controlCmd('<?= $cmds['MoveDown'] ?>',event,0,1)"></div> <div class="arrowBtn downBtn<?php echo $hasTilt?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveDown'] ?>',event,0,1)"></div>
<div class="arrowBtn downRightBtn<?= $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?= $cmds['MoveDownRight'] ?>',event,1,1)"></div> <div class="arrowBtn downRightBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveDownRight'] ?>',event,1,1)"></div>
</div> </div>
</div> </div>
<?php <?php
@ -283,12 +285,12 @@ function controlPresets( $monitor, $cmds )
ob_start(); ob_start();
?> ?>
<div class="presetControls"> <div class="presetControls">
<!--<div><?= $SLANG['Presets'] ?></div>--> <!--<div><?php echo $SLANG['Presets'] ?></div>-->
<div> <div>
<?php <?php
for ( $i = 1; $i <= $monitor['NumPresets']; $i++ ) for ( $i = 1; $i <= $monitor['NumPresets']; $i++ )
{ {
?><input type="button" class="ptzNumBtn" title="<?= isset($labels[$i])?$labels[$i]:"" ?>" value="<?= $i ?>" onclick="controlCmd('<?= $cmds['PresetGoto'] ?><?= $i ?>');"/><?php ?><input type="button" class="ptzNumBtn" title="<?php echo isset($labels[$i])?$labels[$i]:"" ?>" value="<?php echo $i ?>" onclick="controlCmd('<?php echo $cmds['PresetGoto'] ?><?php echo $i ?>');"/><?php
if ( $i && (($i%$presetBreak) == 0) ) if ( $i && (($i%$presetBreak) == 0) )
{ {
?><br/><?php ?><br/><?php
@ -301,13 +303,13 @@ function controlPresets( $monitor, $cmds )
if ( $monitor['HasHomePreset'] ) if ( $monitor['HasHomePreset'] )
{ {
?> ?>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Home'] ?>" onclick="controlCmd('<?= $cmds['PresetHome'] ?>');"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Home'] ?>" onclick="controlCmd('<?php echo $cmds['PresetHome'] ?>');"/>
<?php <?php
} }
if ( canEdit( 'Monitors') && $monitor['CanSetPresets'] ) if ( canEdit( 'Monitors') && $monitor['CanSetPresets'] )
{ {
?> ?>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Set'] ?>" onclick="createPopup( '?view=controlpreset&amp;mid=<?= $monitor['Id'] ?>', 'zmPreset', 'preset' );"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Set'] ?>" onclick="createPopup( '?view=controlpreset&amp;mid=<?php echo $monitor['Id'] ?>', 'zmPreset', 'preset' );"/>
<?php <?php
} }
?> ?>
@ -324,25 +326,25 @@ function controlPower( $monitor, $cmds )
ob_start(); ob_start();
?> ?>
<div class="powerControls"> <div class="powerControls">
<div class="powerLabel"><?= $SLANG['Control'] ?></div> <div class="powerLabel"><?php echo $SLANG['Control'] ?></div>
<div> <div>
<?php <?php
if ( $monitor['CanWake'] ) if ( $monitor['CanWake'] )
{ {
?> ?>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Wake'] ?>" onclick="controlCmd('<?= $cmds['Wake'] ?>')"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Wake'] ?>" onclick="controlCmd('<?php echo $cmds['Wake'] ?>')"/>
<?php <?php
} }
if ( $monitor['CanSleep'] ) if ( $monitor['CanSleep'] )
{ {
?> ?>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Sleep'] ?>" onclick="controlCmd('<?= $cmds['Sleep'] ?>')"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Sleep'] ?>" onclick="controlCmd('<?php echo $cmds['Sleep'] ?>')"/>
<?php <?php
} }
if ( $monitor['CanReset'] ) if ( $monitor['CanReset'] )
{ {
?> ?>
<input type="button" class="ptzTextBtn" value="<?= $SLANG['Reset'] ?>" onclick="controlCmd('<?= $cmds['Reset'] ?>')"/> <input type="button" class="ptzTextBtn" value="<?php echo $SLANG['Reset'] ?>" onclick="controlCmd('<?php echo $cmds['Reset'] ?>')"/>
<?php <?php
} }
?> ?>

80
web/skins/classic/includes/export_functions.php
View File

@ -24,7 +24,7 @@ function exportHeader( $title )
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title><?= $title ?></title> <title><?php echo $title ?></title>
<style type="text/css"> <style type="text/css">
<!-- <!--
<?php include( ZM_SKIN_PATH.'/css/export.css' ); ?> <?php include( ZM_SKIN_PATH.'/css/export.css' ); ?>
@ -118,21 +118,21 @@ function exportEventDetail( $event, $exportFrames, $exportImages )
<body> <body>
<div id="page"> <div id="page">
<div id="content"> <div id="content">
<h2><?= $SLANG['Event'] ?>: <?= validHtmlStr($event['Name']) ?><?php if(!empty($otherlinks)) { ?> (<?=$otherlinks?>) <?php } ?></h2> <h2><?php echo $SLANG['Event'] ?>: <?php echo validHtmlStr($event['Name']) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
<table id="eventDetail"> <table id="eventDetail">
<tr><th scope="row"><?= $SLANG['Id'] ?></th><td><?= $event['Id'] ?></td></tr> <tr><th scope="row"><?php echo $SLANG['Id'] ?></th><td><?php echo $event['Id'] ?></td></tr>
<tr><th scope="row"><?= $SLANG['Name'] ?></th><td><?= validHtmlStr($event['Name']) ?></td></tr> <tr><th scope="row"><?php echo $SLANG['Name'] ?></th><td><?php echo validHtmlStr($event['Name']) ?></td></tr>
<tr><th scope="row"><?= $SLANG['Monitor'] ?></th><td><?= validHtmlStr($event['MonitorName']) ?> (<?= $event['MonitorId'] ?>)</td></tr> <tr><th scope="row"><?php echo $SLANG['Monitor'] ?></th><td><?php echo validHtmlStr($event['MonitorName']) ?> (<?php echo $event['MonitorId'] ?>)</td></tr>
<tr><th scope="row"><?= $SLANG['Cause'] ?></th><td><?= validHtmlStr($event['Cause']) ?></td></tr> <tr><th scope="row"><?php echo $SLANG['Cause'] ?></th><td><?php echo validHtmlStr($event['Cause']) ?></td></tr>
<tr><th scope="row"><?= $SLANG['Notes'] ?></th><td><?= validHtmlStr($event['Notes']) ?></td></tr> <tr><th scope="row"><?php echo $SLANG['Notes'] ?></th><td><?php echo validHtmlStr($event['Notes']) ?></td></tr>
<tr><th scope="row"><?= $SLANG['Time'] ?></th><td><?= strftime( STRF_FMT_DATETIME_SHORTER, strtotime($event['StartTime']) ) ?></td></tr> <tr><th scope="row"><?php echo $SLANG['Time'] ?></th><td><?php echo strftime( STRF_FMT_DATETIME_SHORTER, strtotime($event['StartTime']) ) ?></td></tr>
<tr><th scope="row"><?= $SLANG['Duration'] ?></th><td><?= $event['Length'] ?></td></tr> <tr><th scope="row"><?php echo $SLANG['Duration'] ?></th><td><?php echo $event['Length'] ?></td></tr>
<tr><th scope="row"><?= $SLANG['Frames'] ?></th><td><?= $event['Frames'] ?></td></tr> <tr><th scope="row"><?php echo $SLANG['Frames'] ?></th><td><?php echo $event['Frames'] ?></td></tr>
<tr><th scope="row"><?= $SLANG['AttrAlarmFrames'] ?></th><td><?= $event['AlarmFrames'] ?></td></tr> <tr><th scope="row"><?php echo $SLANG['AttrAlarmFrames'] ?></th><td><?php echo $event['AlarmFrames'] ?></td></tr>
<tr><th scope="row"><?= $SLANG['AttrTotalScore'] ?></th><td><?= $event['TotScore'] ?></td></tr> <tr><th scope="row"><?php echo $SLANG['AttrTotalScore'] ?></th><td><?php echo $event['TotScore'] ?></td></tr>
<tr><th scope="row"><?= $SLANG['AttrAvgScore'] ?></th><td><?= $event['AvgScore'] ?></td></tr> <tr><th scope="row"><?php echo $SLANG['AttrAvgScore'] ?></th><td><?php echo $event['AvgScore'] ?></td></tr>
<tr><th scope="row"><?= $SLANG['AttrMaxScore'] ?></th><td><?= $event['MaxScore'] ?></td></tr> <tr><th scope="row"><?php echo $SLANG['AttrMaxScore'] ?></th><td><?php echo $event['MaxScore'] ?></td></tr>
<tr><th scope="row"><?= $SLANG['Archived'] ?></th><td><?= $event['Archived']?$SLANG['Yes']:$SLANG['No'] ?></td></tr> <tr><th scope="row"><?php echo $SLANG['Archived'] ?></th><td><?php echo $event['Archived']?$SLANG['Yes']:$SLANG['No'] ?></td></tr>
</table> </table>
</div> </div>
</div> </div>
@ -161,19 +161,19 @@ function exportEventFrames( $event, $exportDetail, $exportImages )
<body> <body>
<div id="page"> <div id="page">
<div id="content"> <div id="content">
<h2><?= $SLANG['Frames'] ?>: <?= validHtmlStr($event['Name']) ?><?php if(!empty($otherlinks)) { ?> (<?=$otherlinks?>) <?php } ?></h2> <h2><?php echo $SLANG['Frames'] ?>: <?php echo validHtmlStr($event['Name']) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
<table id="eventFrames"> <table id="eventFrames">
<tr> <tr>
<th><?= $SLANG['FrameId'] ?></th> <th><?php echo $SLANG['FrameId'] ?></th>
<th><?= $SLANG['Type'] ?></th> <th><?php echo $SLANG['Type'] ?></th>
<th><?= $SLANG['TimeStamp'] ?></th> <th><?php echo $SLANG['TimeStamp'] ?></th>
<th><?= $SLANG['TimeDelta'] ?></th> <th><?php echo $SLANG['TimeDelta'] ?></th>
<th><?= $SLANG['Score'] ?></th> <th><?php echo $SLANG['Score'] ?></th>
<?php <?php
if ( $exportImages ) if ( $exportImages )
{ {
?> ?>
<th><?= $SLANG['Image'] ?></th> <th><?php echo $SLANG['Image'] ?></th>
<?php <?php
} }
?> ?>
@ -194,17 +194,17 @@ function exportEventFrames( $event, $exportDetail, $exportImages )
$class = strtolower($frame['Type']); $class = strtolower($frame['Type']);
?> ?>
<tr class="<?= $class ?>"> <tr class="<?php echo $class ?>">
<td><?= $frame['FrameId'] ?></td> <td><?php echo $frame['FrameId'] ?></td>
<td><?= $frame['Type'] ?></td> <td><?php echo $frame['Type'] ?></td>
<td><?= strftime( STRF_FMT_TIME, $frame['UnixTimeStamp'] ) ?></td> <td><?php echo strftime( STRF_FMT_TIME, $frame['UnixTimeStamp'] ) ?></td>
<td><?= number_format( $frame['Delta'], 2 ) ?></td> <td><?php echo number_format( $frame['Delta'], 2 ) ?></td>
<td><?= $frame['Score'] ?></td> <td><?php echo $frame['Score'] ?></td>
<?php <?php
if ( $exportImages ) if ( $exportImages )
{ {
?> ?>
<td><a href="<?= $imageFile ?>" target="zmExportImage"><img src="<?= $imageFile ?>" border="0" class="thumb" alt="Frame <?= $frame['FrameId'] ?>"/></a></td> <td><a href="<?php echo $imageFile ?>" target="zmExportImage"><img src="<?php echo $imageFile ?>" border="0" class="thumb" alt="Frame <?php echo $frame['FrameId'] ?>"/></a></td>
<?php <?php
} }
?> ?>
@ -216,7 +216,7 @@ function exportEventFrames( $event, $exportDetail, $exportImages )
{ {
?> ?>
<tr> <tr>
<td class="monoRow" colspan="<?= $exportImages?6:5 ?>"><?= $SLANG['NoFramesRecorded'] ?></td> <td class="monoRow" colspan="<?php echo $exportImages?6:5 ?>"><?php echo $SLANG['NoFramesRecorded'] ?></td>
</tr> </tr>
<?php <?php
} }
@ -249,9 +249,9 @@ function exportEventImages( $event, $exportDetail, $exportFrames, $myfilelist )
?> ?>
<body> <body>
<style> <style>
*.horizontal_track {background-color: #bbb;width: <?=$event['Width']?>px;line-height: 0px;font-size: 0px;text-align: left;padding: 4px;border: 1px solid;border-color: #ddd #999 #999 #ddd;} *.horizontal_track {background-color: #bbb;width: <?php echo$event['Width']?>px;line-height: 0px;font-size: 0px;text-align: left;padding: 4px;border: 1px solid;border-color: #ddd #999 #999 #ddd;}
*.horizontal_slider {background-color: #666;width: 16px;height: 8px;position: relative;z-index: 2;line-height: 0;margin: 0;border: 2px solid;border-color: #999 #333 #333 #999;} *.horizontal_slider {background-color: #666;width: 16px;height: 8px;position: relative;z-index: 2;line-height: 0;margin: 0;border: 2px solid;border-color: #999 #333 #333 #999;}
*.horizontal_slit {background-color: #333;width: <?=($event['Width']-10)?>px;height: 2px;margin: 4px 4px 2px 4px;line-height: 0;position: absolute;z-index: 1;border: 1px solid;border-color: #999 #ddd #ddd #999;} *.horizontal_slit {background-color: #333;width: <?php echo($event['Width']-10)?>px;height: 2px;margin: 4px 4px 2px 4px;line-height: 0;position: absolute;z-index: 1;border: 1px solid;border-color: #999 #ddd #ddd #999;}
*.vertical_track {background-color: #bbb;padding: 3px 5px 15px 5px;border: 1px solid;border-color: #ddd #999 #999 #ddd;} *.vertical_track {background-color: #bbb;padding: 3px 5px 15px 5px;border: 1px solid;border-color: #ddd #999 #999 #ddd;}
*.vertical_slider {background-color: #666;width: 18px;height: 8px;font: 0px;text-align: left;line-height: 0px;position: relative;z-index: 1;border: 2px solid;border-color: #999 #333 #333 #999;} *.vertical_slider {background-color: #666;width: 18px;height: 8px;font: 0px;text-align: left;line-height: 0px;position: relative;z-index: 1;border: 2px solid;border-color: #999 #333 #333 #999;}
*.vertical_slit {background-color: #000;width: 2px;height: 100px;position: absolute;margin: 4px 10px 4px 10px;padding: 4px 0 1px 0;line-height: 0;font-size: 0;border: 1px solid;border-color: #666 #ccc #ccc #666;} *.vertical_slit {background-color: #000;width: 2px;height: 100px;position: absolute;margin: 4px 10px 4px 10px;padding: 4px 0 1px 0;line-height: 0;font-size: 0;border: 1px solid;border-color: #666 #ccc #ccc #666;}
@ -259,7 +259,7 @@ function exportEventImages( $event, $exportDetail, $exportFrames, $myfilelist )
.value_display {background-color: #bbb;color: #333;width: 30px;margin: 0 2px;text-align: right;font-size: 8pt;font-face: verdana, arial, helvetica, sans-serif;font-weight: bold;line-height: 12px;border: 0;cursor: default;} .value_display {background-color: #bbb;color: #333;width: 30px;margin: 0 2px;text-align: right;font-size: 8pt;font-face: verdana, arial, helvetica, sans-serif;font-weight: bold;line-height: 12px;border: 0;cursor: default;}
</style> </style>
<h2><?= $SLANG['Images'] ?>: <?= validHtmlStr($event['Name']) ?><?php if(!empty($otherlinks)) { ?> (<?=$otherlinks?>) <?php } ?></h2> <h2><?php echo $SLANG['Images'] ?>: <?php echo validHtmlStr($event['Name']) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
<ilayer id="slidensmain" width=&{slidewidth}; height=&{slideheight}; bgColor=&{slidebgcolor}; visibility=hide> <ilayer id="slidensmain" width=&{slidewidth}; height=&{slideheight}; bgColor=&{slidebgcolor}; visibility=hide>
<layer id="slidenssub" width=&{slidewidth}; left=auto top=auto></layer> <layer id="slidenssub" width=&{slidewidth}; left=auto top=auto></layer>
@ -277,7 +277,7 @@ function exportEventImages( $event, $exportDetail, $exportFrames, $myfilelist )
<div align="center"><div class="horizontal_track" > <div align="center"><div class="horizontal_track" >
<div class="horizontal_slit" >&nbsp;</div> <div class="horizontal_slit" >&nbsp;</div>
<div class="horizontal_slider" id="imageslider_id" style="left: 0px;" <div class="horizontal_slider" id="imageslider_id" style="left: 0px;"
onmousedown="slide(event,'horizontal', <?=($event['Width']-20)?>, 1, <?=$listcount?>, <?=$listcount?>,0, 'imageslider_display_id');" >&nbsp;</div> onmousedown="slide(event,'horizontal', <?php echo($event['Width']-20)?>, 1, <?php echo$listcount?>, <?php echo$listcount?>,0, 'imageslider_display_id');" >&nbsp;</div>
</div></div> </div></div>
<div align="center"><div class="display_holder" ><input id="imageslider_display_id" class="value_display" type="text" value="0" onfocus="blur(this);" /></div></div> <div align="center"><div class="display_holder" ><input id="imageslider_display_id" class="value_display" type="text" value="0" onfocus="blur(this);" /></div></div>
@ -290,9 +290,9 @@ function exportEventImages( $event, $exportDetail, $exportFrames, $myfilelist )
* Visit http://www.dynamicdrive.com/ for full source code * Visit http://www.dynamicdrive.com/ for full source code
***********************************************/ ***********************************************/
var eventWidth = <?=$event['Width']?>; var eventWidth = <?php echo$event['Width']?>;
var eventHeight = <?=$event['Height']?>; var eventHeight = <?php echo$event['Height']?>;
var variableslide=[<?=$slides?>]; var variableslide=[<?php echo$slides?>];
//configure the below 3 variables to set the dimension/background color of the slideshow //configure the below 3 variables to set the dimension/background color of the slideshow
@ -596,7 +596,7 @@ function exportEventImagesMaster( $eids )
exportHeader( $SLANG['Images'].' Master' ); exportHeader( $SLANG['Images'].' Master' );
?> ?>
<body> <body>
<h2><?= $SLANG['Images'] ?> Master</h2> <h2><?php echo $SLANG['Images'] ?> Master</h2>
<?php <?php
foreach ($eids as $eid) { foreach ($eids as $eid) {
//get monitor id and event id //get monitor id and event id
@ -644,7 +644,7 @@ function exportEventImagesMaster( $eids )
<?php foreach($eids as $eid) <?php foreach($eids as $eid)
{ {
?> ?>
<div><a href="javascript:switchevent('<?php echo $eventMonitorId[$eid].'/' . $eid; ?>/zmEventImages.html');"><?=$eid?></a></div> <div><a href="javascript:switchevent('<?php echo $eventMonitorId[$eid].'/' . $eid; ?>/zmEventImages.html');"><?php echo$eid?></a></div>
<?php <?php
} }
?> ?>
@ -660,7 +660,7 @@ function exportEventImagesMaster( $eids )
if ($eventMonitorId[$eid] == $monitor) if ($eventMonitorId[$eid] == $monitor)
{ {
?> ?>
<div><a href="javascript:switchevent('<?php echo $eventMonitorId[$eid].'/' . $eid; ?>/zmEventImages.html');"><?=$eid?></a></div> <div><a href="javascript:switchevent('<?php echo $eventMonitorId[$eid].'/' . $eid; ?>/zmEventImages.html');"><?php echo$eid?></a></div>
<?php <?php
} }
} }

10
web/skins/classic/includes/functions.php
View File

@ -38,17 +38,17 @@ function xhtmlHeaders( $file, $title )
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title><?= ZM_WEB_TITLE_PREFIX ?> - <?= validHtmlStr($title) ?></title> <title><?php echo ZM_WEB_TITLE_PREFIX ?> - <?php echo validHtmlStr($title) ?></title>
<link rel="icon" type="image/ico" href="graphics/favicon.ico"/> <link rel="icon" type="image/ico" href="graphics/favicon.ico"/>
<link rel="shortcut icon" href="graphics/favicon.ico"/> <link rel="shortcut icon" href="graphics/favicon.ico"/>
<link rel="stylesheet" href="css/reset.css" type="text/css"/> <link rel="stylesheet" href="css/reset.css" type="text/css"/>
<link rel="stylesheet" href="css/overlay.css" type="text/css"/> <link rel="stylesheet" href="css/overlay.css" type="text/css"/>
<link rel="stylesheet" href="<?= $skinCssFile ?>" type="text/css" media="screen"/> <link rel="stylesheet" href="<?php echo $skinCssFile ?>" type="text/css" media="screen"/>
<?php <?php
if ( $viewCssFile ) if ( $viewCssFile )
{ {
?> ?>
<link rel="stylesheet" href="<?= $viewCssFile ?>" type="text/css" media="screen"/> <link rel="stylesheet" href="<?php echo $viewCssFile ?>" type="text/css" media="screen"/>
<?php <?php
} }
if ( $viewCssPhpFile ) if ( $viewCssPhpFile )
@ -99,12 +99,12 @@ function xhtmlHeaders( $file, $title )
<?php <?php
} }
?> ?>
<script type="text/javascript" src="<?= $skinJsFile ?>"></script> <script type="text/javascript" src="<?php echo $skinJsFile ?>"></script>
<?php <?php
if ( $viewJsFile ) if ( $viewJsFile )
{ {
?> ?>
<script type="text/javascript" src="<?= $viewJsFile ?>"></script> <script type="text/javascript" src="<?php echo $viewJsFile ?>"></script>
<?php <?php
} }
?> ?>

18
web/skins/classic/js/skin.js.php
View File

@ -24,17 +24,17 @@
// //
?> ?>
var AJAX_TIMEOUT = <?= ZM_WEB_AJAX_TIMEOUT ?>; var AJAX_TIMEOUT = <?php echo ZM_WEB_AJAX_TIMEOUT ?>;
var currentView = '<?= $view ?>'; var currentView = '<?php echo $view ?>';
var thisUrl = "<?= ZM_BASE_URL.$_SERVER['PHP_SELF'] ?>"; var thisUrl = "<?php echo ZM_BASE_URL.$_SERVER['PHP_SELF'] ?>";
var skinPath = "<?= ZM_SKIN_PATH ?>"; var skinPath = "<?php echo ZM_SKIN_PATH ?>";
var canEditSystem = <?= canEdit('System' )?'true':'false' ?>; var canEditSystem = <?php echo canEdit('System' )?'true':'false' ?>;
var canViewSystem = <?= canView('System' )?'true':'false' ?>; var canViewSystem = <?php echo canView('System' )?'true':'false' ?>;
var refreshParent = <?= !empty($refreshParent)?'true':'false' ?>; var refreshParent = <?php echo !empty($refreshParent)?'true':'false' ?>;
var focusWindow = <?= !empty($focusWindow)?'true':'false' ?>; var focusWindow = <?php echo !empty($focusWindow)?'true':'false' ?>;
var imagePrefix = "<?= viewImagePath( "", '&' ) ?>"; var imagePrefix = "<?php echo viewImagePath( "", '&' ) ?>";

10
web/skins/classic/views/bandwidth.php
View File

@ -40,16 +40,16 @@ xhtmlHeaders(__FILE__, $SLANG['Bandwidth'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Bandwidth'] ?></h2> <h2><?php echo $SLANG['Bandwidth'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<input type="hidden" name="action" value="bandwidth"/> <input type="hidden" name="action" value="bandwidth"/>
<p><?= $SLANG['SetNewBandwidth'] ?></p> <p><?php echo $SLANG['SetNewBandwidth'] ?></p>
<p><?= buildSelect( "newBandwidth", $bwArray ) ?></p> <p><?php echo buildSelect( "newBandwidth", $bwArray ) ?></p>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow();"/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
</div> </div>
</form> </form>
</div> </div>

79
web/skins/classic/views/console.php
View File

@ -18,6 +18,11 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// //
if ( ZM_OPT_USE_AUTH && ! isset($user) ) {
$view = "error";
return;
}
$eventCounts = array( $eventCounts = array(
array( array(
"title" => $SLANG['Events'], "title" => $SLANG['Events'],
@ -182,33 +187,33 @@ xhtmlHeaders( __FILE__, $SLANG['Console'] );
?> ?>
<body> <body>
<div id="page"> <div id="page">
<form name="monitorForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="monitorForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value=""/> <input type="hidden" name="action" value=""/>
<div id="header"> <div id="header">
<h3 id="systemTime"><?= preg_match( '/%/', DATE_FMT_CONSOLE_LONG )?strftime( DATE_FMT_CONSOLE_LONG ):date( DATE_FMT_CONSOLE_LONG ) ?></h3> <h3 id="systemTime"><?php echo preg_match( '/%/', DATE_FMT_CONSOLE_LONG )?strftime( DATE_FMT_CONSOLE_LONG ):date( DATE_FMT_CONSOLE_LONG ) ?></h3>
<h3 id="systemStats"><?= $SLANG['Load'] ?>: <?= getLoad() ?> / <?= $SLANG['Disk'] ?>: <?= getDiskPercent() ?>%</h3> <h3 id="systemStats"><?php echo $SLANG['Load'] ?>: <?php echo getLoad() ?> / <?php echo $SLANG['Disk'] ?>: <?php echo getDiskPercent() ?>%</h3>
<h2 id="title"><a href="http://www.zoneminder.com" target="ZoneMinder">ZoneMinder</a> <?= $SLANG['Console'] ?> - <?= makePopupLink( '?view=state', 'zmState', 'state', $status, canEdit( 'System' ) ) ?> - <?= makePopupLink( '?view=version', 'zmVersion', 'version', '<span class="'.$versionClass.'">v'.ZM_VERSION.'</span>', canEdit( 'System' ) ) ?></h2> <h2 id="title"><a href="http://www.zoneminder.com" target="ZoneMinder">ZoneMinder</a> <?php echo $SLANG['Console'] ?> - <?php echo makePopupLink( '?view=state', 'zmState', 'state', $status, canEdit( 'System' ) ) ?> - <?php echo makePopupLink( '?view=version', 'zmVersion', 'version', '<span class="'.$versionClass.'">v'.ZM_VERSION.'</span>', canEdit( 'System' ) ) ?></h2>
<div class="clear"></div> <div class="clear"></div>
<div id="monitorSummary"><?= makePopupLink( '?view=groups', 'zmGroups', 'groups', 'Group: ' . ($group?' ('.$group['Name'].')':'All').': '. sprintf( $CLANG['MonitorCount'], count($displayMonitors), zmVlang( $VLANG['Monitor'], count($displayMonitors) ) ) ); ?></div> <div id="monitorSummary"><?php echo makePopupLink( '?view=groups', 'zmGroups', 'groups', 'Group: ' . ($group?' ('.$group['Name'].')':'All').': '. sprintf( $CLANG['MonitorCount'], count($displayMonitors), zmVlang( $VLANG['Monitor'], count($displayMonitors) ) ) ); ?></div>
<?php <?php
if ( ZM_OPT_X10 && canView( 'Devices' ) ) if ( ZM_OPT_X10 && canView( 'Devices' ) )
{ {
?> ?>
<div id="devices"><?= makePopupLink( '?view=devices', 'zmDevices', 'devices', $SLANG['Devices'] ) ?></div> <div id="devices"><?php echo makePopupLink( '?view=devices', 'zmDevices', 'devices', $SLANG['Devices'] ) ?></div>
<?php <?php
} }
if ( canView( 'System' ) ) if ( canView( 'System' ) )
{ {
?> ?>
<div id="options"><?= makePopupLink( '?view=options', 'zmOptions', 'options', $SLANG['Options'] ) ?><?php if ( logToDatabase() > Logger::NOLOG ) { ?> / <?= makePopupLink( '?view=log', 'zmLog', 'log', '<span class="'.logState().'">'.$SLANG['Log'].'</span>' ) ?><?php } ?></div> <div id="options"><?php echo makePopupLink( '?view=options', 'zmOptions', 'options', $SLANG['Options'] ) ?><?php if ( logToDatabase() > Logger::NOLOG ) { ?> / <?php echo makePopupLink( '?view=log', 'zmLog', 'log', '<span class="'.logState().'">'.$SLANG['Log'].'</span>' ) ?><?php } ?></div>
<?php <?php
} }
if ( canView( 'Stream' ) && $cycleCount > 1 ) if ( canView( 'Stream' ) && $cycleCount > 1 )
{ {
$cycleGroup = isset($_COOKIE['zmGroup'])?$_COOKIE['zmGroup']:0; $cycleGroup = isset($_COOKIE['zmGroup'])?$_COOKIE['zmGroup']:0;
?> ?>
<div id="cycleMontage"><?= makePopupLink( '?view=cycle&amp;group='.$cycleGroup, 'zmCycle'.$cycleGroup, array( 'cycle', $cycleWidth, $cycleHeight ), $SLANG['Cycle'], $running ) ?>&nbsp;/&nbsp;<?= makePopupLink( '?view=montage&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montage', $SLANG['Montage'], $running ) ?></div> <div id="cycleMontage"><?php echo makePopupLink( '?view=cycle&amp;group='.$cycleGroup, 'zmCycle'.$cycleGroup, array( 'cycle', $cycleWidth, $cycleHeight ), $SLANG['Cycle'], $running ) ?>&nbsp;/&nbsp;<?php echo makePopupLink( '?view=montage&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montage', $SLANG['Montage'], $running ) ?></div>
<?php <?php
} }
else else
@ -220,59 +225,59 @@ else
<h3 id="loginBandwidth"><?php <h3 id="loginBandwidth"><?php
if ( ZM_OPT_USE_AUTH ) if ( ZM_OPT_USE_AUTH )
{ {
?><?= $SLANG['LoggedInAs'] ?> <?= makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?>, <?= strtolower( $SLANG['ConfiguredFor'] ) ?><?php ?><?php echo $SLANG['LoggedInAs'] ?> <?php echo makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?>, <?php echo strtolower( $SLANG['ConfiguredFor'] ) ?><?php
} }
else else
{ {
?><?= $SLANG['ConfiguredFor'] ?><?php ?><?php echo $SLANG['ConfiguredFor'] ?><?php
} }
?>&nbsp;<?= makePopupLink( '?view=bandwidth', 'zmBandwidth', 'bandwidth', $bwArray[$_COOKIE['zmBandwidth']], ($user && $user['MaxBandwidth'] != 'low' ) ) ?> <?= $SLANG['BandwidthHead'] ?></h3> ?>&nbsp;<?php echo makePopupLink( '?view=bandwidth', 'zmBandwidth', 'bandwidth', $bwArray[$_COOKIE['zmBandwidth']], ($user && $user['MaxBandwidth'] != 'low' ) ) ?> <?php echo $SLANG['BandwidthHead'] ?></h3>
</div> </div>
<div id="content"> <div id="content">
<table id="consoleTable" cellspacing="0"> <table id="consoleTable" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th class="colName"><?= $SLANG['Name'] ?></th> <th class="colName"><?php echo $SLANG['Name'] ?></th>
<th class="colFunction"><?= $SLANG['Function'] ?></th> <th class="colFunction"><?php echo $SLANG['Function'] ?></th>
<th class="colSource"><?= $SLANG['Source'] ?></th> <th class="colSource"><?php echo $SLANG['Source'] ?></th>
<?php <?php
for ( $i = 0; $i < count($eventCounts); $i++ ) for ( $i = 0; $i < count($eventCounts); $i++ )
{ {
?> ?>
<th class="colEvents"><?= $eventCounts[$i]['title'] ?></th> <th class="colEvents"><?php echo $eventCounts[$i]['title'] ?></th>
<?php <?php
} }
?> ?>
<th class="colZones"><?= $SLANG['Zones'] ?></th> <th class="colZones"><?php echo $SLANG['Zones'] ?></th>
<?php <?php
if ( canEdit('Monitors') ) if ( canEdit('Monitors') )
{ {
?> ?>
<th class="colOrder"><?= $SLANG['Order'] ?></th> <th class="colOrder"><?php echo $SLANG['Order'] ?></th>
<?php <?php
} }
?> ?>
<th class="colMark"><?= $SLANG['Mark'] ?></th> <th class="colMark"><?php echo $SLANG['Mark'] ?></th>
</tr> </tr>
</thead> </thead>
<tfoot> <tfoot>
<tr> <tr>
<td class="colLeftButtons" colspan="3"> <td class="colLeftButtons" colspan="3">
<input type="button" value="<?= $SLANG['Refresh'] ?>" onclick="location.reload(true);"/> <input type="button" value="<?php echo $SLANG['Refresh'] ?>" onclick="location.reload(true);"/>
<?= makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', $SLANG['AddNewMonitor'], (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', $SLANG['AddNewMonitor'], (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?>
<?= makePopupButton( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', $SLANG['Filters'], canView( 'Events' ) ) ?> <?php echo makePopupButton( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', $SLANG['Filters'], canView( 'Events' ) ) ?>
</td> </td>
<?php <?php
for ( $i = 0; $i < count($eventCounts); $i++ ) for ( $i = 0; $i < count($eventCounts); $i++ )
{ {
parseFilter( $eventCounts[$i]['filter'] ); parseFilter( $eventCounts[$i]['filter'] );
?> ?>
<td class="colEvents"><?= makePopupLink( '?view='.$eventsView.'&amp;page=1'.$eventCounts[$i]['filter']['query'], $eventsWindow, $eventsView, $eventCounts[$i]['total'], canView( 'Events' ) ) ?></td> <td class="colEvents"><?php echo makePopupLink( '?view='.$eventsView.'&amp;page=1'.$eventCounts[$i]['filter']['query'], $eventsWindow, $eventsView, $eventCounts[$i]['total'], canView( 'Events' ) ) ?></td>
<?php <?php
} }
?> ?>
<td class="colZones"><?= $zoneCount ?></td> <td class="colZones"><?php echo $zoneCount ?></td>
<td class="colRightButtons" colspan="<?= canEdit('Monitors')?2:1 ?>"><input type="button" name="editBtn" value="<?= $SLANG['Edit'] ?>" onclick="editMonitor( this )" disabled="disabled"/><input type="button" name="deleteBtn" value="<?= $SLANG['Delete'] ?>" onclick="deleteMonitor( this )" disabled="disabled"/></td> <td class="colRightButtons" colspan="<?php echo canEdit('Monitors')?2:1 ?>"><input type="button" name="editBtn" value="<?php echo $SLANG['Edit'] ?>" onclick="editMonitor( this )" disabled="disabled"/><input type="button" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" onclick="deleteMonitor( this )" disabled="disabled"/></td>
</tr> </tr>
</tfoot> </tfoot>
<tbody> <tbody>
@ -301,23 +306,23 @@ foreach( $displayMonitors as $monitor )
$fclass .= " disabledText"; $fclass .= " disabledText";
$scale = max( reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE ); $scale = max( reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
?> ?>
<td class="colName"><?= makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td> <td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
<td class="colFunction"><?= makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.$SLANG['Fn'.$monitor['Function']].( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td> <td class="colFunction"><?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.$SLANG['Fn'.$monitor['Function']].( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
<?php if ( $monitor['Type'] == "Local" ) { ?> <?php if ( $monitor['Type'] == "Local" ) { ?>
<td class="colSource"><?= makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$monitor['Device'].' ('.$monitor['Channel'].')</span>', canEdit( 'Monitors' ) ) ?></td> <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$monitor['Device'].' ('.$monitor['Channel'].')</span>', canEdit( 'Monitors' ) ) ?></td>
<?php } elseif ( $monitor['Type'] == "Remote" ) { ?> <?php } elseif ( $monitor['Type'] == "Remote" ) { ?>
<td class="colSource"><?= makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*@/', '', $monitor['Host'] ).'</span>', canEdit( 'Monitors' ) ) ?></td> <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*@/', '', $monitor['Host'] ).'</span>', canEdit( 'Monitors' ) ) ?></td>
<?php } elseif ( $monitor['Type'] == "File" ) { ?> <?php } elseif ( $monitor['Type'] == "File" ) { ?>
<td class="colSource"><?= makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*\//', '', $monitor['Path'] ).'</span>', canEdit( 'Monitors' ) ) ?></td> <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*\//', '', $monitor['Path'] ).'</span>', canEdit( 'Monitors' ) ) ?></td>
<?php } elseif ( $monitor['Type'] == "Ffmpeg" ) { ?> <?php } elseif ( $monitor['Type'] == "Ffmpeg" ) { ?>
<td class="colSource"><?= makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*\//', '', $monitor['Path'] ).'</span>', canEdit( 'Monitors' ) ) ?></td> <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*\//', '', $monitor['Path'] ).'</span>', canEdit( 'Monitors' ) ) ?></td>
<?php } elseif ( $monitor['Type'] == "Libvlc" ) { <?php } elseif ( $monitor['Type'] == "Libvlc" ) {
$domain = parse_url( $monitor['Path'], PHP_URL_HOST ); $domain = parse_url( $monitor['Path'], PHP_URL_HOST );
$shortpath = $domain ? $domain : preg_replace( '/^.*\//', '', $monitor['Path'] ); $shortpath = $domain ? $domain : preg_replace( '/^.*\//', '', $monitor['Path'] );
?> ?>
<td class="colSource"><?= makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$shortpath.'</span>', canEdit( 'Monitors' ) ) ?></td> <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$shortpath.'</span>', canEdit( 'Monitors' ) ) ?></td>
<?php } elseif ( $monitor['Type'] == "cURL" ) { ?> <?php } elseif ( $monitor['Type'] == "cURL" ) { ?>
<td class="colSource"><?= makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*\//', '', $monitor['Path'] ).'</span>', canEdit( 'Monitors' ) ) ?></td> <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.preg_replace( '/^.*\//', '', $monitor['Path'] ).'</span>', canEdit( 'Monitors' ) ) ?></td>
<?php } else { ?> <?php } else { ?>
<td class="colSource">&nbsp;</td> <td class="colSource">&nbsp;</td>
<?php } ?> <?php } ?>
@ -325,20 +330,20 @@ foreach( $displayMonitors as $monitor )
for ( $i = 0; $i < count($eventCounts); $i++ ) for ( $i = 0; $i < count($eventCounts); $i++ )
{ {
?> ?>
<td class="colEvents"><?= makePopupLink( '?view='.$eventsView.'&amp;page=1'.$monitor['eventCounts'][$i]['filter']['query'], $eventsWindow, $eventsView, $monitor['EventCount'.$i], canView( 'Events' ) ) ?></td> <td class="colEvents"><?php echo makePopupLink( '?view='.$eventsView.'&amp;page=1'.$monitor['eventCounts'][$i]['filter']['query'], $eventsWindow, $eventsView, $monitor['EventCount'.$i], canView( 'Events' ) ) ?></td>
<?php <?php
} }
?> ?>
<td class="colZones"><?= makePopupLink( '?view=zones&amp;mid='.$monitor['Id'], 'zmZones', array( 'zones', $monitor['Width'], $monitor['Height'] ), $monitor['ZoneCount'], canView( 'Monitors' ) ) ?></td> <td class="colZones"><?php echo makePopupLink( '?view=zones&amp;mid='.$monitor['Id'], 'zmZones', array( 'zones', $monitor['Width'], $monitor['Height'] ), $monitor['ZoneCount'], canView( 'Monitors' ) ) ?></td>
<?php <?php
if ( canEdit('Monitors') ) if ( canEdit('Monitors') )
{ {
?> ?>
<td class="colOrder"><?= makeLink( '?view='.$view.'&amp;action=sequence&amp;mid='.$monitor['Id'].'&amp;smid='.$seqIdUpList[$monitor['Id']], '<img src="'.$seqUpFile.'" alt="Up"/>', $monitor['Sequence']>$minSequence ) ?><?= makeLink( '?view='.$view.'&amp;action=sequence&amp;mid='.$monitor['Id'].'&amp;smid='.$seqIdDownList[$monitor['Id']], '<img src="'.$seqDownFile.'" alt="Down"/>', $monitor['Sequence']<$maxSequence ) ?></td> <td class="colOrder"><?php echo makeLink( '?view='.$view.'&amp;action=sequence&amp;mid='.$monitor['Id'].'&amp;smid='.$seqIdUpList[$monitor['Id']], '<img src="'.$seqUpFile.'" alt="Up"/>', $monitor['Sequence']>$minSequence ) ?><?php echo makeLink( '?view='.$view.'&amp;action=sequence&amp;mid='.$monitor['Id'].'&amp;smid='.$seqIdDownList[$monitor['Id']], '<img src="'.$seqDownFile.'" alt="Down"/>', $monitor['Sequence']<$maxSequence ) ?></td>
<?php <?php
} }
?> ?>
<td class="colMark"><input type="checkbox" name="markMids[]" value="<?= $monitor['Id'] ?>" onclick="setButtonStates( this )"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></td> <td class="colMark"><input type="checkbox" name="markMids[]" value="<?php echo $monitor['Id'] ?>" onclick="setButtonStates( this )"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></td>
</tr> </tr>
<?php <?php
} }

12
web/skins/classic/views/control.php
View File

@ -59,19 +59,19 @@ xhtmlHeaders(__FILE__, $SLANG['Control'] );
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<a href="#" onclick="closeWindow();"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a>
</div> </div>
<h2><?= $SLANG['Control'] ?></h2> <h2><?php echo $SLANG['Control'] ?></h2>
<div id="headerControl"> <div id="headerControl">
<form name="contentForm" id="contentForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<?= buildSelect( "mid", $mids, "this.form.submit();" ); ?> <?php echo buildSelect( "mid", $mids, "this.form.submit();" ); ?>
</form> </form>
</div> </div>
</div> </div>
<div id="content"> <div id="content">
<div id="ptzControls" class="ptzControls"> <div id="ptzControls" class="ptzControls">
<?= ptzControls( $monitor ) ?> <?php echo ptzControls( $monitor ) ?>
</div> </div>
</div> </div>
</div> </div>

396
web/skins/classic/views/controlcap.php
View File

@ -160,7 +160,7 @@ xhtmlHeaders(__FILE__, $SLANG['ControlCap']." - ".$newControl['Name'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['ControlCap'] ?> - <?= $newControl['Name'] ?></h2> <h2><?php echo $SLANG['ControlCap'] ?> - <?php echo $newControl['Name'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<ul class="tabList"> <ul class="tabList">
@ -170,168 +170,168 @@ foreach ( $tabs as $name=>$value )
if ( $tab == $name ) if ( $tab == $name )
{ {
?> ?>
<li class="active"><?= $value ?></li> <li class="active"><?php echo $value ?></li>
<?php <?php
} }
else else
{ {
?> ?>
<li><a href="#" onclick="submitTab( '<?= $name ?>' ); return( false );"><?= $value ?></a></li> <li><a href="#" onclick="submitTab( '<?php echo $name ?>' ); return( false );"><?php echo $value ?></a></li>
<?php <?php
} }
} }
?> ?>
</ul> </ul>
<div class="clear"></div> <div class="clear"></div>
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="tab" value="<?= $tab ?>"/> <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
<input type="hidden" name="action" value="controlcap"/> <input type="hidden" name="action" value="controlcap"/>
<input type="hidden" name="cid" value="<?= requestVar('cid') ?>"/> <input type="hidden" name="cid" value="<?php echo requestVar('cid') ?>"/>
<?php <?php
if ( $tab != 'main' ) if ( $tab != 'main' )
{ {
?> ?>
<input type="hidden" name="newControl[Name]" value="<?= validHtmlStr($newControl['Name']) ?>"/> <input type="hidden" name="newControl[Name]" value="<?php echo validHtmlStr($newControl['Name']) ?>"/>
<input type="hidden" name="newControl[Type]" value="<?= validHtmlStr($newControl['Type']) ?>"/> <input type="hidden" name="newControl[Type]" value="<?php echo validHtmlStr($newControl['Type']) ?>"/>
<input type="hidden" name="newControl[Protocol]" value="<?= validHtmlStr($newControl['Protocol']) ?>"/> <input type="hidden" name="newControl[Protocol]" value="<?php echo validHtmlStr($newControl['Protocol']) ?>"/>
<input type="hidden" name="newControl[CanWake]" value="<?= !empty($newControl['CanWake']) ?>"/> <input type="hidden" name="newControl[CanWake]" value="<?php echo !empty($newControl['CanWake']) ?>"/>
<input type="hidden" name="newControl[CanSleep]" value="<?= !empty($newControl['CanSleep']) ?>"/> <input type="hidden" name="newControl[CanSleep]" value="<?php echo !empty($newControl['CanSleep']) ?>"/>
<input type="hidden" name="newControl[CanReset]" value="<?= !empty($newControl['CanReset']) ?>"/> <input type="hidden" name="newControl[CanReset]" value="<?php echo !empty($newControl['CanReset']) ?>"/>
<?php <?php
} }
if ( $tab != 'move' ) if ( $tab != 'move' )
{ {
?> ?>
<input type="hidden" name="newControl[CanMove]" value="<?= !empty($newControl['CanMove']) ?>"/> <input type="hidden" name="newControl[CanMove]" value="<?php echo !empty($newControl['CanMove']) ?>"/>
<input type="hidden" name="newControl[CanMoveDiag]" value="<?= !empty($newControl['CanMoveDiag']) ?>"/> <input type="hidden" name="newControl[CanMoveDiag]" value="<?php echo !empty($newControl['CanMoveDiag']) ?>"/>
<input type="hidden" name="newControl[CanMoveMap]" value="<?= !empty($newControl['CanMoveMap']) ?>"/> <input type="hidden" name="newControl[CanMoveMap]" value="<?php echo !empty($newControl['CanMoveMap']) ?>"/>
<input type="hidden" name="newControl[CanMoveAbs]" value="<?= !empty($newControl['CanMoveAbs']) ?>"/> <input type="hidden" name="newControl[CanMoveAbs]" value="<?php echo !empty($newControl['CanMoveAbs']) ?>"/>
<input type="hidden" name="newControl[CanMoveRel]" value="<?= !empty($newControl['CanMoveRel']) ?>"/> <input type="hidden" name="newControl[CanMoveRel]" value="<?php echo !empty($newControl['CanMoveRel']) ?>"/>
<input type="hidden" name="newControl[CanMoveCon]" value="<?= !empty($newControl['CanMoveCon']) ?>"/> <input type="hidden" name="newControl[CanMoveCon]" value="<?php echo !empty($newControl['CanMoveCon']) ?>"/>
<?php <?php
} }
if ( $tab != 'pan' ) if ( $tab != 'pan' )
{ {
?> ?>
<input type="hidden" name="newControl[CanPan]" value="<?= !empty($newControl['CanPan']) ?>"/> <input type="hidden" name="newControl[CanPan]" value="<?php echo !empty($newControl['CanPan']) ?>"/>
<input type="hidden" name="newControl[MinPanRange]" value="<?= $newControl['MinPanRange'] ?>"/> <input type="hidden" name="newControl[MinPanRange]" value="<?php echo $newControl['MinPanRange'] ?>"/>
<input type="hidden" name="newControl[MaxPanRange]" value="<?= $newControl['MaxPanRange'] ?>"/> <input type="hidden" name="newControl[MaxPanRange]" value="<?php echo $newControl['MaxPanRange'] ?>"/>
<input type="hidden" name="newControl[MinPanStep]" value="<?= $newControl['MinPanStep'] ?>"/> <input type="hidden" name="newControl[MinPanStep]" value="<?php echo $newControl['MinPanStep'] ?>"/>
<input type="hidden" name="newControl[MaxPanStep]" value="<?= $newControl['MaxPanStep'] ?>"/> <input type="hidden" name="newControl[MaxPanStep]" value="<?php echo $newControl['MaxPanStep'] ?>"/>
<input type="hidden" name="newControl[HasPanSpeed]" value="<?= !empty($newControl['HasPanSpeed']) ?>"/> <input type="hidden" name="newControl[HasPanSpeed]" value="<?php echo !empty($newControl['HasPanSpeed']) ?>"/>
<input type="hidden" name="newControl[MinPanSpeed]" value="<?= $newControl['MinPanSpeed'] ?>"/> <input type="hidden" name="newControl[MinPanSpeed]" value="<?php echo $newControl['MinPanSpeed'] ?>"/>
<input type="hidden" name="newControl[MaxPanSpeed]" value="<?= $newControl['MaxPanSpeed'] ?>"/> <input type="hidden" name="newControl[MaxPanSpeed]" value="<?php echo $newControl['MaxPanSpeed'] ?>"/>
<input type="hidden" name="newControl[HasTurboPan]" value="<?= !empty($newControl['HasTurboPan']) ?>"/> <input type="hidden" name="newControl[HasTurboPan]" value="<?php echo !empty($newControl['HasTurboPan']) ?>"/>
<input type="hidden" name="newControl[TurboPanSpeed]" value="<?= $newControl['TurboPanSpeed'] ?>"/> <input type="hidden" name="newControl[TurboPanSpeed]" value="<?php echo $newControl['TurboPanSpeed'] ?>"/>
<?php <?php
} }
if ( $tab != 'tilt' ) if ( $tab != 'tilt' )
{ {
?> ?>
<input type="hidden" name="newControl[CanTilt]" value="<?= !empty($newControl['CanTilt']) ?>"/> <input type="hidden" name="newControl[CanTilt]" value="<?php echo !empty($newControl['CanTilt']) ?>"/>
<input type="hidden" name="newControl[MinTiltRange]" value="<?= $newControl['MinTiltRange'] ?>"/> <input type="hidden" name="newControl[MinTiltRange]" value="<?php echo $newControl['MinTiltRange'] ?>"/>
<input type="hidden" name="newControl[MaxTiltRange]" value="<?= $newControl['MaxTiltRange'] ?>"/> <input type="hidden" name="newControl[MaxTiltRange]" value="<?php echo $newControl['MaxTiltRange'] ?>"/>
<input type="hidden" name="newControl[MinTiltStep]" value="<?= $newControl['MinTiltStep'] ?>"/> <input type="hidden" name="newControl[MinTiltStep]" value="<?php echo $newControl['MinTiltStep'] ?>"/>
<input type="hidden" name="newControl[MaxTiltStep]" value="<?= $newControl['MaxTiltStep'] ?>"/> <input type="hidden" name="newControl[MaxTiltStep]" value="<?php echo $newControl['MaxTiltStep'] ?>"/>
<input type="hidden" name="newControl[HasTiltSpeed]" value="<?= !empty($newControl['HasTiltSpeed']) ?>"/> <input type="hidden" name="newControl[HasTiltSpeed]" value="<?php echo !empty($newControl['HasTiltSpeed']) ?>"/>
<input type="hidden" name="newControl[MinTiltSpeed]" value="<?= $newControl['MinTiltSpeed'] ?>"/> <input type="hidden" name="newControl[MinTiltSpeed]" value="<?php echo $newControl['MinTiltSpeed'] ?>"/>
<input type="hidden" name="newControl[MaxTiltSpeed]" value="<?= $newControl['MaxTiltSpeed'] ?>"/> <input type="hidden" name="newControl[MaxTiltSpeed]" value="<?php echo $newControl['MaxTiltSpeed'] ?>"/>
<input type="hidden" name="newControl[HasTurboTilt]" value="<?= !empty($newControl['HasTurboTilt']) ?>"/> <input type="hidden" name="newControl[HasTurboTilt]" value="<?php echo !empty($newControl['HasTurboTilt']) ?>"/>
<input type="hidden" name="newControl[TurboTiltSpeed]" value="<?= $newControl['TurboTiltSpeed'] ?>"/> <input type="hidden" name="newControl[TurboTiltSpeed]" value="<?php echo $newControl['TurboTiltSpeed'] ?>"/>
<?php <?php
} }
if ( $tab != 'zoom' ) if ( $tab != 'zoom' )
{ {
?> ?>
<input type="hidden" name="newControl[CanZoom]" value="<?= !empty($newControl['CanZoom']) ?>"/> <input type="hidden" name="newControl[CanZoom]" value="<?php echo !empty($newControl['CanZoom']) ?>"/>
<input type="hidden" name="newControl[CanZoomAbs]" value="<?= !empty($newControl['CanZoomAbs']) ?>"/> <input type="hidden" name="newControl[CanZoomAbs]" value="<?php echo !empty($newControl['CanZoomAbs']) ?>"/>
<input type="hidden" name="newControl[CanZoomRel]" value="<?= !empty($newControl['CanZoomRel']) ?>"/> <input type="hidden" name="newControl[CanZoomRel]" value="<?php echo !empty($newControl['CanZoomRel']) ?>"/>
<input type="hidden" name="newControl[CanZoomCon]" value="<?= !empty($newControl['CanZoomCon']) ?>"/> <input type="hidden" name="newControl[CanZoomCon]" value="<?php echo !empty($newControl['CanZoomCon']) ?>"/>
<input type="hidden" name="newControl[MinZoomRange]" value="<?= $newControl['MinZoomRange'] ?>"/> <input type="hidden" name="newControl[MinZoomRange]" value="<?php echo $newControl['MinZoomRange'] ?>"/>
<input type="hidden" name="newControl[MaxZoomRange]" value="<?= $newControl['MaxZoomRange'] ?>"/> <input type="hidden" name="newControl[MaxZoomRange]" value="<?php echo $newControl['MaxZoomRange'] ?>"/>
<input type="hidden" name="newControl[MinZoomStep]" value="<?= $newControl['MinZoomStep'] ?>"/> <input type="hidden" name="newControl[MinZoomStep]" value="<?php echo $newControl['MinZoomStep'] ?>"/>
<input type="hidden" name="newControl[MaxZoomStep]" value="<?= $newControl['MaxZoomStep'] ?>"/> <input type="hidden" name="newControl[MaxZoomStep]" value="<?php echo $newControl['MaxZoomStep'] ?>"/>
<input type="hidden" name="newControl[HasZoomSpeed]" value="<?= !empty($newControl['HasZoomSpeed']) ?>"/> <input type="hidden" name="newControl[HasZoomSpeed]" value="<?php echo !empty($newControl['HasZoomSpeed']) ?>"/>
<input type="hidden" name="newControl[MinZoomSpeed]" value="<?= $newControl['MinZoomSpeed'] ?>"/> <input type="hidden" name="newControl[MinZoomSpeed]" value="<?php echo $newControl['MinZoomSpeed'] ?>"/>
<input type="hidden" name="newControl[MaxZoomSpeed]" value="<?= $newControl['MaxZoomSpeed'] ?>"/> <input type="hidden" name="newControl[MaxZoomSpeed]" value="<?php echo $newControl['MaxZoomSpeed'] ?>"/>
<?php <?php
} }
if ( $tab != 'focus' ) if ( $tab != 'focus' )
{ {
?> ?>
<input type="hidden" name="newControl[CanFocus]" value="<?= !empty($newControl['CanFocus']) ?>"/> <input type="hidden" name="newControl[CanFocus]" value="<?php echo !empty($newControl['CanFocus']) ?>"/>
<input type="hidden" name="newControl[CanAutoFocus]" value="<?= !empty($newControl['CanAutoFocus']) ?>"/> <input type="hidden" name="newControl[CanAutoFocus]" value="<?php echo !empty($newControl['CanAutoFocus']) ?>"/>
<input type="hidden" name="newControl[CanFocusAbs]" value="<?= !empty($newControl['CanFocusAbs']) ?>"/> <input type="hidden" name="newControl[CanFocusAbs]" value="<?php echo !empty($newControl['CanFocusAbs']) ?>"/>
<input type="hidden" name="newControl[CanFocusRel]" value="<?= !empty($newControl['CanFocusRel']) ?>"/> <input type="hidden" name="newControl[CanFocusRel]" value="<?php echo !empty($newControl['CanFocusRel']) ?>"/>
<input type="hidden" name="newControl[CanFocusCon]" value="<?= !empty($newControl['CanFocusCon']) ?>"/> <input type="hidden" name="newControl[CanFocusCon]" value="<?php echo !empty($newControl['CanFocusCon']) ?>"/>
<input type="hidden" name="newControl[MinFocusRange]" value="<?= $newControl['MinFocusRange'] ?>"/> <input type="hidden" name="newControl[MinFocusRange]" value="<?php echo $newControl['MinFocusRange'] ?>"/>
<input type="hidden" name="newControl[MaxFocusRange]" value="<?= $newControl['MaxFocusRange'] ?>"/> <input type="hidden" name="newControl[MaxFocusRange]" value="<?php echo $newControl['MaxFocusRange'] ?>"/>
<input type="hidden" name="newControl[MinFocusStep]" value="<?= $newControl['MinFocusStep'] ?>"/> <input type="hidden" name="newControl[MinFocusStep]" value="<?php echo $newControl['MinFocusStep'] ?>"/>
<input type="hidden" name="newControl[MaxFocusStep]" value="<?= $newControl['MaxFocusStep'] ?>"/> <input type="hidden" name="newControl[MaxFocusStep]" value="<?php echo $newControl['MaxFocusStep'] ?>"/>
<input type="hidden" name="newControl[HasFocusSpeed]" value="<?= !empty($newControl['HasFocusSpeed']) ?>"/> <input type="hidden" name="newControl[HasFocusSpeed]" value="<?php echo !empty($newControl['HasFocusSpeed']) ?>"/>
<input type="hidden" name="newControl[MinFocusSpeed]" value="<?= $newControl['MinFocusSpeed'] ?>"/> <input type="hidden" name="newControl[MinFocusSpeed]" value="<?php echo $newControl['MinFocusSpeed'] ?>"/>
<input type="hidden" name="newControl[MaxFocusSpeed]" value="<?= $newControl['MaxFocusSpeed'] ?>"/> <input type="hidden" name="newControl[MaxFocusSpeed]" value="<?php echo $newControl['MaxFocusSpeed'] ?>"/>
<?php <?php
} }
if ( $tab != 'iris' ) if ( $tab != 'iris' )
{ {
?> ?>
<input type="hidden" name="newControl[CanIris]" value="<?= !empty($newControl['CanIris']) ?>"/> <input type="hidden" name="newControl[CanIris]" value="<?php echo !empty($newControl['CanIris']) ?>"/>
<input type="hidden" name="newControl[CanAutoIris]" value="<?= !empty($newControl['CanAutoIris']) ?>"/> <input type="hidden" name="newControl[CanAutoIris]" value="<?php echo !empty($newControl['CanAutoIris']) ?>"/>
<input type="hidden" name="newControl[CanIrisAbs]" value="<?= !empty($newControl['CanIrisAbs']) ?>"/> <input type="hidden" name="newControl[CanIrisAbs]" value="<?php echo !empty($newControl['CanIrisAbs']) ?>"/>
<input type="hidden" name="newControl[CanIrisRel]" value="<?= !empty($newControl['CanIrisRel']) ?>"/> <input type="hidden" name="newControl[CanIrisRel]" value="<?php echo !empty($newControl['CanIrisRel']) ?>"/>
<input type="hidden" name="newControl[CanIrisCon]" value="<?= !empty($newControl['CanIrisCon']) ?>"/> <input type="hidden" name="newControl[CanIrisCon]" value="<?php echo !empty($newControl['CanIrisCon']) ?>"/>
<input type="hidden" name="newControl[MinIrisRange]" value="<?= $newControl['MinIrisRange'] ?>"/> <input type="hidden" name="newControl[MinIrisRange]" value="<?php echo $newControl['MinIrisRange'] ?>"/>
<input type="hidden" name="newControl[MaxIrisRange]" value="<?= $newControl['MaxIrisRange'] ?>"/> <input type="hidden" name="newControl[MaxIrisRange]" value="<?php echo $newControl['MaxIrisRange'] ?>"/>
<input type="hidden" name="newControl[MinIrisStep]" value="<?= $newControl['MinIrisStep'] ?>"/> <input type="hidden" name="newControl[MinIrisStep]" value="<?php echo $newControl['MinIrisStep'] ?>"/>
<input type="hidden" name="newControl[MaxIrisStep]" value="<?= $newControl['MaxIrisStep'] ?>"/> <input type="hidden" name="newControl[MaxIrisStep]" value="<?php echo $newControl['MaxIrisStep'] ?>"/>
<input type="hidden" name="newControl[HasIrisSpeed]" value="<?= !empty($newControl['HasIrisSpeed']) ?>"/> <input type="hidden" name="newControl[HasIrisSpeed]" value="<?php echo !empty($newControl['HasIrisSpeed']) ?>"/>
<input type="hidden" name="newControl[MinIrisSpeed]" value="<?= $newControl['MinIrisSpeed'] ?>"/> <input type="hidden" name="newControl[MinIrisSpeed]" value="<?php echo $newControl['MinIrisSpeed'] ?>"/>
<input type="hidden" name="newControl[MaxIrisSpeed]" value="<?= $newControl['MaxIrisSpeed'] ?>"/> <input type="hidden" name="newControl[MaxIrisSpeed]" value="<?php echo $newControl['MaxIrisSpeed'] ?>"/>
<?php <?php
} }
if ( $tab != 'gain' ) if ( $tab != 'gain' )
{ {
?> ?>
<input type="hidden" name="newControl[CanGain]" value="<?= !empty($newControl['CanGain']) ?>"/> <input type="hidden" name="newControl[CanGain]" value="<?php echo !empty($newControl['CanGain']) ?>"/>
<input type="hidden" name="newControl[CanAutoGain]" value="<?= !empty($newControl['CanAutoGain']) ?>"/> <input type="hidden" name="newControl[CanAutoGain]" value="<?php echo !empty($newControl['CanAutoGain']) ?>"/>
<input type="hidden" name="newControl[CanGainAbs]" value="<?= !empty($newControl['CanGainAbs']) ?>"/> <input type="hidden" name="newControl[CanGainAbs]" value="<?php echo !empty($newControl['CanGainAbs']) ?>"/>
<input type="hidden" name="newControl[CanGainRel]" value="<?= !empty($newControl['CanGainRel']) ?>"/> <input type="hidden" name="newControl[CanGainRel]" value="<?php echo !empty($newControl['CanGainRel']) ?>"/>
<input type="hidden" name="newControl[CanGainCon]" value="<?= !empty($newControl['CanGainCon']) ?>"/> <input type="hidden" name="newControl[CanGainCon]" value="<?php echo !empty($newControl['CanGainCon']) ?>"/>
<input type="hidden" name="newControl[MinGainRange]" value="<?= $newControl['MinGainRange'] ?>"/> <input type="hidden" name="newControl[MinGainRange]" value="<?php echo $newControl['MinGainRange'] ?>"/>
<input type="hidden" name="newControl[MaxGainRange]" value="<?= $newControl['MaxGainRange'] ?>"/> <input type="hidden" name="newControl[MaxGainRange]" value="<?php echo $newControl['MaxGainRange'] ?>"/>
<input type="hidden" name="newControl[MinGainStep]" value="<?= $newControl['MinGainStep'] ?>"/> <input type="hidden" name="newControl[MinGainStep]" value="<?php echo $newControl['MinGainStep'] ?>"/>
<input type="hidden" name="newControl[MaxGainStep]" value="<?= $newControl['MaxGainStep'] ?>"/> <input type="hidden" name="newControl[MaxGainStep]" value="<?php echo $newControl['MaxGainStep'] ?>"/>
<input type="hidden" name="newControl[HasGainSpeed]" value="<?= !empty($newControl['HasGainSpeed']) ?>"/> <input type="hidden" name="newControl[HasGainSpeed]" value="<?php echo !empty($newControl['HasGainSpeed']) ?>"/>
<input type="hidden" name="newControl[MinGainSpeed]" value="<?= $newControl['MinGainSpeed'] ?>"/> <input type="hidden" name="newControl[MinGainSpeed]" value="<?php echo $newControl['MinGainSpeed'] ?>"/>
<input type="hidden" name="newControl[MaxGainSpeed]" value="<?= $newControl['MaxGainSpeed'] ?>"/> <input type="hidden" name="newControl[MaxGainSpeed]" value="<?php echo $newControl['MaxGainSpeed'] ?>"/>
<?php <?php
} }
if ( $tab != 'white' ) if ( $tab != 'white' )
{ {
?> ?>
<input type="hidden" name="newControl[CanWhite]" value="<?= !empty($newControl['CanWhite']) ?>"/> <input type="hidden" name="newControl[CanWhite]" value="<?php echo !empty($newControl['CanWhite']) ?>"/>
<input type="hidden" name="newControl[CanAutoWhite]" value="<?= !empty($newControl['CanAutoWhite']) ?>"/> <input type="hidden" name="newControl[CanAutoWhite]" value="<?php echo !empty($newControl['CanAutoWhite']) ?>"/>
<input type="hidden" name="newControl[CanWhiteAbs]" value="<?= !empty($newControl['CanWhiteAbs']) ?>"/> <input type="hidden" name="newControl[CanWhiteAbs]" value="<?php echo !empty($newControl['CanWhiteAbs']) ?>"/>
<input type="hidden" name="newControl[CanWhiteRel]" value="<?= !empty($newControl['CanWhiteRel']) ?>"/> <input type="hidden" name="newControl[CanWhiteRel]" value="<?php echo !empty($newControl['CanWhiteRel']) ?>"/>
<input type="hidden" name="newControl[CanWhiteCon]" value="<?= !empty($newControl['CanWhiteCon']) ?>"/> <input type="hidden" name="newControl[CanWhiteCon]" value="<?php echo !empty($newControl['CanWhiteCon']) ?>"/>
<input type="hidden" name="newControl[MinWhiteRange]" value="<?= $newControl['MinWhiteRange'] ?>"/> <input type="hidden" name="newControl[MinWhiteRange]" value="<?php echo $newControl['MinWhiteRange'] ?>"/>
<input type="hidden" name="newControl[MaxWhiteRange]" value="<?= $newControl['MaxWhiteRange'] ?>"/> <input type="hidden" name="newControl[MaxWhiteRange]" value="<?php echo $newControl['MaxWhiteRange'] ?>"/>
<input type="hidden" name="newControl[MinWhiteStep]" value="<?= $newControl['MinWhiteStep'] ?>"/> <input type="hidden" name="newControl[MinWhiteStep]" value="<?php echo $newControl['MinWhiteStep'] ?>"/>
<input type="hidden" name="newControl[MaxWhiteStep]" value="<?= $newControl['MaxWhiteStep'] ?>"/> <input type="hidden" name="newControl[MaxWhiteStep]" value="<?php echo $newControl['MaxWhiteStep'] ?>"/>
<input type="hidden" name="newControl[HasWhiteSpeed]" value="<?= !empty($newControl['HasWhiteSpeed']) ?>"/> <input type="hidden" name="newControl[HasWhiteSpeed]" value="<?php echo !empty($newControl['HasWhiteSpeed']) ?>"/>
<input type="hidden" name="newControl[MinWhiteSpeed]" value="<?= $newControl['MinWhiteSpeed'] ?>"/> <input type="hidden" name="newControl[MinWhiteSpeed]" value="<?php echo $newControl['MinWhiteSpeed'] ?>"/>
<input type="hidden" name="newControl[MaxWhiteSpeed]" value="<?= $newControl['MaxWhiteSpeed'] ?>"/> <input type="hidden" name="newControl[MaxWhiteSpeed]" value="<?php echo $newControl['MaxWhiteSpeed'] ?>"/>
<?php <?php
} }
if ( $tab != 'presets' ) if ( $tab != 'presets' )
{ {
?> ?>
<input type="hidden" name="newControl[HasPresets]" value="<?= !empty($newControl['HasPresets']) ?>"/> <input type="hidden" name="newControl[HasPresets]" value="<?php echo !empty($newControl['HasPresets']) ?>"/>
<input type="hidden" name="newControl[NumPresets]" value="<?= $newControl['NumPresets'] ?>"/> <input type="hidden" name="newControl[NumPresets]" value="<?php echo $newControl['NumPresets'] ?>"/>
<input type="hidden" name="newControl[HasHomePreset]" value="<?= !empty($newControl['HasHomePreset']) ?>"/> <input type="hidden" name="newControl[HasHomePreset]" value="<?php echo !empty($newControl['HasHomePreset']) ?>"/>
<input type="hidden" name="newControl[CanSetPresets]" value="<?= !empty($newControl['CanSetPresets']) ?>"/> <input type="hidden" name="newControl[CanSetPresets]" value="<?php echo !empty($newControl['CanSetPresets']) ?>"/>
<?php <?php
} }
?> ?>
@ -343,158 +343,158 @@ switch ( $tab )
case 'main' : case 'main' :
{ {
?> ?>
<tr><th scope="row"><?= $SLANG['Name'] ?></th><td><input type="text" name="newControl[Name]" value="<?= validHtmlStr($newControl['Name']) ?>" size="24"/></td></tr> <tr><th scope="row"><?php echo $SLANG['Name'] ?></th><td><input type="text" name="newControl[Name]" value="<?php echo validHtmlStr($newControl['Name']) ?>" size="24"/></td></tr>
<?php <?php
$types = array( 'Local'=>$SLANG['Local'], 'Remote'=>$SLANG['Remote'], 'Ffmpeg'=>$SLANG['Ffmpeg'], 'Libvlc'=>$SLANG['Libvlc'], 'cURL'=>"cURL"); $types = array( 'Local'=>$SLANG['Local'], 'Remote'=>$SLANG['Remote'], 'Ffmpeg'=>$SLANG['Ffmpeg'], 'Libvlc'=>$SLANG['Libvlc'], 'cURL'=>"cURL");
?> ?>
<tr><th scope="row"><?= $SLANG['Type'] ?></th><td><?= buildSelect( "newControl[Type]", $types ); ?></td></tr> <tr><th scope="row"><?php echo $SLANG['Type'] ?></th><td><?php echo buildSelect( "newControl[Type]", $types ); ?></td></tr>
<tr><th scope="row"><?= $SLANG['Protocol'] ?></th><td><input type="text" name="newControl[Protocol]" value="<?= validHtmlStr($newControl['Protocol']) ?>" size="24"/></td></tr> <tr><th scope="row"><?php echo $SLANG['Protocol'] ?></th><td><input type="text" name="newControl[Protocol]" value="<?php echo validHtmlStr($newControl['Protocol']) ?>" size="24"/></td></tr>
<tr><th scope="row"><?= $SLANG['CanWake'] ?></th><td><input type="checkbox" name="newControl[CanWake]" value="1"<?php if ( !empty($newControl['CanWake']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanWake'] ?></th><td><input type="checkbox" name="newControl[CanWake]" value="1"<?php if ( !empty($newControl['CanWake']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanSleep'] ?></th><td><input type="checkbox" name="newControl[CanSleep]" value="1"<?php if ( !empty($newControl['CanSleep']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanSleep'] ?></th><td><input type="checkbox" name="newControl[CanSleep]" value="1"<?php if ( !empty($newControl['CanSleep']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanReset'] ?></th><td><input type="checkbox" name="newControl[CanReset]" value="1"<?php if ( !empty($newControl['CanReset']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanReset'] ?></th><td><input type="checkbox" name="newControl[CanReset]" value="1"<?php if ( !empty($newControl['CanReset']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<?php <?php
break; break;
} }
case 'move' : case 'move' :
{ {
?> ?>
<tr><th scope="row"><?= $SLANG['CanMove'] ?></th><td><input type="checkbox" name="newControl[CanMove]" value="1"<?php if ( !empty($newControl['CanMove']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanMove'] ?></th><td><input type="checkbox" name="newControl[CanMove]" value="1"<?php if ( !empty($newControl['CanMove']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanMoveDiag'] ?></th><td><input type="checkbox" name="newControl[CanMoveDiag]" value="1"<?php if ( !empty($newControl['CanMoveDiag']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanMoveDiag'] ?></th><td><input type="checkbox" name="newControl[CanMoveDiag]" value="1"<?php if ( !empty($newControl['CanMoveDiag']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanMoveMap'] ?></th><td><input type="checkbox" name="newControl[CanMoveMap]" value="1"<?php if ( !empty($newControl['CanMoveMap']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanMoveMap'] ?></th><td><input type="checkbox" name="newControl[CanMoveMap]" value="1"<?php if ( !empty($newControl['CanMoveMap']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanMoveAbs'] ?></th><td><input type="checkbox" name="newControl[CanMoveAbs]" value="1"<?php if ( !empty($newControl['CanMoveAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanMoveAbs'] ?></th><td><input type="checkbox" name="newControl[CanMoveAbs]" value="1"<?php if ( !empty($newControl['CanMoveAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanMoveRel'] ?></th><td><input type="checkbox" name="newControl[CanMoveRel]" value="1"<?php if ( !empty($newControl['CanMoveRel']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanMoveRel'] ?></th><td><input type="checkbox" name="newControl[CanMoveRel]" value="1"<?php if ( !empty($newControl['CanMoveRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanMoveCon'] ?></th><td><input type="checkbox" name="newControl[CanMoveCon]" value="1"<?php if ( !empty($newControl['CanMoveCon']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanMoveCon'] ?></th><td><input type="checkbox" name="newControl[CanMoveCon]" value="1"<?php if ( !empty($newControl['CanMoveCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<?php <?php
break; break;
} }
case 'pan' : case 'pan' :
{ {
?> ?>
<tr><th scope="row"><?= $SLANG['CanPan'] ?></th><td><input type="checkbox" name="newControl[CanPan]" value="1"<?php if ( !empty($newControl['CanPan']) ) { ?> checked="checked"<?php } ?>></td></tr> <tr><th scope="row"><?php echo $SLANG['CanPan'] ?></th><td><input type="checkbox" name="newControl[CanPan]" value="1"<?php if ( !empty($newControl['CanPan']) ) { ?> checked="checked"<?php } ?>></td></tr>
<tr><th scope="row"><?= $SLANG['MinPanRange'] ?></th><td><input type="text" name="newControl[MinPanRange]" value="<?= $newControl['MinPanRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinPanRange'] ?></th><td><input type="text" name="newControl[MinPanRange]" value="<?php echo $newControl['MinPanRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxPanRange'] ?></th><td><input type="text" name="newControl[MaxPanRange]" value="<?= $newControl['MaxPanRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxPanRange'] ?></th><td><input type="text" name="newControl[MaxPanRange]" value="<?php echo $newControl['MaxPanRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MinPanStep'] ?></th><td><input type="text" name="newControl[MinPanStep]" value="<?= $newControl['MinPanStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinPanStep'] ?></th><td><input type="text" name="newControl[MinPanStep]" value="<?php echo $newControl['MinPanStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxPanStep'] ?></th><td><input type="text" name="newControl[MaxPanStep]" value="<?= $newControl['MaxPanStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxPanStep'] ?></th><td><input type="text" name="newControl[MaxPanStep]" value="<?php echo $newControl['MaxPanStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['HasPanSpeed'] ?></th><td><input type="checkbox" name="newControl[HasPanSpeed]" value="1"<?php if ( !empty($newControl['HasPanSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['HasPanSpeed'] ?></th><td><input type="checkbox" name="newControl[HasPanSpeed]" value="1"<?php if ( !empty($newControl['HasPanSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['MinPanSpeed'] ?></th><td><input type="text" name="newControl[MinPanSpeed]" value="<?= $newControl['MinPanSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinPanSpeed'] ?></th><td><input type="text" name="newControl[MinPanSpeed]" value="<?php echo $newControl['MinPanSpeed'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxPanSpeed'] ?></th><td><input type="text" name="newControl[MaxPanSpeed]" value="<?= $newControl['MaxPanSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxPanSpeed'] ?></th><td><input type="text" name="newControl[MaxPanSpeed]" value="<?php echo $newControl['MaxPanSpeed'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['HasTurboPan'] ?></th><td><input type="checkbox" name="newControl[HasTurboPan]" value="1"<?php if ( !empty($newControl['HasTurboPan']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['HasTurboPan'] ?></th><td><input type="checkbox" name="newControl[HasTurboPan]" value="1"<?php if ( !empty($newControl['HasTurboPan']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['TurboPanSpeed'] ?></th><td><input type="text" name="newControl[TurboPanSpeed]" value="<?= $newControl['TurboPanSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['TurboPanSpeed'] ?></th><td><input type="text" name="newControl[TurboPanSpeed]" value="<?php echo $newControl['TurboPanSpeed'] ?>" size="8"/></td></tr>
<?php <?php
break; break;
} }
case 'tilt' : case 'tilt' :
{ {
?> ?>
<tr><th scope="row"><?= $SLANG['CanTilt'] ?></th><td><input type="checkbox" name="newControl[CanTilt]" value="1"<?php if ( !empty($newControl['CanTilt']) ) { ?> checked="checked"<?php } ?>></td></tr> <tr><th scope="row"><?php echo $SLANG['CanTilt'] ?></th><td><input type="checkbox" name="newControl[CanTilt]" value="1"<?php if ( !empty($newControl['CanTilt']) ) { ?> checked="checked"<?php } ?>></td></tr>
<tr><th scope="row"><?= $SLANG['MinTiltRange'] ?></th><td><input type="text" name="newControl[MinTiltRange]" value="<?= $newControl['MinTiltRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinTiltRange'] ?></th><td><input type="text" name="newControl[MinTiltRange]" value="<?php echo $newControl['MinTiltRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxTiltRange'] ?></th><td><input type="text" name="newControl[MaxTiltRange]" value="<?= $newControl['MaxTiltRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxTiltRange'] ?></th><td><input type="text" name="newControl[MaxTiltRange]" value="<?php echo $newControl['MaxTiltRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MinTiltStep'] ?></th><td><input type="text" name="newControl[MinTiltStep]" value="<?= $newControl['MinTiltStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinTiltStep'] ?></th><td><input type="text" name="newControl[MinTiltStep]" value="<?php echo $newControl['MinTiltStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxTiltStep'] ?></th><td><input type="text" name="newControl[MaxTiltStep]" value="<?= $newControl['MaxTiltStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxTiltStep'] ?></th><td><input type="text" name="newControl[MaxTiltStep]" value="<?php echo $newControl['MaxTiltStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['HasTiltSpeed'] ?></th><td><input type="checkbox" name="newControl[HasTiltSpeed]" value="1"<?php if ( !empty($newControl['HasTiltSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['HasTiltSpeed'] ?></th><td><input type="checkbox" name="newControl[HasTiltSpeed]" value="1"<?php if ( !empty($newControl['HasTiltSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['MinTiltSpeed'] ?></th><td><input type="text" name="newControl[MinTiltSpeed]" value="<?= $newControl['MinTiltSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinTiltSpeed'] ?></th><td><input type="text" name="newControl[MinTiltSpeed]" value="<?php echo $newControl['MinTiltSpeed'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxTiltSpeed'] ?></th><td><input type="text" name="newControl[MaxTiltSpeed]" value="<?= $newControl['MaxTiltSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxTiltSpeed'] ?></th><td><input type="text" name="newControl[MaxTiltSpeed]" value="<?php echo $newControl['MaxTiltSpeed'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['HasTurboTilt'] ?></th><td><input type="checkbox" name="newControl[HasTurboTilt]" value="1"<?php if ( !empty($newControl['HasTurboTilt']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['HasTurboTilt'] ?></th><td><input type="checkbox" name="newControl[HasTurboTilt]" value="1"<?php if ( !empty($newControl['HasTurboTilt']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['TurboTiltSpeed'] ?></th><td><input type="text" name="newControl[TurboTiltSpeed]" value="<?= $newControl['TurboTiltSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['TurboTiltSpeed'] ?></th><td><input type="text" name="newControl[TurboTiltSpeed]" value="<?php echo $newControl['TurboTiltSpeed'] ?>" size="8"/></td></tr>
<?php <?php
break; break;
} }
case 'zoom' : case 'zoom' :
{ {
?> ?>
<tr><th scope="row"><?= $SLANG['CanZoom'] ?></th><td><input type="checkbox" name="newControl[CanZoom]" value="1"<?php if ( !empty($newControl['CanZoom']) ) { ?> checked="checked"<?php } ?>></td></tr> <tr><th scope="row"><?php echo $SLANG['CanZoom'] ?></th><td><input type="checkbox" name="newControl[CanZoom]" value="1"<?php if ( !empty($newControl['CanZoom']) ) { ?> checked="checked"<?php } ?>></td></tr>
<tr><th scope="row"><?= $SLANG['CanZoomAbs'] ?></th><td><input type="checkbox" name="newControl[CanZoomAbs]" value="1"<?php if ( !empty($newControl['CanZoomAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanZoomAbs'] ?></th><td><input type="checkbox" name="newControl[CanZoomAbs]" value="1"<?php if ( !empty($newControl['CanZoomAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanZoomRel'] ?></th><td><input type="checkbox" name="newControl[CanZoomRel]" value="1"<?php if ( !empty($newControl['CanZoomRel']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanZoomRel'] ?></th><td><input type="checkbox" name="newControl[CanZoomRel]" value="1"<?php if ( !empty($newControl['CanZoomRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanZoomCon'] ?></th><td><input type="checkbox" name="newControl[CanZoomCon]" value="1"<?php if ( !empty($newControl['CanZoomCon']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanZoomCon'] ?></th><td><input type="checkbox" name="newControl[CanZoomCon]" value="1"<?php if ( !empty($newControl['CanZoomCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['MinZoomRange'] ?></th><td><input type="text" name="newControl[MinZoomRange]" value="<?= $newControl['MinZoomRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinZoomRange'] ?></th><td><input type="text" name="newControl[MinZoomRange]" value="<?php echo $newControl['MinZoomRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxZoomRange'] ?></th><td><input type="text" name="newControl[MaxZoomRange]" value="<?= $newControl['MaxZoomRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxZoomRange'] ?></th><td><input type="text" name="newControl[MaxZoomRange]" value="<?php echo $newControl['MaxZoomRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MinZoomStep'] ?></th><td><input type="text" name="newControl[MinZoomStep]" value="<?= $newControl['MinZoomStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinZoomStep'] ?></th><td><input type="text" name="newControl[MinZoomStep]" value="<?php echo $newControl['MinZoomStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxZoomStep'] ?></th><td><input type="text" name="newControl[MaxZoomStep]" value="<?= $newControl['MaxZoomStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxZoomStep'] ?></th><td><input type="text" name="newControl[MaxZoomStep]" value="<?php echo $newControl['MaxZoomStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['HasZoomSpeed'] ?></th><td><input type="checkbox" name="newControl[HasZoomSpeed]" value="1"<?php if ( !empty($newControl['HasZoomSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['HasZoomSpeed'] ?></th><td><input type="checkbox" name="newControl[HasZoomSpeed]" value="1"<?php if ( !empty($newControl['HasZoomSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['MinZoomSpeed'] ?></th><td><input type="text" name="newControl[MinZoomSpeed]" value="<?= $newControl['MinZoomSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinZoomSpeed'] ?></th><td><input type="text" name="newControl[MinZoomSpeed]" value="<?php echo $newControl['MinZoomSpeed'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxZoomSpeed'] ?></th><td><input type="text" name="newControl[MaxZoomSpeed]" value="<?= $newControl['MaxZoomSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxZoomSpeed'] ?></th><td><input type="text" name="newControl[MaxZoomSpeed]" value="<?php echo $newControl['MaxZoomSpeed'] ?>" size="8"/></td></tr>
<?php <?php
break; break;
} }
case 'focus' : case 'focus' :
{ {
?> ?>
<tr><th scope="row"><?= $SLANG['CanFocus'] ?></th><td><input type="checkbox" name="newControl[CanFocus]" value="1"<?php if ( !empty($newControl['CanFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanFocus'] ?></th><td><input type="checkbox" name="newControl[CanFocus]" value="1"<?php if ( !empty($newControl['CanFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanAutoFocus'] ?></th><td><input type="checkbox" name="newControl[CanAutoFocus]" value="1"<?php if ( !empty($newControl['CanAutoFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanAutoFocus'] ?></th><td><input type="checkbox" name="newControl[CanAutoFocus]" value="1"<?php if ( !empty($newControl['CanAutoFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanFocusAbs'] ?></th><td><input type="checkbox" name="newControl[CanFocusAbs]" value="1"<?php if ( !empty($newControl['CanFocusAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanFocusAbs'] ?></th><td><input type="checkbox" name="newControl[CanFocusAbs]" value="1"<?php if ( !empty($newControl['CanFocusAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanFocusRel'] ?></th><td><input type="checkbox" name="newControl[CanFocusRel]" value="1"<?php if ( !empty($newControl['CanFocusRel']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanFocusRel'] ?></th><td><input type="checkbox" name="newControl[CanFocusRel]" value="1"<?php if ( !empty($newControl['CanFocusRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanFocusCon'] ?></th><td><input type="checkbox" name="newControl[CanFocusCon]" value="1"<?php if ( !empty($newControl['CanFocusCon']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanFocusCon'] ?></th><td><input type="checkbox" name="newControl[CanFocusCon]" value="1"<?php if ( !empty($newControl['CanFocusCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['MinFocusRange'] ?></th><td><input type="text" name="newControl[MinFocusRange]" value="<?= $newControl['MinFocusRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinFocusRange'] ?></th><td><input type="text" name="newControl[MinFocusRange]" value="<?php echo $newControl['MinFocusRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxFocusRange'] ?></th><td><input type="text" name="newControl[MaxFocusRange]" value="<?= $newControl['MaxFocusRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxFocusRange'] ?></th><td><input type="text" name="newControl[MaxFocusRange]" value="<?php echo $newControl['MaxFocusRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MinFocusStep'] ?></th><td><input type="text" name="newControl[MinFocusStep]" value="<?= $newControl['MinFocusStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinFocusStep'] ?></th><td><input type="text" name="newControl[MinFocusStep]" value="<?php echo $newControl['MinFocusStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxFocusStep'] ?></th><td><input type="text" name="newControl[MaxFocusStep]" value="<?= $newControl['MaxFocusStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxFocusStep'] ?></th><td><input type="text" name="newControl[MaxFocusStep]" value="<?php echo $newControl['MaxFocusStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['HasFocusSpeed'] ?></th><td><input type="checkbox" name="newControl[HasFocusSpeed]" value="1"<?php if ( !empty($newControl['HasFocusSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['HasFocusSpeed'] ?></th><td><input type="checkbox" name="newControl[HasFocusSpeed]" value="1"<?php if ( !empty($newControl['HasFocusSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['MinFocusSpeed'] ?></th><td><input type="text" name="newControl[MinFocusSpeed]" value="<?= $newControl['MinFocusSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinFocusSpeed'] ?></th><td><input type="text" name="newControl[MinFocusSpeed]" value="<?php echo $newControl['MinFocusSpeed'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxFocusSpeed'] ?></th><td><input type="text" name="newControl[MaxFocusSpeed]" value="<?= $newControl['MaxFocusSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxFocusSpeed'] ?></th><td><input type="text" name="newControl[MaxFocusSpeed]" value="<?php echo $newControl['MaxFocusSpeed'] ?>" size="8"/></td></tr>
<?php <?php
break; break;
} }
case 'iris' : case 'iris' :
{ {
?> ?>
<tr><th scope="row"><?= $SLANG['CanIris'] ?></th><td><input type="checkbox" name="newControl[CanIris]" value="1"<?php if ( !empty($newControl['CanIris']) ) { ?> checked="checked"<?php } ?>></td></tr> <tr><th scope="row"><?php echo $SLANG['CanIris'] ?></th><td><input type="checkbox" name="newControl[CanIris]" value="1"<?php if ( !empty($newControl['CanIris']) ) { ?> checked="checked"<?php } ?>></td></tr>
<tr><th scope="row"><?= $SLANG['CanAutoIris'] ?></th><td><input type="checkbox" name="newControl[CanAutoIris]" value="1"<?php if ( !empty($newControl['CanAutoIris']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanAutoIris'] ?></th><td><input type="checkbox" name="newControl[CanAutoIris]" value="1"<?php if ( !empty($newControl['CanAutoIris']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanIrisAbs'] ?></th><td><input type="checkbox" name="newControl[CanIrisAbs]" value="1"<?php if ( !empty($newControl['CanIrisAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanIrisAbs'] ?></th><td><input type="checkbox" name="newControl[CanIrisAbs]" value="1"<?php if ( !empty($newControl['CanIrisAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanIrisRel'] ?></th><td><input type="checkbox" name="newControl[CanIrisRel]" value="1"<?php if ( !empty($newControl['CanIrisRel']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanIrisRel'] ?></th><td><input type="checkbox" name="newControl[CanIrisRel]" value="1"<?php if ( !empty($newControl['CanIrisRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanIrisCon'] ?></th><td><input type="checkbox" name="newControl[CanIrisCon]" value="1"<?php if ( !empty($newControl['CanIrisCon']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanIrisCon'] ?></th><td><input type="checkbox" name="newControl[CanIrisCon]" value="1"<?php if ( !empty($newControl['CanIrisCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['MinIrisRange'] ?></th><td><input type="text" name="newControl[MinIrisRange]" value="<?= $newControl['MinIrisRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinIrisRange'] ?></th><td><input type="text" name="newControl[MinIrisRange]" value="<?php echo $newControl['MinIrisRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxIrisRange'] ?></th><td><input type="text" name="newControl[MaxIrisRange]" value="<?= $newControl['MaxIrisRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxIrisRange'] ?></th><td><input type="text" name="newControl[MaxIrisRange]" value="<?php echo $newControl['MaxIrisRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MinIrisStep'] ?></th><td><input type="text" name="newControl[MinIrisStep]" value="<?= $newControl['MinIrisStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinIrisStep'] ?></th><td><input type="text" name="newControl[MinIrisStep]" value="<?php echo $newControl['MinIrisStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxIrisStep'] ?></th><td><input type="text" name="newControl[MaxIrisStep]" value="<?= $newControl['MaxIrisStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxIrisStep'] ?></th><td><input type="text" name="newControl[MaxIrisStep]" value="<?php echo $newControl['MaxIrisStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['HasIrisSpeed'] ?></th><td><input type="checkbox" name="newControl[HasIrisSpeed]" value="1"<?php if ( !empty($newControl['HasIrisSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['HasIrisSpeed'] ?></th><td><input type="checkbox" name="newControl[HasIrisSpeed]" value="1"<?php if ( !empty($newControl['HasIrisSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['MinIrisSpeed'] ?></th><td><input type="text" name="newControl[MinIrisSpeed]" value="<?= $newControl['MinIrisSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinIrisSpeed'] ?></th><td><input type="text" name="newControl[MinIrisSpeed]" value="<?php echo $newControl['MinIrisSpeed'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxIrisSpeed'] ?></th><td><input type="text" name="newControl[MaxIrisSpeed]" value="<?= $newControl['MaxIrisSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxIrisSpeed'] ?></th><td><input type="text" name="newControl[MaxIrisSpeed]" value="<?php echo $newControl['MaxIrisSpeed'] ?>" size="8"/></td></tr>
<?php <?php
break; break;
} }
case 'gain' : case 'gain' :
{ {
?> ?>
<tr><th scope="row"><?= $SLANG['CanGain'] ?></th><td><input type="checkbox" name="newControl[CanGain]" value="1"<?php if ( !empty($newControl['CanGain']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanGain'] ?></th><td><input type="checkbox" name="newControl[CanGain]" value="1"<?php if ( !empty($newControl['CanGain']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanAutoGain'] ?></th><td><input type="checkbox" name="newControl[CanAutoGain]" value="1"<?php if ( !empty($newControl['CanAutoGain']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanAutoGain'] ?></th><td><input type="checkbox" name="newControl[CanAutoGain]" value="1"<?php if ( !empty($newControl['CanAutoGain']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanGainAbs'] ?></th><td><input type="checkbox" name="newControl[CanGainAbs]" value="1"<?php if ( !empty($newControl['CanGainAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanGainAbs'] ?></th><td><input type="checkbox" name="newControl[CanGainAbs]" value="1"<?php if ( !empty($newControl['CanGainAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanGainRel'] ?></th><td><input type="checkbox" name="newControl[CanGainRel]" value="1"<?php if ( !empty($newControl['CanGainRel']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanGainRel'] ?></th><td><input type="checkbox" name="newControl[CanGainRel]" value="1"<?php if ( !empty($newControl['CanGainRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanGainCon'] ?></th><td><input type="checkbox" name="newControl[CanGainCon]" value="1"<?php if ( !empty($newControl['CanGainCon']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanGainCon'] ?></th><td><input type="checkbox" name="newControl[CanGainCon]" value="1"<?php if ( !empty($newControl['CanGainCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['MinGainRange'] ?></th><td><input type="text" name="newControl[MinGainRange]" value="<?= $newControl['MinGainRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinGainRange'] ?></th><td><input type="text" name="newControl[MinGainRange]" value="<?php echo $newControl['MinGainRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxGainRange'] ?></th><td><input type="text" name="newControl[MaxGainRange]" value="<?= $newControl['MaxGainRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxGainRange'] ?></th><td><input type="text" name="newControl[MaxGainRange]" value="<?php echo $newControl['MaxGainRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MinGainStep'] ?></th><td><input type="text" name="newControl[MinGainStep]" value="<?= $newControl['MinGainStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinGainStep'] ?></th><td><input type="text" name="newControl[MinGainStep]" value="<?php echo $newControl['MinGainStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxGainStep'] ?></th><td><input type="text" name="newControl[MaxGainStep]" value="<?= $newControl['MaxGainStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxGainStep'] ?></th><td><input type="text" name="newControl[MaxGainStep]" value="<?php echo $newControl['MaxGainStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['HasGainSpeed'] ?></th><td><input type="checkbox" name="newControl[HasGainSpeed]" value="1"<?php if ( !empty($newControl['HasGainSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['HasGainSpeed'] ?></th><td><input type="checkbox" name="newControl[HasGainSpeed]" value="1"<?php if ( !empty($newControl['HasGainSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['MinGainSpeed'] ?></th><td><input type="text" name="newControl[MinGainSpeed]" value="<?= $newControl['MinGainSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinGainSpeed'] ?></th><td><input type="text" name="newControl[MinGainSpeed]" value="<?php echo $newControl['MinGainSpeed'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxGainSpeed'] ?></th><td><input type="text" name="newControl[MaxGainSpeed]" value="<?= $newControl['MaxGainSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxGainSpeed'] ?></th><td><input type="text" name="newControl[MaxGainSpeed]" value="<?php echo $newControl['MaxGainSpeed'] ?>" size="8"/></td></tr>
<?php <?php
break; break;
} }
case 'white' : case 'white' :
{ {
?> ?>
<tr><th scope="row"><?= $SLANG['CanWhite'] ?></th><td><input type="checkbox" name="newControl[CanWhite]" value="1"<?php if ( !empty($newControl['CanWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanWhite'] ?></th><td><input type="checkbox" name="newControl[CanWhite]" value="1"<?php if ( !empty($newControl['CanWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanAutoWhite'] ?></th><td><input type="checkbox" name="newControl[CanAutoWhite]" value="1"<?php if ( !empty($newControl['CanAutoWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanAutoWhite'] ?></th><td><input type="checkbox" name="newControl[CanAutoWhite]" value="1"<?php if ( !empty($newControl['CanAutoWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanWhiteAbs'] ?></th><td><input type="checkbox" name="newControl[CanWhiteAbs]" value="1"<?php if ( !empty($newControl['CanWhiteAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanWhiteAbs'] ?></th><td><input type="checkbox" name="newControl[CanWhiteAbs]" value="1"<?php if ( !empty($newControl['CanWhiteAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanWhiteRel'] ?></th><td><input type="checkbox" name="newControl[CanWhiteRel]" value="1"<?php if ( !empty($newControl['CanWhiteRel']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanWhiteRel'] ?></th><td><input type="checkbox" name="newControl[CanWhiteRel]" value="1"<?php if ( !empty($newControl['CanWhiteRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanWhiteCon'] ?></th><td><input type="checkbox" name="newControl[CanWhiteCon]" value="1"<?php if ( !empty($newControl['CanWhiteCon']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanWhiteCon'] ?></th><td><input type="checkbox" name="newControl[CanWhiteCon]" value="1"<?php if ( !empty($newControl['CanWhiteCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['MinWhiteRange'] ?></th><td><input type="text" name="newControl[MinWhiteRange]" value="<?= $newControl['MinWhiteRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinWhiteRange'] ?></th><td><input type="text" name="newControl[MinWhiteRange]" value="<?php echo $newControl['MinWhiteRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxWhiteRange'] ?></th><td><input type="text" name="newControl[MaxWhiteRange]" value="<?= $newControl['MaxWhiteRange'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxWhiteRange'] ?></th><td><input type="text" name="newControl[MaxWhiteRange]" value="<?php echo $newControl['MaxWhiteRange'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MinWhiteStep'] ?></th><td><input type="text" name="newControl[MinWhiteStep]" value="<?= $newControl['MinWhiteStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinWhiteStep'] ?></th><td><input type="text" name="newControl[MinWhiteStep]" value="<?php echo $newControl['MinWhiteStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxWhiteStep'] ?></th><td><input type="text" name="newControl[MaxWhiteStep]" value="<?= $newControl['MaxWhiteStep'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxWhiteStep'] ?></th><td><input type="text" name="newControl[MaxWhiteStep]" value="<?php echo $newControl['MaxWhiteStep'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['HasWhiteSpeed'] ?></th><td><input type="checkbox" name="newControl[HasWhiteSpeed]" value="1"<?php if ( !empty($newControl['HasWhiteSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['HasWhiteSpeed'] ?></th><td><input type="checkbox" name="newControl[HasWhiteSpeed]" value="1"<?php if ( !empty($newControl['HasWhiteSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['MinWhiteSpeed'] ?></th><td><input type="text" name="newControl[MinWhiteSpeed]" value="<?= $newControl['MinWhiteSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MinWhiteSpeed'] ?></th><td><input type="text" name="newControl[MinWhiteSpeed]" value="<?php echo $newControl['MinWhiteSpeed'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['MaxWhiteSpeed'] ?></th><td><input type="text" name="newControl[MaxWhiteSpeed]" value="<?= $newControl['MaxWhiteSpeed'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['MaxWhiteSpeed'] ?></th><td><input type="text" name="newControl[MaxWhiteSpeed]" value="<?php echo $newControl['MaxWhiteSpeed'] ?>" size="8"/></td></tr>
<?php <?php
break; break;
} }
case 'presets' : case 'presets' :
{ {
?> ?>
<tr><th scope="row"><?= $SLANG['HasPresets'] ?></th><td><input type="checkbox" name="newControl[HasPresets]" value="1"<?php if ( !empty($newControl['HasPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['HasPresets'] ?></th><td><input type="checkbox" name="newControl[HasPresets]" value="1"<?php if ( !empty($newControl['HasPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['NumPresets'] ?></th><td><input type="text" name="newControl[NumPresets]" value="<?= $newControl['NumPresets'] ?>" size="8"/></td></tr> <tr><th scope="row"><?php echo $SLANG['NumPresets'] ?></th><td><input type="text" name="newControl[NumPresets]" value="<?php echo $newControl['NumPresets'] ?>" size="8"/></td></tr>
<tr><th scope="row"><?= $SLANG['HasHomePreset'] ?></th><td><input type="checkbox" name="newControl[HasHomePreset]" value="1"<?php if ( !empty($newControl['HasHomePreset']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['HasHomePreset'] ?></th><td><input type="checkbox" name="newControl[HasHomePreset]" value="1"<?php if ( !empty($newControl['HasHomePreset']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><th scope="row"><?= $SLANG['CanSetPresets'] ?></th><td><input type="checkbox" name="newControl[CanSetPresets]" value="1"<?php if ( !empty($newControl['CanSetPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><th scope="row"><?php echo $SLANG['CanSetPresets'] ?></th><td><input type="checkbox" name="newControl[CanSetPresets]" value="1"<?php if ( !empty($newControl['CanSetPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<?php <?php
break; break;
} }
@ -503,7 +503,7 @@ switch ( $tab )
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"<?php if ( !canEdit( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canEdit( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

50
web/skins/classic/views/controlcaps.php
View File

@ -34,27 +34,27 @@ xhtmlHeaders(__FILE__, $SLANG['ControlCaps'] );
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<a href="#" onclick="closeWindow();"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a>
</div> </div>
<h2><?= $SLANG['ControlCaps'] ?></h2> <h2><?php echo $SLANG['ControlCaps'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>" onsubmit="return( confirmDelete( 'Warning, deleting a control will reset all monitors that use it to be uncontrollable.\nAre you sure you wish to delete?' ) );"> <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>" onsubmit="return( confirmDelete( 'Warning, deleting a control will reset all monitors that use it to be uncontrollable.\nAre you sure you wish to delete?' ) );">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value="delete"/> <input type="hidden" name="action" value="delete"/>
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th class="colName"><?= $SLANG['Name'] ?></th> <th class="colName"><?php echo $SLANG['Name'] ?></th>
<th class="colType"><?= $SLANG['Type'] ?></th> <th class="colType"><?php echo $SLANG['Type'] ?></th>
<th class="colProtocol"><?= $SLANG['Protocol'] ?></th> <th class="colProtocol"><?php echo $SLANG['Protocol'] ?></th>
<th class="colCanMove"><?= $SLANG['CanMove'] ?></th> <th class="colCanMove"><?php echo $SLANG['CanMove'] ?></th>
<th class="colCanZoom"><?= $SLANG['CanZoom'] ?></th> <th class="colCanZoom"><?php echo $SLANG['CanZoom'] ?></th>
<th class="colCanFocus"><?= $SLANG['CanFocus'] ?></th> <th class="colCanFocus"><?php echo $SLANG['CanFocus'] ?></th>
<th class="colCanIris"><?= $SLANG['CanIris'] ?></th> <th class="colCanIris"><?php echo $SLANG['CanIris'] ?></th>
<th class="colCanWhiteBal"><?= $SLANG['CanWhiteBal'] ?></th> <th class="colCanWhiteBal"><?php echo $SLANG['CanWhiteBal'] ?></th>
<th class="colHasPresets"><?= $SLANG['HasPresets'] ?></th> <th class="colHasPresets"><?php echo $SLANG['HasPresets'] ?></th>
<th class="colMark"><?= $SLANG['Mark'] ?></th> <th class="colMark"><?php echo $SLANG['Mark'] ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -63,16 +63,16 @@ foreach( $controls as $control )
{ {
?> ?>
<tr> <tr>
<td class="colName"><?= makePopupLink( '?view=controlcap&amp;cid='.$control['Id'], 'zmControlCap', 'controlcap', $control['Name'], canView( 'Control' ) ) ?></td> <td class="colName"><?php echo makePopupLink( '?view=controlcap&amp;cid='.$control['Id'], 'zmControlCap', 'controlcap', $control['Name'], canView( 'Control' ) ) ?></td>
<td class="colType"><?= $control['Type'] ?></td> <td class="colType"><?php echo $control['Type'] ?></td>
<td class="colProtocol"><?= $control['Protocol'] ?></td> <td class="colProtocol"><?php echo $control['Protocol'] ?></td>
<td class="colCanMove"><?= $control['CanMove']?$SLANG['Yes']:$SLANG['No'] ?></td> <td class="colCanMove"><?php echo $control['CanMove']?$SLANG['Yes']:$SLANG['No'] ?></td>
<td class="colCanZoom"><?= $control['CanZoom']?$SLANG['Yes']:$SLANG['No'] ?></td> <td class="colCanZoom"><?php echo $control['CanZoom']?$SLANG['Yes']:$SLANG['No'] ?></td>
<td class="colCanFocus"><?= $control['CanFocus']?$SLANG['Yes']:$SLANG['No'] ?></td> <td class="colCanFocus"><?php echo $control['CanFocus']?$SLANG['Yes']:$SLANG['No'] ?></td>
<td class="colCanIris"><?= $control['CanIris']?$SLANG['Yes']:$SLANG['No'] ?></td> <td class="colCanIris"><?php echo $control['CanIris']?$SLANG['Yes']:$SLANG['No'] ?></td>
<td class="colCanWhiteBal"><?= $control['CanWhite']?$SLANG['Yes']:$SLANG['No'] ?></td> <td class="colCanWhiteBal"><?php echo $control['CanWhite']?$SLANG['Yes']:$SLANG['No'] ?></td>
<td class="colHasPresets"><?= $control['HasHomePreset']?'H':'' ?><?= $control['HasPresets']?$control['NumPresets']:'0' ?></td> <td class="colHasPresets"><?php echo $control['HasHomePreset']?'H':'' ?><?php echo $control['HasPresets']?$control['NumPresets']:'0' ?></td>
<td class="colMark"><input type="checkbox" name="markCids[]" value="<?= $control['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !canEdit( 'Control' ) ) {?> disabled="disabled"<?php } ?>/></td> <td class="colMark"><input type="checkbox" name="markCids[]" value="<?php echo $control['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !canEdit( 'Control' ) ) {?> disabled="disabled"<?php } ?>/></td>
</tr> </tr>
<?php <?php
} }
@ -80,7 +80,7 @@ foreach( $controls as $control )
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="button" value="<?= $SLANG['AddNewControl'] ?>" onclick="createPopup( '?view=controlcap', 'zmControlCap', 'controlcap' );"<?php if ( !canEdit( 'Control' ) ) {?> disabled="disabled"<?php } ?>/><input type="submit" name="deleteBtn" value="<?= $SLANG['Delete'] ?>" disabled="disabled"/> <input type="button" value="<?php echo $SLANG['AddNewControl'] ?>" onclick="createPopup( '?view=controlcap', 'zmControlCap', 'controlcap' );"<?php if ( !canEdit( 'Control' ) ) {?> disabled="disabled"<?php } ?>/><input type="submit" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" disabled="disabled"/>
</div> </div>
</form> </form>
</div> </div>

12
web/skins/classic/views/controlpreset.php
View File

@ -49,19 +49,19 @@ xhtmlHeaders(__FILE__, $SLANG['SetPreset'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['SetPreset'] ?></h2> <h2><?php echo $SLANG['SetPreset'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<input type="hidden" name="mid" value="<?= $monitor['Id'] ?>"/> <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>"/>
<input type="hidden" name="action" value="control"/> <input type="hidden" name="action" value="control"/>
<input type="hidden" name="control" value="presetSet"/> <input type="hidden" name="control" value="presetSet"/>
<input type="hidden" name="showControls" value="1"/> <input type="hidden" name="showControls" value="1"/>
<p><?= buildSelect( "preset", $presets, "updateLabel()" ) ?></p> <p><?php echo buildSelect( "preset", $presets, "updateLabel()" ) ?></p>
<p><label for="newLabel"><?= $SLANG['NewLabel'] ?></label><input type="text" name="newLabel" id="newLabel" value="" size="16"/></p> <p><label for="newLabel"><?php echo $SLANG['NewLabel'] ?></label><input type="text" name="newLabel" id="newLabel" value="" size="16"/></p>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

8
web/skins/classic/views/cycle.php
View File

@ -94,13 +94,13 @@ xhtmlHeaders(__FILE__, $SLANG['CycleWatch'] );
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<?php if ( $mode == "stream" ) { ?> <?php if ( $mode == "stream" ) { ?>
<a href="?view=<?= $view ?>&amp;mode=still&amp;group=<?= $group ?>&amp;mid=<?= $monitor['Id'] ?>"><?= $SLANG['Stills'] ?></a> <a href="?view=<?php echo $view ?>&amp;mode=still&amp;group=<?php echo $group ?>&amp;mid=<?php echo $monitor['Id'] ?>"><?php echo $SLANG['Stills'] ?></a>
<?php } else { ?> <?php } else { ?>
<a href="?view=<?= $view ?>&amp;mode=stream&amp;group=<?= $group ?>&amp;mid=<?= $monitor['Id'] ?>"><?= $SLANG['Stream'] ?></a> <a href="?view=<?php echo $view ?>&amp;mode=stream&amp;group=<?php echo $group ?>&amp;mid=<?php echo $monitor['Id'] ?>"><?php echo $SLANG['Stream'] ?></a>
<?php } ?> <?php } ?>
<a href="#" onclick="closeWindow(); return( false );"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindow(); return( false );"><?php echo $SLANG['Close'] ?></a>
</div> </div>
<h2><?= $SLANG['Cycle'] ?> - <?= validHtmlStr($monitor['Name']) ?></h2> <h2><?php echo $SLANG['Cycle'] ?> - <?php echo validHtmlStr($monitor['Name']) ?></h2>
</div> </div>
<div id="content"> <div id="content">
<div id="imageFeed"> <div id="imageFeed">

18
web/skins/classic/views/device.php
View File

@ -38,27 +38,27 @@ xhtmlHeaders( __FILE__, $SLANG['Device']." - ".$newDevice['Name'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Device']." - ".validHtmlStr($newDevice['Name']) ?></h2> <h2><?php echo $SLANG['Device']." - ".validHtmlStr($newDevice['Name']) ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value="device"/> <input type="hidden" name="action" value="device"/>
<input type="hidden" name="did" value="<?= $newDevice['Id'] ?>"/> <input type="hidden" name="did" value="<?php echo $newDevice['Id'] ?>"/>
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<th scope="row"><?= $SLANG['Name'] ?></th> <th scope="row"><?php echo $SLANG['Name'] ?></th>
<td><input type="text" name="newDevice[Name]" value="<?= validHtmlStr($newDevice['Name']) ?>"/></td> <td><input type="text" name="newDevice[Name]" value="<?php echo validHtmlStr($newDevice['Name']) ?>"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['KeyString'] ?></th> <th scope="row"><?php echo $SLANG['KeyString'] ?></th>
<td><input type="text" name="newDevice[KeyString]" value="<?= validHtmlStr($newDevice['KeyString']) ?>"/></td> <td><input type="text" name="newDevice[KeyString]" value="<?php echo validHtmlStr($newDevice['KeyString']) ?>"/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"<?php if ( !canEdit( 'Devices' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canEdit( 'Devices' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

18
web/skins/classic/views/devices.php
View File

@ -37,10 +37,10 @@ xhtmlHeaders(__FILE__, $SLANG['Devices'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Devices'] ?></h2> <h2><?php echo $SLANG['Devices'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<input type="hidden" name="action" value="device"/> <input type="hidden" name="action" value="device"/>
<input type="hidden" name="key" value=""/> <input type="hidden" name="key" value=""/>
@ -64,10 +64,10 @@ foreach( $devices as $device )
} }
?> ?>
<tr> <tr>
<td><?= makePopupLink( '?view=device&amp;did='.$device['Id'], 'zmDevice', 'device', '<span class="'.$fclass.'">'.validHtmlStr($device['Name']).' ('.validHtmlStr($device['KeyString']).')</span>', canEdit( 'Devices' ) ) ?></td> <td><?php echo makePopupLink( '?view=device&amp;did='.$device['Id'], 'zmDevice', 'device', '<span class="'.$fclass.'">'.validHtmlStr($device['Name']).' ('.validHtmlStr($device['KeyString']).')</span>', canEdit( 'Devices' ) ) ?></td>
<td><input type="button" value="<?= $SLANG['On'] ?>"<?= ($device['Status'] != 'ON')?' class="set"':'' ?> onclick="switchDeviceOn( this, '<?= validHtmlStr($device['KeyString']) ?>' )"<?= canEdit( 'Devices' )?"":' disabled="disabled"' ?>/></td> <td><input type="button" value="<?php echo $SLANG['On'] ?>"<?php echo ($device['Status'] != 'ON')?' class="set"':'' ?> onclick="switchDeviceOn( this, '<?php echo validHtmlStr($device['KeyString']) ?>' )"<?php echo canEdit( 'Devices' )?"":' disabled="disabled"' ?>/></td>
<td><input type="button" value="<?= $SLANG['Off'] ?>"<?= ($device['Status'] != 'OFF')?' class="set"':'' ?> onclick="switchDeviceOff( this, '<?= validHtmlStr($device['KeyString']) ?>' )"<?= canEdit( 'Devices' )?"":' disabled="disabled"' ?>/></td> <td><input type="button" value="<?php echo $SLANG['Off'] ?>"<?php echo ($device['Status'] != 'OFF')?' class="set"':'' ?> onclick="switchDeviceOff( this, '<?php echo validHtmlStr($device['KeyString']) ?>' )"<?php echo canEdit( 'Devices' )?"":' disabled="disabled"' ?>/></td>
<td><input type="checkbox" name="markDids[]" value="<?= $device['Id'] ?>" onclick="configureButtons( this, 'markDids' );"<?php if ( !canEdit( 'Devices' ) ) {?> disabled="disabled"<?php } ?>/></td> <td><input type="checkbox" name="markDids[]" value="<?php echo $device['Id'] ?>" onclick="configureButtons( this, 'markDids' );"<?php if ( !canEdit( 'Devices' ) ) {?> disabled="disabled"<?php } ?>/></td>
</tr> </tr>
<?php <?php
} }
@ -75,9 +75,9 @@ foreach( $devices as $device )
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="button" value="<?= $SLANG['New'] ?>" onclick="createPopup( '?view=device&amp;did=0', 'zmDevice', 'device' )"<?= canEdit('Devices')?'':' disabled="disabled"' ?>/> <input type="button" value="<?php echo $SLANG['New'] ?>" onclick="createPopup( '?view=device&amp;did=0', 'zmDevice', 'device' )"<?php echo canEdit('Devices')?'':' disabled="disabled"' ?>/>
<input type="button" name="deleteBtn" value="<?= $SLANG['Delete'] ?>" onclick="deleteDevice( this )" disabled="disabled"/> <input type="button" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" onclick="deleteDevice( this )" disabled="disabled"/>
<input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow();"/> <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
</div> </div>
</form> </form>
</div> </div>

14
web/skins/classic/views/donate.php
View File

@ -41,22 +41,22 @@ xhtmlHeaders(__FILE__, $SLANG['Donate'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Donate'] ?></h2> <h2><?php echo $SLANG['Donate'] ?></h2>
<h1>ZoneMinder - <?= $SLANG['Donate'] ?></h1> <h1>ZoneMinder - <?php echo $SLANG['Donate'] ?></h1>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<input type="hidden" name="action" value="donate"/> <input type="hidden" name="action" value="donate"/>
<p> <p>
<?= $SLANG['DonateEnticement'] ?> <?php echo $SLANG['DonateEnticement'] ?>
</p> </p>
<p> <p>
<?= buildSelect( "option", $options ); ?> <?php echo buildSelect( "option", $options ); ?>
</p> </p>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Apply'] ?>" onclick="submitForm( this )"> <input type="submit" value="<?php echo $SLANG['Apply'] ?>" onclick="submitForm( this )">
<input type="button" value="<?= $SLANG['Close'] ?>" onclick="closeWindow()"> <input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="closeWindow()">
</div> </div>
</form> </form>
</div> </div>

8
web/skins/classic/views/error.php
View File

@ -25,17 +25,17 @@ xhtmlHeaders(__FILE__, $SLANG['Error'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h1>ZoneMinder <?= $SLANG['Error'] ?></h1> <h1>ZoneMinder <?php echo $SLANG['Error'] ?></h1>
</div> </div>
<div id="content"> <div id="content">
<p> <p>
<?= $SLANG['YouNoPerms'] ?> <?php echo $SLANG['YouNoPerms'] ?>
</p> </p>
<p> <p>
<?= $SLANG['ContactAdmin'] ?> <?php echo $SLANG['ContactAdmin'] ?>
</p> </p>
<p> <p>
<a href="#" onclick="closeWindow();"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a>
</p> </p>
</div> </div>
</div> </div>

62
web/skins/classic/views/event.php
View File

@ -84,52 +84,52 @@ xhtmlHeaders(__FILE__, $SLANG['Event'] );
<div id="dataBar"> <div id="dataBar">
<table id="dataTable" class="major" cellspacing="0"> <table id="dataTable" class="major" cellspacing="0">
<tr> <tr>
<td><span id="dataId" title="<?= $SLANG['Id'] ?>"><?= $event['Id'] ?></span></td> <td><span id="dataId" title="<?php echo $SLANG['Id'] ?>"><?php echo $event['Id'] ?></span></td>
<td><span id="dataCause" title="<?= $event['Notes']?validHtmlStr($event['Notes']):$SLANG['AttrCause'] ?>"><?= validHtmlStr($event['Cause']) ?></span></td> <td><span id="dataCause" title="<?php echo $event['Notes']?validHtmlStr($event['Notes']):$SLANG['AttrCause'] ?>"><?php echo validHtmlStr($event['Cause']) ?></span></td>
<td><span id="dataTime" title="<?= $SLANG['Time'] ?>"><?= strftime( STRF_FMT_DATETIME_SHORT, strtotime($event['StartTime'] ) ) ?></span></td> <td><span id="dataTime" title="<?php echo $SLANG['Time'] ?>"><?php echo strftime( STRF_FMT_DATETIME_SHORT, strtotime($event['StartTime'] ) ) ?></span></td>
<td><span id="dataDuration" title="<?= $SLANG['Duration'] ?>"><?= $event['Length'] ?></span>s</td> <td><span id="dataDuration" title="<?php echo $SLANG['Duration'] ?>"><?php echo $event['Length'] ?></span>s</td>
<td><span id="dataFrames" title="<?= $SLANG['AttrFrames']."/".$SLANG['AttrAlarmFrames'] ?>"><?= $event['Frames'] ?>/<?= $event['AlarmFrames'] ?></span></td> <td><span id="dataFrames" title="<?php echo $SLANG['AttrFrames']."/".$SLANG['AttrAlarmFrames'] ?>"><?php echo $event['Frames'] ?>/<?php echo $event['AlarmFrames'] ?></span></td>
<td><span id="dataScore" title="<?= $SLANG['AttrTotalScore']."/".$SLANG['AttrAvgScore']."/".$SLANG['AttrMaxScore'] ?>"><?= $event['TotScore'] ?>/<?= $event['AvgScore'] ?>/<?= $event['MaxScore'] ?></span></td> <td><span id="dataScore" title="<?php echo $SLANG['AttrTotalScore']."/".$SLANG['AttrAvgScore']."/".$SLANG['AttrMaxScore'] ?>"><?php echo $event['TotScore'] ?>/<?php echo $event['AvgScore'] ?>/<?php echo $event['MaxScore'] ?></span></td>
</tr> </tr>
</table> </table>
</div> </div>
<div id="menuBar1"> <div id="menuBar1">
<div id="scaleControl"><label for="scale"><?= $SLANG['Scale'] ?></label><?= buildSelect( "scale", $scales, "changeScale();" ); ?></div> <div id="scaleControl"><label for="scale"><?php echo $SLANG['Scale'] ?></label><?php echo buildSelect( "scale", $scales, "changeScale();" ); ?></div>
<div id="replayControl"><label for="replayMode"><?= $SLANG['Replay'] ?></label><?= buildSelect( "replayMode", $replayModes, "changeReplayMode();" ); ?></div> <div id="replayControl"><label for="replayMode"><?php echo $SLANG['Replay'] ?></label><?php echo buildSelect( "replayMode", $replayModes, "changeReplayMode();" ); ?></div>
<div id="nameControl"><input type="text" id="eventName" name="eventName" value="<?= validHtmlStr($event['Name']) ?>" size="16"/><input type="button" value="<?= $SLANG['Rename'] ?>" onclick="renameEvent()"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/></div> <div id="nameControl"><input type="text" id="eventName" name="eventName" value="<?php echo validHtmlStr($event['Name']) ?>" size="16"/><input type="button" value="<?php echo $SLANG['Rename'] ?>" onclick="renameEvent()"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/></div>
</div> </div>
<div id="menuBar2"> <div id="menuBar2">
<div id="closeWindow"><a href="#" onclick="closeWindow();"><?= $SLANG['Close'] ?></a></div> <div id="closeWindow"><a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a></div>
<?php <?php
if ( canEdit( 'Events' ) ) if ( canEdit( 'Events' ) )
{ {
?> ?>
<div id="deleteEvent"><a href="#" onclick="deleteEvent()"><?= $SLANG['Delete'] ?></a></div> <div id="deleteEvent"><a href="#" onclick="deleteEvent()"><?php echo $SLANG['Delete'] ?></a></div>
<div id="editEvent"><a href="#" onclick="editEvent()"><?= $SLANG['Edit'] ?></a></div> <div id="editEvent"><a href="#" onclick="editEvent()"><?php echo $SLANG['Edit'] ?></a></div>
<?php <?php
} }
if ( canView( 'Events' ) ) if ( canView( 'Events' ) )
{ {
?> ?>
<div id="exportEvent"><a href="#" onclick="exportEvent()"><?= $SLANG['Export'] ?></a></div> <div id="exportEvent"><a href="#" onclick="exportEvent()"><?php echo $SLANG['Export'] ?></a></div>
<?php <?php
} }
if ( canEdit( 'Events' ) ) if ( canEdit( 'Events' ) )
{ {
?> ?>
<div id="archiveEvent" class="hidden"><a href="#" onclick="archiveEvent()"><?= $SLANG['Archive'] ?></a></div> <div id="archiveEvent" class="hidden"><a href="#" onclick="archiveEvent()"><?php echo $SLANG['Archive'] ?></a></div>
<div id="unarchiveEvent" class="hidden"><a href="#" onclick="unarchiveEvent()"><?= $SLANG['Unarchive'] ?></a></div> <div id="unarchiveEvent" class="hidden"><a href="#" onclick="unarchiveEvent()"><?php echo $SLANG['Unarchive'] ?></a></div>
<?php <?php
} }
?> ?>
<div id="framesEvent"><a href="#" onclick="showEventFrames()"><?= $SLANG['Frames'] ?></a></div> <div id="framesEvent"><a href="#" onclick="showEventFrames()"><?php echo $SLANG['Frames'] ?></a></div>
<div id="streamEvent"<?php if ( $streamMode == 'stream' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showStream()"><?= $SLANG['Stream'] ?></a></div> <div id="streamEvent"<?php if ( $streamMode == 'stream' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showStream()"><?php echo $SLANG['Stream'] ?></a></div>
<div id="stillsEvent"<?php if ( $streamMode == 'still' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showStills()"><?= $SLANG['Stills'] ?></a></div> <div id="stillsEvent"<?php if ( $streamMode == 'still' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showStills()"><?php echo $SLANG['Stills'] ?></a></div>
<?php <?php
if ( ZM_OPT_FFMPEG ) if ( ZM_OPT_FFMPEG )
{ {
?> ?>
<div id="videoEvent"><a href="#" onclick="videoEvent()"><?= $SLANG['Video'] ?></a></div> <div id="videoEvent"><a href="#" onclick="videoEvent()"><?php echo $SLANG['Video'] ?></a></div>
<?php <?php
} }
?> ?>
@ -157,15 +157,15 @@ else
?> ?>
</div> </div>
<p id="dvrControls"> <p id="dvrControls">
<input type="button" value="&lt;+" id="prevBtn" title="<?= $SLANG['Prev'] ?>" class="inactive" onclick="streamPrev( true )"/> <input type="button" value="&lt;+" id="prevBtn" title="<?php echo $SLANG['Prev'] ?>" class="inactive" onclick="streamPrev( true )"/>
<input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?= $SLANG['Rewind'] ?>" class="inactive" disabled="disabled" onclick="streamFastRev( true )"/> <input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?php echo $SLANG['Rewind'] ?>" class="inactive" disabled="disabled" onclick="streamFastRev( true )"/>
<input type="button" value="&lt;" id="slowRevBtn" title="<?= $SLANG['StepBack'] ?>" class="unavail" disabled="disabled" onclick="streamSlowRev( true )"/> <input type="button" value="&lt;" id="slowRevBtn" title="<?php echo $SLANG['StepBack'] ?>" class="unavail" disabled="disabled" onclick="streamSlowRev( true )"/>
<input type="button" value="||" id="pauseBtn" title="<?= $SLANG['Pause'] ?>" class="inactive" onclick="streamPause( true )"/> <input type="button" value="||" id="pauseBtn" title="<?php echo $SLANG['Pause'] ?>" class="inactive" onclick="streamPause( true )"/>
<input type="button" value="|>" id="playBtn" title="<?= $SLANG['Play'] ?>" class="active" disabled="disabled" onclick="streamPlay( true )"/> <input type="button" value="|>" id="playBtn" title="<?php echo $SLANG['Play'] ?>" class="active" disabled="disabled" onclick="streamPlay( true )"/>
<input type="button" value="&gt;" id="slowFwdBtn" title="<?= $SLANG['StepForward'] ?>" class="unavail" disabled="disabled" onclick="streamSlowFwd( true )"/> <input type="button" value="&gt;" id="slowFwdBtn" title="<?php echo $SLANG['StepForward'] ?>" class="unavail" disabled="disabled" onclick="streamSlowFwd( true )"/>
<input type="button" value="&gt;&gt;" id="fastFwdBtn" title="<?= $SLANG['FastForward'] ?>" class="inactive" disabled="disabled" onclick="streamFastFwd( true )"/> <input type="button" value="&gt;&gt;" id="fastFwdBtn" title="<?php echo $SLANG['FastForward'] ?>" class="inactive" disabled="disabled" onclick="streamFastFwd( true )"/>
<input type="button" value="&ndash;" id="zoomOutBtn" title="<?= $SLANG['ZoomOut'] ?>" class="avail" onclick="streamZoomOut()"/> <input type="button" value="&ndash;" id="zoomOutBtn" title="<?php echo $SLANG['ZoomOut'] ?>" class="avail" onclick="streamZoomOut()"/>
<input type="button" value="+&gt;" id="nextBtn" title="<?= $SLANG['Next'] ?>" class="inactive" onclick="streamNext( true )"/> <input type="button" value="+&gt;" id="nextBtn" title="<?php echo $SLANG['Next'] ?>" class="inactive" onclick="streamNext( true )"/>
</p> </p>
<div id="replayStatus"> <div id="replayStatus">
<span id="mode">Mode: <span id="modeValue">&nbsp;</span></span> <span id="mode">Mode: <span id="modeValue">&nbsp;</span></span>
@ -178,7 +178,7 @@ else
for ( $i = 0; $i < $panelSections; $i++ ) for ( $i = 0; $i < $panelSections; $i++ )
{ {
?> ?>
<div class="progressBox" id="progressBox<?= $i ?>" title=""></div> <div class="progressBox" id="progressBox<?php echo $i ?>" title=""></div>
<?php <?php
} }
?> ?>
@ -193,8 +193,8 @@ else
<div id="eventImageFrame"> <div id="eventImageFrame">
<img id="eventImage" src="graphics/transparent.gif" alt=""/> <img id="eventImage" src="graphics/transparent.gif" alt=""/>
<div id="eventImageBar"> <div id="eventImageBar">
<div id="eventImageClose"><input type="button" value="<?= $SLANG['Close'] ?>" onclick="hideEventImage()"/></div> <div id="eventImageClose"><input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="hideEventImage()"/></div>
<div id="eventImageStats" class="hidden"><input type="button" value="<?= $SLANG['Stats'] ?>" onclick="showFrameStats()"/></div> <div id="eventImageStats" class="hidden"><input type="button" value="<?php echo $SLANG['Stats'] ?>" onclick="showFrameStats()"/></div>
<div id="eventImageData">Frame <span id="eventImageNo"></span></div> <div id="eventImageData">Frame <span id="eventImageNo"></span></div>
</div> </div>
</div> </div>

22
web/skins/classic/views/eventdetail.php
View File

@ -72,27 +72,27 @@ else
if ( $mode == 'single' ) if ( $mode == 'single' )
{ {
?> ?>
<h2><?= $SLANG['Event'] ?> <?= $eid ?></h2> <h2><?php echo $SLANG['Event'] ?> <?php echo $eid ?></h2>
<?php <?php
} }
else else
{ {
?> ?>
<h2><?= $SLANG['Events'] ?></h2> <h2><?php echo $SLANG['Events'] ?></h2>
<?php <?php
} }
?> ?>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<?php <?php
if ( $mode == 'single' ) if ( $mode == 'single' )
{ {
?> ?>
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value="eventdetail"/> <input type="hidden" name="action" value="eventdetail"/>
<input type="hidden" name="eid" value="<?= $eid ?>"/> <input type="hidden" name="eid" value="<?php echo $eid ?>"/>
<?php <?php
} }
elseif ( $mode = 'multi' ) elseif ( $mode = 'multi' )
@ -104,7 +104,7 @@ elseif ( $mode = 'multi' )
foreach ( $_REQUEST['eids'] as $eid ) foreach ( $_REQUEST['eids'] as $eid )
{ {
?> ?>
<input type="hidden" name="markEids[]" value="<?= validHtmlStr($eid) ?>"/> <input type="hidden" name="markEids[]" value="<?php echo validHtmlStr($eid) ?>"/>
<?php <?php
} }
} }
@ -112,17 +112,17 @@ elseif ( $mode = 'multi' )
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<th scope="row"><?= $SLANG['Cause'] ?></th> <th scope="row"><?php echo $SLANG['Cause'] ?></th>
<td><input type="text" name="newEvent[Cause]" value="<?= validHtmlStr($newEvent['Cause']) ?>" size="32"/></td> <td><input type="text" name="newEvent[Cause]" value="<?php echo validHtmlStr($newEvent['Cause']) ?>" size="32"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Notes'] ?></th> <th scope="row"><?php echo $SLANG['Notes'] ?></th>
<td><textarea name="newEvent[Notes]" rows="6" cols="50"><?= validHtmlStr($newEvent['Notes']) ?></textarea></td> <td><textarea name="newEvent[Notes]" rows="6" cols="50"><?php echo validHtmlStr($newEvent['Notes']) ?></textarea></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

92
web/skins/classic/views/events.php
View File

@ -127,42 +127,42 @@ if ( $pages > 1 )
if ( !empty($page) ) if ( !empty($page) )
{ {
?> ?>
<a href="?view=<?= $view ?>&amp;page=0<?= $filterQuery ?><?= $sortQuery ?>&amp;limit=<?= $limit ?>"><?= $SLANG['ViewAll'] ?></a> <a href="?view=<?php echo $view ?>&amp;page=0<?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $limit ?>"><?php echo $SLANG['ViewAll'] ?></a>
<?php <?php
} }
else else
{ {
?> ?>
<a href="?view=<?= $view ?>&amp;page=1<?= $filterQuery ?><?= $sortQuery ?>&amp;limit=<?= $limit ?>"><?= $SLANG['ViewPaged'] ?></a> <a href="?view=<?php echo $view ?>&amp;page=1<?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $limit ?>"><?php echo $SLANG['ViewPaged'] ?></a>
<?php <?php
} }
} }
?> ?>
<a href="#" onclick="closeWindows();"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindows();"><?php echo $SLANG['Close'] ?></a>
</div> </div>
<h2><?= sprintf( $CLANG['EventCount'], $nEvents, zmVlang( $VLANG['Event'], $nEvents ) ) ?></h2> <h2><?php echo sprintf( $CLANG['EventCount'], $nEvents, zmVlang( $VLANG['Event'], $nEvents ) ) ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="post" action=""> <form name="contentForm" id="contentForm" method="post" action="">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value=""/> <input type="hidden" name="action" value=""/>
<input type="hidden" name="page" value="<?= $page ?>"/> <input type="hidden" name="page" value="<?php echo $page ?>"/>
<?= $_REQUEST['filter']['fields'] ?> <?php echo $_REQUEST['filter']['fields'] ?>
<input type="hidden" name="sort_field" value="<?= validHtmlStr($_REQUEST['sort_field']) ?>"/> <input type="hidden" name="sort_field" value="<?php echo validHtmlStr($_REQUEST['sort_field']) ?>"/>
<input type="hidden" name="sort_asc" value="<?= validHtmlStr($_REQUEST['sort_asc']) ?>"/> <input type="hidden" name="sort_asc" value="<?php echo validHtmlStr($_REQUEST['sort_asc']) ?>"/>
<input type="hidden" name="limit" value="<?= $limit ?>"/> <input type="hidden" name="limit" value="<?php echo $limit ?>"/>
<?php <?php
if ( $pagination ) if ( $pagination )
{ {
?> ?>
<h3 class="pagination"><?= $pagination ?></h3> <h3 class="pagination"><?php echo $pagination ?></h3>
<?php <?php
} }
?> ?>
<p id="controls"> <p id="controls">
<a id="refreshLink" href="#" onclick="location.reload(true);"><?= $SLANG['Refresh'] ?></a> <a id="refreshLink" href="#" onclick="location.reload(true);"><?php echo $SLANG['Refresh'] ?></a>
<a id="filterLink" href="#" onclick="createPopup( '?view=filter&amp;page=<?= $page ?><?= $filterQuery ?>', 'zmFilter', 'filter' );"><?= $SLANG['ShowFilterWindow'] ?></a> <a id="filterLink" href="#" onclick="createPopup( '?view=filter&amp;page=<?php echo $page ?><?php echo $filterQuery ?>', 'zmFilter', 'filter' );"><?php echo $SLANG['ShowFilterWindow'] ?></a>
<a id="timelineLink" href="#" onclick="createPopup( '?view=timeline<?= $filterQuery ?>', 'zmTimeline', 'timeline' );"><?= $SLANG['ShowTimeline'] ?></a> <a id="timelineLink" href="#" onclick="createPopup( '?view=timeline<?php echo $filterQuery ?>', 'zmTimeline', 'timeline' );"><?php echo $SLANG['ShowTimeline'] ?></a>
</p> </p>
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
<tbody> <tbody>
@ -174,22 +174,22 @@ foreach ( $events as $event )
{ {
?> ?>
<tr> <tr>
<th class="colId"><a href="<?= sortHeader( 'Id' ) ?>"><?= $SLANG['Id'] ?><?= sortTag( 'Id' ) ?></a></th> <th class="colId"><a href="<?php echo sortHeader( 'Id' ) ?>"><?php echo $SLANG['Id'] ?><?php echo sortTag( 'Id' ) ?></a></th>
<th class="colName"><a href="<?= sortHeader( 'Name' ) ?>"><?= $SLANG['Name'] ?><?= sortTag( 'Name' ) ?></a></th> <th class="colName"><a href="<?php echo sortHeader( 'Name' ) ?>"><?php echo $SLANG['Name'] ?><?php echo sortTag( 'Name' ) ?></a></th>
<th class="colMonitor"><a href="<?= sortHeader( 'MonitorName' ) ?>"><?= $SLANG['Monitor'] ?><?= sortTag( 'MonitorName' ) ?></a></th> <th class="colMonitor"><a href="<?php echo sortHeader( 'MonitorName' ) ?>"><?php echo $SLANG['Monitor'] ?><?php echo sortTag( 'MonitorName' ) ?></a></th>
<th class="colCause"><a href="<?= sortHeader( 'Cause' ) ?>"><?= $SLANG['Cause'] ?><?= sortTag( 'Cause' ) ?></a></th> <th class="colCause"><a href="<?php echo sortHeader( 'Cause' ) ?>"><?php echo $SLANG['Cause'] ?><?php echo sortTag( 'Cause' ) ?></a></th>
<th class="colTime"><a href="<?= sortHeader( 'StartTime' ) ?>"><?= $SLANG['Time'] ?><?= sortTag( 'StartTime' ) ?></a></th> <th class="colTime"><a href="<?php echo sortHeader( 'StartTime' ) ?>"><?php echo $SLANG['Time'] ?><?php echo sortTag( 'StartTime' ) ?></a></th>
<th class="colDuration"><a href="<?= sortHeader( 'Length' ) ?>"><?= $SLANG['Duration'] ?><?= sortTag( 'Length' ) ?></a></th> <th class="colDuration"><a href="<?php echo sortHeader( 'Length' ) ?>"><?php echo $SLANG['Duration'] ?><?php echo sortTag( 'Length' ) ?></a></th>
<th class="colFrames"><a href="<?= sortHeader( 'Frames' ) ?>"><?= $SLANG['Frames'] ?><?= sortTag( 'Frames' ) ?></a></th> <th class="colFrames"><a href="<?php echo sortHeader( 'Frames' ) ?>"><?php echo $SLANG['Frames'] ?><?php echo sortTag( 'Frames' ) ?></a></th>
<th class="colAlarmFrames"><a href="<?= sortHeader( 'AlarmFrames' ) ?>"><?= $SLANG['AlarmBrFrames'] ?><?= sortTag( 'AlarmFrames' ) ?></a></th> <th class="colAlarmFrames"><a href="<?php echo sortHeader( 'AlarmFrames' ) ?>"><?php echo $SLANG['AlarmBrFrames'] ?><?php echo sortTag( 'AlarmFrames' ) ?></a></th>
<th class="colTotScore"><a href="<?= sortHeader( 'TotScore' ) ?>"><?= $SLANG['TotalBrScore'] ?><?= sortTag( 'TotScore' ) ?></a></th> <th class="colTotScore"><a href="<?php echo sortHeader( 'TotScore' ) ?>"><?php echo $SLANG['TotalBrScore'] ?><?php echo sortTag( 'TotScore' ) ?></a></th>
<th class="colAvgScore"><a href="<?= sortHeader( 'AvgScore' ) ?>"><?= $SLANG['AvgBrScore'] ?><?= sortTag( 'AvgScore' ) ?></a></th> <th class="colAvgScore"><a href="<?php echo sortHeader( 'AvgScore' ) ?>"><?php echo $SLANG['AvgBrScore'] ?><?php echo sortTag( 'AvgScore' ) ?></a></th>
<th class="colMaxScore"><a href="<?= sortHeader( 'MaxScore' ) ?>"><?= $SLANG['MaxBrScore'] ?><?= sortTag( 'MaxScore' ) ?></a></th> <th class="colMaxScore"><a href="<?php echo sortHeader( 'MaxScore' ) ?>"><?php echo $SLANG['MaxBrScore'] ?><?php echo sortTag( 'MaxScore' ) ?></a></th>
<?php <?php
if ( ZM_WEB_LIST_THUMBS ) if ( ZM_WEB_LIST_THUMBS )
{ {
?> ?>
<th class="colThumbnail"><?= $SLANG['Thumbnail'] ?></th> <th class="colThumbnail"><?php echo $SLANG['Thumbnail'] ?></th>
<?php <?php
} }
?> ?>
@ -200,24 +200,24 @@ foreach ( $events as $event )
$scale = max( reScale( SCALE_BASE, $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE ); $scale = max( reScale( SCALE_BASE, $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
?> ?>
<tr> <tr>
<td class="colId"><?= makePopupLink( '?view=event&amp;eid='.$event['Id'].$filterQuery.$sortQuery.'&amp;page=1', 'zmEvent', array( 'event', reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ) ), $event['Id'].($event['Archived']?'*':'') ) ?></td> <td class="colId"><?php echo makePopupLink( '?view=event&amp;eid='.$event['Id'].$filterQuery.$sortQuery.'&amp;page=1', 'zmEvent', array( 'event', reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ) ), $event['Id'].($event['Archived']?'*':'') ) ?></td>
<td class="colName"><?= makePopupLink( '?view=event&amp;eid='.$event['Id'].$filterQuery.$sortQuery.'&amp;page=1', 'zmEvent', array( 'event', reScale( $event['Width'], $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), reScale( $event['Height'], $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE ) ), validHtmlStr($event['Name']).($event['Archived']?'*':'' ) ) ?></td> <td class="colName"><?php echo makePopupLink( '?view=event&amp;eid='.$event['Id'].$filterQuery.$sortQuery.'&amp;page=1', 'zmEvent', array( 'event', reScale( $event['Width'], $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), reScale( $event['Height'], $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE ) ), validHtmlStr($event['Name']).($event['Archived']?'*':'' ) ) ?></td>
<td class="colMonitorName"><?= $event['MonitorName'] ?></td> <td class="colMonitorName"><?php echo $event['MonitorName'] ?></td>
<td class="colCause"><?= makePopupLink( '?view=eventdetail&amp;eid='.$event['Id'], 'zmEventDetail', 'eventdetail', validHtmlStr($event['Cause']), canEdit( 'Events' ), 'title="'.htmlspecialchars($event['Notes']).'"' ) ?></td> <td class="colCause"><?php echo makePopupLink( '?view=eventdetail&amp;eid='.$event['Id'], 'zmEventDetail', 'eventdetail', validHtmlStr($event['Cause']), canEdit( 'Events' ), 'title="'.htmlspecialchars($event['Notes']).'"' ) ?></td>
<td class="colTime"><?= strftime( STRF_FMT_DATETIME_SHORTER, strtotime($event['StartTime']) ) ?></td> <td class="colTime"><?php echo strftime( STRF_FMT_DATETIME_SHORTER, strtotime($event['StartTime']) ) ?></td>
<td class="colDuration"><?= $event['Length'] ?></td> <td class="colDuration"><?php echo $event['Length'] ?></td>
<td class="colFrames"><?= makePopupLink( '?view=frames&amp;eid='.$event['Id'], 'zmFrames', 'frames', $event['Frames'] ) ?></td> <td class="colFrames"><?php echo makePopupLink( '?view=frames&amp;eid='.$event['Id'], 'zmFrames', 'frames', $event['Frames'] ) ?></td>
<td class="colAlarmFrames"><?= makePopupLink( '?view=frames&amp;eid='.$event['Id'], 'zmFrames', 'frames', $event['AlarmFrames'] ) ?></td> <td class="colAlarmFrames"><?php echo makePopupLink( '?view=frames&amp;eid='.$event['Id'], 'zmFrames', 'frames', $event['AlarmFrames'] ) ?></td>
<td class="colTotScore"><?= $event['TotScore'] ?></td> <td class="colTotScore"><?php echo $event['TotScore'] ?></td>
<td class="colAvgScore"><?= $event['AvgScore'] ?></td> <td class="colAvgScore"><?php echo $event['AvgScore'] ?></td>
<td class="colMaxScore"><?= makePopupLink( '?view=frame&amp;eid='.$event['Id'].'&amp;fid=0', 'zmImage', array( 'image', reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ) ), $event['MaxScore'] ) ?></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 <?php
if ( ZM_WEB_LIST_THUMBS ) if ( ZM_WEB_LIST_THUMBS )
{ {
if ( $thumbData = createListThumbnail( $event ) ) if ( $thumbData = createListThumbnail( $event ) )
{ {
?> ?>
<td class="colThumbnail"><?= makePopupLink( '?view=frame&amp;eid='.$event['Id'].'&amp;fid='.$thumbData['FrameId'], 'zmImage', array( 'image', reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ) ), '<img src="'.viewImagePath( $thumbData['Path'] ).'" width="'.$thumbData['Width'].'" height="'.$thumbData['Height'].'" alt="'.$thumbData['FrameId'].'/'.$event['MaxScore'].'"/>' ) ?></td> <td class="colThumbnail"><?php echo makePopupLink( '?view=frame&amp;eid='.$event['Id'].'&amp;fid='.$thumbData['FrameId'], 'zmImage', array( 'image', reScale( $event['Width'], $scale ), reScale( $event['Height'], $scale ) ), '<img src="'.viewImagePath( $thumbData['Path'] ).'" width="'.$thumbData['Width'].'" height="'.$thumbData['Height'].'" alt="'.$thumbData['FrameId'].'/'.$event['MaxScore'].'"/>' ) ?></td>
<?php <?php
} }
else else
@ -228,7 +228,7 @@ foreach ( $events as $event )
} }
} }
?> ?>
<td class="colMark"><input type="checkbox" name="markEids[]" value="<?= $event['Id'] ?>" onclick="configureButton( this, 'markEids' );"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/></td> <td class="colMark"><input type="checkbox" name="markEids[]" value="<?php echo $event['Id'] ?>" onclick="configureButton( this, 'markEids' );"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/></td>
</tr> </tr>
<?php <?php
} }
@ -239,19 +239,19 @@ foreach ( $events as $event )
if ( $pagination ) if ( $pagination )
{ {
?> ?>
<h3 class="pagination"><?= $pagination ?></h3> <h3 class="pagination"><?php echo $pagination ?></h3>
<?php <?php
} }
if ( true || canEdit( 'Events' ) ) if ( true || canEdit( 'Events' ) )
{ {
?> ?>
<div id="contentButtons"> <div id="contentButtons">
<input type="button" name="viewBtn" value="<?= $SLANG['View'] ?>" onclick="viewEvents( this, 'markEids' );" disabled="disabled"/> <input type="button" name="viewBtn" value="<?php echo $SLANG['View'] ?>" onclick="viewEvents( this, 'markEids' );" disabled="disabled"/>
<input type="button" name="archiveBtn" value="<?= $SLANG['Archive'] ?>" onclick="archiveEvents( this, 'markEids' )" disabled="disabled"/> <input type="button" name="archiveBtn" value="<?php echo $SLANG['Archive'] ?>" onclick="archiveEvents( this, 'markEids' )" disabled="disabled"/>
<input type="button" name="unarchiveBtn" value="<?= $SLANG['Unarchive'] ?>" onclick="unarchiveEvents( this, 'markEids' );" disabled="disabled"/> <input type="button" name="unarchiveBtn" value="<?php echo $SLANG['Unarchive'] ?>" onclick="unarchiveEvents( this, 'markEids' );" disabled="disabled"/>
<input type="button" name="editBtn" value="<?= $SLANG['Edit'] ?>" onclick="editEvents( this, 'markEids' )" disabled="disabled"/> <input type="button" name="editBtn" value="<?php echo $SLANG['Edit'] ?>" onclick="editEvents( this, 'markEids' )" disabled="disabled"/>
<input type="button" name="exportBtn" value="<?= $SLANG['Export'] ?>" onclick="exportEvents( this, 'markEids' )" disabled="disabled"/> <input type="button" name="exportBtn" value="<?php echo $SLANG['Export'] ?>" onclick="exportEvents( this, 'markEids' )" disabled="disabled"/>
<input type="button" name="deleteBtn" value="<?= $SLANG['Delete'] ?>" onclick="deleteEvents( this, 'markEids' );" disabled="disabled"/> <input type="button" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" onclick="deleteEvents( this, 'markEids' );" disabled="disabled"/>
</div> </div>
<?php <?php
} }

34
web/skins/classic/views/export.php
View File

@ -48,17 +48,17 @@ xhtmlHeaders(__FILE__, $SLANG['Export'] );
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<a href="#" onclick="closeWindow()"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindow()"><?php echo $SLANG['Close'] ?></a>
</div> </div>
<h2><?= $SLANG['ExportOptions'] ?></h2> <h2><?php echo $SLANG['ExportOptions'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<?php <?php
if ( !empty($_REQUEST['eid']) ) if ( !empty($_REQUEST['eid']) )
{ {
?> ?>
<input type="hidden" name="id" value="<?= validInt($_REQUEST['eid']) ?>"/> <input type="hidden" name="id" value="<?php echo validInt($_REQUEST['eid']) ?>"/>
<?php <?php
} }
elseif ( !empty($_REQUEST['eids']) ) elseif ( !empty($_REQUEST['eids']) )
@ -66,7 +66,7 @@ elseif ( !empty($_REQUEST['eids']) )
foreach ( $_REQUEST['eids'] as $eid ) foreach ( $_REQUEST['eids'] as $eid )
{ {
?> ?>
<input type="hidden" name="eids[]" value="<?= validInt($eid) ?>"/> <input type="hidden" name="eids[]" value="<?php echo validInt($eid) ?>"/>
<?php <?php
} }
unset( $eid ); unset( $eid );
@ -75,54 +75,54 @@ elseif ( !empty($_REQUEST['eids']) )
<table id="contentTable" class="minor" cellspacing="0"> <table id="contentTable" class="minor" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<th scope="row"><?= $SLANG['ExportDetails'] ?></th> <th scope="row"><?php echo $SLANG['ExportDetails'] ?></th>
<td><input type="checkbox" name="exportDetail" value="1"<?php if ( !empty($_REQUEST['exportDetail']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td> <td><input type="checkbox" name="exportDetail" value="1"<?php if ( !empty($_REQUEST['exportDetail']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ExportFrames'] ?></th> <th scope="row"><?php echo $SLANG['ExportFrames'] ?></th>
<td><input type="checkbox" name="exportFrames" value="1"<?php if ( !empty($_REQUEST['exportFrames']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td> <td><input type="checkbox" name="exportFrames" value="1"<?php if ( !empty($_REQUEST['exportFrames']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ExportImageFiles'] ?></th> <th scope="row"><?php echo $SLANG['ExportImageFiles'] ?></th>
<td><input type="checkbox" name="exportImages" value="1"<?php if ( !empty($_REQUEST['exportImages']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td> <td><input type="checkbox" name="exportImages" value="1"<?php if ( !empty($_REQUEST['exportImages']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ExportVideoFiles'] ?></th> <th scope="row"><?php echo $SLANG['ExportVideoFiles'] ?></th>
<td><input type="checkbox" name="exportVideo" value="1"<?php if ( !empty($_REQUEST['exportVideo']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td> <td><input type="checkbox" name="exportVideo" value="1"<?php if ( !empty($_REQUEST['exportVideo']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ExportMiscFiles'] ?></th> <th scope="row"><?php echo $SLANG['ExportMiscFiles'] ?></th>
<td><input type="checkbox" name="exportMisc" value="1"<?php if ( !empty($_REQUEST['exportMisc']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td> <td><input type="checkbox" name="exportMisc" value="1"<?php if ( !empty($_REQUEST['exportMisc']) ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ExportFormat'] ?></th> <th scope="row"><?php echo $SLANG['ExportFormat'] ?></th>
<td> <td>
<input type="radio" id="exportFormatTar" name="exportFormat" value="tar"<?php if ( isset($_REQUEST['exportFormat']) && $_REQUEST['exportFormat'] == "tar" ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/><label for="exportFormatTar"><?= $SLANG['ExportFormatTar'] ?></label> <input type="radio" id="exportFormatTar" name="exportFormat" value="tar"<?php if ( isset($_REQUEST['exportFormat']) && $_REQUEST['exportFormat'] == "tar" ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/><label for="exportFormatTar"><?php echo $SLANG['ExportFormatTar'] ?></label>
<input type="radio" id="exportFormatZip" name="exportFormat" value="zip"<?php if ( isset($_REQUEST['exportFormat']) && $_REQUEST['exportFormat'] == "zip" ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/><label for="exportFormatZip"><?= $SLANG['ExportFormatZip'] ?></label> <input type="radio" id="exportFormatZip" name="exportFormat" value="zip"<?php if ( isset($_REQUEST['exportFormat']) && $_REQUEST['exportFormat'] == "zip" ) { ?> checked="checked"<?php } ?> onclick="configureExportButton( this )"/><label for="exportFormatZip"><?php echo $SLANG['ExportFormatZip'] ?></label>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<input type="button" id="exportButton" name="exportButton" value="<?= $SLANG['Export'] ?>" onclick="exportEvent( this.form );" disabled="disabled"/> <input type="button" id="exportButton" name="exportButton" value="<?php echo $SLANG['Export'] ?>" onclick="exportEvent( this.form );" disabled="disabled"/>
</form> </form>
</div> </div>
<?php <?php
if ( isset($_REQUEST['generated']) ) if ( isset($_REQUEST['generated']) )
{ {
?> ?>
<h2 id="exportProgress" class="<?= $_REQUEST['generated']?'infoText':'errorText' ?>"><span id="exportProgressText"><?= $_REQUEST['generated']?$SLANG['ExportSucceeded']:$SLANG['ExportFailed'] ?></span><span id="exportProgressTicker"></span></h2> <h2 id="exportProgress" class="<?php echo $_REQUEST['generated']?'infoText':'errorText' ?>"><span id="exportProgressText"><?php echo $_REQUEST['generated']?$SLANG['ExportSucceeded']:$SLANG['ExportFailed'] ?></span><span id="exportProgressTicker"></span></h2>
<?php <?php
} }
else else
{ {
?> ?>
<h2 id="exportProgress" class="hidden warnText"><span id="exportProgressText"><?= $SLANG['Exporting'] ?></span><span id="exportProgressTicker"></span></h2> <h2 id="exportProgress" class="hidden warnText"><span id="exportProgressText"><?php echo $SLANG['Exporting'] ?></span><span id="exportProgressTicker"></span></h2>
<?php <?php
} }
if ( !empty($_REQUEST['generated']) ) if ( !empty($_REQUEST['generated']) )
{ {
?> ?>
<h3 id="downloadLink"><a href="<?= validHtmlStr($_REQUEST['exportFile']) ?>"><?= $SLANG['Download'] ?></a></h3> <h3 id="downloadLink"><a href="<?php echo validHtmlStr($_REQUEST['exportFile']) ?>"><?php echo $SLANG['Download'] ?></a></h3>
<?php <?php
} }
?> ?>

74
web/skins/classic/views/filter.php
View File

@ -140,14 +140,14 @@ xhtmlHeaders(__FILE__, $SLANG['EventFilter'] );
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<a href="#" onclick="closeWindow();"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a>
</div> </div>
<h2><?= $SLANG['EventFilter'] ?></h2> <h2><?php echo $SLANG['EventFilter'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="filter"/> <input type="hidden" name="view" value="filter"/>
<input type="hidden" name="page" value="<?= requestVar( 'page' ) ?>"/> <input type="hidden" name="page" value="<?php echo requestVar( 'page' ) ?>"/>
<input type="hidden" name="reload" value="0"/> <input type="hidden" name="reload" value="0"/>
<input type="hidden" name="execute" value="0"/> <input type="hidden" name="execute" value="0"/>
<input type="hidden" name="action" value=""/> <input type="hidden" name="action" value=""/>
@ -155,7 +155,7 @@ xhtmlHeaders(__FILE__, $SLANG['EventFilter'] );
<input type="hidden" name="line" value=""/> <input type="hidden" name="line" value=""/>
<input type="hidden" name="fid" value=""/> <input type="hidden" name="fid" value=""/>
<hr/> <hr/>
<div id="filterSelector"><label for="<?= $selectName ?>"><?= $SLANG['UseFilter'] ?></label><?php if ( count($filterNames) > 1 ) { echo buildSelect( $selectName, $filterNames, "submitToFilter( this, 1 );" ); } else { ?><select disabled="disabled"><option><?= $SLANG['NoSavedFilters'] ?></option></select><?php } ?><?= $backgroundStr ?></div> <div id="filterSelector"><label for="<?php echo $selectName ?>"><?php echo $SLANG['UseFilter'] ?></label><?php if ( count($filterNames) > 1 ) { echo buildSelect( $selectName, $filterNames, "submitToFilter( this, 1 );" ); } else { ?><select disabled="disabled"><option><?php echo $SLANG['NoSavedFilters'] ?></option></select><?php } ?><?php echo $backgroundStr ?></div>
<hr/> <hr/>
<table id="fieldsTable" class="filterTable" cellspacing="0"> <table id="fieldsTable" class="filterTable" cellspacing="0">
<tbody> <tbody>
@ -174,41 +174,41 @@ for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['term
else else
{ {
?> ?>
<td><?= buildSelect( "filter[terms][$i][cnj]", $conjunctionTypes ); ?></td> <td><?php echo buildSelect( "filter[terms][$i][cnj]", $conjunctionTypes ); ?></td>
<?php <?php
} }
?> ?>
<td><?php if ( count($_REQUEST['filter']['terms']) > 2 ) { echo buildSelect( "filter[terms][$i][obr]", $obracketTypes ); } else { ?>&nbsp;<?php } ?></td> <td><?php if ( count($_REQUEST['filter']['terms']) > 2 ) { echo buildSelect( "filter[terms][$i][obr]", $obracketTypes ); } else { ?>&nbsp;<?php } ?></td>
<td><?= buildSelect( "filter[terms][$i][attr]", $attrTypes, "clearValue( this, $i ); submitToFilter( this, 0 );" ); ?></td> <td><?php echo buildSelect( "filter[terms][$i][attr]", $attrTypes, "clearValue( this, $i ); submitToFilter( this, 0 );" ); ?></td>
<?php <?php
if ( isset($_REQUEST['filter']['terms'][$i]['attr']) ) if ( isset($_REQUEST['filter']['terms'][$i]['attr']) )
{ {
if ( $_REQUEST['filter']['terms'][$i]['attr'] == "Archived" ) if ( $_REQUEST['filter']['terms'][$i]['attr'] == "Archived" )
{ {
?> ?>
<td><?= $SLANG['OpEq'] ?><input type="hidden" name="filter[terms][<?= $i ?>][op]" value="="/></td> <td><?php echo $SLANG['OpEq'] ?><input type="hidden" name="filter[terms][<?php echo $i ?>][op]" value="="/></td>
<td><?= buildSelect( "filter[terms][$i][val]", $archiveTypes ); ?></td> <td><?php echo buildSelect( "filter[terms][$i][val]", $archiveTypes ); ?></td>
<?php <?php
} }
elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "DateTime" ) elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "DateTime" )
{ {
?> ?>
<td><?= buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td> <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
<td><input name="filter[terms][<?= $i ?>][val]" id="filter[terms][<?= $i ?>][val]" value="<?= isset($_REQUEST['filter']['terms'][$i]['val'])?validHtmlStr($_REQUEST['filter']['terms'][$i]['val']):'' ?>"/><?php if ( $hasCal ) { ?><script type="text/javascript">Calendar.setup( { inputField: "filter[terms][<?= $i ?>][val]", ifFormat: "%Y-%m-%d %H:%M", showsTime: true, timeFormat: "24", showOthers: true, weekNumbers: false });</script><?php } ?></td> <td><input name="filter[terms][<?php echo $i ?>][val]" id="filter[terms][<?php echo $i ?>][val]" value="<?php echo isset($_REQUEST['filter']['terms'][$i]['val'])?validHtmlStr($_REQUEST['filter']['terms'][$i]['val']):'' ?>"/><?php if ( $hasCal ) { ?><script type="text/javascript">Calendar.setup( { inputField: "filter[terms][<?php echo $i ?>][val]", ifFormat: "%Y-%m-%d %H:%M", showsTime: true, timeFormat: "24", showOthers: true, weekNumbers: false });</script><?php } ?></td>
<?php <?php
} }
elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "Date" ) elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "Date" )
{ {
?> ?>
<td><?= buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td> <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
<td><input name="filter[terms][<?= $i ?>][val]" id="filter[terms][<?= $i ?>][val]" value="<?= isset($_REQUEST['filter']['terms'][$i]['val'])?validHtmlStr($_REQUEST['filter']['terms'][$i]['val']):'' ?>"/><?php if ( $hasCal ) { ?><script type="text/javascript">Calendar.setup( { inputField: "filter[terms][<?= $i ?>][val]", ifFormat: "%Y-%m-%d", showOthers: true, weekNumbers: false });</script><?php } ?></td> <td><input name="filter[terms][<?php echo $i ?>][val]" id="filter[terms][<?php echo $i ?>][val]" value="<?php echo isset($_REQUEST['filter']['terms'][$i]['val'])?validHtmlStr($_REQUEST['filter']['terms'][$i]['val']):'' ?>"/><?php if ( $hasCal ) { ?><script type="text/javascript">Calendar.setup( { inputField: "filter[terms][<?php echo $i ?>][val]", ifFormat: "%Y-%m-%d", showOthers: true, weekNumbers: false });</script><?php } ?></td>
<?php <?php
} }
elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "Weekday" ) elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "Weekday" )
{ {
?> ?>
<td><?= buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td> <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
<td><?= buildSelect( "filter[terms][$i][val]", $weekdays ); ?></td> <td><?php echo buildSelect( "filter[terms][$i][val]", $weekdays ); ?></td>
<?php <?php
} }
elseif ( false && $_REQUEST['filter']['terms'][$i]['attr'] == "MonitorName" ) elseif ( false && $_REQUEST['filter']['terms'][$i]['attr'] == "MonitorName" )
@ -222,28 +222,28 @@ for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['term
} }
} }
?> ?>
<td><?= buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td> <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
<td><?= buildSelect( "filter[terms][$i][val]", $monitors ); ?></td> <td><?php echo buildSelect( "filter[terms][$i][val]", $monitors ); ?></td>
<?php <?php
} }
else else
{ {
?> ?>
<td><?= buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td> <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
<td><input name="filter[terms][<?= $i ?>][val]" value="<?= $_REQUEST['filter']['terms'][$i]['val'] ?>"/></td> <td><input name="filter[terms][<?php echo $i ?>][val]" value="<?php echo $_REQUEST['filter']['terms'][$i]['val'] ?>"/></td>
<?php <?php
} }
} }
else else
{ {
?> ?>
<td><?= buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td> <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
<td><input name="filter[terms][<?= $i ?>][val]" value="<?= isset($_REQUEST['filter']['terms'][$i]['val'])?$_REQUEST['filter']['terms'][$i]['val']:'' ?>"/></td> <td><input name="filter[terms][<?php echo $i ?>][val]" value="<?php echo isset($_REQUEST['filter']['terms'][$i]['val'])?$_REQUEST['filter']['terms'][$i]['val']:'' ?>"/></td>
<?php <?php
} }
?> ?>
<td><?php if ( count($_REQUEST['filter']['terms']) > 2 ) { echo buildSelect( "filter[terms][$i][cbr]", $cbracketTypes ); } else { ?>&nbsp;<?php } ?></td> <td><?php if ( count($_REQUEST['filter']['terms']) > 2 ) { echo buildSelect( "filter[terms][$i][cbr]", $cbracketTypes ); } else { ?>&nbsp;<?php } ?></td>
<td><input type="button" onclick="addTerm( this, <?= $i+1 ?> )" value="+"/><?php if ( $_REQUEST['filter']['terms'] > 1 ) { ?><input type="button" onclick="delTerm( this, <?= $i ?> )" value="-"/><?php } ?></td> <td><input type="button" onclick="addTerm( this, <?php echo $i+1 ?> )" value="+"/><?php if ( $_REQUEST['filter']['terms'] > 1 ) { ?><input type="button" onclick="delTerm( this, <?php echo $i ?> )" value="-"/><?php } ?></td>
</tr> </tr>
<?php <?php
} }
@ -254,8 +254,8 @@ for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['term
<table id="sortTable" class="filterTable" cellspacing="0"> <table id="sortTable" class="filterTable" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<td><label for="sort_field"><?= $SLANG['SortBy'] ?></label><?= buildSelect( "sort_field", $sort_fields ); ?><?= buildSelect( "sort_asc", $sort_dirns ); ?></td> <td><label for="sort_field"><?php echo $SLANG['SortBy'] ?></label><?php echo buildSelect( "sort_field", $sort_fields ); ?><?php echo buildSelect( "sort_asc", $sort_dirns ); ?></td>
<td><label for="limit"><?= $SLANG['LimitResultsPre'] ?></label><input type="text" size="6" id="limit" name="limit" value="<?= isset($_REQUEST['limit'])?validInt($_REQUEST['limit']):"" ?>"/><?= $SLANG['LimitResultsPost'] ?></td> <td><label for="limit"><?php echo $SLANG['LimitResultsPre'] ?></label><input type="text" size="6" id="limit" name="limit" value="<?php echo isset($_REQUEST['limit'])?validInt($_REQUEST['limit']):"" ?>"/><?php echo $SLANG['LimitResultsPost'] ?></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -263,7 +263,7 @@ for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['term
<table id="actionsTable" class="filterTable" cellspacing="0"> <table id="actionsTable" class="filterTable" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<td><?= $SLANG['FilterArchiveEvents'] ?></td> <td><?php echo $SLANG['FilterArchiveEvents'] ?></td>
<td><input type="checkbox" name="autoArchive" value="1"<?php if ( !empty($dbFilter['AutoArchive']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td> <td><input type="checkbox" name="autoArchive" value="1"<?php if ( !empty($dbFilter['AutoArchive']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td>
</tr> </tr>
<?php <?php
@ -271,7 +271,7 @@ if ( ZM_OPT_FFMPEG )
{ {
?> ?>
<tr> <tr>
<td><?= $SLANG['FilterVideoEvents'] ?></td> <td><?php echo $SLANG['FilterVideoEvents'] ?></td>
<td><input type="checkbox" name="autoVideo" value="1"<?php if ( !empty($dbFilter['AutoVideo']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td> <td><input type="checkbox" name="autoVideo" value="1"<?php if ( !empty($dbFilter['AutoVideo']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td>
</tr> </tr>
<?php <?php
@ -280,7 +280,7 @@ if ( ZM_OPT_UPLOAD )
{ {
?> ?>
<tr> <tr>
<td><?= $SLANG['FilterUploadEvents'] ?></td> <td><?php echo $SLANG['FilterUploadEvents'] ?></td>
<td><input type="checkbox" name="autoUpload" value="1"<?php if ( !empty($dbFilter['AutoUpload']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td> <td><input type="checkbox" name="autoUpload" value="1"<?php if ( !empty($dbFilter['AutoUpload']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td>
</tr> </tr>
<?php <?php
@ -289,7 +289,7 @@ if ( ZM_OPT_EMAIL )
{ {
?> ?>
<tr> <tr>
<td><?= $SLANG['FilterEmailEvents'] ?></td> <td><?php echo $SLANG['FilterEmailEvents'] ?></td>
<td><input type="checkbox" name="autoEmail" value="1"<?php if ( !empty($dbFilter['AutoEmail']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td> <td><input type="checkbox" name="autoEmail" value="1"<?php if ( !empty($dbFilter['AutoEmail']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td>
</tr> </tr>
<?php <?php
@ -298,31 +298,31 @@ if ( ZM_OPT_MESSAGE )
{ {
?> ?>
<tr> <tr>
<td><?= $SLANG['FilterMessageEvents'] ?></td> <td><?php echo $SLANG['FilterMessageEvents'] ?></td>
<td><input type="checkbox" name="autoMessage" value="1"<?php if ( !empty($dbFilter['AutoMessage']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td> <td><input type="checkbox" name="autoMessage" value="1"<?php if ( !empty($dbFilter['AutoMessage']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td>
</tr> </tr>
<?php <?php
} }
?> ?>
<tr> <tr>
<td><?= $SLANG['FilterExecuteEvents'] ?></td> <td><?php echo $SLANG['FilterExecuteEvents'] ?></td>
<td><input type="checkbox" name="autoExecute" value="1"<?php if ( !empty($dbFilter['AutoExecute']) ) { ?> checked="checked"<?php } ?>/><input type="text" name="autoExecuteCmd" value="<?= isset($dbFilter['AutoExecuteCmd'])?$dbFilter['AutoExecuteCmd']:"" ?>" size="32" maxlength="255" onchange="updateButtons( this )"/></td> <td><input type="checkbox" name="autoExecute" value="1"<?php if ( !empty($dbFilter['AutoExecute']) ) { ?> checked="checked"<?php } ?>/><input type="text" name="autoExecuteCmd" value="<?php echo isset($dbFilter['AutoExecuteCmd'])?$dbFilter['AutoExecuteCmd']:"" ?>" size="32" maxlength="255" onchange="updateButtons( this )"/></td>
</tr> </tr>
<tr> <tr>
<td><?= $SLANG['FilterDeleteEvents'] ?></td> <td><?php echo $SLANG['FilterDeleteEvents'] ?></td>
<td colspan="2"><input type="checkbox" name="autoDelete" value="1"<?php if ( !empty($dbFilter['AutoDelete']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td> <td colspan="2"><input type="checkbox" name="autoDelete" value="1"<?php if ( !empty($dbFilter['AutoDelete']) ) { ?> checked="checked"<?php } ?> onclick="updateButtons( this )"/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<hr/> <hr/>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Submit'] ?>" onclick="submitToEvents( this );"/> <input type="submit" value="<?php echo $SLANG['Submit'] ?>" onclick="submitToEvents( this );"/>
<input type="button" name="executeButton" id="executeButton" value="<?= $SLANG['Execute'] ?>" onclick="executeFilter( this );"/> <input type="button" name="executeButton" id="executeButton" value="<?php echo $SLANG['Execute'] ?>" onclick="executeFilter( this );"/>
<?php if ( canEdit( 'Events' ) ) { ?> <?php if ( canEdit( 'Events' ) ) { ?>
<input type="button" value="<?= $SLANG['Save'] ?>" onclick="saveFilter( this );"/><?php } ?> <input type="button" value="<?php echo $SLANG['Save'] ?>" onclick="saveFilter( this );"/><?php } ?>
<?php if ( canEdit( 'Events' ) && isset($dbFilter) ) { ?> <?php if ( canEdit( 'Events' ) && isset($dbFilter) ) { ?>
<input type="button" value="<?= $SLANG['Delete'] ?>" onclick="deleteFilter( this, '<?= $dbFilter['Name'] ?>' );"/><?php } ?> <input type="button" value="<?php echo $SLANG['Delete'] ?>" onclick="deleteFilter( this, '<?php echo $dbFilter['Name'] ?>' );"/><?php } ?>
<input type="button" value="<?= $SLANG['Reset'] ?>" onclick="submitToFilter( this, 1 );"/> <input type="button" value="<?php echo $SLANG['Reset'] ?>" onclick="submitToFilter( this, 1 );"/>
</div> </div>
</form> </form>
</div> </div>

36
web/skins/classic/views/filtersave.php
View File

@ -46,38 +46,38 @@ xhtmlHeaders(__FILE__, $SLANG['SaveFilter'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['SaveFilter'] ?></h2> <h2><?php echo $SLANG['SaveFilter'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<input type="hidden" name="action" value="filter"/> <input type="hidden" name="action" value="filter"/>
<?= $filter['fields'] ?> <?php echo $filter['fields'] ?>
<input type="hidden" name="sort_field" value="<?= requestVar( 'sort_field' ) ?>"/> <input type="hidden" name="sort_field" value="<?php echo requestVar( 'sort_field' ) ?>"/>
<input type="hidden" name="sort_asc" value="<?= requestVar( 'sort_asc' ) ?>"/> <input type="hidden" name="sort_asc" value="<?php echo requestVar( 'sort_asc' ) ?>"/>
<input type="hidden" name="limit" value="<?= requestVar( 'limit' ) ?>"/> <input type="hidden" name="limit" value="<?php echo requestVar( 'limit' ) ?>"/>
<input type="hidden" name="autoArchive" value="<?= requestVar( 'autoArchive' ) ?>"/> <input type="hidden" name="autoArchive" value="<?php echo requestVar( 'autoArchive' ) ?>"/>
<input type="hidden" name="autoVideo" value="<?= requestVar( 'autoVideo' ) ?>"/> <input type="hidden" name="autoVideo" value="<?php echo requestVar( 'autoVideo' ) ?>"/>
<input type="hidden" name="autoUpload" value="<?= requestVar( 'autoUpload' ) ?>"/> <input type="hidden" name="autoUpload" value="<?php echo requestVar( 'autoUpload' ) ?>"/>
<input type="hidden" name="autoEmail" value="<?= requestVar( 'autoEmail' ) ?>"/> <input type="hidden" name="autoEmail" value="<?php echo requestVar( 'autoEmail' ) ?>"/>
<input type="hidden" name="autoMessage" value="<?= requestVar( 'autoMessage' ) ?>"/> <input type="hidden" name="autoMessage" value="<?php echo requestVar( 'autoMessage' ) ?>"/>
<input type="hidden" name="autoExecute" value="<?= requestVar( 'autoExecute' ) ?>"/> <input type="hidden" name="autoExecute" value="<?php echo requestVar( 'autoExecute' ) ?>"/>
<input type="hidden" name="autoExecuteCmd" value="<?= requestVar( 'autoExecuteCmd' ) ?>"/> <input type="hidden" name="autoExecuteCmd" value="<?php echo requestVar( 'autoExecuteCmd' ) ?>"/>
<input type="hidden" name="autoDelete" value="<?= requestVar( 'autoDelete' ) ?>"/> <input type="hidden" name="autoDelete" value="<?php echo requestVar( 'autoDelete' ) ?>"/>
<?php if ( count($filterNames) ) { ?> <?php if ( count($filterNames) ) { ?>
<p> <p>
<label for="<?= $selectName ?>"><?= $SLANG['SaveAs'] ?></label><?= buildSelect( $selectName, $filterNames ); ?><label for="<?= $newSelectName ?>"><?= $SLANG['OrEnterNewName'] ?></label><input type="text" size="32" id="<?= $newSelectName ?>" name="<?= $newSelectName ?>" value="<?= requestVar('filterName') ?>"/> <label for="<?php echo $selectName ?>"><?php echo $SLANG['SaveAs'] ?></label><?php echo buildSelect( $selectName, $filterNames ); ?><label for="<?php echo $newSelectName ?>"><?php echo $SLANG['OrEnterNewName'] ?></label><input type="text" size="32" id="<?php echo $newSelectName ?>" name="<?php echo $newSelectName ?>" value="<?php echo requestVar('filterName') ?>"/>
</p> </p>
<?php } else { ?> <?php } else { ?>
<p> <p>
<label for="<?= $newSelectName ?>"><?= $SLANG['EnterNewFilterName'] ?></label><input type="text" size="32" id="<?= $newSelectName ?>" name="<?= $newSelectName ?>" value=""> <label for="<?php echo $newSelectName ?>"><?php echo $SLANG['EnterNewFilterName'] ?></label><input type="text" size="32" id="<?php echo $newSelectName ?>" name="<?php echo $newSelectName ?>" value="">
</p> </p>
<?php } ?> <?php } ?>
<p> <p>
<label for="background"><?= $SLANG['BackgroundFilter'] ?></label><input type="checkbox" id="background" name="background" value="1"<?php if ( !empty($filterData['Background']) ) { ?> checked="checked"<?php } ?>/> <label for="background"><?php echo $SLANG['BackgroundFilter'] ?></label><input type="checkbox" id="background" name="background" value="1"<?php if ( !empty($filterData['Background']) ) { ?> checked="checked"<?php } ?>/>
</p> </p>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow();"/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
</div> </div>
</form> </form>
</div> </div>

24
web/skins/classic/views/frame.php
View File

@ -69,30 +69,30 @@ xhtmlHeaders(__FILE__, $SLANG['Frame']." - ".$event['Id']." - ".$frame['FrameId'
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<?php if ( ZM_RECORD_EVENT_STATS && $alarmFrame ) { echo makePopupLink( '?view=stats&amp;eid='.$event['Id'].'&amp;fid='.$frame['FrameId'], 'zmStats', 'stats', $SLANG['Stats'] ); } ?> <?php if ( ZM_RECORD_EVENT_STATS && $alarmFrame ) { echo makePopupLink( '?view=stats&amp;eid='.$event['Id'].'&amp;fid='.$frame['FrameId'], 'zmStats', 'stats', $SLANG['Stats'] ); } ?>
<?php if ( canEdit( 'Events' ) ) { ?><a href="?view=none&amp;action=delete&amp;markEid=<?= $event['Id'] ?>"><?= $SLANG['Delete'] ?></a><?php } ?> <?php if ( canEdit( 'Events' ) ) { ?><a href="?view=none&amp;action=delete&amp;markEid=<?php echo $event['Id'] ?>"><?php echo $SLANG['Delete'] ?></a><?php } ?>
<a href="#" onclick="closeWindow(); return( false );"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindow(); return( false );"><?php echo $SLANG['Close'] ?></a>
</div> </div>
<h2><?= $SLANG['Frame'] ?> <?= $event['Id']."-".$frame['FrameId']." (".$frame['Score'].")" ?></h2> <h2><?php echo $SLANG['Frame'] ?> <?php echo $event['Id']."-".$frame['FrameId']." (".$frame['Score'].")" ?></h2>
</div> </div>
<div id="content"> <div id="content">
<p id="image"><?php if ( $imageData['hasAnalImage'] ) { ?><a href="?view=frame&amp;eid=<?= $event['Id'] ?>&amp;fid=<?= $frame['FrameId'] ?>&amp;scale=<?= $scale ?>&amp;show=<?= $imageData['isAnalImage']?"capt":"anal" ?>"><?php } ?><img src="<?= viewImagePath( $imagePath ) ?>" width="<?= reScale( $event['Width'], $event['DefaultScale'], $scale ) ?>" height="<?= reScale( $event['Height'], $event['DefaultScale'], $scale ) ?>" alt="<?= $frame['EventId']."-".$frame['FrameId'] ?>" class="<?= $imageData['imageClass'] ?>"/><?php if ( $imageData['hasAnalImage'] ) { ?></a><?php } ?></p> <p id="image"><?php if ( $imageData['hasAnalImage'] ) { ?><a href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $imageData['isAnalImage']?"capt":"anal" ?>"><?php } ?><img src="<?php echo viewImagePath( $imagePath ) ?>" width="<?php echo reScale( $event['Width'], $event['DefaultScale'], $scale ) ?>" height="<?php echo reScale( $event['Height'], $event['DefaultScale'], $scale ) ?>" alt="<?php echo $frame['EventId']."-".$frame['FrameId'] ?>" class="<?php echo $imageData['imageClass'] ?>"/><?php if ( $imageData['hasAnalImage'] ) { ?></a><?php } ?></p>
<p id="controls"> <p id="controls">
<?php if ( $frame['FrameId'] > 1 ) { ?> <?php if ( $frame['FrameId'] > 1 ) { ?>
<a id="firstLink" href="?view=frame&amp;eid=<?= $event['Id'] ?>&amp;fid=<?= $firstFid ?>&amp;scale=<?= $scale ?>"><?= $SLANG['First'] ?></a> <a id="firstLink" href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $firstFid ?>&amp;scale=<?php echo $scale ?>"><?php echo $SLANG['First'] ?></a>
<?php } if ( $frame['FrameId'] > 1 ) { ?> <?php } if ( $frame['FrameId'] > 1 ) { ?>
<a id="prevLink" href="?view=frame&amp;eid=<?= $event['Id'] ?>&amp;fid=<?= $prevFid ?>&amp;scale=<?= $scale ?>"><?= $SLANG['Prev'] ?></a> <a id="prevLink" href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $prevFid ?>&amp;scale=<?php echo $scale ?>"><?php echo $SLANG['Prev'] ?></a>
<?php } if ( $frame['FrameId'] < $maxFid ) { ?> <?php } if ( $frame['FrameId'] < $maxFid ) { ?>
<a id="nextLink" href="?view=frame&amp;eid=<?= $event['Id'] ?>&amp;fid=<?= $nextFid ?>&amp;scale=<?= $scale ?>"><?= $SLANG['Next'] ?></a> <a id="nextLink" href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $nextFid ?>&amp;scale=<?php echo $scale ?>"><?php echo $SLANG['Next'] ?></a>
<?php } if ( $frame['FrameId'] < $maxFid ) { ?> <?php } if ( $frame['FrameId'] < $maxFid ) { ?>
<a id="lastLink" href="?view=frame&amp;eid=<?= $event['Id'] ?>&amp;fid=<?= $lastFid ?>&amp;scale=<?= $scale ?>"><?= $SLANG['Last'] ?></a> <a id="lastLink" href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=<?php echo $lastFid ?>&amp;scale=<?php echo $scale ?>"><?php echo $SLANG['Last'] ?></a>
<?php } ?> <?php } ?>
</p> </p>
<?php if (file_exists ($dImagePath)) { ?> <?php if (file_exists ($dImagePath)) { ?>
<p id="diagImagePath"><?= $dImagePath ?></p> <p id="diagImagePath"><?php echo $dImagePath ?></p>
<p id="diagImage"><img src=?"<?= viewImagePath( $dImagePath ) ?>" width="<?= reScale( $event['Width'], $event['DefaultScale'], $scale ) ?>" height="<?= reScale( $event['Height'], $event['DefaultScale'], $scale ) ?>" class="<?= $imageData['imageClass'] ?>"/></p> <p id="diagImage"><img src=?"<?php echo viewImagePath( $dImagePath ) ?>" width="<?php echo reScale( $event['Width'], $event['DefaultScale'], $scale ) ?>" height="<?php echo reScale( $event['Height'], $event['DefaultScale'], $scale ) ?>" class="<?php echo $imageData['imageClass'] ?>"/></p>
<?php } if (file_exists ($rImagePath)) { ?> <?php } if (file_exists ($rImagePath)) { ?>
<p id="refImagePath"><?= $rImagePath ?></p> <p id="refImagePath"><?php echo $rImagePath ?></p>
<p id="refImage"><img src="<?= viewImagePath( $rImagePath ) ?>" width="<?= reScale( $event['Width'], $event['DefaultScale'], $scale ) ?>" height="<?= reScale( $event['Height'], $event['DefaultScale'], $scale ) ?>" class="<?= $imageData['imageClass'] ?>"/></p> <p id="refImage"><img src="<?php echo viewImagePath( $rImagePath ) ?>" width="<?php echo reScale( $event['Width'], $event['DefaultScale'], $scale ) ?>" height="<?php echo reScale( $event['Height'], $event['DefaultScale'], $scale ) ?>" class="<?php echo $imageData['imageClass'] ?>"/></p>
<?php } ?> <?php } ?>
</div> </div>
</div> </div>

32
web/skins/classic/views/frames.php
View File

@ -36,20 +36,20 @@ xhtmlHeaders(__FILE__, $SLANG['Frames']." - ".$event['Id'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"><a href="#" onclick="closeWindow();"><?= $SLANG['Close'] ?></a></div> <div id="headerButtons"><a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a></div>
<h2><?= $SLANG['Frames'] ?> - <?= $event['Id'] ?></h2> <h2><?php echo $SLANG['Frames'] ?> - <?php echo $event['Id'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th class="colId"><?= $SLANG['FrameId'] ?></th> <th class="colId"><?php echo $SLANG['FrameId'] ?></th>
<th class="colType"><?= $SLANG['Type'] ?></th> <th class="colType"><?php echo $SLANG['Type'] ?></th>
<th class="colTimeStamp"><?= $SLANG['TimeStamp'] ?></th> <th class="colTimeStamp"><?php echo $SLANG['TimeStamp'] ?></th>
<th class="colTimeDelta"><?= $SLANG['TimeDelta'] ?></th> <th class="colTimeDelta"><?php echo $SLANG['TimeDelta'] ?></th>
<th class="colScore"><?= $SLANG['Score'] ?></th> <th class="colScore"><?php echo $SLANG['Score'] ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -60,22 +60,22 @@ if ( count($frames) )
{ {
$class = strtolower($frame['Type']); $class = strtolower($frame['Type']);
?> ?>
<tr class="<?= $class ?>"> <tr class="<?php echo $class ?>">
<td class="colId"><?= makePopupLink( '?view=frame&amp;eid='.$event['Id'].'&amp;fid='.$frame['FrameId'], 'zmImage', array( 'image', $event['Width'], $event['Height'] ), $frame['FrameId'] ) ?></td> <td class="colId"><?php echo makePopupLink( '?view=frame&amp;eid='.$event['Id'].'&amp;fid='.$frame['FrameId'], 'zmImage', array( 'image', $event['Width'], $event['Height'] ), $frame['FrameId'] ) ?></td>
<td class="colType"><?= $frame['Type'] ?></td> <td class="colType"><?php echo $frame['Type'] ?></td>
<td class="colTimeStamp"><?= strftime( STRF_FMT_TIME, $frame['UnixTimeStamp'] ) ?></td> <td class="colTimeStamp"><?php echo strftime( STRF_FMT_TIME, $frame['UnixTimeStamp'] ) ?></td>
<td class="colTimeDelta"><?= number_format( $frame['Delta'], 2 ) ?></td> <td class="colTimeDelta"><?php echo number_format( $frame['Delta'], 2 ) ?></td>
<?php <?php
if ( ZM_RECORD_EVENT_STATS && ($frame['Type'] == 'Alarm') ) if ( ZM_RECORD_EVENT_STATS && ($frame['Type'] == 'Alarm') )
{ {
?> ?>
<td class="colScore"><?= makePopupLink( '?view=stats&amp;eid='.$event['Id'].'&amp;fid='.$frame['FrameId'], 'zmStats', 'stats', $frame['Score'] ) ?></td> <td class="colScore"><?php echo makePopupLink( '?view=stats&amp;eid='.$event['Id'].'&amp;fid='.$frame['FrameId'], 'zmStats', 'stats', $frame['Score'] ) ?></td>
<?php <?php
} }
else else
{ {
?> ?>
<td class="colScore"><?= $frame['Score'] ?></td> <td class="colScore"><?php echo $frame['Score'] ?></td>
<?php <?php
} }
?> ?>
@ -87,7 +87,7 @@ else
{ {
?> ?>
<tr> <tr>
<td colspan="5"><?= $SLANG['NoFramesRecorded'] ?></td> <td colspan="5"><?php echo $SLANG['NoFramesRecorded'] ?></td>
</tr> </tr>
<?php <?php
} }

14
web/skins/classic/views/function.php
View File

@ -33,29 +33,29 @@ xhtmlHeaders(__FILE__, $SLANG['Function']." - ".validHtmlStr($monitor['Name']) )
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Function']." - ".validHtmlStr($monitor['Name']) ?></h2> <h2><?php echo $SLANG['Function']." - ".validHtmlStr($monitor['Name']) ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<input type="hidden" name="action" value="function"/> <input type="hidden" name="action" value="function"/>
<input type="hidden" name="mid" value="<?= $monitor['Id'] ?>"/> <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>"/>
<p> <p>
<select name="newFunction"> <select name="newFunction">
<?php <?php
foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction ) foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction )
{ {
?> ?>
<option value="<?= $optFunction ?>"<?php if ( $optFunction == $monitor['Function'] ) { ?> selected="selected"<?php } ?>><?= $SLANG['Fn'.$optFunction] ?></option> <option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $monitor['Function'] ) { ?> selected="selected"<?php } ?>><?php echo $SLANG['Fn'.$optFunction] ?></option>
<?php <?php
} }
?> ?>
</select> </select>
<label for="newEnabled"><?= $SLANG['Enabled'] ?></label><input type="checkbox" name="newEnabled" id="newEnabled" value="1"<?php if ( !empty($monitor['Enabled']) ) { ?> checked="checked"<?php } ?>/> <label for="newEnabled"><?php echo $SLANG['Enabled'] ?></label><input type="checkbox" name="newEnabled" id="newEnabled" value="1"<?php if ( !empty($monitor['Enabled']) ) { ?> checked="checked"<?php } ?>/>
</p> </p>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"/>
<input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

20
web/skins/classic/views/group.php
View File

@ -42,21 +42,21 @@ xhtmlHeaders( __FILE__, $SLANG['Group']." - ".$newGroup['Name'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Group'] ?> - <?= $newGroup['Name'] ?></h2> <h2><?php echo $SLANG['Group'] ?> - <?php echo $newGroup['Name'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="groupForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="groupForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value="group"/> <input type="hidden" name="action" value="group"/>
<input type="hidden" name="gid" value="<?= $newGroup['Id'] ?>"/> <input type="hidden" name="gid" value="<?php echo $newGroup['Id'] ?>"/>
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<th scope="row"><?= $SLANG['Name'] ?></th> <th scope="row"><?php echo $SLANG['Name'] ?></th>
<td><input type="text" name="newGroup[Name]" value="<?= validHtmlStr($newGroup['Name']) ?>"/></td> <td><input type="text" name="newGroup[Name]" value="<?php echo validHtmlStr($newGroup['Name']) ?>"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['MonitorIds'] ?></th> <th scope="row"><?php echo $SLANG['MonitorIds'] ?></th>
<td> <td>
<select name="newGroup[MonitorIds][]" size="4" multiple="multiple"> <select name="newGroup[MonitorIds][]" size="4" multiple="multiple">
<?php <?php
@ -67,7 +67,7 @@ xhtmlHeaders( __FILE__, $SLANG['Group']." - ".$newGroup['Name'] );
if ( visibleMonitor( $monitor['Id'] ) ) if ( visibleMonitor( $monitor['Id'] ) )
{ {
?> ?>
<option value="<?= $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?= validHtmlStr($monitor['Name']) ?></option> <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($monitor['Name']) ?></option>
<?php <?php
} }
} }
@ -78,8 +78,8 @@ xhtmlHeaders( __FILE__, $SLANG['Group']." - ".$newGroup['Name'] );
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"<?php if ( !canEdit( 'System' ) ) { ?> disabled="disabled"<?php } ?>/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canEdit( 'System' ) ) { ?> disabled="disabled"<?php } ?>/>
<input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

32
web/skins/classic/views/groups.php
View File

@ -41,41 +41,41 @@ xhtmlHeaders(__FILE__, $SLANG['Groups'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Groups'] ?></h2> <h2><?php echo $SLANG['Groups'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="groupsForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="groupsForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<input type="hidden" name="action" value="setgroup"/> <input type="hidden" name="action" value="setgroup"/>
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th class="colName"><?= $SLANG['Name'] ?></th> <th class="colName"><?php echo $SLANG['Name'] ?></th>
<th class="colIds"><?= $SLANG['MonitorIds'] ?></th> <th class="colIds"><?php echo $SLANG['MonitorIds'] ?></th>
<th class="colSelect"><?= $SLANG['Select'] ?></th> <th class="colSelect"><?php echo $SLANG['Select'] ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr class="highlight"> <tr class="highlight">
<td class="colName"><?= $SLANG['NoGroup'] ?></td> <td class="colName"><?php echo $SLANG['NoGroup'] ?></td>
<td class="colIds"><?= $SLANG['All'] ?></td> <td class="colIds"><?php echo $SLANG['All'] ?></td>
<td class="colSelect"><input type="radio" name="gid" value="0"<?= !$selected?' checked="checked"':'' ?> onclick="configureButtons( this );"/></td> <td class="colSelect"><input type="radio" name="gid" value="0"<?php echo !$selected?' checked="checked"':'' ?> onclick="configureButtons( this );"/></td>
</tr> </tr>
<?php foreach ( $groups as $group ) { ?> <?php foreach ( $groups as $group ) { ?>
<tr> <tr>
<td class="colName"><?= validHtmlStr($group['Name']) ?></td> <td class="colName"><?php echo validHtmlStr($group['Name']) ?></td>
<td class="colIds"><?= monitorIdsToNames( $group['MonitorIds'], 30 ) ?></td> <td class="colIds"><?php echo monitorIdsToNames( $group['MonitorIds'], 30 ) ?></td>
<td class="colSelect"><input type="radio" name="gid" value="<?= $group['Id'] ?>"<?= $group['selected']?' checked="checked"':'' ?> onclick="configureButtons( this );"/></td> <td class="colSelect"><input type="radio" name="gid" value="<?php echo $group['Id'] ?>"<?php echo $group['selected']?' checked="checked"':'' ?> onclick="configureButtons( this );"/></td>
</tr> </tr>
<?php } ?> <?php } ?>
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Apply'] ?>"/> <input type="submit" value="<?php echo $SLANG['Apply'] ?>"/>
<input type="button" value="<?= $SLANG['New'] ?>" onclick="newGroup()"<?= canEdit('System')?'':' disabled="disabled"' ?>/> <input type="button" value="<?php echo $SLANG['New'] ?>" onclick="newGroup()"<?php echo canEdit('System')?'':' disabled="disabled"' ?>/>
<input type="button" name="editBtn" value="<?= $SLANG['Edit'] ?>" onclick="editGroup( this )"<?= $selected&&canEdit('System')?'':' disabled="disabled"' ?>/> <input type="button" name="editBtn" value="<?php echo $SLANG['Edit'] ?>" onclick="editGroup( this )"<?php echo $selected&&canEdit('System')?'':' disabled="disabled"' ?>/>
<input type="button" name="deleteBtn" value="<?= $SLANG['Delete'] ?>" onclick="deleteGroup( this )"<?= $selected&&canEdit('System')?'':' disabled="disabled"' ?>/> <input type="button" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" onclick="deleteGroup( this )"<?php echo $selected&&canEdit('System')?'':' disabled="disabled"' ?>/>
<input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow();"/> <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
</div> </div>
</form> </form>
</div> </div>

6
web/skins/classic/views/js/console.js.php
View File

@ -1,4 +1,4 @@
var consoleRefreshTimeout = <?= 1000*ZM_WEB_REFRESH_MAIN ?>; var consoleRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_MAIN ?>;
<?php <?php
if ( ZM_CHECK_FOR_UPDATES && canEdit('System') && ZM_DYN_LAST_VERSION && ( verNum(ZM_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( verNum(ZM_DYN_CURR_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( ZM_DYN_NEXT_REMINDER < time() ) ) if ( ZM_CHECK_FOR_UPDATES && canEdit('System') && ZM_DYN_LAST_VERSION && ( verNum(ZM_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( verNum(ZM_DYN_CURR_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( ZM_DYN_NEXT_REMINDER < time() ) )
@ -24,5 +24,5 @@ elseif ( ZM_DYN_SHOW_DONATE_REMINDER )
} }
} }
?> ?>
var showVersionPopup = <?= isset($showVersionPopup )?'true':'false' ?>; var showVersionPopup = <?php echo isset($showVersionPopup )?'true':'false' ?>;
var showDonatePopup = <?= isset($showDonatePopup )?'true':'false' ?>; var showDonatePopup = <?php echo isset($showDonatePopup )?'true':'false' ?>;

2
web/skins/classic/views/js/controlpreset.js.php
View File

@ -3,7 +3,7 @@ var labels = new Array();
foreach ( $labels as $index=>$label ) foreach ( $labels as $index=>$label )
{ {
?> ?>
labels[<?= validInt($index) ?>] = "<?= validJsStr($label) ?>"; labels[<?php echo validInt($index) ?>] = "<?php echo validJsStr($label) ?>";
<?php <?php
} }
?> ?>

8
web/skins/classic/views/js/cycle.js.php
View File

@ -1,5 +1,5 @@
var currGroup = "<?= isset($_REQUEST['group'])?validJsStr($_REQUEST['group']):'' ?>"; var currGroup = "<?php echo isset($_REQUEST['group'])?validJsStr($_REQUEST['group']):'' ?>";
var nextMid = "<?= isset($nextMid)?$nextMid:'' ?>"; var nextMid = "<?php echo isset($nextMid)?$nextMid:'' ?>";
var mode = "<?= $mode ?>"; var mode = "<?php echo $mode ?>";
var cycleRefreshTimeout = <?= 1000*ZM_WEB_REFRESH_CYCLE ?>; var cycleRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_CYCLE ?>;

4
web/skins/classic/views/js/donate.js.php
View File

@ -1,2 +1,2 @@
var action = '<?= isset($_REQUEST['action'])?validJsStr($_REQUEST['action']):'' ?>'; var action = '<?php echo isset($_REQUEST['action'])?validJsStr($_REQUEST['action']):'' ?>';
var option = '<?= isset($_REQUEST['option'])?validJsStr($_REQUEST['option']):'' ?>'; var option = '<?php echo isset($_REQUEST['option'])?validJsStr($_REQUEST['option']):'' ?>';

60
web/skins/classic/views/js/event.js.php
View File

@ -1,48 +1,48 @@
// //
// Import constants // Import constants
// //
var CMD_NONE = <?= CMD_NONE ?>; var CMD_NONE = <?php echo CMD_NONE ?>;
var CMD_PAUSE = <?= CMD_PAUSE ?>; var CMD_PAUSE = <?php echo CMD_PAUSE ?>;
var CMD_PLAY = <?= CMD_PLAY ?>; var CMD_PLAY = <?php echo CMD_PLAY ?>;
var CMD_STOP = <?= CMD_STOP ?>; var CMD_STOP = <?php echo CMD_STOP ?>;
var CMD_FASTFWD = <?= CMD_FASTFWD ?>; var CMD_FASTFWD = <?php echo CMD_FASTFWD ?>;
var CMD_SLOWFWD = <?= CMD_SLOWFWD ?>; var CMD_SLOWFWD = <?php echo CMD_SLOWFWD ?>;
var CMD_SLOWREV = <?= CMD_SLOWREV ?>; var CMD_SLOWREV = <?php echo CMD_SLOWREV ?>;
var CMD_FASTREV = <?= CMD_FASTREV ?>; var CMD_FASTREV = <?php echo CMD_FASTREV ?>;
var CMD_ZOOMIN = <?= CMD_ZOOMIN ?>; var CMD_ZOOMIN = <?php echo CMD_ZOOMIN ?>;
var CMD_ZOOMOUT = <?= CMD_ZOOMOUT ?>; var CMD_ZOOMOUT = <?php echo CMD_ZOOMOUT ?>;
var CMD_PAN = <?= CMD_PAN ?>; var CMD_PAN = <?php echo CMD_PAN ?>;
var CMD_SCALE = <?= CMD_SCALE ?>; var CMD_SCALE = <?php echo CMD_SCALE ?>;
var CMD_PREV = <?= CMD_PREV ?>; var CMD_PREV = <?php echo CMD_PREV ?>;
var CMD_NEXT = <?= CMD_NEXT ?>; var CMD_NEXT = <?php echo CMD_NEXT ?>;
var CMD_SEEK = <?= CMD_SEEK ?>; var CMD_SEEK = <?php echo CMD_SEEK ?>;
var CMD_QUERY = <?= CMD_QUERY ?>; var CMD_QUERY = <?php echo CMD_QUERY ?>;
var SCALE_BASE = <?= SCALE_BASE ?>; var SCALE_BASE = <?php echo SCALE_BASE ?>;
// //
// PHP variables to JS // PHP variables to JS
// //
var connKey = '<?= $connkey ?>'; var connKey = '<?php echo $connkey ?>';
var eventData = { var eventData = {
Id: <?= $event['Id'] ?>, Id: <?php echo $event['Id'] ?>,
Width: <?= $event['Width'] ?>, Width: <?php echo $event['Width'] ?>,
Height: <?= $event['Height'] ?>, Height: <?php echo $event['Height'] ?>,
Length: <?= $event['Length'] ?> Length: <?php echo $event['Length'] ?>
}; };
var filterQuery = '<?= isset($filterQuery)?validJsStr($filterQuery):'' ?>'; var filterQuery = '<?php echo isset($filterQuery)?validJsStr($filterQuery):'' ?>';
var sortQuery = '<?= isset($sortQuery)?validJsStr($sortQuery):'' ?>'; var sortQuery = '<?php echo isset($sortQuery)?validJsStr($sortQuery):'' ?>';
var scale = <?= $scale ?>; var scale = <?php echo $scale ?>;
var canEditEvents = <?= canEdit( 'Events' )?'true':'false' ?>; var canEditEvents = <?php echo canEdit( 'Events' )?'true':'false' ?>;
var streamTimeout = <?= 1000*ZM_WEB_REFRESH_STATUS ?>; var streamTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
var canStreamNative = <?= canStreamNative()?'true':'false' ?>; var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
// //
// Strings // Strings
// //
var deleteString = "<?= $SLANG['Delete'] ?>"; var deleteString = "<?php echo $SLANG['Delete'] ?>";
var causeString = "<?= $SLANG['AttrCause'] ?>"; var causeString = "<?php echo $SLANG['AttrCause'] ?>";

16
web/skins/classic/views/js/events.js.php
View File

@ -1,13 +1,13 @@
//var openFilterWindow = <?= $_REQUEST['filter']?'true':'false' ?>; //var openFilterWindow = <?php echo $_REQUEST['filter']?'true':'false' ?>;
var openFilterWindow = false; var openFilterWindow = false;
var archivedEvents = <?= !empty($archived)?'true':'false' ?>; var archivedEvents = <?php echo !empty($archived)?'true':'false' ?>;
var unarchivedEvents = <?= !empty($unarchived)?'true':'false' ?>; var unarchivedEvents = <?php echo !empty($unarchived)?'true':'false' ?>;
var filterQuery = '<?= isset($filterQuery)?validJsStr($filterQuery):'' ?>'; var filterQuery = '<?php echo isset($filterQuery)?validJsStr($filterQuery):'' ?>';
var sortQuery = '<?= isset($sortQuery)?validJsStr($sortQuery):'' ?>'; var sortQuery = '<?php echo isset($sortQuery)?validJsStr($sortQuery):'' ?>';
var maxWidth = <?= $maxWidth?$maxWidth:0 ?>; var maxWidth = <?php echo $maxWidth?$maxWidth:0 ?>;
var maxHeight = <?= $maxHeight?$maxHeight:0 ?>; var maxHeight = <?php echo $maxHeight?$maxHeight:0 ?>;
var confirmDeleteEventsString = "<?= addslashes($SLANG['ConfirmDeleteEvents']) ?>"; var confirmDeleteEventsString = "<?php echo addslashes($SLANG['ConfirmDeleteEvents']) ?>";

10
web/skins/classic/views/js/export.js.php
View File

@ -5,18 +5,18 @@ if ( isset($_REQUEST['eids']) )
foreach ( $_REQUEST['eids'] as $eid ) foreach ( $_REQUEST['eids'] as $eid )
$eidParms[] = "eids[]=".validInt($eid); $eidParms[] = "eids[]=".validInt($eid);
?> ?>
var eidParm = '<?= join( '&', $eidParms ) ?>'; var eidParm = '<?php echo join( '&', $eidParms ) ?>';
<?php <?php
} }
else else
{ {
?> ?>
var eidParm = 'eid=<?= validInt($_REQUEST['eid']) ?>'; var eidParm = 'eid=<?php echo validInt($_REQUEST['eid']) ?>';
<?php <?php
} }
?> ?>
var exportReady = <?= !empty($_REQUEST['generated'])?'true':'false' ?>; var exportReady = <?php echo !empty($_REQUEST['generated'])?'true':'false' ?>;
var exportFile = '<?= !empty($_REQUEST['exportFile'])?validJsStr($_REQUEST['exportFile']):'' ?>'; var exportFile = '<?php echo !empty($_REQUEST['exportFile'])?validJsStr($_REQUEST['exportFile']):'' ?>';
var exportProgressString = '<?= addslashes($SLANG['Exporting']) ?>'; var exportProgressString = '<?php echo addslashes($SLANG['Exporting']) ?>';

12
web/skins/classic/views/js/filter.js.php
View File

@ -1,4 +1,4 @@
var deleteSavedFilterString = "<?= $SLANG['DeleteSavedFilter'] ?>"; var deleteSavedFilterString = "<?php echo $SLANG['DeleteSavedFilter'] ?>";
function validateForm( form ) function validateForm( form )
{ {
<?php <?php
@ -10,8 +10,8 @@ if ( isset ($_REQUEST['filter']) && count($_REQUEST['filter']['terms']) > 2 )
for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ ) for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ )
{ {
?> ?>
var obr = form.elements['filter[terms][<?= $i ?>][obr]']; var obr = form.elements['filter[terms][<?php echo $i ?>][obr]'];
var cbr = form.elements['filter[terms][<?= $i ?>][cbr]']; var cbr = form.elements['filter[terms][<?php echo $i ?>][cbr]'];
bracket_count += parseInt(obr.options[obr.selectedIndex].value); bracket_count += parseInt(obr.options[obr.selectedIndex].value);
bracket_count -= parseInt(cbr.options[cbr.selectedIndex].value); bracket_count -= parseInt(cbr.options[cbr.selectedIndex].value);
<?php <?php
@ -19,7 +19,7 @@ for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ )
?> ?>
if ( bracket_count ) if ( bracket_count )
{ {
alert( "<?= $SLANG['ErrorBrackets'] ?>" ); alert( "<?php echo $SLANG['ErrorBrackets'] ?>" );
return( false ); return( false );
} }
<?php <?php
@ -29,10 +29,10 @@ for ( $i = 0; $i < count($_REQUEST['filter']['terms']); $i++ )
for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['terms']); $i++ ) for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['terms']); $i++ )
{ {
?> ?>
var val = form.elements['filter[terms][<?= $i ?>][val]']; var val = form.elements['filter[terms][<?php echo $i ?>][val]'];
if ( val.value == '' ) if ( val.value == '' )
{ {
alert( "<?= $SLANG['ErrorValidValue'] ?>" ); alert( "<?php echo $SLANG['ErrorValidValue'] ?>" );
return( false ); return( false );
} }
<?php <?php

82
web/skins/classic/views/js/monitor.js.php
View File

@ -1,5 +1,5 @@
var optControl = <?= ZM_OPT_CONTROL ?>; var optControl = <?php echo ZM_OPT_CONTROL ?>;
var defaultAspectRatio = '<?= ZM_DEFAULT_ASPECT_RATIO ?>'; var defaultAspectRatio = '<?php echo ZM_DEFAULT_ASPECT_RATIO ?>';
<?php <?php
if ( ZM_OPT_CONTROL ) if ( ZM_OPT_CONTROL )
@ -16,24 +16,24 @@ var controlOptions = new Object();
{ {
$controlTypes[$row['Id']] = $row['Name']; $controlTypes[$row['Id']] = $row['Name'];
?> ?>
controlOptions[<?= $row['Id'] ?>] = new Array(); controlOptions[<?php echo $row['Id'] ?>] = new Array();
<?php <?php
if ( $row['HasHomePreset'] ) if ( $row['HasHomePreset'] )
{ {
?> ?>
controlOptions[<?= $row['Id'] ?>][0] = '<?= $SLANG['Home'] ?>'; controlOptions[<?php echo $row['Id'] ?>][0] = '<?php echo $SLANG['Home'] ?>';
<?php <?php
} }
else else
{ {
?> ?>
controlOptions[<?= $row['Id'] ?>][0] = null; controlOptions[<?php echo $row['Id'] ?>][0] = null;
<?php <?php
} }
for ( $i = 1; $i <= $row['NumPresets']; $i++ ) for ( $i = 1; $i <= $row['NumPresets']; $i++ )
{ {
?> ?>
controlOptions[<?= $row['Id'] ?>][<?= $i ?>] = '<?= $SLANG['Preset'].' '.$i ?>'; controlOptions[<?php echo $row['Id'] ?>][<?php echo $i ?>] = '<?php echo $SLANG['Preset'].' '.$i ?>';
<?php <?php
} }
} }
@ -49,7 +49,7 @@ var monitorNames = new Object();
foreach ( dbFetchAll( "select Name from Monitors order by Name asc", "Name" ) as $name ) foreach ( dbFetchAll( "select Name from Monitors order by Name asc", "Name" ) as $name )
{ {
?> ?>
monitorNames['<?= validJsStr($name) ?>'] = true; monitorNames['<?php echo validJsStr($name) ?>'] = true;
<?php <?php
} }
} }
@ -60,76 +60,76 @@ function validateForm( form )
var errors = new Array(); var errors = new Array();
if ( form.elements['newMonitor[Name]'].value.search( /[^\w-]/ ) >= 0 ) if ( form.elements['newMonitor[Name]'].value.search( /[^\w-]/ ) >= 0 )
errors[errors.length] = "<?= $SLANG['BadNameChars'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadNameChars'] ?>";
else if ( form.elements.mid.value == 0 && monitorNames[form.elements['newMonitor[Name]'].value] ) else if ( form.elements.mid.value == 0 && monitorNames[form.elements['newMonitor[Name]'].value] )
errors[errors.length] = "<?= $SLANG['DuplicateMonitorName'] ?>"; errors[errors.length] = "<?php echo $SLANG['DuplicateMonitorName'] ?>";
if ( form.elements['newMonitor[MaxFPS]'].value && !(parseFloat(form.elements['newMonitor[MaxFPS]'].value) > 0 ) ) if ( form.elements['newMonitor[MaxFPS]'].value && !(parseFloat(form.elements['newMonitor[MaxFPS]'].value) > 0 ) )
errors[errors.length] = "<?= $SLANG['BadMaxFPS'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadMaxFPS'] ?>";
if ( form.elements['newMonitor[AlarmMaxFPS]'].value && !(parseFloat(form.elements['newMonitor[AlarmMaxFPS]'].value) > 0 ) ) if ( form.elements['newMonitor[AlarmMaxFPS]'].value && !(parseFloat(form.elements['newMonitor[AlarmMaxFPS]'].value) > 0 ) )
errors[errors.length] = "<?= $SLANG['BadAlarmMaxFPS'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadAlarmMaxFPS'] ?>";
if ( !form.elements['newMonitor[RefBlendPerc]'].value || (parseInt(form.elements['newMonitor[RefBlendPerc]'].value) > 100 ) || (parseInt(form.elements['newMonitor[RefBlendPerc]'].value) < 0 ) ) if ( !form.elements['newMonitor[RefBlendPerc]'].value || (parseInt(form.elements['newMonitor[RefBlendPerc]'].value) > 100 ) || (parseInt(form.elements['newMonitor[RefBlendPerc]'].value) < 0 ) )
errors[errors.length] = "<?= $SLANG['BadRefBlendPerc'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadRefBlendPerc'] ?>";
if ( form.elements['newMonitor[Type]'].value == 'Local' ) if ( form.elements['newMonitor[Type]'].value == 'Local' )
{ {
if ( !form.elements['newMonitor[Palette]'].value || !form.elements['newMonitor[Palette]'].value.match( /^\d+$/ ) ) if ( !form.elements['newMonitor[Palette]'].value || !form.elements['newMonitor[Palette]'].value.match( /^\d+$/ ) )
errors[errors.length] = "<?= $SLANG['BadPalette'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadPalette'] ?>";
if ( !form.elements['newMonitor[Device]'].value ) if ( !form.elements['newMonitor[Device]'].value )
errors[errors.length] = "<?= $SLANG['BadDevice'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadDevice'] ?>";
if ( !form.elements['newMonitor[Channel]'].value || !form.elements['newMonitor[Channel]'].value.match( /^\d+$/ ) ) if ( !form.elements['newMonitor[Channel]'].value || !form.elements['newMonitor[Channel]'].value.match( /^\d+$/ ) )
errors[errors.length] = "<?= $SLANG['BadChannel'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadChannel'] ?>";
if ( !form.elements['newMonitor[Format]'].value || !form.elements['newMonitor[Format]'].value.match( /^\d+$/ ) ) if ( !form.elements['newMonitor[Format]'].value || !form.elements['newMonitor[Format]'].value.match( /^\d+$/ ) )
errors[errors.length] = "<?= $SLANG['BadFormat'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadFormat'] ?>";
} }
else if ( form.elements['newMonitor[Type]'].value == 'Remote' ) else if ( form.elements['newMonitor[Type]'].value == 'Remote' )
{ {
if ( !form.elements['newMonitor[Host]'].value || !form.elements['newMonitor[Host]'].value.match( /^[0-9a-zA-Z_.:@-]+$/ ) ) if ( !form.elements['newMonitor[Host]'].value || !form.elements['newMonitor[Host]'].value.match( /^[0-9a-zA-Z_.:@-]+$/ ) )
errors[errors.length] = "<?= $SLANG['BadHost'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadHost'] ?>";
if ( form.elements['newMonitor[Port]'].value && !form.elements['newMonitor[Port]'].value.match( /^\d+$/ ) ) if ( form.elements['newMonitor[Port]'].value && !form.elements['newMonitor[Port]'].value.match( /^\d+$/ ) )
errors[errors.length] = "<?= $SLANG['BadPort'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadPort'] ?>";
//if ( !form.elements['newMonitor[Path]'].value ) //if ( !form.elements['newMonitor[Path]'].value )
//errors[errors.length] = "<?= $SLANG['BadPath'] ?>"; //errors[errors.length] = "<?php echo $SLANG['BadPath'] ?>";
} }
else if ( form.elements['newMonitor[Type]'].value == 'File' ) else if ( form.elements['newMonitor[Type]'].value == 'File' )
{ {
if ( !form.elements['newMonitor[Path]'].value ) if ( !form.elements['newMonitor[Path]'].value )
errors[errors.length] = "<?= $SLANG['BadPath'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadPath'] ?>";
} }
if ( !form.elements['newMonitor[Colours]'].value || (parseInt(form.elements['newMonitor[Colours]'].value) != 1 && parseInt(form.elements['newMonitor[Colours]'].value) != 3 && parseInt(form.elements['newMonitor[Colours]'].value) != 4 ) ) if ( !form.elements['newMonitor[Colours]'].value || (parseInt(form.elements['newMonitor[Colours]'].value) != 1 && parseInt(form.elements['newMonitor[Colours]'].value) != 3 && parseInt(form.elements['newMonitor[Colours]'].value) != 4 ) )
errors[errors.length] = "<?= $SLANG['BadColours'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadColours'] ?>";
if ( !form.elements['newMonitor[Width]'].value || !(parseInt(form.elements['newMonitor[Width]'].value) > 0 ) ) if ( !form.elements['newMonitor[Width]'].value || !(parseInt(form.elements['newMonitor[Width]'].value) > 0 ) )
errors[errors.length] = "<?= $SLANG['BadWidth'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadWidth'] ?>";
if ( !form.elements['newMonitor[Height]'].value || !(parseInt(form.elements['newMonitor[Height]'].value) > 0 ) ) if ( !form.elements['newMonitor[Height]'].value || !(parseInt(form.elements['newMonitor[Height]'].value) > 0 ) )
errors[errors.length] = "<?= $SLANG['BadHeight'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadHeight'] ?>";
if ( !form.elements['newMonitor[LabelX]'].value || !(parseInt(form.elements['newMonitor[LabelX]'].value) >= 0 ) ) if ( !form.elements['newMonitor[LabelX]'].value || !(parseInt(form.elements['newMonitor[LabelX]'].value) >= 0 ) )
errors[errors.length] = "<?= $SLANG['BadLabelX'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadLabelX'] ?>";
if ( !form.elements['newMonitor[LabelY]'].value || !(parseInt(form.elements['newMonitor[LabelY]'].value) >= 0 ) ) if ( !form.elements['newMonitor[LabelY]'].value || !(parseInt(form.elements['newMonitor[LabelY]'].value) >= 0 ) )
errors[errors.length] = "<?= $SLANG['BadLabelY'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadLabelY'] ?>";
if ( !form.elements['newMonitor[ImageBufferCount]'].value || !(parseInt(form.elements['newMonitor[ImageBufferCount]'].value) >= 10 ) ) if ( !form.elements['newMonitor[ImageBufferCount]'].value || !(parseInt(form.elements['newMonitor[ImageBufferCount]'].value) >= 10 ) )
errors[errors.length] = "<?= $SLANG['BadImageBufferCount'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadImageBufferCount'] ?>";
if ( !form.elements['newMonitor[WarmupCount]'].value || !(parseInt(form.elements['newMonitor[WarmupCount]'].value) >= 0 ) ) if ( !form.elements['newMonitor[WarmupCount]'].value || !(parseInt(form.elements['newMonitor[WarmupCount]'].value) >= 0 ) )
errors[errors.length] = "<?= $SLANG['BadWarmupCount'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadWarmupCount'] ?>";
if ( !form.elements['newMonitor[PreEventCount]'].value || !(parseInt(form.elements['newMonitor[PreEventCount]'].value) > 0 ) || (parseInt(form.elements['newMonitor[PreEventCount]'].value) > parseInt(form.elements['newMonitor[ImageBufferCount]'].value)) ) if ( !form.elements['newMonitor[PreEventCount]'].value || !(parseInt(form.elements['newMonitor[PreEventCount]'].value) > 0 ) || (parseInt(form.elements['newMonitor[PreEventCount]'].value) > parseInt(form.elements['newMonitor[ImageBufferCount]'].value)) )
errors[errors.length] = "<?= $SLANG['BadPreEventCount'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadPreEventCount'] ?>";
if ( !form.elements['newMonitor[PostEventCount]'].value || !(parseInt(form.elements['newMonitor[PostEventCount]'].value) >= 0 ) ) if ( !form.elements['newMonitor[PostEventCount]'].value || !(parseInt(form.elements['newMonitor[PostEventCount]'].value) >= 0 ) )
errors[errors.length] = "<?= $SLANG['BadPostEventCount'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadPostEventCount'] ?>";
if ( !form.elements['newMonitor[StreamReplayBuffer]'].value || !(parseInt(form.elements['newMonitor[StreamReplayBuffer]'].value) >= 0 ) ) if ( !form.elements['newMonitor[StreamReplayBuffer]'].value || !(parseInt(form.elements['newMonitor[StreamReplayBuffer]'].value) >= 0 ) )
errors[errors.length] = "<?= $SLANG['BadStreamReplayBuffer'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadStreamReplayBuffer'] ?>";
if ( !form.elements['newMonitor[AlarmFrameCount]'].value || !(parseInt(form.elements['newMonitor[AlarmFrameCount]'].value) > 0 ) ) if ( !form.elements['newMonitor[AlarmFrameCount]'].value || !(parseInt(form.elements['newMonitor[AlarmFrameCount]'].value) > 0 ) )
errors[errors.length] = "<?= $SLANG['BadAlarmFrameCount'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadAlarmFrameCount'] ?>";
if ( !form.elements['newMonitor[SectionLength]'].value || !(parseInt(form.elements['newMonitor[SectionLength]'].value) >= 30 ) ) if ( !form.elements['newMonitor[SectionLength]'].value || !(parseInt(form.elements['newMonitor[SectionLength]'].value) >= 30 ) )
errors[errors.length] = "<?= $SLANG['BadSectionLength'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadSectionLength'] ?>";
if ( !form.elements['newMonitor[FPSReportInterval]'].value || !(parseInt(form.elements['newMonitor[FPSReportInterval]'].value) >= 0 ) ) if ( !form.elements['newMonitor[FPSReportInterval]'].value || !(parseInt(form.elements['newMonitor[FPSReportInterval]'].value) >= 0 ) )
errors[errors.length] = "<?= $SLANG['BadFPSReportInterval'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadFPSReportInterval'] ?>";
if ( !form.elements['newMonitor[FrameSkip]'].value || !(parseInt(form.elements['newMonitor[FrameSkip]'].value) >= 0 ) ) if ( !form.elements['newMonitor[FrameSkip]'].value || !(parseInt(form.elements['newMonitor[FrameSkip]'].value) >= 0 ) )
errors[errors.length] = "<?= $SLANG['BadFrameSkip'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadFrameSkip'] ?>";
if ( !form.elements['newMonitor[MotionFrameSkip]'].value || !(parseInt(form.elements['newMonitor[MotionFrameSkip]'].value) >= 0 ) ) if ( !form.elements['newMonitor[MotionFrameSkip]'].value || !(parseInt(form.elements['newMonitor[MotionFrameSkip]'].value) >= 0 ) )
errors[errors.length] = "<?= $SLANG['BadMotionFrameSkip'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadMotionFrameSkip'] ?>";
if ( form.elements['newMonitor[Type]'].value == 'Local' ) if ( form.elements['newMonitor[Type]'].value == 'Local' )
if ( !form.elements['newMonitor[SignalCheckColour]'].value || !form.elements['newMonitor[SignalCheckColour]'].value.match( /^[#0-9a-zA-Z]+$/ ) ) if ( !form.elements['newMonitor[SignalCheckColour]'].value || !form.elements['newMonitor[SignalCheckColour]'].value.match( /^[#0-9a-zA-Z]+$/ ) )
errors[errors.length] = "<?= $SLANG['BadSignalCheckColour'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadSignalCheckColour'] ?>";
if ( !form.elements['newMonitor[WebColour]'].value || !form.elements['newMonitor[WebColour]'].value.match( /^[#0-9a-zA-Z]+$/ ) ) if ( !form.elements['newMonitor[WebColour]'].value || !form.elements['newMonitor[WebColour]'].value.match( /^[#0-9a-zA-Z]+$/ ) )
errors[errors.length] = "<?= $SLANG['BadWebColour'] ?>"; errors[errors.length] = "<?php echo $SLANG['BadWebColour'] ?>";
if ( errors.length ) if ( errors.length )
{ {
@ -164,8 +164,8 @@ function updateMethods( element )
foreach( $httpMethods as $value=>$label ) foreach( $httpMethods as $value=>$label )
{ {
?> ?>
methodSelector.options[methodSelector.options.length] = new Option( "<?= htmlspecialchars($label) ?>", "<?= $value ?>" ); methodSelector.options[methodSelector.options.length] = new Option( "<?php echo htmlspecialchars($label) ?>", "<?php echo $value ?>" );
if ( origMethod.value == "<?= $value ?>" ) if ( origMethod.value == "<?php echo $value ?>" )
methodSelector.selectedIndex = methodSelector.options.length-1; methodSelector.selectedIndex = methodSelector.options.length-1;
<?php <?php
} }
@ -178,8 +178,8 @@ foreach( $httpMethods as $value=>$label )
foreach( $rtspMethods as $value=>$label ) foreach( $rtspMethods as $value=>$label )
{ {
?> ?>
methodSelector.options[methodSelector.options.length] = new Option( "<?= htmlspecialchars($label) ?>", "<?= $value ?>" ); methodSelector.options[methodSelector.options.length] = new Option( "<?php echo htmlspecialchars($label) ?>", "<?php echo $value ?>" );
if ( origMethod.value == "<?= $value ?>" ) if ( origMethod.value == "<?php echo $value ?>" )
methodSelector.selectedIndex = form.elements['newMonitor[Method]'].options.length-1; methodSelector.selectedIndex = form.elements['newMonitor[Method]'].options.length-1;
<?php <?php
} }

36
web/skins/classic/views/js/montage.js.php
View File

@ -1,37 +1,37 @@
// //
// Import constants // Import constants
// //
var STATE_IDLE = <?= STATE_IDLE ?>; var STATE_IDLE = <?php echo STATE_IDLE ?>;
var STATE_PREALARM = <?= STATE_PREALARM ?>; var STATE_PREALARM = <?php echo STATE_PREALARM ?>;
var STATE_ALARM = <?= STATE_ALARM ?>; var STATE_ALARM = <?php echo STATE_ALARM ?>;
var STATE_ALERT = <?= STATE_ALERT ?>; var STATE_ALERT = <?php echo STATE_ALERT ?>;
var STATE_TAPE = <?= STATE_TAPE ?>; var STATE_TAPE = <?php echo STATE_TAPE ?>;
var stateStrings = new Array(); var stateStrings = new Array();
stateStrings[STATE_IDLE] = "<?= $SLANG['Idle'] ?>"; stateStrings[STATE_IDLE] = "<?php echo $SLANG['Idle'] ?>";
stateStrings[STATE_PREALARM] = "<?= $SLANG['Idle'] ?>"; stateStrings[STATE_PREALARM] = "<?php echo $SLANG['Idle'] ?>";
stateStrings[STATE_ALARM] = "<?= $SLANG['Alarm'] ?>"; stateStrings[STATE_ALARM] = "<?php echo $SLANG['Alarm'] ?>";
stateStrings[STATE_ALERT] = "<?= $SLANG['Alert'] ?>"; stateStrings[STATE_ALERT] = "<?php echo $SLANG['Alert'] ?>";
stateStrings[STATE_TAPE] = "<?= $SLANG['Record'] ?>"; stateStrings[STATE_TAPE] = "<?php echo $SLANG['Record'] ?>";
var CMD_QUERY = <?= CMD_QUERY ?>; var CMD_QUERY = <?php echo CMD_QUERY ?>;
var SCALE_BASE = <?= SCALE_BASE ?>; var SCALE_BASE = <?php echo SCALE_BASE ?>;
var COMPACT_MONTAGE = <?= ZM_WEB_COMPACT_MONTAGE ?>; var COMPACT_MONTAGE = <?php echo ZM_WEB_COMPACT_MONTAGE ?>;
var SOUND_ON_ALARM = <?= ZM_WEB_SOUND_ON_ALARM ?>; var SOUND_ON_ALARM = <?php echo ZM_WEB_SOUND_ON_ALARM ?>;
var POPUP_ON_ALARM = <?= ZM_WEB_POPUP_ON_ALARM ?>; var POPUP_ON_ALARM = <?php echo ZM_WEB_POPUP_ON_ALARM ?>;
var statusRefreshTimeout = <?= 1000*ZM_WEB_REFRESH_STATUS ?>; var statusRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
var canStreamNative = <?= canStreamNative()?'true':'false' ?>; var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
var monitorData = new Array(); var monitorData = new Array();
<?php <?php
foreach ( $monitors as $monitor ) foreach ( $monitors as $monitor )
{ {
?> ?>
monitorData[monitorData.length] = { 'id': <?= $monitor['Id'] ?>, 'connKey': <?= $monitor['connKey'] ?>, 'width': <?= $monitor['Width'] ?>,'height':<?= $monitor['Height'] ?> }; monitorData[monitorData.length] = { 'id': <?php echo $monitor['Id'] ?>, 'connKey': <?php echo $monitor['connKey'] ?>, 'width': <?php echo $monitor['Width'] ?>,'height':<?php echo $monitor['Height'] ?> };
<?php <?php
} }
?> ?>

4
web/skins/classic/views/js/options.js.php
View File

@ -1,5 +1,5 @@
var restartWarning = <?= empty($restartWarning)?'false':'true' ?>; var restartWarning = <?php echo empty($restartWarning)?'false':'true' ?>;
if ( restartWarning ) if ( restartWarning )
{ {
alert( "<?= $SLANG['OptionRestartWarning'] ?>" ); alert( "<?php echo $SLANG['OptionRestartWarning'] ?>" );
} }

4
web/skins/classic/views/js/state.js.php
View File

@ -1,2 +1,2 @@
var running = <?= $running?'true':'false' ?>; var running = <?php echo $running?'true':'false' ?>;
var applying = <?= !empty($_REQUEST['apply'])?'true':'false' ?>; var applying = <?php echo !empty($_REQUEST['apply'])?'true':'false' ?>;

6
web/skins/classic/views/js/timeline.js.php
View File

@ -1,4 +1,4 @@
var filterQuery = '<?= validJsStr($filterQuery) ?>'; var filterQuery = '<?php echo validJsStr($filterQuery) ?>';
var monitorNames = new Object(); var monitorNames = new Object();
<?php <?php
@ -7,10 +7,10 @@ foreach ( $monitors as $monitor )
if ( !empty($monitorIds[$monitor['Id']]) ) if ( !empty($monitorIds[$monitor['Id']]) )
{ {
?> ?>
monitorNames[<?= $monitor['Id'] ?>] = '<?= validJsStr($monitor['Name']) ?>'; monitorNames[<?php echo $monitor['Id'] ?>] = '<?php echo validJsStr($monitor['Name']) ?>';
<?php <?php
} }
} }
?> ?>
var archivedString = "<?= $SLANG['Archived'] ?>"; var archivedString = "<?php echo $SLANG['Archived'] ?>";

2
web/skins/classic/views/js/version.js.php
View File

@ -1 +1 @@
var openZmWindow = <?= (isset($_REQUEST['action']) && $_REQUEST['action'] == "version" && $_REQUEST['option'] == "go")?'true':'false' ?>; var openZmWindow = <?php echo (isset($_REQUEST['action']) && $_REQUEST['action'] == "version" && $_REQUEST['option'] == "go")?'true':'false' ?>;

8
web/skins/classic/views/js/video.js.php
View File

@ -1,5 +1,5 @@
var eventId = '<?= $event['Id'] ?>'; var eventId = '<?php echo $event['Id'] ?>';
var videoGenSuccessString = '<?= addslashes($SLANG['VideoGenSucceeded']) ?>'; var videoGenSuccessString = '<?php echo addslashes($SLANG['VideoGenSucceeded']) ?>';
var videoGenFailedString = '<?= addslashes($SLANG['VideoGenFailed']) ?>'; var videoGenFailedString = '<?php echo addslashes($SLANG['VideoGenFailed']) ?>';
var videoGenProgressString = '<?= addslashes($SLANG['GeneratingVideo']) ?>'; var videoGenProgressString = '<?php echo addslashes($SLANG['GeneratingVideo']) ?>';

92
web/skins/classic/views/js/watch.js.php
View File

@ -1,63 +1,63 @@
// //
// Import constants // Import constants
// //
var STATE_IDLE = <?= STATE_IDLE ?>; var STATE_IDLE = <?php echo STATE_IDLE ?>;
var STATE_PREALARM = <?= STATE_PREALARM ?>; var STATE_PREALARM = <?php echo STATE_PREALARM ?>;
var STATE_ALARM = <?= STATE_ALARM ?>; var STATE_ALARM = <?php echo STATE_ALARM ?>;
var STATE_ALERT = <?= STATE_ALERT ?>; var STATE_ALERT = <?php echo STATE_ALERT ?>;
var STATE_TAPE = <?= STATE_TAPE ?>; var STATE_TAPE = <?php echo STATE_TAPE ?>;
var stateStrings = new Array(); var stateStrings = new Array();
stateStrings[STATE_IDLE] = "<?= $SLANG['Idle'] ?>"; stateStrings[STATE_IDLE] = "<?php echo $SLANG['Idle'] ?>";
stateStrings[STATE_PREALARM] = "<?= $SLANG['Idle'] ?>"; stateStrings[STATE_PREALARM] = "<?php echo $SLANG['Idle'] ?>";
stateStrings[STATE_ALARM] = "<?= $SLANG['Alarm'] ?>"; stateStrings[STATE_ALARM] = "<?php echo $SLANG['Alarm'] ?>";
stateStrings[STATE_ALERT] = "<?= $SLANG['Alert'] ?>"; stateStrings[STATE_ALERT] = "<?php echo $SLANG['Alert'] ?>";
stateStrings[STATE_TAPE] = "<?= $SLANG['Record'] ?>"; stateStrings[STATE_TAPE] = "<?php echo $SLANG['Record'] ?>";
var deleteString = "<?= $SLANG['Delete'] ?>"; var deleteString = "<?php echo $SLANG['Delete'] ?>";
var CMD_NONE = <?= CMD_NONE ?>; var CMD_NONE = <?php echo CMD_NONE ?>;
var CMD_PAUSE = <?= CMD_PAUSE ?>; var CMD_PAUSE = <?php echo CMD_PAUSE ?>;
var CMD_PLAY = <?= CMD_PLAY ?>; var CMD_PLAY = <?php echo CMD_PLAY ?>;
var CMD_STOP = <?= CMD_STOP ?>; var CMD_STOP = <?php echo CMD_STOP ?>;
var CMD_FASTFWD = <?= CMD_FASTFWD ?>; var CMD_FASTFWD = <?php echo CMD_FASTFWD ?>;
var CMD_SLOWFWD = <?= CMD_SLOWFWD ?>; var CMD_SLOWFWD = <?php echo CMD_SLOWFWD ?>;
var CMD_SLOWREV = <?= CMD_SLOWREV ?>; var CMD_SLOWREV = <?php echo CMD_SLOWREV ?>;
var CMD_FASTREV = <?= CMD_FASTREV ?>; var CMD_FASTREV = <?php echo CMD_FASTREV ?>;
var CMD_ZOOMIN = <?= CMD_ZOOMIN ?>; var CMD_ZOOMIN = <?php echo CMD_ZOOMIN ?>;
var CMD_ZOOMOUT = <?= CMD_ZOOMOUT ?>; var CMD_ZOOMOUT = <?php echo CMD_ZOOMOUT ?>;
var CMD_PAN = <?= CMD_PAN ?>; var CMD_PAN = <?php echo CMD_PAN ?>;
var CMD_SCALE = <?= CMD_SCALE ?>; var CMD_SCALE = <?php echo CMD_SCALE ?>;
var CMD_PREV = <?= CMD_PREV ?>; var CMD_PREV = <?php echo CMD_PREV ?>;
var CMD_NEXT = <?= CMD_NEXT ?>; var CMD_NEXT = <?php echo CMD_NEXT ?>;
var CMD_SEEK = <?= CMD_SEEK ?>; var CMD_SEEK = <?php echo CMD_SEEK ?>;
var CMD_QUERY = <?= CMD_QUERY ?>; var CMD_QUERY = <?php echo CMD_QUERY ?>;
var SCALE_BASE = <?= SCALE_BASE ?>; var SCALE_BASE = <?php echo SCALE_BASE ?>;
var SOUND_ON_ALARM = <?= ZM_WEB_SOUND_ON_ALARM ?>; var SOUND_ON_ALARM = <?php echo ZM_WEB_SOUND_ON_ALARM ?>;
var POPUP_ON_ALARM = <?= ZM_WEB_POPUP_ON_ALARM ?>; var POPUP_ON_ALARM = <?php echo ZM_WEB_POPUP_ON_ALARM ?>;
var streamMode = "<?= $streamMode ?>"; var streamMode = "<?php echo $streamMode ?>";
var showMode = "<?= ($showPtzControls && !empty($control))?"control":"events" ?>"; var showMode = "<?php echo ($showPtzControls && !empty($control))?"control":"events" ?>";
var connKey = '<?= $connkey ?>'; var connKey = '<?php echo $connkey ?>';
var maxDisplayEvents = <?= 2 * MAX_EVENTS ?>; var maxDisplayEvents = <?php echo 2 * MAX_EVENTS ?>;
var monitorId = <?= $monitor['Id'] ?>; var monitorId = <?php echo $monitor['Id'] ?>;
var monitorWidth = <?= $monitor['Width'] ?>; var monitorWidth = <?php echo $monitor['Width'] ?>;
var monitorHeight = <?= $monitor['Height'] ?>; var monitorHeight = <?php echo $monitor['Height'] ?>;
var scale = <?= $scale ?>; var scale = <?php echo $scale ?>;
var streamSrc = "<?= preg_replace( '/&amp;/', '&', $streamSrc ) ?>"; var streamSrc = "<?php echo preg_replace( '/&amp;/', '&', $streamSrc ) ?>";
var statusRefreshTimeout = <?= 1000*ZM_WEB_REFRESH_STATUS ?>; var statusRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
var eventsRefreshTimeout = <?= 1000*ZM_WEB_REFRESH_EVENTS ?>; var eventsRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_EVENTS ?>;
var imageRefreshTimeout = <?= 1000*ZM_WEB_REFRESH_IMAGE ?>; var imageRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_IMAGE ?>;
var canEditMonitors = <?= canEdit( 'Monitors' )?'true':'false' ?>; var canEditMonitors = <?php echo canEdit( 'Monitors' )?'true':'false' ?>;
var canStreamNative = <?= canStreamNative()?'true':'false' ?>; var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
var canPlayPauseAudio = Browser.ie; var canPlayPauseAudio = Browser.ie;
@ -71,5 +71,5 @@ var imageControlMode = "moveConMap";
var imageControlMode = null; var imageControlMode = null;
<?php } ?> <?php } ?>
var refreshApplet = <?= (canStreamApplet() && $streamMode == "jpeg")?'true':'false' ?>; var refreshApplet = <?php echo (canStreamApplet() && $streamMode == "jpeg")?'true':'false' ?>;
var appletRefreshTime = <?= ZM_RELOAD_CAMBOZOLA ?>; var appletRefreshTime = <?php echo ZM_RELOAD_CAMBOZOLA ?>;

88
web/skins/classic/views/js/zone.js.php
View File

@ -3,37 +3,37 @@ var presets = new Object();
foreach ( $presets as $preset ) foreach ( $presets as $preset )
{ {
?> ?>
presets[<?= $preset['Id'] ?>] = { presets[<?php echo $preset['Id'] ?>] = {
'UnitsIndex': <?= $preset['UnitsIndex'] ?>, 'UnitsIndex': <?php echo $preset['UnitsIndex'] ?>,
'CheckMethodIndex': <?= $preset['CheckMethodIndex'] ?>, 'CheckMethodIndex': <?php echo $preset['CheckMethodIndex'] ?>,
'MinPixelThreshold': '<?= $preset['MinPixelThreshold'] ?>', 'MinPixelThreshold': '<?php echo $preset['MinPixelThreshold'] ?>',
'MaxPixelThreshold': '<?= $preset['MaxPixelThreshold'] ?>', 'MaxPixelThreshold': '<?php echo $preset['MaxPixelThreshold'] ?>',
'FilterX': '<?= $preset['FilterX'] ?>', 'FilterX': '<?php echo $preset['FilterX'] ?>',
'FilterY': '<?= $preset['FilterY'] ?>', 'FilterY': '<?php echo $preset['FilterY'] ?>',
'MinAlarmPixels': '<?= $preset['MinAlarmPixels'] ?>', 'MinAlarmPixels': '<?php echo $preset['MinAlarmPixels'] ?>',
'MaxAlarmPixels': '<?= $preset['MaxAlarmPixels'] ?>', 'MaxAlarmPixels': '<?php echo $preset['MaxAlarmPixels'] ?>',
'MinFilterPixels': '<?= $preset['MinFilterPixels'] ?>', 'MinFilterPixels': '<?php echo $preset['MinFilterPixels'] ?>',
'MaxFilterPixels': '<?= $preset['MaxFilterPixels'] ?>', 'MaxFilterPixels': '<?php echo $preset['MaxFilterPixels'] ?>',
'MinBlobPixels': '<?= $preset['MinBlobPixels'] ?>', 'MinBlobPixels': '<?php echo $preset['MinBlobPixels'] ?>',
'MaxBlobPixels': '<?= $preset['MaxBlobPixels'] ?>', 'MaxBlobPixels': '<?php echo $preset['MaxBlobPixels'] ?>',
'MinBlobs': '<?= $preset['MinBlobs'] ?>', 'MinBlobs': '<?php echo $preset['MinBlobs'] ?>',
'MaxBlobs': '<?= $preset['MaxBlobs'] ?>', 'MaxBlobs': '<?php echo $preset['MaxBlobs'] ?>',
'OverloadFrames': '<?= $preset['OverloadFrames'] ?>', 'OverloadFrames': '<?php echo $preset['OverloadFrames'] ?>',
'ExtendAlarmFrames': '<?= $preset['ExtendAlarmFrames'] ?>' 'ExtendAlarmFrames': '<?php echo $preset['ExtendAlarmFrames'] ?>'
}; };
<?php <?php
} }
?> ?>
var zone = { var zone = {
'Name': '<?= validJsStr($zone['Name']) ?>', 'Name': '<?php echo validJsStr($zone['Name']) ?>',
'Id': <?= validJsStr($zone['Id']) ?>, 'Id': <?php echo validJsStr($zone['Id']) ?>,
'MonitorId': <?= validJsStr($zone['MonitorId']) ?>, 'MonitorId': <?php echo validJsStr($zone['MonitorId']) ?>,
'CheckMethod': '<?= $zone['CheckMethod'] ?>', 'CheckMethod': '<?php echo $zone['CheckMethod'] ?>',
'AlarmRGB': '<?= $zone['AlarmRGB'] ?>', 'AlarmRGB': '<?php echo $zone['AlarmRGB'] ?>',
'NumCoords': <?= $zone['NumCoords'] ?>, 'NumCoords': <?php echo $zone['NumCoords'] ?>,
'Coords': '<?= $zone['Coords'] ?>', 'Coords': '<?php echo $zone['Coords'] ?>',
'Area': <?= $zone['Area'] ?> 'Area': <?php echo $zone['Area'] ?>
}; };
zone['Points'] = new Array(); zone['Points'] = new Array();
@ -41,27 +41,27 @@ zone['Points'] = new Array();
for ( $i = 0; $i < count($newZone['Points']); $i++ ) for ( $i = 0; $i < count($newZone['Points']); $i++ )
{ {
?> ?>
zone['Points'][<?= $i ?>] = { 'x': <?= $newZone['Points'][$i]['x'] ?>, 'y': <?= $newZone['Points'][$i]['y'] ?> }; zone['Points'][<?php echo $i ?>] = { 'x': <?php echo $newZone['Points'][$i]['x'] ?>, 'y': <?php echo $newZone['Points'][$i]['y'] ?> };
<?php <?php
} }
?> ?>
var maxX = <?= $monitor['Width']-1 ?>; var maxX = <?php echo $monitor['Width']-1 ?>;
var maxY = <?= $monitor['Height']-1 ?>; var maxY = <?php echo $monitor['Height']-1 ?>;
var selfIntersecting = <?= $selfIntersecting?'true':'false' ?>; var selfIntersecting = <?php echo $selfIntersecting?'true':'false' ?>;
var selfIntersectingString = '<?= addslashes($SLANG['SelfIntersecting']) ?>'; var selfIntersectingString = '<?php echo addslashes($SLANG['SelfIntersecting']) ?>';
var alarmRGBUnsetString = '<?= addslashes($SLANG['AlarmRGBUnset']) ?>'; var alarmRGBUnsetString = '<?php echo addslashes($SLANG['AlarmRGBUnset']) ?>';
var minPixelThresUnsetString = '<?= addslashes($SLANG['MinPixelThresUnset']) ?>'; var minPixelThresUnsetString = '<?php echo addslashes($SLANG['MinPixelThresUnset']) ?>';
var minPixelThresLtMaxString = '<?= addslashes($SLANG['MinPixelThresLtMax']) ?>'; var minPixelThresLtMaxString = '<?php echo addslashes($SLANG['MinPixelThresLtMax']) ?>';
var filterUnsetString = '<?= addslashes($SLANG['FilterUnset']) ?>'; var filterUnsetString = '<?php echo addslashes($SLANG['FilterUnset']) ?>';
var minAlarmAreaUnsetString = '<?= addslashes($SLANG['MinAlarmAreaUnset']) ?>'; var minAlarmAreaUnsetString = '<?php echo addslashes($SLANG['MinAlarmAreaUnset']) ?>';
var minAlarmAreaLtMaxString = '<?= addslashes($SLANG['MinAlarmAreaLtMax']) ?>'; var minAlarmAreaLtMaxString = '<?php echo addslashes($SLANG['MinAlarmAreaLtMax']) ?>';
var minFilterAreaUnsetString = '<?= addslashes($SLANG['MinFilterAreaUnset']) ?>'; var minFilterAreaUnsetString = '<?php echo addslashes($SLANG['MinFilterAreaUnset']) ?>';
var minFilterAreaLtMaxString = '<?= addslashes($SLANG['MinFilterAreaLtMax']) ?>'; var minFilterAreaLtMaxString = '<?php echo addslashes($SLANG['MinFilterAreaLtMax']) ?>';
var minFilterLtMinAlarmString = '<?= addslashes($SLANG['MinFilterLtMinAlarm']) ?>'; var minFilterLtMinAlarmString = '<?php echo addslashes($SLANG['MinFilterLtMinAlarm']) ?>';
var minBlobAreaUnsetString = '<?= addslashes($SLANG['MinBlobAreaUnset']) ?>'; var minBlobAreaUnsetString = '<?php echo addslashes($SLANG['MinBlobAreaUnset']) ?>';
var minBlobAreaLtMaxString = '<?= addslashes($SLANG['MinBlobAreaLtMax']) ?>'; var minBlobAreaLtMaxString = '<?php echo addslashes($SLANG['MinBlobAreaLtMax']) ?>';
var minBlobLtMinFilterString = '<?= addslashes($SLANG['MinBlobLtMinFilter']) ?>'; var minBlobLtMinFilterString = '<?php echo addslashes($SLANG['MinBlobLtMinFilter']) ?>';
var minBlobsUnsetString = '<?= addslashes($SLANG['MinBlobsUnset']) ?>'; var minBlobsUnsetString = '<?php echo addslashes($SLANG['MinBlobsUnset']) ?>';
var minBlobsLtMaxString = '<?= addslashes($SLANG['MinBlobsLtMax']) ?>'; var minBlobsLtMaxString = '<?php echo addslashes($SLANG['MinBlobsLtMax']) ?>';

58
web/skins/classic/views/log.php
View File

@ -32,21 +32,21 @@ xhtmlHeaders(__FILE__, $SLANG['SystemLog'] );
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<input type="button" value="<?= $SLANG['More'] ?>" onclick="expandLog()"/> <input type="button" value="<?php echo $SLANG['More'] ?>" onclick="expandLog()"/>
<input type="button" value="<?= $SLANG['Clear'] ?>" onclick="clearLog()"/> <input type="button" value="<?php echo $SLANG['Clear'] ?>" onclick="clearLog()"/>
<input type="button" value="<?= $SLANG['Refresh'] ?>" onclick="refreshLog()"/> <input type="button" value="<?php echo $SLANG['Refresh'] ?>" onclick="refreshLog()"/>
<input type="button" value="<?= $SLANG['Export'] ?>" onclick="exportLog()"/> <input type="button" value="<?php echo $SLANG['Export'] ?>" onclick="exportLog()"/>
<input type="button" value="<?= $SLANG['Close'] ?>" onclick="closeWindow()"/> <input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="closeWindow()"/>
</div> </div>
<h2 class="floating"><?= $SLANG['SystemLog'] ?></h2> <h2 class="floating"><?php echo $SLANG['SystemLog'] ?></h2>
<div id="headerControl"> <div id="headerControl">
<table id="logSummary" cellspacing="0"> <table id="logSummary" cellspacing="0">
<tr> <tr>
<td><?= $SLANG['Updated'] ?>: <span id="lastUpdate"></span></td> <td><?php echo $SLANG['Updated'] ?>: <span id="lastUpdate"></span></td>
<td><?= $SLANG['State'] ?>: <span id="logState"></span></td> <td><?php echo $SLANG['State'] ?>: <span id="logState"></span></td>
<td><?= $SLANG['Total'] ?>: <span id="totalLogs"></span></td> <td><?php echo $SLANG['Total'] ?>: <span id="totalLogs"></span></td>
<td><?= $SLANG['Available'] ?>: <span id="availLogs"></span></td> <td><?php echo $SLANG['Available'] ?>: <span id="availLogs"></span></td>
<td><?= $SLANG['Displaying'] ?>: <span id="displayLogs"></span></td> <td><?php echo $SLANG['Displaying'] ?>: <span id="displayLogs"></span></td>
</tr> </tr>
</table> </table>
</div> </div>
@ -58,20 +58,20 @@ xhtmlHeaders(__FILE__, $SLANG['SystemLog'] );
Level <select id="filter[Level]" onchange="filterLog(this)"><option value="">---</option></select> Level <select id="filter[Level]" onchange="filterLog(this)"><option value="">---</option></select>
File <select id="filter[File]" onchange="filterLog(this)"><option value="">------</option></select> File <select id="filter[File]" onchange="filterLog(this)"><option value="">------</option></select>
Line <select id="filter[Line]" onchange="filterLog(this)"><option value="">----</option></select> Line <select id="filter[Line]" onchange="filterLog(this)"><option value="">----</option></select>
<input type="reset" value="<?= $SLANG['Reset'] ?>" onclick="resetLog()"/> <input type="reset" value="<?php echo $SLANG['Reset'] ?>" onclick="resetLog()"/>
</div> </div>
<form name="logForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="logForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<table id="logTable" class="major" cellspacing="0"> <table id="logTable" class="major" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th><?= $SLANG['DateTime'] ?></th> <th><?php echo $SLANG['DateTime'] ?></th>
<th class="table-th-nosort"><?= $SLANG['Component'] ?></th> <th class="table-th-nosort"><?php echo $SLANG['Component'] ?></th>
<th class="table-th-nosort"><?= $SLANG['Pid'] ?></th> <th class="table-th-nosort"><?php echo $SLANG['Pid'] ?></th>
<th class="table-th-nosort"><?= $SLANG['Level'] ?></th> <th class="table-th-nosort"><?php echo $SLANG['Level'] ?></th>
<th class="table-th-nosort"><?= $SLANG['Message'] ?></th> <th class="table-th-nosort"><?php echo $SLANG['Message'] ?></th>
<th class="table-th-nosort"><?= $SLANG['File'] ?></th> <th class="table-th-nosort"><?php echo $SLANG['File'] ?></th>
<th class="table-th-nosort"><?= $SLANG['Line'] ?></th> <th class="table-th-nosort"><?php echo $SLANG['Line'] ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -84,29 +84,29 @@ xhtmlHeaders(__FILE__, $SLANG['SystemLog'] );
</div> </div>
<div id="exportLog" class="overlay"> <div id="exportLog" class="overlay">
<div class="overlayHeader"> <div class="overlayHeader">
<div class="overlayTitle"><?= $SLANG['ExportLog'] ?></div> <div class="overlayTitle"><?php echo $SLANG['ExportLog'] ?></div>
</div> </div>
<div class="overlayBody"> <div class="overlayBody">
<div class="overlayContent"> <div class="overlayContent">
<form id="exportForm" action="" method="post"> <form id="exportForm" action="" method="post">
<fieldset> <fieldset>
<legend><?= $SLANG['SelectLog'] ?></legend> <legend><?php echo $SLANG['SelectLog'] ?></legend>
<label for="selectorAll">All</label><input type="radio" id="selectorAll" name="selector" value="all"/> <label for="selectorAll">All</label><input type="radio" id="selectorAll" name="selector" value="all"/>
<label for="selectorFilter">Filter</label><input type="radio" id="selectorFilter" name="selector" value="filter"/> <label for="selectorFilter">Filter</label><input type="radio" id="selectorFilter" name="selector" value="filter"/>
<label for="selectorCurrent">Current</label><input type="radio" id="selectorCurrent" name="selector" value="current" title="<?= $SLANG['ChooseLogSelection'] ?>" data-validators="validate-one-required"/> <label for="selectorCurrent">Current</label><input type="radio" id="selectorCurrent" name="selector" value="current" title="<?php echo $SLANG['ChooseLogSelection'] ?>" data-validators="validate-one-required"/>
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend><?= $SLANG['SelectFormat'] ?></legend> <legend><?php echo $SLANG['SelectFormat'] ?></legend>
<label for="formatText">Text</label><input type="radio" id="formatText" name="format" value="text"/> <label for="formatText">Text</label><input type="radio" id="formatText" name="format" value="text"/>
<label for="formatTSV">TSV</label><input type="radio" id="formatTSV" name="format" value="tsv"/> <label for="formatTSV">TSV</label><input type="radio" id="formatTSV" name="format" value="tsv"/>
<label for="formatXML">HTML</label><input type="radio" id="formatHTML" name="format" value="html"/> <label for="formatXML">HTML</label><input type="radio" id="formatHTML" name="format" value="html"/>
<label for="formatXML">XML</label><input type="radio" id="formatXML" name="format" value="xml" title="<?= $SLANG['ChooseLogFormat'] ?>" class="validate-one-required"/> <label for="formatXML">XML</label><input type="radio" id="formatXML" name="format" value="xml" title="<?php echo $SLANG['ChooseLogFormat'] ?>" class="validate-one-required"/>
</fieldset> </fieldset>
<div id="exportError"> <div id="exportError">
<?= $SLANG['ExportFailed'] ?>: <span id="exportErrorText"></span> <?php echo $SLANG['ExportFailed'] ?>: <span id="exportErrorText"></span>
</div> </div>
<input type="button" id="exportButton" value="<?= $SLANG['Export'] ?>" onclick="exportRequest()"/> <input type="button" id="exportButton" value="<?php echo $SLANG['Export'] ?>" onclick="exportRequest()"/>
<input type="button" value="<?= $SLANG['Cancel'] ?>" class="overlayCloser"/> <input type="button" value="<?php echo $SLANG['Cancel'] ?>" class="overlayCloser"/>
</form> </form>
</div> </div>
</div> </div>

12
web/skins/classic/views/login.php
View File

@ -23,25 +23,25 @@ xhtmlHeaders(__FILE__, $SLANG['Login'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h1>ZoneMinder <?= $SLANG['Login'] ?></h1> <h1>ZoneMinder <?php echo $SLANG['Login'] ?></h1>
</div> </div>
<div id="content"> <div id="content">
<form name="loginForm" id="loginForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="loginForm" id="loginForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="action" value="login"/> <input type="hidden" name="action" value="login"/>
<input type="hidden" name="view" value="postlogin"/> <input type="hidden" name="view" value="postlogin"/>
<table id="loginTable" class="minor" cellspacing="0"> <table id="loginTable" class="minor" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<td class="colLeft"><?= $SLANG['Username'] ?></td> <td class="colLeft"><?php echo $SLANG['Username'] ?></td>
<td class="colRight"><input type="text" name="username" value="<?= isset($_REQUEST['username'])?validHtmlStr($_REQUEST['username']):"" ?>" size="12"/></td> <td class="colRight"><input type="text" name="username" value="<?php echo isset($_REQUEST['username'])?validHtmlStr($_REQUEST['username']):"" ?>" size="12"/></td>
</tr> </tr>
<tr> <tr>
<td class="colLeft"><?= $SLANG['Password'] ?></td> <td class="colLeft"><?php echo $SLANG['Password'] ?></td>
<td class="colRight"><input type="password" name="password" value="" size="12"/></td> <td class="colRight"><input type="password" name="password" value="" size="12"/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<input type="submit" value="<?= $SLANG['Login'] ?>"/> <input type="submit" value="<?php echo $SLANG['Login'] ?>"/>
</form> </form>
</div> </div>
</div> </div>

12
web/skins/classic/views/logout.php
View File

@ -25,24 +25,24 @@ xhtmlHeaders(__FILE__, $SLANG['Logout'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h1>ZoneMinder <?= $SLANG['Logout'] ?></h1> <h1>ZoneMinder <?php echo $SLANG['Logout'] ?></h1>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="action" value="logout"/> <input type="hidden" name="action" value="logout"/>
<input type="hidden" name="view" value="login"/> <input type="hidden" name="view" value="login"/>
<p><?= sprintf( $CLANG['CurrentLogin'], $user['Username'] ) ?></p> <p><?php echo sprintf( $CLANG['CurrentLogin'], $user['Username'] ) ?></p>
<p> <p>
<input type="submit" value="<?= $SLANG['Logout'] ?>"/> <input type="submit" value="<?php echo $SLANG['Logout'] ?>"/>
<?php <?php
if ( ZM_USER_SELF_EDIT ) if ( ZM_USER_SELF_EDIT )
{ {
?> ?>
<input type="button" value="<?= $SLANG['Config'] ?>" onclick="createPopup( '?view=user&amp;uid=<?= $user['Id'] ?>', 'zmUser', 'user' );"/> <input type="button" value="<?php echo $SLANG['Config'] ?>" onclick="createPopup( '?view=user&amp;uid=<?php echo $user['Id'] ?>', 'zmUser', 'user' );"/>
<?php <?php
} }
?> ?>
<input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow();"/> <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
</p> </p>
</form> </form>
</div> </div>

298
web/skins/classic/views/monitor.php
View File

@ -425,13 +425,13 @@ if ( canEdit( 'Monitors' ) )
{ {
?> ?>
<div id="headerButtons"> <div id="headerButtons">
<a href="#" onclick="createPopup( '?view=monitorprobe&amp;mid=<?= $monitor['Id'] ?>', 'zmMonitorProbe<?= $monitor['Id'] ?>', 'monitorprobe' ); return( false );"><?= $SLANG['Probe'] ?></a> <a href="#" onclick="createPopup( '?view=monitorprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorProbe<?php echo $monitor['Id'] ?>', 'monitorprobe' ); return( false );"><?php echo $SLANG['Probe'] ?></a>
<a href="#" onclick="createPopup( '?view=monitorpreset&amp;mid=<?= $monitor['Id'] ?>', 'zmMonitorPreset<?= $monitor['Id'] ?>', 'monitorpreset' ); return( false );"><?= $SLANG['Presets'] ?></a> <a href="#" onclick="createPopup( '?view=monitorpreset&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorPreset<?php echo $monitor['Id'] ?>', 'monitorpreset' ); return( false );"><?php echo $SLANG['Presets'] ?></a>
</div> </div>
<?php <?php
} }
?> ?>
<h2><?= $SLANG['Monitor'] ?> - <?= validHtmlStr($monitor['Name']) ?><?php if ( !empty($monitor['Id']) ) { ?> (<?= $monitor['Id'] ?>)<?php } ?></h2> <h2><?php echo $SLANG['Monitor'] ?> - <?php echo validHtmlStr($monitor['Name']) ?><?php if ( !empty($monitor['Id']) ) { ?> (<?php echo $monitor['Id'] ?>)<?php } ?></h2>
</div> </div>
<div id="content"> <div id="content">
<ul class="tabList"> <ul class="tabList">
@ -441,45 +441,45 @@ foreach ( $tabs as $name=>$value )
if ( $tab == $name ) if ( $tab == $name )
{ {
?> ?>
<li class="active"><?= $value ?></li> <li class="active"><?php echo $value ?></li>
<?php <?php
} }
else else
{ {
?> ?>
<li><a href="#" onclick="submitTab( '<?= $name ?>' ); return( false );"><?= $value ?></a></li> <li><a href="#" onclick="submitTab( '<?php echo $name ?>' ); return( false );"><?php echo $value ?></a></li>
<?php <?php
} }
} }
?> ?>
</ul> </ul>
<div class="clear"></div> <div class="clear"></div>
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>" onsubmit="return validateForm( this )"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" onsubmit="return validateForm( this )">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="tab" value="<?= $tab ?>"/> <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
<input type="hidden" name="action" value="monitor"/> <input type="hidden" name="action" value="monitor"/>
<input type="hidden" name="mid" value="<?= $monitor['Id'] ?>"/> <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>"/>
<input type="hidden" name="newMonitor[LinkedMonitors]" value="<?= isset($newMonitor['LinkedMonitors'])?$newMonitor['LinkedMonitors']:'' ?>"/> <input type="hidden" name="newMonitor[LinkedMonitors]" value="<?php echo isset($newMonitor['LinkedMonitors'])?$newMonitor['LinkedMonitors']:'' ?>"/>
<input type="hidden" name="origMethod" value="<?= isset($newMonitor['Method'])?$newMonitor['Method']:'' ?>"/> <input type="hidden" name="origMethod" value="<?php echo isset($newMonitor['Method'])?$newMonitor['Method']:'' ?>"/>
<?php <?php
if ( $tab != 'general' ) if ( $tab != 'general' )
{ {
?> ?>
<input type="hidden" name="newMonitor[Name]" value="<?= validHtmlStr($newMonitor['Name']) ?>"/> <input type="hidden" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>"/>
<input type="hidden" name="newMonitor[Type]" value="<?= validHtmlStr($newMonitor['Type']) ?>"/> <input type="hidden" name="newMonitor[Type]" value="<?php echo validHtmlStr($newMonitor['Type']) ?>"/>
<input type="hidden" name="newMonitor[Function]" value="<?= validHtmlStr($newMonitor['Function']) ?>"/> <input type="hidden" name="newMonitor[Function]" value="<?php echo validHtmlStr($newMonitor['Function']) ?>"/>
<input type="hidden" name="newMonitor[Enabled]" value="<?= validHtmlStr($newMonitor['Enabled']) ?>"/> <input type="hidden" name="newMonitor[Enabled]" value="<?php echo validHtmlStr($newMonitor['Enabled']) ?>"/>
<input type="hidden" name="newMonitor[RefBlendPerc]" value="<?= validHtmlStr($newMonitor['RefBlendPerc']) ?>"/> <input type="hidden" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['RefBlendPerc']) ?>"/>
<input type="hidden" name="newMonitor[AlarmRefBlendPerc]" value="<?= validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>"/> <input type="hidden" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>"/>
<input type="hidden" name="newMonitor[MaxFPS]" value="<?= validHtmlStr($newMonitor['MaxFPS']) ?>"/> <input type="hidden" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>"/>
<input type="hidden" name="newMonitor[AlarmMaxFPS]" value="<?= validHtmlStr($newMonitor['AlarmMaxFPS']) ?>"/> <input type="hidden" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>"/>
<?php <?php
if ( isset($newMonitor['Triggers']) ) if ( isset($newMonitor['Triggers']) )
{ {
foreach( $newMonitor['Triggers'] as $newTrigger ) foreach( $newMonitor['Triggers'] as $newTrigger )
{ {
?> ?>
<input type="hidden" name="newMonitor[Triggers][]" value="<?= validHtmlStr($newTrigger) ?>"/> <input type="hidden" name="newMonitor[Triggers][]" value="<?php echo validHtmlStr($newTrigger) ?>"/>
<?php <?php
} }
} }
@ -487,111 +487,111 @@ if ( $tab != 'general' )
if ( ZM_HAS_V4L && ($tab != 'source' || $newMonitor['Type'] != 'Local') ) if ( ZM_HAS_V4L && ($tab != 'source' || $newMonitor['Type'] != 'Local') )
{ {
?> ?>
<input type="hidden" name="newMonitor[Device]" value="<?= validHtmlStr($newMonitor['Device']) ?>"/> <input type="hidden" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>"/>
<input type="hidden" name="newMonitor[Channel]" value="<?= validHtmlStr($newMonitor['Channel']) ?>"/> <input type="hidden" name="newMonitor[Channel]" value="<?php echo validHtmlStr($newMonitor['Channel']) ?>"/>
<input type="hidden" name="newMonitor[Format]" value="<?= validHtmlStr($newMonitor['Format']) ?>"/> <input type="hidden" name="newMonitor[Format]" value="<?php echo validHtmlStr($newMonitor['Format']) ?>"/>
<input type="hidden" name="newMonitor[Palette]" value="<?= validHtmlStr($newMonitor['Palette']) ?>"/> <input type="hidden" name="newMonitor[Palette]" value="<?php echo validHtmlStr($newMonitor['Palette']) ?>"/>
<input type="hidden" name="newMonitor[V4LMultiBuffer]" value="<?= validHtmlStr($newMonitor['V4LMultiBuffer']) ?>"/> <input type="hidden" name="newMonitor[V4LMultiBuffer]" value="<?php echo validHtmlStr($newMonitor['V4LMultiBuffer']) ?>"/>
<input type="hidden" name="newMonitor[V4LCapturesPerFrame]" value="<?= validHtmlStr($newMonitor['V4LCapturesPerFrame']) ?>"/> <input type="hidden" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($newMonitor['V4LCapturesPerFrame']) ?>"/>
<?php <?php
} }
if ( $tab != 'source' || $newMonitor['Type'] != 'Remote' ) if ( $tab != 'source' || $newMonitor['Type'] != 'Remote' )
{ {
?> ?>
<input type="hidden" name="newMonitor[Protocol]" value="<?= validHtmlStr($newMonitor['Protocol']) ?>"/> <input type="hidden" name="newMonitor[Protocol]" value="<?php echo validHtmlStr($newMonitor['Protocol']) ?>"/>
<input type="hidden" name="newMonitor[Host]" value="<?= validHtmlStr($newMonitor['Host']) ?>"/> <input type="hidden" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>"/>
<input type="hidden" name="newMonitor[Port]" value="<?= validHtmlStr($newMonitor['Port']) ?>"/> <input type="hidden" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>"/>
<?php <?php
} }
if ( $tab != 'source' || ($newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc') ) if ( $tab != 'source' || ($newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc') )
{ {
?> ?>
<input type="hidden" name="newMonitor[Method]" value="<?= validHtmlStr($newMonitor['Method']) ?>"/> <input type="hidden" name="newMonitor[Method]" value="<?php echo validHtmlStr($newMonitor['Method']) ?>"/>
<?php <?php
} }
if ( $tab != 'source' || ($newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' )) if ( $tab != 'source' || ($newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' ))
{ {
?> ?>
<input type="hidden" name="newMonitor[Options]" value="<?= validHtmlStr($newMonitor['Options']) ?>"/> <input type="hidden" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>"/>
<?php <?php
} }
if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'File' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' && $newMonitor['Type'] != 'cURL') ) if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'File' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' && $newMonitor['Type'] != 'cURL') )
{ {
?> ?>
<input type="hidden" name="newMonitor[Path]" value="<?= validHtmlStr($newMonitor['Path']) ?>"/> <input type="hidden" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>"/>
<input type="hidden" name="newMonitor[User]" value="<?= validHtmlStr($newMonitor['User']) ?>"/> <input type="hidden" name="newMonitor[User]" value="<?php echo validHtmlStr($newMonitor['User']) ?>"/>
<input type="hidden" name="newMonitor[Pass]" value="<?= validHtmlStr($newMonitor['Pass']) ?>"/> <input type="hidden" name="newMonitor[Pass]" value="<?php echo validHtmlStr($newMonitor['Pass']) ?>"/>
<?php <?php
} }
if ( $tab != 'source' ) if ( $tab != 'source' )
{ {
?> ?>
<input type="hidden" name="newMonitor[Colours]" value="<?= validHtmlStr($newMonitor['Colours']) ?>"/> <input type="hidden" name="newMonitor[Colours]" value="<?php echo validHtmlStr($newMonitor['Colours']) ?>"/>
<input type="hidden" name="newMonitor[Width]" value="<?= validHtmlStr($newMonitor['Width']) ?>"/> <input type="hidden" name="newMonitor[Width]" value="<?php echo validHtmlStr($newMonitor['Width']) ?>"/>
<input type="hidden" name="newMonitor[Height]" value="<?= validHtmlStr($newMonitor['Height']) ?>"/> <input type="hidden" name="newMonitor[Height]" value="<?php echo validHtmlStr($newMonitor['Height']) ?>"/>
<input type="hidden" name="newMonitor[Orientation]" value="<?= validHtmlStr($newMonitor['Orientation']) ?>"/> <input type="hidden" name="newMonitor[Orientation]" value="<?php echo validHtmlStr($newMonitor['Orientation']) ?>"/>
<input type="hidden" name="newMonitor[Deinterlacing]" value="<?= validHtmlStr($newMonitor['Deinterlacing']) ?>"/> <input type="hidden" name="newMonitor[Deinterlacing]" value="<?php echo validHtmlStr($newMonitor['Deinterlacing']) ?>"/>
<?php <?php
} }
if ( $tab != 'timestamp' ) if ( $tab != 'timestamp' )
{ {
?> ?>
<input type="hidden" name="newMonitor[LabelFormat]" value="<?= validHtmlStr($newMonitor['LabelFormat']) ?>"/> <input type="hidden" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>"/>
<input type="hidden" name="newMonitor[LabelX]" value="<?= validHtmlStr($newMonitor['LabelX']) ?>"/> <input type="hidden" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($newMonitor['LabelX']) ?>"/>
<input type="hidden" name="newMonitor[LabelY]" value="<?= validHtmlStr($newMonitor['LabelY']) ?>"/> <input type="hidden" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($newMonitor['LabelY']) ?>"/>
<?php <?php
} }
if ( $tab != 'buffers' ) if ( $tab != 'buffers' )
{ {
?> ?>
<input type="hidden" name="newMonitor[ImageBufferCount]" value="<?= validHtmlStr($newMonitor['ImageBufferCount']) ?>"/> <input type="hidden" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>"/>
<input type="hidden" name="newMonitor[WarmupCount]" value="<?= validHtmlStr($newMonitor['WarmupCount']) ?>"/> <input type="hidden" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($newMonitor['WarmupCount']) ?>"/>
<input type="hidden" name="newMonitor[PreEventCount]" value="<?= validHtmlStr($newMonitor['PreEventCount']) ?>"/> <input type="hidden" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($newMonitor['PreEventCount']) ?>"/>
<input type="hidden" name="newMonitor[PostEventCount]" value="<?= validHtmlStr($newMonitor['PostEventCount']) ?>"/> <input type="hidden" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($newMonitor['PostEventCount']) ?>"/>
<input type="hidden" name="newMonitor[StreamReplayBuffer]" value="<?= validHtmlStr($newMonitor['StreamReplayBuffer']) ?>"/> <input type="hidden" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($newMonitor['StreamReplayBuffer']) ?>"/>
<input type="hidden" name="newMonitor[AlarmFrameCount]" value="<?= validHtmlStr($newMonitor['AlarmFrameCount']) ?>"/> <input type="hidden" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>"/>
<?php <?php
} }
if ( ZM_OPT_CONTROL && $tab != 'control' ) if ( ZM_OPT_CONTROL && $tab != 'control' )
{ {
?> ?>
<input type="hidden" name="newMonitor[Controllable]" value="<?= validHtmlStr($newMonitor['Controllable']) ?>"/> <input type="hidden" name="newMonitor[Controllable]" value="<?php echo validHtmlStr($newMonitor['Controllable']) ?>"/>
<input type="hidden" name="newMonitor[ControlId]" value="<?= validHtmlStr($newMonitor['ControlId']) ?>"/> <input type="hidden" name="newMonitor[ControlId]" value="<?php echo validHtmlStr($newMonitor['ControlId']) ?>"/>
<input type="hidden" name="newMonitor[ControlDevice]" value="<?= validHtmlStr($newMonitor['ControlDevice']) ?>"/> <input type="hidden" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($newMonitor['ControlDevice']) ?>"/>
<input type="hidden" name="newMonitor[ControlAddress]" value="<?= validHtmlStr($newMonitor['ControlAddress']) ?>"/> <input type="hidden" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($newMonitor['ControlAddress']) ?>"/>
<input type="hidden" name="newMonitor[AutoStopTimeout]" value="<?= validHtmlStr($newMonitor['AutoStopTimeout']) ?>"/> <input type="hidden" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($newMonitor['AutoStopTimeout']) ?>"/>
<input type="hidden" name="newMonitor[TrackMotion]" value="<?= validHtmlStr($newMonitor['TrackMotion']) ?>"/> <input type="hidden" name="newMonitor[TrackMotion]" value="<?php echo validHtmlStr($newMonitor['TrackMotion']) ?>"/>
<input type="hidden" name="newMonitor[TrackDelay]" value="<?= validHtmlStr($newMonitor['TrackDelay']) ?>"/> <input type="hidden" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($newMonitor['TrackDelay']) ?>"/>
<input type="hidden" name="newMonitor[ReturnLocation]" value="<?= validHtmlStr($newMonitor['ReturnLocation']) ?>"/> <input type="hidden" name="newMonitor[ReturnLocation]" value="<?php echo validHtmlStr($newMonitor['ReturnLocation']) ?>"/>
<input type="hidden" name="newMonitor[ReturnDelay]" value="<?= validHtmlStr($newMonitor['ReturnDelay']) ?>"/> <input type="hidden" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($newMonitor['ReturnDelay']) ?>"/>
<?php <?php
} }
if ( ZM_OPT_X10 && $tab != 'x10' ) if ( ZM_OPT_X10 && $tab != 'x10' )
{ {
?> ?>
<input type="hidden" name="newX10Monitor[Activation]" value="<?= validHtmlStr($newX10Monitor['Activation']) ?>"/> <input type="hidden" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>"/>
<input type="hidden" name="newX10Monitor[AlarmInput]" value="<?= validHtmlStr($newX10Monitor['AlarmInput']) ?>"/> <input type="hidden" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>"/>
<input type="hidden" name="newX10Monitor[AlarmOutput]" value="<?= validHtmlStr($newX10Monitor['AlarmOutput']) ?>"/> <input type="hidden" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>"/>
<?php <?php
} }
if ( $tab != 'misc' ) if ( $tab != 'misc' )
{ {
?> ?>
<input type="hidden" name="newMonitor[EventPrefix]" value="<?= validHtmlStr($newMonitor['EventPrefix']) ?>"/> <input type="hidden" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>"/>
<input type="hidden" name="newMonitor[SectionLength]" value="<?= validHtmlStr($newMonitor['SectionLength']) ?>"/> <input type="hidden" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($newMonitor['SectionLength']) ?>"/>
<input type="hidden" name="newMonitor[FrameSkip]" value="<?= validHtmlStr($newMonitor['FrameSkip']) ?>"/> <input type="hidden" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($newMonitor['FrameSkip']) ?>"/>
<input type="hidden" name="newMonitor[MotionFrameSkip]" value="<?= validHtmlStr($newMonitor['MotionFrameSkip']) ?>"/> <input type="hidden" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($newMonitor['MotionFrameSkip']) ?>"/>
<input type="hidden" name="newMonitor[FPSReportInterval]" value="<?= validHtmlStr($newMonitor['FPSReportInterval']) ?>"/> <input type="hidden" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($newMonitor['FPSReportInterval']) ?>"/>
<input type="hidden" name="newMonitor[DefaultView]" value="<?= validHtmlStr($newMonitor['DefaultView']) ?>"/> <input type="hidden" name="newMonitor[DefaultView]" value="<?php echo validHtmlStr($newMonitor['DefaultView']) ?>"/>
<input type="hidden" name="newMonitor[DefaultRate]" value="<?= validHtmlStr($newMonitor['DefaultRate']) ?>"/> <input type="hidden" name="newMonitor[DefaultRate]" value="<?php echo validHtmlStr($newMonitor['DefaultRate']) ?>"/>
<input type="hidden" name="newMonitor[DefaultScale]" value="<?= validHtmlStr($newMonitor['DefaultScale']) ?>"/> <input type="hidden" name="newMonitor[DefaultScale]" value="<?php echo validHtmlStr($newMonitor['DefaultScale']) ?>"/>
<input type="hidden" name="newMonitor[WebColour]" value="<?= validHtmlStr($newMonitor['WebColour']) ?>"/> <input type="hidden" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($newMonitor['WebColour']) ?>"/>
<?php <?php
} }
if ( ZM_HAS_V4L && ($tab != 'misc' || $newMonitor['Type'] != 'Local') ) if ( ZM_HAS_V4L && ($tab != 'misc' || $newMonitor['Type'] != 'Local') )
{ {
?> ?>
<input type="hidden" name="newMonitor[SignalCheckColour]" value="<?= validHtmlStr($newMonitor['SignalCheckColour']) ?>"/> <input type="hidden" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($newMonitor['SignalCheckColour']) ?>"/>
<?php <?php
} }
?> ?>
@ -603,21 +603,21 @@ switch ( $tab )
case 'general' : case 'general' :
{ {
?> ?>
<tr><td><?= $SLANG['Name'] ?></td><td><input type="text" name="newMonitor[Name]" value="<?= validHtmlStr($newMonitor['Name']) ?>" size="16"/></td></tr> <tr><td><?php echo $SLANG['Name'] ?></td><td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>" size="16"/></td></tr>
<tr><td><?= $SLANG['SourceType'] ?></td><td><?= buildSelect( "newMonitor[Type]", $sourceTypes ); ?></td></tr> <tr><td><?php echo $SLANG['SourceType'] ?></td><td><?php echo buildSelect( "newMonitor[Type]", $sourceTypes ); ?></td></tr>
<tr><td><?= $SLANG['Function'] ?></td><td><select name="newMonitor[Function]"> <tr><td><?php echo $SLANG['Function'] ?></td><td><select name="newMonitor[Function]">
<?php <?php
foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction ) foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction )
{ {
?> ?>
<option value="<?= $optFunction ?>"<?php if ( $optFunction == $newMonitor['Function'] ) { ?> selected="selected"<?php } ?>><?= $optFunction ?></option> <option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $newMonitor['Function'] ) { ?> selected="selected"<?php } ?>><?php echo $optFunction ?></option>
<?php <?php
} }
?> ?>
</select></td></tr> </select></td></tr>
<tr><td><?= $SLANG['Enabled'] ?></td><td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php if ( !empty($newMonitor['Enabled']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><td><?php echo $SLANG['Enabled'] ?></td><td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php if ( !empty($newMonitor['Enabled']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr> <tr>
<td><?= $SLANG['LinkedMonitors'] ?></td> <td><?php echo $SLANG['LinkedMonitors'] ?></td>
<td> <td>
<select name="monitorIds" size="4" multiple="multiple" onchange="updateLinkedMonitors( this )"> <select name="monitorIds" size="4" multiple="multiple" onchange="updateLinkedMonitors( this )">
<?php <?php
@ -631,7 +631,7 @@ switch ( $tab )
if ( (empty($newMonitor['Id']) || ($monitor['Id'] != $newMonitor['Id'])) && visibleMonitor( $monitor['Id'] ) ) if ( (empty($newMonitor['Id']) || ($monitor['Id'] != $newMonitor['Id'])) && visibleMonitor( $monitor['Id'] ) )
{ {
?> ?>
<option value="<?= $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?= validHtmlStr($monitor['Name']) ?></option> <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($monitor['Name']) ?></option>
<?php <?php
} }
} }
@ -639,23 +639,23 @@ switch ( $tab )
</select> </select>
</td> </td>
</tr> </tr>
<tr><td><?= $SLANG['MaximumFPS'] ?></td><td><input type="text" name="newMonitor[MaxFPS]" value="<?= validHtmlStr($newMonitor['MaxFPS']) ?>" size="6"/></td></tr> <tr><td><?php echo $SLANG['MaximumFPS'] ?></td><td><input type="text" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>" size="6"/></td></tr>
<tr><td><?= $SLANG['AlarmMaximumFPS'] ?></td><td><input type="text" name="newMonitor[AlarmMaxFPS]" value="<?= validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="6"/></td></tr> <tr><td><?php echo $SLANG['AlarmMaximumFPS'] ?></td><td><input type="text" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="6"/></td></tr>
<?php <?php
if ( ZM_FAST_IMAGE_BLENDS ) if ( ZM_FAST_IMAGE_BLENDS )
{ {
?> ?>
<tr><td><?= $SLANG['RefImageBlendPct'] ?></td><td><select name="newMonitor[RefBlendPerc]"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['RefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></td></tr> <tr><td><?php echo $SLANG['RefImageBlendPct'] ?></td><td><select name="newMonitor[RefBlendPerc]"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['RefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
<tr><td><?= "Alarm " . $SLANG['RefImageBlendPct'] ?></td><td><select name="newMonitor[AlarmRefBlendPerc]"><?php foreach ( $fastblendopts_alarm as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['AlarmRefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></td></tr> <tr><td><?php echo "Alarm " . $SLANG['RefImageBlendPct'] ?></td><td><select name="newMonitor[AlarmRefBlendPerc]"><?php foreach ( $fastblendopts_alarm as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['AlarmRefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
<?php <?php
} else { } else {
?> ?>
<tr><td><?= $SLANG['RefImageBlendPct'] ?></td><td><input type="text" name="newMonitor[RefBlendPerc]" value="<?= validHtmlStr($newMonitor['RefBlendPerc']) ?>" size="4"/></td></tr> <tr><td><?php echo $SLANG['RefImageBlendPct'] ?></td><td><input type="text" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['RefBlendPerc']) ?>" size="4"/></td></tr>
<tr><td><?= "Alarm " . $SLANG['RefImageBlendPct'] ?></td><td><input type="text" name="newMonitor[AlarmRefBlendPerc]" value="<?= validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>" size="4"/></td></tr> <tr><td><?php echo "Alarm " . $SLANG['RefImageBlendPct'] ?></td><td><input type="text" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>" size="4"/></td></tr>
<?php <?php
} }
?> ?>
<tr><td><?= $SLANG['Triggers'] ?></td><td> <tr><td><?php echo $SLANG['Triggers'] ?></td><td>
<?php <?php
$optTriggers = getSetValues( 'Monitors', 'Triggers' ); $optTriggers = getSetValues( 'Monitors', 'Triggers' );
$breakCount = (int)(ceil(count($optTriggers))); $breakCount = (int)(ceil(count($optTriggers)));
@ -668,14 +668,14 @@ switch ( $tab )
if ( $optCount && ($optCount%$breakCount == 0) ) if ( $optCount && ($optCount%$breakCount == 0) )
echo "</br>"; echo "</br>";
?> ?>
<input type="checkbox" name="newMonitor[Triggers][]" value="<?= $optTrigger ?>"<?php if ( isset($newMonitor['Triggers']) && in_array( $optTrigger, $newMonitor['Triggers'] ) ) { ?> checked="checked"<?php } ?>/>&nbsp;<?= $optTrigger ?> <input type="checkbox" name="newMonitor[Triggers][]" value="<?php echo $optTrigger ?>"<?php if ( isset($newMonitor['Triggers']) && in_array( $optTrigger, $newMonitor['Triggers'] ) ) { ?> checked="checked"<?php } ?>/>&nbsp;<?php echo $optTrigger ?>
<?php <?php
$optCount ++; $optCount ++;
} }
if ( !$optCount ) if ( !$optCount )
{ {
?> ?>
<em><?= $SLANG['NoneAvailable'] ?></em> <em><?php echo $SLANG['NoneAvailable'] ?></em>
<?php <?php
} }
?> ?>
@ -688,27 +688,27 @@ switch ( $tab )
if ( ZM_HAS_V4L && $newMonitor['Type'] == "Local" ) if ( ZM_HAS_V4L && $newMonitor['Type'] == "Local" )
{ {
?> ?>
<tr><td><?= $SLANG['DevicePath'] ?></td><td><input type="text" name="newMonitor[Device]" value="<?= validHtmlStr($newMonitor['Device']) ?>" size="24"/></td></tr> <tr><td><?php echo $SLANG['DevicePath'] ?></td><td><input type="text" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>" size="24"/></td></tr>
<tr><td><?= $SLANG['CaptureMethod'] ?></td><td><?= buildSelect( "newMonitor[Method]", $localMethods, "submitTab( '$tab' )" ); ?></td></tr> <tr><td><?php echo $SLANG['CaptureMethod'] ?></td><td><?php echo buildSelect( "newMonitor[Method]", $localMethods, "submitTab( '$tab' )" ); ?></td></tr>
<?php <?php
if ( ZM_HAS_V4L1 && $newMonitor['Method'] == 'v4l1' ) if ( ZM_HAS_V4L1 && $newMonitor['Method'] == 'v4l1' )
{ {
?> ?>
<tr><td><?= $SLANG['DeviceChannel'] ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l1DeviceChannels as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></td></tr> <tr><td><?php echo $SLANG['DeviceChannel'] ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l1DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
<tr><td><?= $SLANG['DeviceFormat'] ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l1DeviceFormats as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></td></tr> <tr><td><?php echo $SLANG['DeviceFormat'] ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l1DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
<tr><td><?= $SLANG['CapturePalette'] ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l1LocalPalettes as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></td></tr> <tr><td><?php echo $SLANG['CapturePalette'] ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l1LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
<?php <?php
} }
else else
{ {
?> ?>
<tr><td><?= $SLANG['DeviceChannel'] ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l2DeviceChannels as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></td></tr> <tr><td><?php echo $SLANG['DeviceChannel'] ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l2DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
<tr><td><?= $SLANG['DeviceFormat'] ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l2DeviceFormats as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></td></tr> <tr><td><?php echo $SLANG['DeviceFormat'] ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l2DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
<tr><td><?= $SLANG['CapturePalette'] ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l2LocalPalettes as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></td></tr> <tr><td><?php echo $SLANG['CapturePalette'] ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l2LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
<?php <?php
} }
?> ?>
<tr><td><?= $SLANG['V4LMultiBuffer'] ?></td><td> <tr><td><?php echo $SLANG['V4LMultiBuffer'] ?></td><td>
<input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $newMonitor['V4LMultiBuffer'] == 1 ? 'checked="checked"' : '' ) ?>/> <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $newMonitor['V4LMultiBuffer'] == 1 ? 'checked="checked"' : '' ) ?>/>
<label for="newMonitor[V4LMultiBuffer]1">Yes</label> <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
<input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $newMonitor['V4LMultiBuffer'] == 0 ? 'checked="checked"' : '' ) ?>/> <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $newMonitor['V4LMultiBuffer'] == 0 ? 'checked="checked"' : '' ) ?>/>
@ -716,69 +716,69 @@ switch ( $tab )
<input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($newMonitor['V4LMultiBuffer']) ? 'checked="checked"' : '' ) ?>/> <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($newMonitor['V4LMultiBuffer']) ? 'checked="checked"' : '' ) ?>/>
<label for="newMonitor[V4LMultiBuffer]">Use Config Value</label> <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
</td></tr> </td></tr>
<tr><td><?= $SLANG['V4LCapturesPerFrame'] ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr> <tr><td><?php echo $SLANG['V4LCapturesPerFrame'] ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr>
<?php <?php
} }
elseif ( $newMonitor['Type'] == "Remote" ) elseif ( $newMonitor['Type'] == "Remote" )
{ {
?> ?>
<tr><td><?= $SLANG['RemoteProtocol'] ?></td><td><?= buildSelect( "newMonitor[Protocol]", $remoteProtocols, "updateMethods( this )" ); ?></td></tr> <tr><td><?php echo $SLANG['RemoteProtocol'] ?></td><td><?php echo buildSelect( "newMonitor[Protocol]", $remoteProtocols, "updateMethods( this )" ); ?></td></tr>
<?php <?php
if ( empty($newMonitor['Protocol']) || $newMonitor['Protocol'] == "http" ) if ( empty($newMonitor['Protocol']) || $newMonitor['Protocol'] == "http" )
{ {
?> ?>
<tr><td><?= $SLANG['RemoteMethod'] ?></td><td><?= buildSelect( "newMonitor[Method]", $httpMethods ); ?></td></tr> <tr><td><?php echo $SLANG['RemoteMethod'] ?></td><td><?php echo buildSelect( "newMonitor[Method]", $httpMethods ); ?></td></tr>
<?php <?php
} }
else else
{ {
?> ?>
<tr><td><?= $SLANG['RemoteMethod'] ?></td><td><?= buildSelect( "newMonitor[Method]", $rtspMethods ); ?></td></tr> <tr><td><?php echo $SLANG['RemoteMethod'] ?></td><td><?php echo buildSelect( "newMonitor[Method]", $rtspMethods ); ?></td></tr>
<?php <?php
} }
?> ?>
<tr><td><?= $SLANG['RemoteHostName'] ?></td><td><input type="text" name="newMonitor[Host]" value="<?= validHtmlStr($newMonitor['Host']) ?>" size="36"/></td></tr> <tr><td><?php echo $SLANG['RemoteHostName'] ?></td><td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>" size="36"/></td></tr>
<tr><td><?= $SLANG['RemoteHostPort'] ?></td><td><input type="text" name="newMonitor[Port]" value="<?= validHtmlStr($newMonitor['Port']) ?>" size="6"/></td></tr> <tr><td><?php echo $SLANG['RemoteHostPort'] ?></td><td><input type="text" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>" size="6"/></td></tr>
<tr><td><?= $SLANG['RemoteHostPath'] ?></td><td><input type="text" name="newMonitor[Path]" value="<?= validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr> <tr><td><?php echo $SLANG['RemoteHostPath'] ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
<?php <?php
} }
elseif ( $newMonitor['Type'] == "File" ) elseif ( $newMonitor['Type'] == "File" )
{ {
?> ?>
<tr><td><?= $SLANG['SourcePath'] ?></td><td><input type="text" name="newMonitor[Path]" value="<?= validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr> <tr><td><?php echo $SLANG['SourcePath'] ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
<?php <?php
} }
elseif ( $newMonitor['Type'] == "cURL" ) elseif ( $newMonitor['Type'] == "cURL" )
{ {
?> ?>
<tr><td><?= "URL" ?></td><td><input type="text" name="newMonitor[Path]" value="<?= validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr> <tr><td><?php echo "URL" ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
<tr><td><?= "Username" ?></td><td><input type="text" name="newMonitor[User]" value="<?= validHtmlStr($newMonitor['User']) ?>" size="12"/></td></tr> <tr><td><?php echo "Username" ?></td><td><input type="text" name="newMonitor[User]" value="<?php echo validHtmlStr($newMonitor['User']) ?>" size="12"/></td></tr>
<tr><td><?= "Password" ?></td><td><input type="text" name="newMonitor[Pass]" value="<?= validHtmlStr($newMonitor['Pass']) ?>" size="12"/></td></tr> <tr><td><?php echo "Password" ?></td><td><input type="text" name="newMonitor[Pass]" value="<?php echo validHtmlStr($newMonitor['Pass']) ?>" size="12"/></td></tr>
<?php <?php
} }
elseif ( $newMonitor['Type'] == "Ffmpeg" || $newMonitor['Type'] == "Libvlc") elseif ( $newMonitor['Type'] == "Ffmpeg" || $newMonitor['Type'] == "Libvlc")
{ {
?> ?>
<tr><td><?= $SLANG['SourcePath'] ?></td><td><input type="text" name="newMonitor[Path]" value="<?= validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr> <tr><td><?php echo $SLANG['SourcePath'] ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
<tr><td><?= $SLANG['RemoteMethod'] ?></td><td><?= buildSelect( "newMonitor[Method]", $rtspMethods ); ?></td></tr> <tr><td><?php echo $SLANG['RemoteMethod'] ?></td><td><?php echo buildSelect( "newMonitor[Method]", $rtspMethods ); ?></td></tr>
<tr><td><?= $SLANG['Options'] ?>&nbsp;(<?= makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" name="newMonitor[Options]" value="<?= validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr> <tr><td><?php echo $SLANG['Options'] ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
<?php <?php
} }
?> ?>
<tr><td><?= "Target Colorspace" ?></td><td><select name="newMonitor[Colours]"><?php foreach ( $Colours as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['Colours'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></td></tr> <tr><td><?php echo "Target Colorspace" ?></td><td><select name="newMonitor[Colours]"><?php foreach ( $Colours as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Colours'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
<tr><td><?= $SLANG['CaptureWidth'] ?> (<?= $SLANG['Pixels'] ?>)</td><td><input type="text" name="newMonitor[Width]" value="<?= validHtmlStr($newMonitor['Width']) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr> <tr><td><?php echo $SLANG['CaptureWidth'] ?> (<?php echo $SLANG['Pixels'] ?>)</td><td><input type="text" name="newMonitor[Width]" value="<?php echo validHtmlStr($newMonitor['Width']) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
<tr><td><?= $SLANG['CaptureHeight'] ?> (<?= $SLANG['Pixels'] ?>)</td><td><input type="text" name="newMonitor[Height]" value="<?= validHtmlStr($newMonitor['Height']) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr> <tr><td><?php echo $SLANG['CaptureHeight'] ?> (<?php echo $SLANG['Pixels'] ?>)</td><td><input type="text" name="newMonitor[Height]" value="<?php echo validHtmlStr($newMonitor['Height']) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
<tr><td><?= $SLANG['PreserveAspect'] ?></td><td><input type="checkbox" name="preserveAspectRatio" value="1"/></td></tr> <tr><td><?php echo $SLANG['PreserveAspect'] ?></td><td><input type="checkbox" name="preserveAspectRatio" value="1"/></td></tr>
<tr><td><?= $SLANG['Orientation'] ?></td><td><select name="newMonitor[Orientation]"><?php foreach ( $orientations as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['Orientation'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></td></tr> <tr><td><?php echo $SLANG['Orientation'] ?></td><td><select name="newMonitor[Orientation]"><?php foreach ( $orientations as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Orientation'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
<?php <?php
if ( $newMonitor['Type'] == "Local" ) if ( $newMonitor['Type'] == "Local" )
{ {
?> ?>
<tr><td><?= "Deinterlacing" ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts_v4l2 as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['Deinterlacing'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></td></tr> <tr><td><?php echo "Deinterlacing" ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts_v4l2 as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Deinterlacing'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
<?php <?php
} else { } else {
?> ?>
<tr><td><?= "Deinterlacing" ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts as $name => $value ) { ?><option value="<?= $value ?>"<?php if ( $value == $newMonitor['Deinterlacing'] ) { ?> selected="selected"<?php } ?>><?= $name ?></option><?php } ?></select></td></tr> <tr><td><?php echo "Deinterlacing" ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Deinterlacing'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
<?php <?php
} }
?> ?>
@ -788,33 +788,33 @@ switch ( $tab )
case 'timestamp' : case 'timestamp' :
{ {
?> ?>
<tr><td><?= $SLANG['TimestampLabelFormat'] ?></td><td><input type="text" name="newMonitor[LabelFormat]" value="<?= validHtmlStr($newMonitor['LabelFormat']) ?>" size="32"/></td></tr> <tr><td><?php echo $SLANG['TimestampLabelFormat'] ?></td><td><input type="text" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>" size="32"/></td></tr>
<tr><td><?= $SLANG['TimestampLabelX'] ?></td><td><input type="text" name="newMonitor[LabelX]" value="<?= validHtmlStr($newMonitor['LabelX']) ?>" size="4"/></td></tr> <tr><td><?php echo $SLANG['TimestampLabelX'] ?></td><td><input type="text" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($newMonitor['LabelX']) ?>" size="4"/></td></tr>
<tr><td><?= $SLANG['TimestampLabelY'] ?></td><td><input type="text" name="newMonitor[LabelY]" value="<?= validHtmlStr($newMonitor['LabelY']) ?>" size="4"/></td></tr> <tr><td><?php echo $SLANG['TimestampLabelY'] ?></td><td><input type="text" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($newMonitor['LabelY']) ?>" size="4"/></td></tr>
<?php <?php
break; break;
} }
case 'buffers' : case 'buffers' :
{ {
?> ?>
<tr><td><?= $SLANG['ImageBufferSize'] ?></td><td><input type="text" name="newMonitor[ImageBufferCount]" value="<?= validHtmlStr($newMonitor['ImageBufferCount']) ?>" size="6"/></td></tr> <tr><td><?php echo $SLANG['ImageBufferSize'] ?></td><td><input type="text" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>" size="6"/></td></tr>
<tr><td><?= $SLANG['WarmupFrames'] ?></td><td><input type="text" name="newMonitor[WarmupCount]" value="<?= validHtmlStr($newMonitor['WarmupCount']) ?>" size="4"/></td></tr> <tr><td><?php echo $SLANG['WarmupFrames'] ?></td><td><input type="text" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($newMonitor['WarmupCount']) ?>" size="4"/></td></tr>
<tr><td><?= $SLANG['PreEventImageBuffer'] ?></td><td><input type="text" name="newMonitor[PreEventCount]" value="<?= validHtmlStr($newMonitor['PreEventCount']) ?>" size="4"/></td></tr> <tr><td><?php echo $SLANG['PreEventImageBuffer'] ?></td><td><input type="text" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($newMonitor['PreEventCount']) ?>" size="4"/></td></tr>
<tr><td><?= $SLANG['PostEventImageBuffer'] ?></td><td><input type="text" name="newMonitor[PostEventCount]" value="<?= validHtmlStr($newMonitor['PostEventCount']) ?>" size="4"/></td></tr> <tr><td><?php echo $SLANG['PostEventImageBuffer'] ?></td><td><input type="text" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($newMonitor['PostEventCount']) ?>" size="4"/></td></tr>
<tr><td><?= $SLANG['StreamReplayBuffer'] ?></td><td><input type="text" name="newMonitor[StreamReplayBuffer]" value="<?= validHtmlStr($newMonitor['StreamReplayBuffer']) ?>" size="6"/></td></tr> <tr><td><?php echo $SLANG['StreamReplayBuffer'] ?></td><td><input type="text" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($newMonitor['StreamReplayBuffer']) ?>" size="6"/></td></tr>
<tr><td><?= $SLANG['AlarmFrameCount'] ?></td><td><input type="text" name="newMonitor[AlarmFrameCount]" value="<?= validHtmlStr($newMonitor['AlarmFrameCount']) ?>" size="4"/></td></tr> <tr><td><?php echo $SLANG['AlarmFrameCount'] ?></td><td><input type="text" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>" size="4"/></td></tr>
<?php <?php
break; break;
} }
case 'control' : case 'control' :
{ {
?> ?>
<tr><td><?= $SLANG['Controllable'] ?></td><td><input type="checkbox" name="newMonitor[Controllable]" value="1"<?php if ( !empty($newMonitor['Controllable']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><td><?php echo $SLANG['Controllable'] ?></td><td><input type="checkbox" name="newMonitor[Controllable]" value="1"<?php if ( !empty($newMonitor['Controllable']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<tr><td><?= $SLANG['ControlType'] ?></td><td><?= buildSelect( "newMonitor[ControlId]", $controlTypes, 'loadLocations( this )' ); ?><?php if ( canEdit( 'Control' ) ) { ?>&nbsp;<a href="#" onclick="createPopup( '?view=controlcaps', 'zmControlCaps', 'controlcaps' );"><?= $SLANG['Edit'] ?></a><?php } ?></td></tr> <tr><td><?php echo $SLANG['ControlType'] ?></td><td><?php echo buildSelect( "newMonitor[ControlId]", $controlTypes, 'loadLocations( this )' ); ?><?php if ( canEdit( 'Control' ) ) { ?>&nbsp;<a href="#" onclick="createPopup( '?view=controlcaps', 'zmControlCaps', 'controlcaps' );"><?php echo $SLANG['Edit'] ?></a><?php } ?></td></tr>
<tr><td><?= $SLANG['ControlDevice'] ?></td><td><input type="text" name="newMonitor[ControlDevice]" value="<?= validHtmlStr($newMonitor['ControlDevice']) ?>" size="32"/></td></tr> <tr><td><?php echo $SLANG['ControlDevice'] ?></td><td><input type="text" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($newMonitor['ControlDevice']) ?>" size="32"/></td></tr>
<tr><td><?= $SLANG['ControlAddress'] ?></td><td><input type="text" name="newMonitor[ControlAddress]" value="<?= validHtmlStr($newMonitor['ControlAddress']) ?>" size="32"/></td></tr> <tr><td><?php echo $SLANG['ControlAddress'] ?></td><td><input type="text" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($newMonitor['ControlAddress']) ?>" size="32"/></td></tr>
<tr><td><?= $SLANG['AutoStopTimeout'] ?></td><td><input type="text" name="newMonitor[AutoStopTimeout]" value="<?= validHtmlStr($newMonitor['AutoStopTimeout']) ?>" size="4"/></td></tr> <tr><td><?php echo $SLANG['AutoStopTimeout'] ?></td><td><input type="text" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($newMonitor['AutoStopTimeout']) ?>" size="4"/></td></tr>
<tr><td><?= $SLANG['TrackMotion'] ?></td><td><input type="checkbox" name="newMonitor[TrackMotion]" value="1"<?php if ( !empty($newMonitor['TrackMotion']) ) { ?> checked="checked"<?php } ?>/></td></tr> <tr><td><?php echo $SLANG['TrackMotion'] ?></td><td><input type="checkbox" name="newMonitor[TrackMotion]" value="1"<?php if ( !empty($newMonitor['TrackMotion']) ) { ?> checked="checked"<?php } ?>/></td></tr>
<?php <?php
$return_options = array( $return_options = array(
'-1' => $SLANG['None'], '-1' => $SLANG['None'],
@ -822,52 +822,52 @@ switch ( $tab )
'1' => $SLANG['Preset']." 1", '1' => $SLANG['Preset']." 1",
); );
?> ?>
<tr><td><?= $SLANG['TrackDelay'] ?></td><td><input type="text" name="newMonitor[TrackDelay]" value="<?= validHtmlStr($newMonitor['TrackDelay']) ?>" size="4"/></td></tr> <tr><td><?php echo $SLANG['TrackDelay'] ?></td><td><input type="text" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($newMonitor['TrackDelay']) ?>" size="4"/></td></tr>
<tr><td><?= $SLANG['ReturnLocation'] ?></td><td><?= buildSelect( "newMonitor[ReturnLocation]", $return_options ); ?></td></tr> <tr><td><?php echo $SLANG['ReturnLocation'] ?></td><td><?php echo buildSelect( "newMonitor[ReturnLocation]", $return_options ); ?></td></tr>
<tr><td><?= $SLANG['ReturnDelay'] ?></td><td><input type="text" name="newMonitor[ReturnDelay]" value="<?= validHtmlStr($newMonitor['ReturnDelay']) ?>" size="4"/></td></tr> <tr><td><?php echo $SLANG['ReturnDelay'] ?></td><td><input type="text" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($newMonitor['ReturnDelay']) ?>" size="4"/></td></tr>
<?php <?php
break; break;
} }
case 'x10' : case 'x10' :
{ {
?> ?>
<tr><td><?= $SLANG['X10ActivationString'] ?></td><td><input type="text" name="newX10Monitor[Activation]" value="<?= validHtmlStr($newX10Monitor['Activation']) ?>" size="20"/></td></tr> <tr><td><?php echo $SLANG['X10ActivationString'] ?></td><td><input type="text" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>" size="20"/></td></tr>
<tr><td><?= $SLANG['X10InputAlarmString'] ?></td><td><input type="text" name="newX10Monitor[AlarmInput]" value="<?= validHtmlStr($newX10Monitor['AlarmInput']) ?>" size="20"/></td></tr> <tr><td><?php echo $SLANG['X10InputAlarmString'] ?></td><td><input type="text" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>" size="20"/></td></tr>
<tr><td><?= $SLANG['X10OutputAlarmString'] ?></td><td><input type="text" name="newX10Monitor[AlarmOutput]" value="<?= validHtmlStr($newX10Monitor['AlarmOutput']) ?>" size="20"/></td></tr> <tr><td><?php echo $SLANG['X10OutputAlarmString'] ?></td><td><input type="text" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>" size="20"/></td></tr>
<?php <?php
break; break;
} }
case 'misc' : case 'misc' :
{ {
?> ?>
<tr><td><?= $SLANG['EventPrefix'] ?></td><td><input type="text" name="newMonitor[EventPrefix]" value="<?= validHtmlStr($newMonitor['EventPrefix']) ?>" size="24"/></td></tr> <tr><td><?php echo $SLANG['EventPrefix'] ?></td><td><input type="text" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>" size="24"/></td></tr>
<tr><td><?= $SLANG['Sectionlength'] ?></td><td><input type="text" name="newMonitor[SectionLength]" value="<?= validHtmlStr($newMonitor['SectionLength']) ?>" size="6"/></td></tr> <tr><td><?php echo $SLANG['Sectionlength'] ?></td><td><input type="text" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($newMonitor['SectionLength']) ?>" size="6"/></td></tr>
<tr><td><?= $SLANG['FrameSkip'] ?></td><td><input type="text" name="newMonitor[FrameSkip]" value="<?= validHtmlStr($newMonitor['FrameSkip']) ?>" size="6"/></td></tr> <tr><td><?php echo $SLANG['FrameSkip'] ?></td><td><input type="text" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($newMonitor['FrameSkip']) ?>" size="6"/></td></tr>
<tr><td><?= $SLANG['MotionFrameSkip'] ?></td><td><input type="text" name="newMonitor[MotionFrameSkip]" value="<?= validHtmlStr($newMonitor['MotionFrameSkip']) ?>" size="6"/></td></tr> <tr><td><?php echo $SLANG['MotionFrameSkip'] ?></td><td><input type="text" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($newMonitor['MotionFrameSkip']) ?>" size="6"/></td></tr>
<tr><td><?= $SLANG['FPSReportInterval'] ?></td><td><input type="text" name="newMonitor[FPSReportInterval]" value="<?= validHtmlStr($newMonitor['FPSReportInterval']) ?>" size="6"/></td></tr> <tr><td><?php echo $SLANG['FPSReportInterval'] ?></td><td><input type="text" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($newMonitor['FPSReportInterval']) ?>" size="6"/></td></tr>
<tr><td><?= $SLANG['DefaultView'] ?></td><td><select name="newMonitor[DefaultView]"> <tr><td><?php echo $SLANG['DefaultView'] ?></td><td><select name="newMonitor[DefaultView]">
<?php <?php
foreach ( getEnumValues( 'Monitors', 'DefaultView' ) as $opt_view ) foreach ( getEnumValues( 'Monitors', 'DefaultView' ) as $opt_view )
{ {
if ( $opt_view == 'Control' && ( !ZM_OPT_CONTROL || !$monitor['Controllable'] ) ) if ( $opt_view == 'Control' && ( !ZM_OPT_CONTROL || !$monitor['Controllable'] ) )
continue; continue;
?> ?>
<option value="<?= $opt_view ?>"<?php if ( $opt_view == $newMonitor['DefaultView'] ) { ?> selected="selected"<?php } ?>><?= $opt_view ?></option> <option value="<?php echo $opt_view ?>"<?php if ( $opt_view == $newMonitor['DefaultView'] ) { ?> selected="selected"<?php } ?>><?php echo $opt_view ?></option>
<?php <?php
} }
?> ?>
</select></td></tr> </select></td></tr>
<tr><td><?= $SLANG['DefaultRate'] ?></td><td><?= buildSelect( "newMonitor[DefaultRate]", $rates ); ?></td></tr> <tr><td><?php echo $SLANG['DefaultRate'] ?></td><td><?php echo buildSelect( "newMonitor[DefaultRate]", $rates ); ?></td></tr>
<tr><td><?= $SLANG['DefaultScale'] ?></td><td><?= buildSelect( "newMonitor[DefaultScale]", $scales ); ?></td></tr> <tr><td><?php echo $SLANG['DefaultScale'] ?></td><td><?php echo buildSelect( "newMonitor[DefaultScale]", $scales ); ?></td></tr>
<?php <?php
if ( ZM_HAS_V4L && $newMonitor['Type'] == "Local" ) if ( ZM_HAS_V4L && $newMonitor['Type'] == "Local" )
{ {
?> ?>
<tr><td><?= $SLANG['SignalCheckColour'] ?></td><td><input type="text" name="newMonitor[SignalCheckColour]" value="<?= validHtmlStr($newMonitor['SignalCheckColour']) ?>" size="10" onchange="$('SignalCheckSwatch').setStyle( 'backgroundColor', this.value )"/><span id="SignalCheckSwatch" class="swatch" style="background-color: <?= $newMonitor['SignalCheckColour'] ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr> <tr><td><?php echo $SLANG['SignalCheckColour'] ?></td><td><input type="text" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($newMonitor['SignalCheckColour']) ?>" size="10" onchange="$('SignalCheckSwatch').setStyle( 'backgroundColor', this.value )"/><span id="SignalCheckSwatch" class="swatch" style="background-color: <?php echo $newMonitor['SignalCheckColour'] ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr>
<?php <?php
} }
?> ?>
<tr><td><?= $SLANG['WebColour'] ?></td><td><input type="text" name="newMonitor[WebColour]" value="<?= validHtmlStr($newMonitor['WebColour']) ?>" size="10" onchange="$('WebSwatch').setStyle( 'backgroundColor', this.value )"/><span id="WebSwatch" class="swatch" style="background-color: <?= validHtmlStr($newMonitor['WebColour']) ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr> <tr><td><?php echo $SLANG['WebColour'] ?></td><td><input type="text" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($newMonitor['WebColour']) ?>" size="10" onchange="$('WebSwatch').setStyle( 'backgroundColor', this.value )"/><span id="WebSwatch" class="swatch" style="background-color: <?php echo validHtmlStr($newMonitor['WebColour']) ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr>
<?php <?php
break; break;
} }
@ -876,7 +876,7 @@ switch ( $tab )
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

12
web/skins/classic/views/monitorpreset.php
View File

@ -38,20 +38,20 @@ xhtmlHeaders(__FILE__, $SLANG['MonitorPreset'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['MonitorPreset'] ?></h2> <h2><?php echo $SLANG['MonitorPreset'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<input type="hidden" name="mid" value="<?= validNum($_REQUEST['mid']) ?>"/> <input type="hidden" name="mid" value="<?php echo validNum($_REQUEST['mid']) ?>"/>
<p> <p>
<?= $SLANG['MonitorPresetIntro'] ?> <?php echo $SLANG['MonitorPresetIntro'] ?>
</p> </p>
<p> <p>
<label for="preset"><?= $SLANG['Preset'] ?></label><?= buildSelect( "preset", $presets, 'configureButtons( this )' ); ?> <label for="preset"><?php echo $SLANG['Preset'] ?></label><?php echo buildSelect( "preset", $presets, 'configureButtons( this )' ); ?>
</p> </p>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" name="saveBtn" value="<?= $SLANG['Save'] ?>" onclick="submitPreset( this )" disabled="disabled"/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="submit" name="saveBtn" value="<?php echo $SLANG['Save'] ?>" onclick="submitPreset( this )" disabled="disabled"/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

12
web/skins/classic/views/monitorprobe.php
View File

@ -339,20 +339,20 @@ xhtmlHeaders(__FILE__, $SLANG['MonitorProbe'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['MonitorProbe'] ?></h2> <h2><?php echo $SLANG['MonitorProbe'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<input type="hidden" name="mid" value="<?= validNum($_REQUEST['mid']) ?>"/> <input type="hidden" name="mid" value="<?php echo validNum($_REQUEST['mid']) ?>"/>
<p> <p>
<?= $SLANG['MonitorProbeIntro'] ?> <?php echo $SLANG['MonitorProbeIntro'] ?>
</p> </p>
<p> <p>
<label for="probe"><?= $SLANG['DetectedCameras'] ?></label><?= buildSelect( "probe", $cameras, 'configureButtons( this )' ); ?> <label for="probe"><?php echo $SLANG['DetectedCameras'] ?></label><?php echo buildSelect( "probe", $cameras, 'configureButtons( this )' ); ?>
</p> </p>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" name="saveBtn" value="<?= $SLANG['Save'] ?>" onclick="submitCamera( this )" disabled="disabled"/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="submit" name="saveBtn" value="<?php echo $SLANG['Save'] ?>" onclick="submitCamera( this )" disabled="disabled"/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

18
web/skins/classic/views/montage.php
View File

@ -90,16 +90,16 @@ xhtmlHeaders(__FILE__, $SLANG['Montage'] );
if ( $showControl ) if ( $showControl )
{ {
?> ?>
<a href="#" onclick="createPopup( '?view=control', 'zmControl', 'control' )"><?= $SLANG['Control'] ?></a> <a href="#" onclick="createPopup( '?view=control', 'zmControl', 'control' )"><?php echo $SLANG['Control'] ?></a>
<?php <?php
} }
?> ?>
<a href="#" onclick="closeWindow()"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindow()"><?php echo $SLANG['Close'] ?></a>
</div> </div>
<h2><?= $SLANG['Montage'] ?></h2> <h2><?php echo $SLANG['Montage'] ?></h2>
<div id="headerControl"> <div id="headerControl">
<span id="scaleControl"><?= $SLANG['Scale'] ?>: <?= buildSelect( "scale", $scales, "changeScale( this );" ); ?></span> <span id="scaleControl"><?php echo $SLANG['Scale'] ?>: <?php echo buildSelect( "scale", $scales, "changeScale( this );" ); ?></span>
<label for="layout"><?= $SLANG['Layout'] ?>:</label><?= buildSelect( "layout", $layouts, 'selectLayout( this )' )?> <label for="layout"><?php echo $SLANG['Layout'] ?>:</label><?php echo buildSelect( "layout", $layouts, 'selectLayout( this )' )?>
</div> </div>
</div> </div>
<div id="content"> <div id="content">
@ -111,9 +111,9 @@ foreach ( $monitors as $monitor )
if ( !isset( $scale ) ) if ( !isset( $scale ) )
$scale = reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE ); $scale = reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
?> ?>
<div id="monitorFrame<?= $monitor['index'] ?>" class="monitorFrame"> <div id="monitorFrame<?php echo $monitor['index'] ?>" class="monitorFrame">
<div id="monitor<?= $monitor['index'] ?>" class="monitor idle"> <div id="monitor<?php echo $monitor['index'] ?>" class="monitor idle">
<div id="imageFeed<?= $monitor['index'] ?>" class="imageFeed" onclick="createPopup( '?view=watch&amp;mid=<?= $monitor['Id'] ?>', 'zmWatch<?= $monitor['Id'] ?>', 'watch', <?= $monitor['scaleWidth'] ?>, <?= $monitor['scaleHeight'] ?> );"> <div id="imageFeed<?php echo $monitor['index'] ?>" class="imageFeed" onclick="createPopup( '?view=watch&amp;mid=<?php echo $monitor['Id'] ?>', 'zmWatch<?php echo $monitor['Id'] ?>', 'watch', <?php echo $monitor['scaleWidth'] ?>, <?php echo $monitor['scaleHeight'] ?> );">
<?php <?php
if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
{ {
@ -138,7 +138,7 @@ else
if ( !ZM_WEB_COMPACT_MONTAGE ) if ( !ZM_WEB_COMPACT_MONTAGE )
{ {
?> ?>
<div id="monitorState<?= $monitor['index'] ?>" class="monitorState idle"><?= $SLANG['State'] ?>:&nbsp;<span id="stateValue<?= $monitor['index'] ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?= $monitor['index'] ?>"></span>&nbsp;fps</div> <div id="monitorState<?php echo $monitor['index'] ?>" class="monitorState idle"><?php echo $SLANG['State'] ?>:&nbsp;<span id="stateValue<?php echo $monitor['index'] ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor['index'] ?>"></span>&nbsp;fps</div>
<?php <?php
} }
?> ?>

4
web/skins/classic/views/none.php
View File

@ -24,14 +24,14 @@ $skinJsFile = getSkinFile( 'js/skin.js' );
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title><?= ZM_WEB_TITLE_PREFIX ?></title> <title><?php echo ZM_WEB_TITLE_PREFIX ?></title>
<script type="text/javascript"> <script type="text/javascript">
<?php <?php
require_once( $skinJsPhpFile ); require_once( $skinJsPhpFile );
?> ?>
</script> </script>
<script type="text/javascript" src="<?= $skinJsFile ?>"></script> <script type="text/javascript" src="<?php echo $skinJsFile ?>"></script>
<script type="text/javascript"> <script type="text/javascript">
<?php <?php
if ( !$debug ) if ( !$debug )

8
web/skins/classic/views/optionhelp.php
View File

@ -31,13 +31,13 @@ xhtmlHeaders(__FILE__, $SLANG['OptionHelp'] );
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<a href="#" onclick="closeWindow();"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a>
</div> </div>
<h2><?= $SLANG['OptionHelp'] ?></h2> <h2><?php echo $SLANG['OptionHelp'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<h3><?= validHtmlStr($_REQUEST['option']) ?></h3> <h3><?php echo validHtmlStr($_REQUEST['option']) ?></h3>
<p class="textblock"><?= $optionHelpText ?></p> <p class="textblock"><?php echo $optionHelpText ?></p>
</div> </div>
</div> </div>
</body> </body>

106
web/skins/classic/views/options.php
View File

@ -57,7 +57,7 @@ xhtmlHeaders( __FILE__, $SLANG['Options'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Options'] ?></h2> <h2><?php echo $SLANG['Options'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<ul class="tabList"> <ul class="tabList">
@ -67,13 +67,13 @@ foreach ( $tabs as $name=>$value )
if ( $tab == $name ) if ( $tab == $name )
{ {
?> ?>
<li class="active"><?= $value ?></li> <li class="active"><?php echo $value ?></li>
<?php <?php
} }
else else
{ {
?> ?>
<li><a href="?view=<?= $view ?>&amp;tab=<?= $name ?>"><?= $value ?></a></li> <li><a href="?view=<?php echo $view ?>&amp;tab=<?php echo $name ?>"><?php echo $value ?></a></li>
<?php <?php
} }
} }
@ -99,11 +99,11 @@ if($tab == 'skins') {
echo "<script type=\"text/javascript\">window.opener.location.reload();window.location.href=\"{$_SERVER['PHP_SELF']}?view={$view}&tab={$tab}\"</script>"; echo "<script type=\"text/javascript\">window.opener.location.reload();window.location.href=\"{$_SERVER['PHP_SELF']}?view={$view}&tab={$tab}\"</script>";
?> ?>
<form name="optionsForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="optionsForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="tab" value="<?= $tab ?>"/> <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
<table class="contentTable major optionTable" cellspacing="0"> <table class="contentTable major optionTable" cellspacing="0">
<thead><tr><th><?= $SLANG['Name'] ?></th><th><?= $SLANG['Description'] ?></th> <th><?= $SLANG['Value'] ?></th></tr></thead> <thead><tr><th><?php echo $SLANG['Name'] ?></th><th><?php echo $SLANG['Description'] ?></th> <th><?php echo $SLANG['Value'] ?></th></tr></thead>
<tbody> <tbody>
<tr> <tr>
<td>ZM_SKIN</td> <td>ZM_SKIN</td>
@ -134,8 +134,8 @@ if($tab == 'skins') {
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"<?= $canEdit?'':' disabled="disabled"' ?>/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php echo $canEdit?'':' disabled="disabled"' ?>/>
<input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow();"/> <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
</div> </div>
</form> </form>
@ -144,24 +144,24 @@ if($tab == 'skins') {
elseif ( $tab == "users" ) elseif ( $tab == "users" )
{ {
?> ?>
<form name="userForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="userForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="tab" value="<?= $tab ?>"/> <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
<input type="hidden" name="action" value="delete"/> <input type="hidden" name="action" value="delete"/>
<table id="contentTable" class="major userTable" cellspacing="0"> <table id="contentTable" class="major userTable" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th class="colUsername"><?= $SLANG['Username'] ?></th> <th class="colUsername"><?php echo $SLANG['Username'] ?></th>
<th class="colLanguage"><?= $SLANG['Language'] ?></th> <th class="colLanguage"><?php echo $SLANG['Language'] ?></th>
<th class="colEnabled"><?= $SLANG['Enabled'] ?></th> <th class="colEnabled"><?php echo $SLANG['Enabled'] ?></th>
<th class="colStream"><?= $SLANG['Stream'] ?></th> <th class="colStream"><?php echo $SLANG['Stream'] ?></th>
<th class="colEvents"><?= $SLANG['Events'] ?></th> <th class="colEvents"><?php echo $SLANG['Events'] ?></th>
<th class="colControl"><?= $SLANG['Control'] ?></th> <th class="colControl"><?php echo $SLANG['Control'] ?></th>
<th class="colMonitors"><?= $SLANG['Monitors'] ?></th> <th class="colMonitors"><?php echo $SLANG['Monitors'] ?></th>
<th class="colSystem"><?= $SLANG['System'] ?></th> <th class="colSystem"><?php echo $SLANG['System'] ?></th>
<th class="colBandwidth"><?= $SLANG['Bandwidth'] ?></th> <th class="colBandwidth"><?php echo $SLANG['Bandwidth'] ?></th>
<th class="colMonitor"><?= $SLANG['Monitor'] ?></th> <th class="colMonitor"><?php echo $SLANG['Monitor'] ?></th>
<th class="colMark"><?= $SLANG['Mark'] ?></th> <th class="colMark"><?php echo $SLANG['Mark'] ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -186,17 +186,17 @@ elseif ( $tab == "users" )
} }
?> ?>
<tr> <tr>
<td class="colUsername"><?= makePopupLink( '?view=user&amp;uid='.$row['Id'], 'zmUser', 'user', validHtmlStr($row['Username']).($user['Username']==$row['Username']?"*":""), $canEdit ) ?></td> <td class="colUsername"><?php echo makePopupLink( '?view=user&amp;uid='.$row['Id'], 'zmUser', 'user', validHtmlStr($row['Username']).($user['Username']==$row['Username']?"*":""), $canEdit ) ?></td>
<td class="colLanguage"><?= $row['Language']?validHtmlStr($row['Language']):'default' ?></td> <td class="colLanguage"><?php echo $row['Language']?validHtmlStr($row['Language']):'default' ?></td>
<td class="colEnabled"><?= $row['Enabled']?$SLANG['Yes']:$SLANG['No'] ?></td> <td class="colEnabled"><?php echo $row['Enabled']?$SLANG['Yes']:$SLANG['No'] ?></td>
<td class="colStream"><?= validHtmlStr($row['Stream']) ?></td> <td class="colStream"><?php echo validHtmlStr($row['Stream']) ?></td>
<td class="colEvents"><?= validHtmlStr($row['Events']) ?></td> <td class="colEvents"><?php echo validHtmlStr($row['Events']) ?></td>
<td class="colControl"><?= validHtmlStr($row['Control']) ?></td> <td class="colControl"><?php echo validHtmlStr($row['Control']) ?></td>
<td class="colMonitors"><?= validHtmlStr($row['Monitors']) ?></td> <td class="colMonitors"><?php echo validHtmlStr($row['Monitors']) ?></td>
<td class="colSystem"><?= validHtmlStr($row['System']) ?></td> <td class="colSystem"><?php echo validHtmlStr($row['System']) ?></td>
<td class="colBandwidth"><?= $row['MaxBandwidth']?$bwArray[$row['MaxBandwidth']]:'&nbsp;' ?></td> <td class="colBandwidth"><?php echo $row['MaxBandwidth']?$bwArray[$row['MaxBandwidth']]:'&nbsp;' ?></td>
<td class="colMonitor"><?= $row['MonitorIds']?(join( ", ", $userMonitors )):"&nbsp;" ?></td> <td class="colMonitor"><?php echo $row['MonitorIds']?(join( ", ", $userMonitors )):"&nbsp;" ?></td>
<td class="colMark"><input type="checkbox" name="markUids[]" value="<?= $row['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td> <td class="colMark"><input type="checkbox" name="markUids[]" value="<?php echo $row['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
</tr> </tr>
<?php <?php
} }
@ -204,7 +204,7 @@ elseif ( $tab == "users" )
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="button" value="<?= $SLANG['AddNewUser'] ?>" onclick="createPopup( '?view=user&amp;uid=0', 'zmUser', 'user' );"<?php if ( !canEdit( 'System' ) ) { ?> disabled="disabled"<?php } ?>/><input type="submit" name="deleteBtn" value="<?= $SLANG['Delete'] ?>" disabled="disabled"/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow();"/> <input type="button" value="<?php echo $SLANG['AddNewUser'] ?>" onclick="createPopup( '?view=user&amp;uid=0', 'zmUser', 'user' );"<?php if ( !canEdit( 'System' ) ) { ?> disabled="disabled"<?php } ?>/><input type="submit" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" disabled="disabled"/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
</div> </div>
</form> </form>
<?php <?php
@ -216,16 +216,16 @@ else
$configCats[$tab]['ZM_LANG_DEFAULT']['Hint'] = join( '|', getLanguages() ); $configCats[$tab]['ZM_LANG_DEFAULT']['Hint'] = join( '|', getLanguages() );
} }
?> ?>
<form name="optionsForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="optionsForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="tab" value="<?= $tab ?>"/> <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
<input type="hidden" name="action" value="options"/> <input type="hidden" name="action" value="options"/>
<table id="contentTable" class="major optionTable" cellspacing="0"> <table id="contentTable" class="major optionTable" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th><?= $SLANG['Name'] ?></th> <th><?php echo $SLANG['Name'] ?></th>
<th><?= $SLANG['Description'] ?></th> <th><?php echo $SLANG['Description'] ?></th>
<th><?= $SLANG['Value'] ?></th> <th><?php echo $SLANG['Value'] ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -237,13 +237,13 @@ else
$optionPromptText = !empty($OLANG[$shortName])?$OLANG[$shortName]['Prompt']:$value['Prompt']; $optionPromptText = !empty($OLANG[$shortName])?$OLANG[$shortName]['Prompt']:$value['Prompt'];
?> ?>
<tr> <tr>
<td><?= $shortName ?></td> <td><?php echo $shortName ?></td>
<td><?= validHtmlStr($optionPromptText) ?>&nbsp;(<?= makePopupLink( '?view=optionhelp&amp;option='.$name, 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td> <td><?php echo validHtmlStr($optionPromptText) ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option='.$name, 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
<?php <?php
if ( $value['Type'] == "boolean" ) if ( $value['Type'] == "boolean" )
{ {
?> ?>
<td><input type="checkbox" id="<?= $name ?>" name="newConfig[<?= $name ?>]" value="1"<?php if ( $value['Value'] ) { ?> checked="checked"<?php } ?><?= $canEdit?'':' disabled="disabled"' ?>/></td> <td><input type="checkbox" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="1"<?php if ( $value['Value'] ) { ?> checked="checked"<?php } ?><?php echo $canEdit?'':' disabled="disabled"' ?>/></td>
<?php <?php
} }
elseif ( preg_match( "/\|/", $value['Hint'] ) ) elseif ( preg_match( "/\|/", $value['Hint'] ) )
@ -255,7 +255,7 @@ else
if ( count( $options ) > 3 ) if ( count( $options ) > 3 )
{ {
?> ?>
<select name="newConfig[<?= $name ?>]"<?= $canEdit?'':' disabled="disabled"' ?>> <select name="newConfig[<?php echo $name ?>]"<?php echo $canEdit?'':' disabled="disabled"' ?>>
<?php <?php
foreach ( $options as $option ) foreach ( $options as $option )
{ {
@ -269,7 +269,7 @@ else
$optionLabel = $optionValue = $option; $optionLabel = $optionValue = $option;
} }
?> ?>
<option value="<?= $optionValue ?>"<?php if ( $value['Value'] == $optionValue ) { echo ' selected="selected"'; } ?>><?= htmlspecialchars($optionLabel) ?></option> <option value="<?php echo $optionValue ?>"<?php if ( $value['Value'] == $optionValue ) { echo ' selected="selected"'; } ?>><?php echo htmlspecialchars($optionLabel) ?></option>
<?php <?php
} }
?> ?>
@ -290,7 +290,7 @@ else
$optionLabel = $optionValue = $option; $optionLabel = $optionValue = $option;
} }
?> ?>
<span><input type="radio" id="<?= $name.'_'.preg_replace( '/[^a-zA-Z0-9]/', '', $optionValue ) ?>" name="newConfig[<?= $name ?>]" value="<?= $optionValue ?>"<?php if ( $value['Value'] == $optionValue ) { ?> checked="checked"<?php } ?><?= $canEdit?'':' disabled="disabled"' ?>/>&nbsp;<?= htmlspecialchars($optionLabel) ?></span> <span><input type="radio" id="<?php echo $name.'_'.preg_replace( '/[^a-zA-Z0-9]/', '', $optionValue ) ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo $optionValue ?>"<?php if ( $value['Value'] == $optionValue ) { ?> checked="checked"<?php } ?><?php echo $canEdit?'':' disabled="disabled"' ?>/>&nbsp;<?php echo htmlspecialchars($optionLabel) ?></span>
<?php <?php
} }
} }
@ -301,31 +301,31 @@ else
elseif ( $value['Type'] == "text" ) elseif ( $value['Type'] == "text" )
{ {
?> ?>
<td><textarea id="<?= $name ?>" name="newConfig[<?= $name ?>]" rows="5" cols="40"<?= $canEdit?'':' disabled="disabled"' ?>><?= validHtmlStr($value['Value']) ?></textarea></td> <td><textarea id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" rows="5" cols="40"<?php echo $canEdit?'':' disabled="disabled"' ?>><?php echo validHtmlStr($value['Value']) ?></textarea></td>
<?php <?php
} }
elseif ( $value['Type'] == "integer" ) elseif ( $value['Type'] == "integer" )
{ {
?> ?>
<td><input type="text" id="<?= $name ?>" name="newConfig[<?= $name ?>]" value="<?= validHtmlStr($value['Value']) ?>" class="small"<?= $canEdit?'':' disabled="disabled"' ?>/></td> <td><input type="text" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo validHtmlStr($value['Value']) ?>" class="small"<?php echo $canEdit?'':' disabled="disabled"' ?>/></td>
<?php <?php
} }
elseif ( $value['Type'] == "hexadecimal" ) elseif ( $value['Type'] == "hexadecimal" )
{ {
?> ?>
<td><input type="text" id="<?= $name ?>" name="newConfig[<?= $name ?>]" value="<?= validHtmlStr($value['Value']) ?>" class="medium"<?= $canEdit?'':' disabled="disabled"' ?>/></td> <td><input type="text" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo validHtmlStr($value['Value']) ?>" class="medium"<?php echo $canEdit?'':' disabled="disabled"' ?>/></td>
<?php <?php
} }
elseif ( $value['Type'] == "decimal" ) elseif ( $value['Type'] == "decimal" )
{ {
?> ?>
<td><input type="text" id="<?= $name ?>" name="newConfig[<?= $name ?>]" value="<?= validHtmlStr($value['Value']) ?>" class="small"<?= $canEdit?'':' disabled="disabled"' ?>/></td> <td><input type="text" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo validHtmlStr($value['Value']) ?>" class="small"<?php echo $canEdit?'':' disabled="disabled"' ?>/></td>
<?php <?php
} }
else else
{ {
?> ?>
<td><input type="text" id="<?= $name ?>" name="newConfig[<?= $name ?>]" value="<?= validHtmlStr($value['Value']) ?>" class="large"<?= $canEdit?'':' disabled="disabled"' ?>/></td> <td><input type="text" id="<?php echo $name ?>" name="newConfig[<?php echo $name ?>]" value="<?php echo validHtmlStr($value['Value']) ?>" class="large"<?php echo $canEdit?'':' disabled="disabled"' ?>/></td>
<?php <?php
} }
?> ?>
@ -336,7 +336,7 @@ else
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"<?= $canEdit?'':' disabled="disabled"' ?>/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow();"/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php echo $canEdit?'':' disabled="disabled"' ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow();"/>
</div> </div>
</form> </form>
<?php <?php

20
web/skins/classic/views/plugin.php
View File

@ -103,15 +103,15 @@ function pLang($name)
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Monitor'] ?> <?= $monitor['Name'] ?> - <?= $SLANG['Zone'] ?> <?= $newZone['Name'] ?> - <?= $SLANG['Plugin'] ?> <?= $plugin ?></h2> <h2><?php echo $SLANG['Monitor'] ?> <?php echo $monitor['Name'] ?> - <?php echo $SLANG['Zone'] ?> <?php echo $newZone['Name'] ?> - <?php echo $SLANG['Plugin'] ?> <?php echo $plugin ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="pluginForm" id="pluginForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="pluginForm" id="pluginForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value="plugin"/> <input type="hidden" name="action" value="plugin"/>
<input type="hidden" name="mid" value="<?= $mid ?>"/> <input type="hidden" name="mid" value="<?php echo $mid ?>"/>
<input type="hidden" name="zid" value="<?= $zid ?>"/> <input type="hidden" name="zid" value="<?php echo $zid ?>"/>
<input type="hidden" name="pl" value="<?= $plugin ?>"/> <input type="hidden" name="pl" value="<?php echo $plugin ?>"/>
<div id="settingsPanel"> <div id="settingsPanel">
<table id="pluginSettings" cellspacing="0"> <table id="pluginSettings" cellspacing="0">
@ -120,7 +120,7 @@ function pLang($name)
foreach($pluginOptions as $name => $popt) foreach($pluginOptions as $name => $popt)
{ {
?> ?>
<tr><th scope="row"><?= pLang($name) ?></th> <tr><th scope="row"><?php echo pLang($name) ?></th>
<? <?
switch($popt['Type']) switch($popt['Type'])
{ {
@ -131,7 +131,7 @@ foreach($pluginOptions as $name => $popt)
$pchoices=explode(',',$popt['Choices']); $pchoices=explode(',',$popt['Choices']);
?> ?>
<td colspan="2"> <td colspan="2">
<select name="pluginOpt[<?= $popt['Name'] ?>]" id="pluginOpt[<?= $popt['Name'] ?>]"> <select name="pluginOpt[<?php echo $popt['Name'] ?>]" id="pluginOpt[<?php echo $popt['Name'] ?>]">
<? <?
foreach($pchoices as $pchoice) foreach($pchoices as $pchoice)
{ {
@ -139,7 +139,7 @@ foreach($pluginOptions as $name => $popt)
if($popt['Value']==$pchoice) if($popt['Value']==$pchoice)
$psel="selected"; $psel="selected";
?> ?>
<option value="<?= $pchoice ?>" <?= $psel ?>><?= pLang($pchoice) ?></option> <option value="<?php echo $pchoice ?>" <?php echo $psel ?>><?php echo pLang($pchoice) ?></option>
<? <?
} }
?> ?>
@ -158,7 +158,7 @@ foreach($pluginOptions as $name => $popt)
?> ?>
</tbody> </tbody>
</table> </table>
<input type="submit" id="submitBtn" name="submitBtn" value="<?= $SLANG['Save'] ?>" onclick="return saveChanges( this )"<?php if (!canEdit( 'Monitors' ) || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="submit" id="submitBtn" name="submitBtn" value="<?php echo $SLANG['Save'] ?>" onclick="return saveChanges( this )"<?php if (!canEdit( 'Monitors' ) || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

4
web/skins/classic/views/postlogin.php
View File

@ -23,10 +23,10 @@ xhtmlHeaders(__FILE__, $SLANG['LoggingIn'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h1>ZoneMinder <?= $SLANG['Login'] ?></h1> <h1>ZoneMinder <?php echo $SLANG['Login'] ?></h1>
</div> </div>
<div id="content"> <div id="content">
<h2><?= $SLANG['LoggingIn'] ?></h2> <h2><?php echo $SLANG['LoggingIn'] ?></h2>
</div> </div>
</div> </div>
</body> </body>

26
web/skins/classic/views/settings.php
View File

@ -41,35 +41,35 @@ xhtmlHeaders(__FILE__, validHtmlStr($monitor['Name'])." - ".$SLANG['Settings'] )
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= validHtmlStr($monitor['Name']) ?> - <?= $SLANG['Settings'] ?></h2> <h2><?php echo validHtmlStr($monitor['Name']) ?> - <?php echo $SLANG['Settings'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value="settings"/> <input type="hidden" name="action" value="settings"/>
<input type="hidden" name="mid" value="<?= validInt($_REQUEST['mid']) ?>"/> <input type="hidden" name="mid" value="<?php echo validInt($_REQUEST['mid']) ?>"/>
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<th scope="row"><?= $SLANG['Brightness'] ?></th> <th scope="row"><?php echo $SLANG['Brightness'] ?></th>
<td><input type="text" name="newBrightness" value="<?= $monitor['Brightness'] ?>" size="8"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td> <td><input type="text" name="newBrightness" value="<?php echo $monitor['Brightness'] ?>" size="8"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Contrast'] ?></th> <th scope="row"><?php echo $SLANG['Contrast'] ?></th>
<td><input type="text" name="newContrast" value="<?= $monitor['Contrast'] ?>" size="8"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td> <td><input type="text" name="newContrast" value="<?php echo $monitor['Contrast'] ?>" size="8"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Hue'] ?></th> <th scope="row"><?php echo $SLANG['Hue'] ?></th>
<td><input type="text" name="newHue" value="<?= $monitor['Hue'] ?>" size="8"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td> <td><input type="text" name="newHue" value="<?php echo $monitor['Hue'] ?>" size="8"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Colour'] ?></th> <th scope="row"><?php echo $SLANG['Colour'] ?></th>
<td><input type="text" name="newColour" value="<?= $monitor['Colour'] ?>" size="8"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td> <td><input type="text" name="newColour" value="<?php echo $monitor['Colour'] ?>" size="8"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?= $SLANG['Close'] ?>" onclick="closeWindow()"/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"<?php if ( !canView( 'Control' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

30
web/skins/classic/views/state.php
View File

@ -34,15 +34,15 @@ xhtmlHeaders(__FILE__, $SLANG['RunState'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['RunState'] ?></h2> <h2><?php echo $SLANG['RunState'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<?php <?php
if ( empty($_REQUEST['apply']) ) if ( empty($_REQUEST['apply']) )
{ {
?> ?>
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value=""/> <input type="hidden" name="action" value=""/>
<input type="hidden" name="apply" value="1"/> <input type="hidden" name="apply" value="1"/>
<p> <p>
@ -51,14 +51,14 @@ if ( empty($_REQUEST['apply']) )
if ( $running ) if ( $running )
{ {
?> ?>
<option value="stop" selected="selected"><?= $SLANG['Stop'] ?></option> <option value="stop" selected="selected"><?php echo $SLANG['Stop'] ?></option>
<option value="restart"><?= $SLANG['Restart'] ?></option> <option value="restart"><?php echo $SLANG['Restart'] ?></option>
<?php <?php
} }
else else
{ {
?> ?>
<option value="start" selected="selected"><?= $SLANG['Start'] ?></option> <option value="start" selected="selected"><?php echo $SLANG['Start'] ?></option>
<?php <?php
} }
?> ?>
@ -66,7 +66,7 @@ if ( empty($_REQUEST['apply']) )
foreach ( $states as $state ) foreach ( $states as $state )
{ {
?> ?>
<option value="<?= $state['Name'] ?>"><?= $state['Name'] ?></option> <option value="<?php echo $state['Name'] ?>"><?php echo $state['Name'] ?></option>
<?php <?php
} }
?> ?>
@ -75,16 +75,16 @@ if ( empty($_REQUEST['apply']) )
<table id="contentTable" class="minor" cellspacing="0"> <table id="contentTable" class="minor" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<th scope="row"><?= $SLANG['NewState'] ?></th> <th scope="row"><?php echo $SLANG['NewState'] ?></th>
<td><input type="text" name="newState" value="" size="16" onchange="checkState( this );"/></td> <td><input type="text" name="newState" value="" size="16" onchange="checkState( this );"/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Apply'] ?>"/> <input type="submit" value="<?php echo $SLANG['Apply'] ?>"/>
<input type="button" name="saveBtn" value="<?= $SLANG['Save'] ?>" disabled="disabled" onclick="saveState( this );"/> <input type="button" name="saveBtn" value="<?php echo $SLANG['Save'] ?>" disabled="disabled" onclick="saveState( this );"/>
<input type="button" name="deleteBtn" value="<?= $SLANG['Delete'] ?>" disabled="disabled" onclick="deleteState( this );"/> <input type="button" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" disabled="disabled" onclick="deleteState( this );"/>
<input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
<?php <?php
} }
@ -93,9 +93,9 @@ else
?> ?>
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<input type="hidden" name="action" value="state"/> <input type="hidden" name="action" value="state"/>
<input type="hidden" name="runState" value="<?= validHtmlStr($_REQUEST['runState']) ?>"/> <input type="hidden" name="runState" value="<?php echo validHtmlStr($_REQUEST['runState']) ?>"/>
<p><?= $SLANG['ApplyingStateChange'] ?></p> <p><?php echo $SLANG['ApplyingStateChange'] ?></p>
<p><?= $SLANG['PleaseWait'] ?></p> <p><?php echo $SLANG['PleaseWait'] ?></p>
<?php <?php
} }
?> ?>

46
web/skins/classic/views/stats.php
View File

@ -38,25 +38,25 @@ xhtmlHeaders(__FILE__, $SLANG['Stats']." - ".$eid." - ".$fid );
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<a href="#" onclick="closeWindow(); return( false );"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindow(); return( false );"><?php echo $SLANG['Close'] ?></a>
</div> </div>
<h2><?= $SLANG['Stats'] ?> - <?= $eid ?> - <?= $fid ?></h2> <h2><?php echo $SLANG['Stats'] ?> - <?php echo $eid ?> - <?php echo $fid ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" id="contentForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th class="colZone"><?= $SLANG['Zone'] ?></th> <th class="colZone"><?php echo $SLANG['Zone'] ?></th>
<th class="colPixelDiff"><?= $SLANG['PixelDiff'] ?></th> <th class="colPixelDiff"><?php echo $SLANG['PixelDiff'] ?></th>
<th class="colAlarmPx"><?= $SLANG['AlarmPx'] ?></th> <th class="colAlarmPx"><?php echo $SLANG['AlarmPx'] ?></th>
<th class="colFilterPx"><?= $SLANG['FilterPx'] ?></th> <th class="colFilterPx"><?php echo $SLANG['FilterPx'] ?></th>
<th class="colBlobPx"><?= $SLANG['BlobPx'] ?></th> <th class="colBlobPx"><?php echo $SLANG['BlobPx'] ?></th>
<th class="colBlobs"><?= $SLANG['Blobs'] ?></th> <th class="colBlobs"><?php echo $SLANG['Blobs'] ?></th>
<th class="colBlobSizes"><?= $SLANG['BlobSizes'] ?></th> <th class="colBlobSizes"><?php echo $SLANG['BlobSizes'] ?></th>
<th class="colAlarmLimits"><?= $SLANG['AlarmLimits'] ?></th> <th class="colAlarmLimits"><?php echo $SLANG['AlarmLimits'] ?></th>
<th class="colScore"><?= $SLANG['Score'] ?></th> <th class="colScore"><?php echo $SLANG['Score'] ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -67,28 +67,28 @@ if ( count($stats) )
{ {
?> ?>
<tr> <tr>
<td class="colZone"><?= validHtmlStr($stat['ZoneName']) ?></td> <td class="colZone"><?php echo validHtmlStr($stat['ZoneName']) ?></td>
<td class="colPixelDiff"><?= validHtmlStr($stat['PixelDiff']) ?></td> <td class="colPixelDiff"><?php echo validHtmlStr($stat['PixelDiff']) ?></td>
<td class="colAlarmPx"><?= sprintf( "%d (%d%%)", $stat['AlarmPixels'], (100*$stat['AlarmPixels']/$stat['Area']) ) ?></td> <td class="colAlarmPx"><?php echo sprintf( "%d (%d%%)", $stat['AlarmPixels'], (100*$stat['AlarmPixels']/$stat['Area']) ) ?></td>
<td class="colFilterPx"><?= sprintf( "%d (%d%%)", $stat['FilterPixels'], (100*$stat['FilterPixels']/$stat['Area']) ) ?></td> <td class="colFilterPx"><?php echo sprintf( "%d (%d%%)", $stat['FilterPixels'], (100*$stat['FilterPixels']/$stat['Area']) ) ?></td>
<td class="colBlobPx"><?= sprintf( "%d (%d%%)", $stat['BlobPixels'], (100*$stat['BlobPixels']/$stat['Area']) ) ?></td> <td class="colBlobPx"><?php echo sprintf( "%d (%d%%)", $stat['BlobPixels'], (100*$stat['BlobPixels']/$stat['Area']) ) ?></td>
<td class="colBlobs"><?= validHtmlStr($stat['Blobs']) ?></td> <td class="colBlobs"><?php echo validHtmlStr($stat['Blobs']) ?></td>
<?php <?php
if ( $stat['Blobs'] > 1 ) if ( $stat['Blobs'] > 1 )
{ {
?> ?>
<td class="colBlobSizes"><?= sprintf( "%d-%d (%d%%-%d%%)", $stat['MinBlobSize'], $stat['MaxBlobSize'], (100*$stat['MinBlobSize']/$stat['Area']), (100*$stat['MaxBlobSize']/$stat['Area']) ) ?></td> <td class="colBlobSizes"><?php echo sprintf( "%d-%d (%d%%-%d%%)", $stat['MinBlobSize'], $stat['MaxBlobSize'], (100*$stat['MinBlobSize']/$stat['Area']), (100*$stat['MaxBlobSize']/$stat['Area']) ) ?></td>
<?php <?php
} }
else else
{ {
?> ?>
<td class="colBlobSizes"><?= sprintf( "%d (%d%%)", $stat['MinBlobSize'], 100*$stat['MinBlobSize']/$stat['Area'] ) ?></td> <td class="colBlobSizes"><?php echo sprintf( "%d (%d%%)", $stat['MinBlobSize'], 100*$stat['MinBlobSize']/$stat['Area'] ) ?></td>
<?php <?php
} }
?> ?>
<td class="colAlarmLimits"><?= validHtmlStr($stat['MinX'].",".$stat['MinY']."-".$stat['MaxX'].",".$stat['MaxY']) ?></td> <td class="colAlarmLimits"><?php echo validHtmlStr($stat['MinX'].",".$stat['MinY']."-".$stat['MaxX'].",".$stat['MaxY']) ?></td>
<td class="colScore"><?= $stat['Score'] ?></td> <td class="colScore"><?php echo $stat['Score'] ?></td>
</tr> </tr>
<?php <?php
} }
@ -97,7 +97,7 @@ else
{ {
?> ?>
<tr> <tr>
<td class="rowNoStats" colspan="9"><?= $SLANG['NoStatisticsRecorded'] ?></td> <td class="rowNoStats" colspan="9"><?php echo $SLANG['NoStatisticsRecorded'] ?></td>
</tr> </tr>
<?php <?php
} }

6
web/skins/classic/views/status.php
View File

@ -36,7 +36,7 @@ xhtmlHeaders(__FILE__, $SLANG['Status'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Status'] ?></h2> <h2><?php echo $SLANG['Status'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
@ -50,7 +50,7 @@ if ( $row = array_shift( $output ) )
foreach ( preg_split( "/\s+/", $row ) as $col ) foreach ( preg_split( "/\s+/", $row ) as $col )
{ {
?> ?>
<th><?= $col ?></th> <th><?php echo $col ?></th>
<?php <?php
} }
?> ?>
@ -69,7 +69,7 @@ foreach ( $output as $row )
foreach ( preg_split( "/\s+/", $row ) as $col ) foreach ( preg_split( "/\s+/", $row ) as $col )
{ {
?> ?>
<td><?= $col ?></td> <td><?php echo $col ?></td>
<?php <?php
} }
?> ?>

52
web/skins/classic/views/timeline.php
View File

@ -705,19 +705,19 @@ function drawXGrid( $chart, $scale, $labelClass, $tickClass, $gridClass, $zoomCl
if ( $labelClass ) if ( $labelClass )
{ {
?> ?>
<div class="<?= $labelClass ?>" style="left: <?= $x-25 ?>px;"><?= strftime( $scale['label'], $timeOffset ); ?></div> <div class="<?php echo $labelClass ?>" style="left: <?php echo $x-25 ?>px;"><?php echo strftime( $scale['label'], $timeOffset ); ?></div>
<?php <?php
} }
if ( $tickClass ) if ( $tickClass )
{ {
?> ?>
<div class="<?= $tickClass ?>" style="left: <?= $x ?>px;"></div> <div class="<?php echo $tickClass ?>" style="left: <?php echo $x ?>px;"></div>
<?php <?php
} }
if ( $gridClass ) if ( $gridClass )
{ {
?> ?>
<div class="<?= $gridClass ?>" style="left: <?= $x ?>px;"></div> <div class="<?php echo $gridClass ?>" style="left: <?php echo $x ?>px;"></div>
<?php <?php
} }
if ( $scale['name'] != 'second' && $zoomClass ) if ( $scale['name'] != 'second' && $zoomClass )
@ -725,7 +725,7 @@ function drawXGrid( $chart, $scale, $labelClass, $tickClass, $gridClass, $zoomCl
$zoomMinTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($lastTick * $chart['data']['x']['density'])) ); $zoomMinTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($lastTick * $chart['data']['x']['density'])) );
$zoomMaxTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($i * $chart['data']['x']['density'])) ); $zoomMaxTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($i * $chart['data']['x']['density'])) );
?> ?>
<div class="<?= $zoomClass ?>" style="left: <?= $lastTick-1 ?>px; width: <?= $i-$lastTick ?>px;" title="<?= $SLANG['ZoomIn'] ?>" onclick="tlZoomBounds( '<?= $zoomMinTime ?>', '<?= $zoomMaxTime ?>' )"></div> <div class="<?php echo $zoomClass ?>" style="left: <?php echo $lastTick-1 ?>px; width: <?php echo $i-$lastTick ?>px;" title="<?php echo $SLANG['ZoomIn'] ?>" onclick="tlZoomBounds( '<?php echo $zoomMinTime ?>', '<?php echo $zoomMaxTime ?>' )"></div>
<?php <?php
} }
$lastTick = $i; $lastTick = $i;
@ -738,7 +738,7 @@ function drawXGrid( $chart, $scale, $labelClass, $tickClass, $gridClass, $zoomCl
$zoomMinTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($lastTick * $chart['data']['x']['density'])) ); $zoomMinTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($lastTick * $chart['data']['x']['density'])) );
$zoomMaxTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($i * $chart['data']['x']['density'])) ); $zoomMaxTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($i * $chart['data']['x']['density'])) );
?> ?>
<div class="<?= $zoomClass ?>" style="left: <?= $lastTick-1 ?>px; width: <?= $i-$lastTick ?>px;" title="<?= $SLANG['ZoomIn'] ?>" onclick="tlZoomBounds( '<?= $zoomMinTime ?>', '<?= $zoomMaxTime ?>' )"></div> <div class="<?php echo $zoomClass ?>" style="left: <?php echo $lastTick-1 ?>px; width: <?php echo $i-$lastTick ?>px;" title="<?php echo $SLANG['ZoomIn'] ?>" onclick="tlZoomBounds( '<?php echo $zoomMinTime ?>', '<?php echo $zoomMaxTime ?>' )"></div>
<?php <?php
} }
?> ?>
@ -760,19 +760,19 @@ function drawYGrid( $chart, $scale, $labelClass, $tickClass, $gridClass )
if ( $labelClass ) if ( $labelClass )
{ {
?> ?>
<div class="<?= $labelClass ?>" style="top: <?= $chart['graph']['height']-($y+8) ?>px;"><?= $label ?></div> <div class="<?php echo $labelClass ?>" style="top: <?php echo $chart['graph']['height']-($y+8) ?>px;"><?php echo $label ?></div>
<?php <?php
} }
if ( $tickClass ) if ( $tickClass )
{ {
?> ?>
<div class="<?= $tickClass ?>" style="top: <?= $chart['graph']['height']-($y+2) ?>px;"></div> <div class="<?php echo $tickClass ?>" style="top: <?php echo $chart['graph']['height']-($y+2) ?>px;"></div>
<?php <?php
} }
if ( $gridClass ) if ( $gridClass )
{ {
?> ?>
<div class="<?= $gridClass ?>" style="top: <?= $chart['graph']['height']-($y+2) ?>px;<?= $i <= 0?' border-top: solid 1px black;':'' ?>"></div> <div class="<?php echo $gridClass ?>" style="top: <?php echo $chart['graph']['height']-($y+2) ?>px;<?php echo $i <= 0?' border-top: solid 1px black;':'' ?>"></div>
<?php <?php
} }
} }
@ -805,31 +805,31 @@ xhtmlHeaders(__FILE__, $SLANG['Timeline'] );
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<?= makePopupLink( '?view=events&amp;page=1'.htmlspecialchars($filterQuery), 'zmEvents', 'events', $SLANG['List'], canView( 'Events' ) ) ?> <?php echo makePopupLink( '?view=events&amp;page=1'.htmlspecialchars($filterQuery), 'zmEvents', 'events', $SLANG['List'], canView( 'Events' ) ) ?>
<a href="#" onclick="closeWindow();"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a>
</div> </div>
<h2><?= $SLANG['Timeline'] ?></h2> <h2><?php echo $SLANG['Timeline'] ?></h2>
</div> </div>
<div id="content" class="chartSize"> <div id="content" class="chartSize">
<div id="topPanel" class="graphWidth"> <div id="topPanel" class="graphWidth">
<div id="imagePanel"> <div id="imagePanel">
<div id="image" class="imageHeight"><img id="imageSrc" class="imageWidth" src="graphics/transparent.gif" alt="<?= $SLANG['ViewEvent'] ?>" title="<?= $SLANG['ViewEvent'] ?>"/></div> <div id="image" class="imageHeight"><img id="imageSrc" class="imageWidth" src="graphics/transparent.gif" alt="<?php echo $SLANG['ViewEvent'] ?>" title="<?php echo $SLANG['ViewEvent'] ?>"/></div>
</div> </div>
<div id="dataPanel"> <div id="dataPanel">
<div id="textPanel"> <div id="textPanel">
<div id="instruction"> <div id="instruction">
<p><?= $SLANG['TimelineTip1'] ?></p> <p><?php echo $SLANG['TimelineTip1'] ?></p>
<p><?= $SLANG['TimelineTip2'] ?></p> <p><?php echo $SLANG['TimelineTip2'] ?></p>
<p><?= $SLANG['TimelineTip3'] ?></p> <p><?php echo $SLANG['TimelineTip3'] ?></p>
<p><?= $SLANG['TimelineTip4'] ?></p> <p><?php echo $SLANG['TimelineTip4'] ?></p>
</div> </div>
<div id="eventData"> <div id="eventData">
</div> </div>
</div> </div>
<div id="navPanel"> <div id="navPanel">
<input type="button" title="<?= $SLANG['PanLeft'] ?>" value="&lt;&lt;" onclick="tlPan( '<?= $minTime ?>', '<?= $range ?>' )"/> <input type="button" title="<?php echo $SLANG['PanLeft'] ?>" value="&lt;&lt;" onclick="tlPan( '<?php echo $minTime ?>', '<?php echo $range ?>' )"/>
<input type="button" title="<?= $SLANG['ZoomOut'] ?>" value="&ndash;" onclick="tlZoomRange( '<?= $midTime ?>', '<?= (int)($range*$majXScale['zoomout']) ?>' )"/> <input type="button" title="<?php echo $SLANG['ZoomOut'] ?>" value="&ndash;" onclick="tlZoomRange( '<?php echo $midTime ?>', '<?php echo (int)($range*$majXScale['zoomout']) ?>' )"/>
<input type="button" title="<?= $SLANG['PanRight'] ?>" value="&gt;&gt;" onclick="tlPan( '<?= $maxTime ?>', '<?= $range ?>' )"/> <input type="button" title="<?php echo $SLANG['PanRight'] ?>" value="&gt;&gt;" onclick="tlPan( '<?php echo $maxTime ?>', '<?php echo $range ?>' )"/>
</div> </div>
</div> </div>
</div> </div>
@ -870,7 +870,7 @@ if ( $mode == "overlay" )
); );
} }
?> ?>
<div class="activity monitorColour<?= $slot['event']['MonitorId'] ?>" style="left: <?= $index ?>px; height: <?= $slotHeight ?>px;" <?= join( " ", $behaviours ) ?>></div> <div class="activity monitorColour<?php echo $slot['event']['MonitorId'] ?>" style="left: <?php echo $index ?>px; height: <?php echo $slotHeight ?>px;" <?php echo join( " ", $behaviours ) ?>></div>
<?php <?php
} }
} }
@ -883,7 +883,7 @@ elseif ( $mode == "split" )
foreach( array_keys($monFrameSlots) as $monitorId ) foreach( array_keys($monFrameSlots) as $monitorId )
{ {
?> ?>
<div id="activity<?= $monitorId ?>"> <div id="activity<?php echo $monitorId ?>">
<?php <?php
unset( $currFrameSlots ); unset( $currFrameSlots );
$currFrameSlots = &$monFrameSlots[$monitorId]; $currFrameSlots = &$monFrameSlots[$monitorId];
@ -908,7 +908,7 @@ elseif ( $mode == "split" )
); );
} }
?> ?>
<div class="activity activity<?= $slot['event']['MonitorId'] ?>" style="left: <?= $index ?>px; height: <?= $slotHeight ?>px;" <?= join( " ", $behaviours ) ?>></div> <div class="activity activity<?php echo $slot['event']['MonitorId'] ?>" style="left: <?php echo $index ?>px; height: <?php echo $slotHeight ?>px;" <?php echo join( " ", $behaviours ) ?>></div>
<?php <?php
} }
?> ?>
@ -919,7 +919,7 @@ elseif ( $mode == "split" )
foreach( array_keys($monEventSlots) as $monitorId ) foreach( array_keys($monEventSlots) as $monitorId )
{ {
?> ?>
<div id="events<?= $monitorId ?>" class="events eventsSize eventsPos<?= $monitorId ?>"> <div id="events<?php echo $monitorId ?>" class="events eventsSize eventsPos<?php echo $monitorId ?>">
<?php <?php
unset( $currEventSlots ); unset( $currEventSlots );
$currEventSlots = &$monEventSlots[$monitorId]; $currEventSlots = &$monEventSlots[$monitorId];
@ -944,7 +944,7 @@ foreach( array_keys($monEventSlots) as $monitorId )
); );
} }
?> ?>
<div class="event eventsHeight monitorColour<?= $monitorId ?>" style="left: <?= $i ?>px; width: <?= $slot['width'] ?>px;" <?= join( " ", $behaviours ) ?>></div> <div class="event eventsHeight monitorColour<?php echo $monitorId ?>" style="left: <?php echo $i ?>px; width: <?php echo $slot['width'] ?>px;" <?php echo join( " ", $behaviours ) ?>></div>
<?php <?php
} }
} }
@ -961,12 +961,12 @@ foreach( array_keys($monEventSlots) as $monitorId )
foreach( array_keys($monEventSlots) as $monitorId ) foreach( array_keys($monEventSlots) as $monitorId )
{ {
?> ?>
<span class="keyEntry"><?= $monitors[$monitorId]['Name'] ?><img id="keyBox<?= $monitorId ?>" class="keyBox monitorColour<?= $monitorId ?>" src="graphics/transparent.gif" alt="<?= $monitors[$monitorId]['Name'] ?>"/></span> <span class="keyEntry"><?php echo $monitors[$monitorId]['Name'] ?><img id="keyBox<?php echo $monitorId ?>" class="keyBox monitorColour<?php echo $monitorId ?>" src="graphics/transparent.gif" alt="<?php echo $monitors[$monitorId]['Name'] ?>"/></span>
<?php <?php
} }
?> ?>
</div> </div>
<div id="range"><?= $title ?></div> <div id="range"><?php echo $title ?></div>
</div> </div>
</div> </div>
</div> </div>

56
web/skins/classic/views/user.php
View File

@ -60,14 +60,14 @@ xhtmlHeaders(__FILE__, $SLANG['User']." - ".$newUser['Username'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['User']." - ".$newUser['Username'] ?></h2> <h2><?php echo $SLANG['User']." - ".$newUser['Username'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>" onsubmit="return validateForm( this, <?= empty($newUser['Password'])?'true':'false' ?> )"> <form name="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" onsubmit="return validateForm( this, <?php echo empty($newUser['Password'])?'true':'false' ?> )">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value="user"/> <input type="hidden" name="action" value="user"/>
<input type="hidden" name="uid" value="<?= validHtmlStr($_REQUEST['uid']) ?>"/> <input type="hidden" name="uid" value="<?php echo validHtmlStr($_REQUEST['uid']) ?>"/>
<input type="hidden" name="newUser[MonitorIds]" value="<?= $newUser['MonitorIds'] ?>"/> <input type="hidden" name="newUser[MonitorIds]" value="<?php echo $newUser['MonitorIds'] ?>"/>
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
<tbody> <tbody>
<?php <?php
@ -75,58 +75,58 @@ if ( canEdit( 'System' ) )
{ {
?> ?>
<tr> <tr>
<th scope="row"><?= $SLANG['Username'] ?></th> <th scope="row"><?php echo $SLANG['Username'] ?></th>
<td><input type="text" name="newUser[Username]" value="<?= $newUser['Username'] ?>"/></td> <td><input type="text" name="newUser[Username]" value="<?php echo $newUser['Username'] ?>"/></td>
</tr> </tr>
<?php <?php
} }
?> ?>
<tr> <tr>
<th scope="row"><?= $SLANG['NewPassword'] ?></th> <th scope="row"><?php echo $SLANG['NewPassword'] ?></th>
<td><input type="password" name="newUser[Password]" value=""/></td> <td><input type="password" name="newUser[Password]" value=""/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ConfirmPassword'] ?></th> <th scope="row"><?php echo $SLANG['ConfirmPassword'] ?></th>
<td><input type="password" name="conf_password" value=""/></td> <td><input type="password" name="conf_password" value=""/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Language'] ?></th> <th scope="row"><?php echo $SLANG['Language'] ?></th>
<td><?= buildSelect( "newUser[Language]", $langs ) ?></td> <td><?php echo buildSelect( "newUser[Language]", $langs ) ?></td>
</tr> </tr>
<?php <?php
if ( canEdit( 'System' ) ) if ( canEdit( 'System' ) )
{ {
?> ?>
<tr> <tr>
<th scope="row"><?= $SLANG['Enabled'] ?></th> <th scope="row"><?php echo $SLANG['Enabled'] ?></th>
<td><?= buildSelect( "newUser[Enabled]", $yesno ) ?></td> <td><?php echo buildSelect( "newUser[Enabled]", $yesno ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Stream'] ?></th> <th scope="row"><?php echo $SLANG['Stream'] ?></th>
<td><?= buildSelect( "newUser[Stream]", $nv ) ?></td> <td><?php echo buildSelect( "newUser[Stream]", $nv ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Events'] ?></th> <th scope="row"><?php echo $SLANG['Events'] ?></th>
<td><?= buildSelect( "newUser[Events]", $nve ) ?></td> <td><?php echo buildSelect( "newUser[Events]", $nve ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Control'] ?></th> <th scope="row"><?php echo $SLANG['Control'] ?></th>
<td><?= buildSelect( "newUser[Control]", $nve ) ?></td> <td><?php echo buildSelect( "newUser[Control]", $nve ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Monitors'] ?></th> <th scope="row"><?php echo $SLANG['Monitors'] ?></th>
<td><?= buildSelect( "newUser[Monitors]", $nve ) ?></td> <td><?php echo buildSelect( "newUser[Monitors]", $nve ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['System'] ?></th> <th scope="row"><?php echo $SLANG['System'] ?></th>
<td><?= buildSelect( "newUser[System]", $nve ) ?></td> <td><?php echo buildSelect( "newUser[System]", $nve ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['MaxBandwidth'] ?></th> <th scope="row"><?php echo $SLANG['MaxBandwidth'] ?></th>
<td><?= buildSelect( "newUser[MaxBandwidth]", $bandwidths ) ?></td> <td><?php echo buildSelect( "newUser[MaxBandwidth]", $bandwidths ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['RestrictedMonitors'] ?></th> <th scope="row"><?php echo $SLANG['RestrictedMonitors'] ?></th>
<td> <td>
<select name="monitorIds" size="4" multiple="multiple"> <select name="monitorIds" size="4" multiple="multiple">
<?php <?php
@ -135,7 +135,7 @@ if ( canEdit( 'System' ) )
if ( visibleMonitor( $monitor['Id'] ) ) if ( visibleMonitor( $monitor['Id'] ) )
{ {
?> ?>
<option value="<?= $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?= htmlentities($monitor['Name']) ?></option> <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo htmlentities($monitor['Name']) ?></option>
<?php <?php
} }
} }
@ -149,7 +149,7 @@ if ( canEdit( 'System' ) )
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

28
web/skins/classic/views/version.php
View File

@ -45,43 +45,43 @@ xhtmlHeaders(__FILE__, $SLANG['Version'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Version'] ?></h2> <h2><?php echo $SLANG['Version'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<?php <?php
if ( ZM_DYN_DB_VERSION && (ZM_DYN_DB_VERSION != ZM_VERSION) ) if ( ZM_DYN_DB_VERSION && (ZM_DYN_DB_VERSION != ZM_VERSION) )
{ {
?> ?>
<p class="errorText"><?= sprintf( $CLANG['VersionMismatch'], ZM_VERSION, ZM_DYN_DB_VERSION ) ?></p> <p class="errorText"><?php echo sprintf( $CLANG['VersionMismatch'], ZM_VERSION, ZM_DYN_DB_VERSION ) ?></p>
<p><?= $SLANG['RunLocalUpdate'] ?></p> <p><?php echo $SLANG['RunLocalUpdate'] ?></p>
<div id="contentButtons"> <div id="contentButtons">
<input type="button" value="<?= $SLANG['Close'] ?>" onclick="closeWindow()"/> <input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="closeWindow()"/>
</div> </div>
<?php <?php
} }
elseif ( verNum( ZM_DYN_LAST_VERSION ) <= verNum( ZM_VERSION ) ) elseif ( verNum( ZM_DYN_LAST_VERSION ) <= verNum( ZM_VERSION ) )
{ {
?> ?>
<p><?= sprintf( $CLANG['RunningRecentVer'], ZM_VERSION ) ?></p> <p><?php echo sprintf( $CLANG['RunningRecentVer'], ZM_VERSION ) ?></p>
<p><?= $SLANG['UpdateNotNecessary'] ?></p> <p><?php echo $SLANG['UpdateNotNecessary'] ?></p>
<p><input type="button" value="<?= $SLANG['GoToZoneMinder'] ?>" onclick="zmWindow()"/></p> <p><input type="button" value="<?php echo $SLANG['GoToZoneMinder'] ?>" onclick="zmWindow()"/></p>
<div id="contentButtons"> <div id="contentButtons">
<input type="button" value="<?= $SLANG['Close'] ?>" onclick="closeWindow()"/> <input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="closeWindow()"/>
</div> </div>
<?php <?php
} }
else else
{ {
?> ?>
<form name="contentForm" id="contentForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="none"/> <input type="hidden" name="view" value="none"/>
<input type="hidden" name="action" value="version"/> <input type="hidden" name="action" value="version"/>
<p><?= $SLANG['UpdateAvailable'] ?></p> <p><?php echo $SLANG['UpdateAvailable'] ?></p>
<p><?= sprintf( $CLANG['LatestRelease'], ZM_DYN_LAST_VERSION, ZM_VERSION ) ?></p> <p><?php echo sprintf( $CLANG['LatestRelease'], ZM_DYN_LAST_VERSION, ZM_VERSION ) ?></p>
<p><?= buildSelect( "option", $options ); ?></p> <p><?php echo buildSelect( "option", $options ); ?></p>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Apply'] ?>" onclick="submitForm( this )"/> <input type="submit" value="<?php echo $SLANG['Apply'] ?>" onclick="submitForm( this )"/>
<input type="button" value="<?= $SLANG['Close'] ?>" onclick="closeWindow()"/> <input type="button" value="<?php echo $SLANG['Close'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
<?php <?php

54
web/skins/classic/views/video.php
View File

@ -109,9 +109,9 @@ xhtmlHeaders(__FILE__, $SLANG['Video'] );
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<a href="#" onclick="closeWindow()"><?= $SLANG['Close'] ?></a> <a href="#" onclick="closeWindow()"><?php echo $SLANG['Close'] ?></a>
</div> </div>
<h2><?= $SLANG['Video'] ?></h2> <h2><?php echo $SLANG['Video'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<?php <?php
@ -122,57 +122,57 @@ if ( isset($_REQUEST['showIndex']) )
$name = $matches[1]; $name = $matches[1];
$videoFormat = $matches[2]; $videoFormat = $matches[2];
?> ?>
<h3 id="videoFile"><?= substr( $videoFiles[$showIndex], strlen(ZM_DIR_EVENTS)+1 ) ?></h3> <h3 id="videoFile"><?php echo substr( $videoFiles[$showIndex], strlen(ZM_DIR_EVENTS)+1 ) ?></h3>
<div id="imageFeed"><?php outputVideoStream( 'videoStream', $videoFiles[$showIndex], validInt($_REQUEST['width']), validInt($_REQUEST['height']), $videoFormat, $name ) ?></div> <div id="imageFeed"><?php outputVideoStream( 'videoStream', $videoFiles[$showIndex], validInt($_REQUEST['width']), validInt($_REQUEST['height']), $videoFormat, $name ) ?></div>
<?php <?php
} }
else else
{ {
?> ?>
<form name="contentForm" id="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="id" value="<?= $event['Id'] ?>"/> <input type="hidden" name="id" value="<?php echo $event['Id'] ?>"/>
<table id="contentTable" class="minor" cellspacing="0"> <table id="contentTable" class="minor" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<th scope="row"><?= $SLANG['VideoFormat'] ?></th> <th scope="row"><?php echo $SLANG['VideoFormat'] ?></th>
<td><?= buildSelect( "videoFormat", $videoFormats ) ?></td> <td><?php echo buildSelect( "videoFormat", $videoFormats ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['FrameRate'] ?></th> <th scope="row"><?php echo $SLANG['FrameRate'] ?></th>
<td><?= buildSelect( "rate", $rates ) ?></td> <td><?php echo buildSelect( "rate", $rates ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['VideoSize'] ?></th> <th scope="row"><?php echo $SLANG['VideoSize'] ?></th>
<td><?= buildSelect( "scale", $scales ) ?></td> <td><?php echo buildSelect( "scale", $scales ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['OverwriteExisting'] ?></th> <th scope="row"><?php echo $SLANG['OverwriteExisting'] ?></th>
<td><input type="checkbox" name="overwrite" value="1"<?php if ( !empty($_REQUEST['overwrite']) ) { ?> checked="checked"<?php } ?>/></td> <td><input type="checkbox" name="overwrite" value="1"<?php if ( !empty($_REQUEST['overwrite']) ) { ?> checked="checked"<?php } ?>/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<input type="button" value="<?= $SLANG['GenerateVideo'] ?>" onclick="generateVideo( this.form );"<?php if ( !ZM_OPT_FFMPEG ) { ?> disabled="disabled"<?php } ?>/> <input type="button" value="<?php echo $SLANG['GenerateVideo'] ?>" onclick="generateVideo( this.form );"<?php if ( !ZM_OPT_FFMPEG ) { ?> disabled="disabled"<?php } ?>/>
</form> </form>
<?php <?php
if ( isset($_REQUEST['generated']) ) if ( isset($_REQUEST['generated']) )
{ {
?> ?>
<h2 id="videoProgress" class="<?= $_REQUEST['generated']?'infoText':'errorText' ?>"><span id="videoProgressText"><?= $_REQUEST['generated']?$SLANG['VideoGenSucceeded']:$SLANG['VideoGenFailed'] ?></span><span id="videoProgressTicker"></span></h2> <h2 id="videoProgress" class="<?php echo $_REQUEST['generated']?'infoText':'errorText' ?>"><span id="videoProgressText"><?php echo $_REQUEST['generated']?$SLANG['VideoGenSucceeded']:$SLANG['VideoGenFailed'] ?></span><span id="videoProgressTicker"></span></h2>
<?php <?php
} }
else else
{ {
?> ?>
<h2 id="videoProgress" class="hidden warnText"><span id="videoProgressText"><?= $SLANG['GeneratingVideo'] ?></span><span id="videoProgressTicker"></span></h2> <h2 id="videoProgress" class="hidden warnText"><span id="videoProgressText"><?php echo $SLANG['GeneratingVideo'] ?></span><span id="videoProgressTicker"></span></h2>
<?php <?php
} }
?> ?>
<h2 id="videoFilesHeader"><?= $SLANG['VideoGenFiles'] ?></h2> <h2 id="videoFilesHeader"><?php echo $SLANG['VideoGenFiles'] ?></h2>
<?php <?php
if ( count($videoFiles) == 0 ) if ( count($videoFiles) == 0 )
{ {
?> ?>
<h3 id="videoNoFiles"><?= $SLANG['VideoGenNoFiles'] ?></h3> <h3 id="videoNoFiles"><?php echo $SLANG['VideoGenNoFiles'] ?></h3>
<?php <?php
} }
else else
@ -181,11 +181,11 @@ else
<table id="videoTable" class="major" cellspacing="0"> <table id="videoTable" class="major" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th scope="row"><?= $SLANG['Format'] ?></th> <th scope="row"><?php echo $SLANG['Format'] ?></th>
<th scope="row"><?= $SLANG['Size'] ?></th> <th scope="row"><?php echo $SLANG['Size'] ?></th>
<th scope="row"><?= $SLANG['Rate'] ?></th> <th scope="row"><?php echo $SLANG['Rate'] ?></th>
<th scope="row"><?= $SLANG['Scale'] ?></th> <th scope="row"><?php echo $SLANG['Scale'] ?></th>
<th scope="row"><?= $SLANG['Action'] ?></th> <th scope="row"><?php echo $SLANG['Action'] ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -218,11 +218,11 @@ else
$height = $scale?reScale( $event['Height'], $scale ):$event['Height']; $height = $scale?reScale( $event['Height'], $scale ):$event['Height'];
?> ?>
<tr> <tr>
<td><?= $matches[4] ?></td> <td><?php echo $matches[4] ?></td>
<td><?= filesize( $file ) ?></td> <td><?php echo filesize( $file ) ?></td>
<td><?= $rateText ?></td> <td><?php echo $rateText ?></td>
<td><?= $scaleText ?></td> <td><?php echo $scaleText ?></td>
<td><?= makePopupLink( '?view='.$view.'&amp;eid='.$event['Id'].'&amp;width='.$width.'&amp;height='.$height.'&amp;showIndex='.$index, 'zmVideo'.$event['Id'].'-'.$scale, array( 'videoview', $width, $height ), $SLANG['View'] ); ?>&nbsp;/&nbsp;<a href="<?= substr( $file, strlen(ZM_DIR_EVENTS)+1 ) ?>" onclick="downloadVideo( <?= $index ?> ); return( false );"><?= $SLANG['Download'] ?></a>&nbsp;/&nbsp;<a href="#" onclick="deleteVideo( <?= $index ?> ); return( false );"><?= $SLANG['Delete'] ?></a></td> <td><?php echo makePopupLink( '?view='.$view.'&amp;eid='.$event['Id'].'&amp;width='.$width.'&amp;height='.$height.'&amp;showIndex='.$index, 'zmVideo'.$event['Id'].'-'.$scale, array( 'videoview', $width, $height ), $SLANG['View'] ); ?>&nbsp;/&nbsp;<a href="<?php echo substr( $file, strlen(ZM_DIR_EVENTS)+1 ) ?>" onclick="downloadVideo( <?php echo $index ?> ); return( false );"><?php echo $SLANG['Download'] ?></a>&nbsp;/&nbsp;<a href="#" onclick="deleteVideo( <?php echo $index ?> ); return( false );"><?php echo $SLANG['Delete'] ?></a></td>
</tr> </tr>
<?php <?php
$index++; $index++;

62
web/skins/classic/views/watch.php
View File

@ -68,8 +68,8 @@ xhtmlHeaders( __FILE__, $monitor['Name']." - ".$SLANG['Feed'] );
<div id="page"> <div id="page">
<div id="content"> <div id="content">
<div id="menuBar"> <div id="menuBar">
<div id="monitorName"><?= $monitor['Name'] ?></div> <div id="monitorName"><?php echo $monitor['Name'] ?></div>
<div id="closeControl"><a href="#" onclick="closeWindow(); return( false );"><?= $SLANG['Close'] ?></a></div> <div id="closeControl"><a href="#" onclick="closeWindow(); return( false );"><?php echo $SLANG['Close'] ?></a></div>
<div id="menuControls"> <div id="menuControls">
<?php <?php
if ( $showPtzControls ) if ( $showPtzControls )
@ -77,13 +77,13 @@ if ( $showPtzControls )
if ( canView( 'Control' ) ) if ( canView( 'Control' ) )
{ {
?> ?>
<div id="controlControl"<?= $showControls?' class="hidden"':'' ?>><a id="controlLink" href="#" onclick="showPtzControls(); return( false );"><?= $SLANG['Control'] ?></a></div> <div id="controlControl"<?php echo $showControls?' class="hidden"':'' ?>><a id="controlLink" href="#" onclick="showPtzControls(); return( false );"><?php echo $SLANG['Control'] ?></a></div>
<?php <?php
} }
if ( canView( 'Events' ) ) if ( canView( 'Events' ) )
{ {
?> ?>
<div id="eventsControl"<?= $showControls?'':' class="hidden"' ?>><a id="eventsLink" href="#" onclick="showEvents(); return( false );"><?= $SLANG['Events'] ?></a></div> <div id="eventsControl"<?php echo $showControls?'':' class="hidden"' ?>><a id="eventsLink" href="#" onclick="showEvents(); return( false );"><?php echo $SLANG['Events'] ?></a></div>
<?php <?php
} }
} }
@ -92,11 +92,11 @@ if ( $showPtzControls )
if ( canView( 'Control' ) && $monitor['Type'] == "Local" ) if ( canView( 'Control' ) && $monitor['Type'] == "Local" )
{ {
?> ?>
<div id="settingsControl"><?= makePopupLink( '?view=settings&amp;mid='.$monitor['Id'], 'zmSettings'.$monitor['Id'], 'settings', $SLANG['Settings'], true, 'id="settingsLink"' ) ?></div> <div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor['Id'], 'zmSettings'.$monitor['Id'], 'settings', $SLANG['Settings'], true, 'id="settingsLink"' ) ?></div>
<?php <?php
} }
?> ?>
<div id="scaleControl"><?= $SLANG['Scale'] ?>: <?= buildSelect( "scale", $scales, "changeScale( this );" ); ?></div> <div id="scaleControl"><?php echo $SLANG['Scale'] ?>: <?php echo buildSelect( "scale", $scales, "changeScale( this );" ); ?></div>
</div> </div>
</div> </div>
<div id="imageFeed"> <div id="imageFeed">
@ -123,29 +123,29 @@ else
if ( canEdit( 'Monitors' ) ) if ( canEdit( 'Monitors' ) )
{ {
?> ?>
<div id="enableDisableAlarms"><a id="enableAlarmsLink" href="#" onclick="cmdEnableAlarms(); return( false );" class="hidden"><?= $SLANG['EnableAlarms'] ?></a><a id="disableAlarmsLink" href="#" onclick="cmdDisableAlarms(); return( false );" class="hidden"><?= $SLANG['DisableAlarms'] ?></a></div> <div id="enableDisableAlarms"><a id="enableAlarmsLink" href="#" onclick="cmdEnableAlarms(); return( false );" class="hidden"><?php echo $SLANG['EnableAlarms'] ?></a><a id="disableAlarmsLink" href="#" onclick="cmdDisableAlarms(); return( false );" class="hidden"><?php echo $SLANG['DisableAlarms'] ?></a></div>
<?php <?php
} }
if ( canEdit( 'Monitors' ) ) if ( canEdit( 'Monitors' ) )
{ {
?> ?>
<div id="forceCancelAlarm"><a id="forceAlarmLink" href="#" onclick="cmdForceAlarm()" class="hidden"><?= $SLANG['ForceAlarm'] ?></a><a id="cancelAlarmLink" href="#" onclick="cmdCancelForcedAlarm()" class="hidden"><?= $SLANG['CancelForcedAlarm'] ?></a></div> <div id="forceCancelAlarm"><a id="forceAlarmLink" href="#" onclick="cmdForceAlarm()" class="hidden"><?php echo $SLANG['ForceAlarm'] ?></a><a id="cancelAlarmLink" href="#" onclick="cmdCancelForcedAlarm()" class="hidden"><?php echo $SLANG['CancelForcedAlarm'] ?></a></div>
<?php <?php
} }
?> ?>
<div id="monitorState"><?= $SLANG['State'] ?>:&nbsp;<span id="stateValue"></span>&nbsp;-&nbsp;<span id="fpsValue"></span>&nbsp;fps</div> <div id="monitorState"><?php echo $SLANG['State'] ?>:&nbsp;<span id="stateValue"></span>&nbsp;-&nbsp;<span id="fpsValue"></span>&nbsp;fps</div>
</div> </div>
<div id="dvrControls"<?= $showDvrControls?'':' class="hidden"' ?>> <div id="dvrControls"<?php echo $showDvrControls?'':' class="hidden"' ?>>
<input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?= $SLANG['Rewind'] ?>" class="unavail" disabled="disabled" onclick="streamCmdFastRev( true )"/> <input type="button" value="&lt;&lt;" id="fastRevBtn" title="<?php echo $SLANG['Rewind'] ?>" class="unavail" disabled="disabled" onclick="streamCmdFastRev( true )"/>
<input type="button" value="&lt;" id="slowRevBtn" title="<?= $SLANG['StepBack'] ?>" class="unavail" disabled="disabled" onclick="streamCmdSlowRev( true )"/> <input type="button" value="&lt;" id="slowRevBtn" title="<?php echo $SLANG['StepBack'] ?>" class="unavail" disabled="disabled" onclick="streamCmdSlowRev( true )"/>
<input type="button" value="||" id="pauseBtn" title="<?= $SLANG['Pause'] ?>" class="inactive" onclick="streamCmdPause( true )"/> <input type="button" value="||" id="pauseBtn" title="<?php echo $SLANG['Pause'] ?>" class="inactive" onclick="streamCmdPause( true )"/>
<input type="button" value="[]" id="stopBtn" title="<?= $SLANG['Stop'] ?>" class="unavail" disabled="disabled" onclick="streamCmdStop( true )"/> <input type="button" value="[]" id="stopBtn" title="<?php echo $SLANG['Stop'] ?>" class="unavail" disabled="disabled" onclick="streamCmdStop( true )"/>
<input type="button" value="|&gt;" id="playBtn" title="<?= $SLANG['Play'] ?>" class="active" disabled="disabled" onclick="streamCmdPlay( true )"/> <input type="button" value="|&gt;" id="playBtn" title="<?php echo $SLANG['Play'] ?>" class="active" disabled="disabled" onclick="streamCmdPlay( true )"/>
<input type="button" value="&gt;" id="slowFwdBtn" title="<?= $SLANG['StepForward'] ?>" class="unavail" disabled="disabled" onclick="streamCmdSlowFwd( true )"/> <input type="button" value="&gt;" id="slowFwdBtn" title="<?php echo $SLANG['StepForward'] ?>" class="unavail" disabled="disabled" onclick="streamCmdSlowFwd( true )"/>
<input type="button" value="&gt;&gt;" id="fastFwdBtn" title="<?= $SLANG['FastForward'] ?>" class="unavail" disabled="disabled" onclick="streamCmdFastFwd( true )"/> <input type="button" value="&gt;&gt;" id="fastFwdBtn" title="<?php echo $SLANG['FastForward'] ?>" class="unavail" disabled="disabled" onclick="streamCmdFastFwd( true )"/>
<input type="button" value="&ndash;" id="zoomOutBtn" title="<?= $SLANG['ZoomOut'] ?>" class="avail" onclick="streamCmdZoomOut()"/> <input type="button" value="&ndash;" id="zoomOutBtn" title="<?php echo $SLANG['ZoomOut'] ?>" class="avail" onclick="streamCmdZoomOut()"/>
</div> </div>
<div id="replayStatus"<?= $streamMode=="single"?' class="hidden"':'' ?>> <div id="replayStatus"<?php echo $streamMode=="single"?' class="hidden"':'' ?>>
<span id="mode">Mode: <span id="modeValue"></span></span> <span id="mode">Mode: <span id="modeValue"></span></span>
<span id="rate">Rate: <span id="rateValue"></span>x</span> <span id="rate">Rate: <span id="rateValue"></span>x</span>
<span id="delay">Delay: <span id="delayValue"></span>s</span> <span id="delay">Delay: <span id="delayValue"></span>s</span>
@ -158,24 +158,24 @@ if ( $showPtzControls )
foreach ( getSkinIncludes( 'includes/control_functions.php' ) as $includeFile ) foreach ( getSkinIncludes( 'includes/control_functions.php' ) as $includeFile )
require_once $includeFile; require_once $includeFile;
?> ?>
<div id="ptzControls" class="ptzControls<?= $showControls?'':' hidden' ?>"> <div id="ptzControls" class="ptzControls<?php echo $showControls?'':' hidden' ?>">
<?= ptzControls( $monitor ) ?> <?php echo ptzControls( $monitor ) ?>
</div> </div>
<?php <?php
} }
if ( canView( 'Events' ) ) if ( canView( 'Events' ) )
{ {
?> ?>
<div id="events"<?= $showControls?' class="hidden"':'' ?>> <div id="events"<?php echo $showControls?' class="hidden"':'' ?>>
<table id="eventList" cellspacing="0"> <table id="eventList" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th class="colId"><?= $SLANG['Id'] ?></th> <th class="colId"><?php echo $SLANG['Id'] ?></th>
<th class="colName"><?= $SLANG['Name'] ?></th> <th class="colName"><?php echo $SLANG['Name'] ?></th>
<th class="colTime"><?= $SLANG['Time'] ?></th> <th class="colTime"><?php echo $SLANG['Time'] ?></th>
<th class="colSecs"><?= $SLANG['Secs'] ?></th> <th class="colSecs"><?php echo $SLANG['Secs'] ?></th>
<th class="colFrames"><?= $SLANG['Frames'] ?></th> <th class="colFrames"><?php echo $SLANG['Frames'] ?></th>
<th class="colScore"><?= $SLANG['Score'] ?></th> <th class="colScore"><?php echo $SLANG['Score'] ?></th>
<th class="colDelete">&nbsp;</th> <th class="colDelete">&nbsp;</th>
</tr> </tr>
</thead> </thead>
@ -197,12 +197,12 @@ if ( ZM_WEB_SOUND_ON_ALARM )
<object id="MediaPlayer" width="0" height="0" <object id="MediaPlayer" width="0" height="0"
classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95" classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902"> codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902">
<param name="FileName" value="<?= $soundSrc ?>"/> <param name="FileName" value="<?php echo $soundSrc ?>"/>
<param name="autoStart" value="0"/> <param name="autoStart" value="0"/>
<param name="loop" value="1"/> <param name="loop" value="1"/>
<param name="hidden" value="1"/> <param name="hidden" value="1"/>
<param name="showControls" value="0"/> <param name="showControls" value="0"/>
<embed src="<?= $soundSrc ?>" <embed src="<?php echo $soundSrc ?>"
autostart="true" autostart="true"
loop="true" loop="true"
hidden="true"> hidden="true">
@ -213,7 +213,7 @@ if ( ZM_WEB_SOUND_ON_ALARM )
else else
{ {
?> ?>
<embed src="<?= $soundSrc ?>" <embed src="<?php echo $soundSrc ?>"
autostart="true" autostart="true"
loop="true" loop="true"
hidden="true"> hidden="true">

112
web/skins/classic/views/zone.php
View File

@ -131,94 +131,94 @@ xhtmlHeaders(__FILE__, $SLANG['Zone'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Monitor'] ?> <?= $monitor['Name'] ?> - <?= $SLANG['Zone'] ?> <?= $newZone['Name'] ?></h2> <h2><?php echo $SLANG['Monitor'] ?> <?php echo $monitor['Name'] ?> - <?php echo $SLANG['Zone'] ?> <?php echo $newZone['Name'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form name="zoneForm" id="zoneForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="zoneForm" id="zoneForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value="zone"/> <input type="hidden" name="action" value="zone"/>
<input type="hidden" name="mid" value="<?= $mid ?>"/> <input type="hidden" name="mid" value="<?php echo $mid ?>"/>
<input type="hidden" name="zid" value="<?= $zid ?>"/> <input type="hidden" name="zid" value="<?php echo $zid ?>"/>
<input type="hidden" name="newZone[NumCoords]" value="<?= count($newZone['Points']) ?>"/> <input type="hidden" name="newZone[NumCoords]" value="<?php echo count($newZone['Points']) ?>"/>
<input type="hidden" name="newZone[Coords]" value="<?= $newZone['Coords'] ?>"/> <input type="hidden" name="newZone[Coords]" value="<?php echo $newZone['Coords'] ?>"/>
<input type="hidden" name="newZone[Area]" value="<?= $newZone['Area'] ?>"/> <input type="hidden" name="newZone[Area]" value="<?php echo $newZone['Area'] ?>"/>
<input type="hidden" name="newZone[AlarmRGB]" value=""/> <input type="hidden" name="newZone[AlarmRGB]" value=""/>
<div id="settingsPanel"> <div id="settingsPanel">
<table id="zoneSettings" cellspacing="0"> <table id="zoneSettings" cellspacing="0">
<tbody> <tbody>
<tr> <tr>
<th scope="row"><?= $SLANG['Name'] ?></th> <th scope="row"><?php echo $SLANG['Name'] ?></th>
<td colspan="2"><input type="text" name="newZone[Name]" value="<?= $newZone['Name'] ?>" size="12"/></td> <td colspan="2"><input type="text" name="newZone[Name]" value="<?php echo $newZone['Name'] ?>" size="12"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Type'] ?></th> <th scope="row"><?php echo $SLANG['Type'] ?></th>
<td colspan="2"><?= buildSelect( "newZone[Type]", $optTypes, 'applyZoneType()' ) ?></td> <td colspan="2"><?php echo buildSelect( "newZone[Type]", $optTypes, 'applyZoneType()' ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Preset'] ?></th> <th scope="row"><?php echo $SLANG['Preset'] ?></th>
<td colspan="2"><?= buildSelect( "presetSelector", $presetNames, array( "onchange"=>"applyPreset()", "onblur"=>"this.selectedIndex=0" ) ) ?></td> <td colspan="2"><?php echo buildSelect( "presetSelector", $presetNames, array( "onchange"=>"applyPreset()", "onblur"=>"this.selectedIndex=0" ) ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Units'] ?></th> <th scope="row"><?php echo $SLANG['Units'] ?></th>
<td colspan="2"><?= buildSelect( "newZone[Units]", $optUnits, 'applyZoneUnits()' ) ?></td> <td colspan="2"><?php echo buildSelect( "newZone[Units]", $optUnits, 'applyZoneUnits()' ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ZoneAlarmColour'] ?></th> <th scope="row"><?php echo $SLANG['ZoneAlarmColour'] ?></th>
<td colspan="2"><input type="text" name="newAlarmRgbR" value="<?= ($newZone['AlarmRGB']>>16)&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>&nbsp;/&nbsp;<input type="text" name="newAlarmRgbG" value="<?= ($newZone['AlarmRGB']>>8)&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>&nbsp;/&nbsp;<input type="text" name="newAlarmRgbB" value="<?= $newZone['AlarmRGB']&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/></td> <td colspan="2"><input type="text" name="newAlarmRgbR" value="<?php echo ($newZone['AlarmRGB']>>16)&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>&nbsp;/&nbsp;<input type="text" name="newAlarmRgbG" value="<?php echo ($newZone['AlarmRGB']>>8)&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>&nbsp;/&nbsp;<input type="text" name="newAlarmRgbB" value="<?php echo $newZone['AlarmRGB']&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['CheckMethod'] ?></th> <th scope="row"><?php echo $SLANG['CheckMethod'] ?></th>
<td colspan="2"><?= buildSelect( "newZone[CheckMethod]", $optCheckMethods, 'applyCheckMethod()' ) ?></td> <td colspan="2"><?php echo buildSelect( "newZone[CheckMethod]", $optCheckMethods, 'applyCheckMethod()' ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ZoneMinMaxPixelThres'] ?></th> <th scope="row"><?php echo $SLANG['ZoneMinMaxPixelThres'] ?></th>
<td><input type="text" name="newZone[MinPixelThreshold]" value="<?= $newZone['MinPixelThreshold'] ?>" size="4" onchange="limitRange( this, 0, 255 )"/></td> <td><input type="text" name="newZone[MinPixelThreshold]" value="<?php echo $newZone['MinPixelThreshold'] ?>" size="4" onchange="limitRange( this, 0, 255 )"/></td>
<td><input type="text" name="newZone[MaxPixelThreshold]" value="<?= $newZone['MaxPixelThreshold'] ?>" size="4" onchange="limitRange( this, 0, 255 )"/></td> <td><input type="text" name="newZone[MaxPixelThreshold]" value="<?php echo $newZone['MaxPixelThreshold'] ?>" size="4" onchange="limitRange( this, 0, 255 )"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ZoneFilterSize'] ?></th> <th scope="row"><?php echo $SLANG['ZoneFilterSize'] ?></th>
<td><input type="text" name="newZone[FilterX]" value="<?= $newZone['FilterX'] ?>" size="4" onchange="limitFilter( this )"/></td> <td><input type="text" name="newZone[FilterX]" value="<?php echo $newZone['FilterX'] ?>" size="4" onchange="limitFilter( this )"/></td>
<td><input type="text" name="newZone[FilterY]" value="<?= $newZone['FilterY'] ?>" size="4" onchange="limitFilter( this )"/></td> <td><input type="text" name="newZone[FilterY]" value="<?php echo $newZone['FilterY'] ?>" size="4" onchange="limitFilter( this )"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ZoneArea'] ?></th> <th scope="row"><?php echo $SLANG['ZoneArea'] ?></th>
<td colspan="2"><input type="text" name="newZone[TempArea]" value="<?= $newZone['Area'] ?>" size="7" disabled="disabled"/></td> <td colspan="2"><input type="text" name="newZone[TempArea]" value="<?php echo $newZone['Area'] ?>" size="7" disabled="disabled"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ZoneMinMaxAlarmArea'] ?></th> <th scope="row"><?php echo $SLANG['ZoneMinMaxAlarmArea'] ?></th>
<td><input type="text" name="newZone[MinAlarmPixels]" value="<?= $newZone['MinAlarmPixels'] ?>" size="6" onchange="limitArea(this)"/></td> <td><input type="text" name="newZone[MinAlarmPixels]" value="<?php echo $newZone['MinAlarmPixels'] ?>" size="6" onchange="limitArea(this)"/></td>
<td><input type="text" name="newZone[MaxAlarmPixels]" value="<?= $newZone['MaxAlarmPixels'] ?>" size="6" onchange="limitArea(this)"/></td> <td><input type="text" name="newZone[MaxAlarmPixels]" value="<?php echo $newZone['MaxAlarmPixels'] ?>" size="6" onchange="limitArea(this)"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ZoneMinMaxFiltArea'] ?></th> <th scope="row"><?php echo $SLANG['ZoneMinMaxFiltArea'] ?></th>
<td><input type="text" name="newZone[MinFilterPixels]" value="<?= $newZone['MinFilterPixels'] ?>" size="6" onchange="limitArea(this)"/></td> <td><input type="text" name="newZone[MinFilterPixels]" value="<?php echo $newZone['MinFilterPixels'] ?>" size="6" onchange="limitArea(this)"/></td>
<td><input type="text" name="newZone[MaxFilterPixels]" value="<?= $newZone['MaxFilterPixels'] ?>" size="6" onchange="limitArea(this)"/></td> <td><input type="text" name="newZone[MaxFilterPixels]" value="<?php echo $newZone['MaxFilterPixels'] ?>" size="6" onchange="limitArea(this)"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ZoneMinMaxBlobArea'] ?></th> <th scope="row"><?php echo $SLANG['ZoneMinMaxBlobArea'] ?></th>
<td><input type="text" name="newZone[MinBlobPixels]" value="<?= $newZone['MinBlobPixels'] ?>" size="6"/></td> <td><input type="text" name="newZone[MinBlobPixels]" value="<?php echo $newZone['MinBlobPixels'] ?>" size="6"/></td>
<td><input type="text" name="newZone[MaxBlobPixels]" value="<?= $newZone['MaxBlobPixels'] ?>" size="6"/></td> <td><input type="text" name="newZone[MaxBlobPixels]" value="<?php echo $newZone['MaxBlobPixels'] ?>" size="6"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ZoneMinMaxBlobs'] ?></th> <th scope="row"><?php echo $SLANG['ZoneMinMaxBlobs'] ?></th>
<td><input type="text" name="newZone[MinBlobs]" value="<?= $newZone['MinBlobs'] ?>" size="4"/></td> <td><input type="text" name="newZone[MinBlobs]" value="<?php echo $newZone['MinBlobs'] ?>" size="4"/></td>
<td><input type="text" name="newZone[MaxBlobs]" value="<?= $newZone['MaxBlobs'] ?>" size="4"/></td> <td><input type="text" name="newZone[MaxBlobs]" value="<?php echo $newZone['MaxBlobs'] ?>" size="4"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ZoneOverloadFrames'] ?></th> <th scope="row"><?php echo $SLANG['ZoneOverloadFrames'] ?></th>
<td colspan="2"><input type="text" name="newZone[OverloadFrames]" value="<?= $newZone['OverloadFrames'] ?>" size="4"/></td> <td colspan="2"><input type="text" name="newZone[OverloadFrames]" value="<?php echo $newZone['OverloadFrames'] ?>" size="4"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['ZoneExtendAlarmFrames'] ?></th> <th scope="row"><?php echo $SLANG['ZoneExtendAlarmFrames'] ?></th>
<td colspan="2"><input type="text" name="newZone[ExtendAlarmFrames]" value="<?= $newZone['ExtendAlarmFrames'] ?>" size="4"/></td> <td colspan="2"><input type="text" name="newZone[ExtendAlarmFrames]" value="<?php echo $newZone['ExtendAlarmFrames'] ?>" size="4"/></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div id="definitionPanel"> <div id="definitionPanel">
<div id="imagePanel"> <div id="imagePanel">
<div id="imageFrame" style="width: <?= reScale( $monitor['Width'], $scale ) ?>px; height: <?= reScale( $monitor['Height'], $scale ) ?>px;"> <div id="imageFrame" style="width: <?php echo reScale( $monitor['Width'], $scale ) ?>px; height: <?php echo reScale( $monitor['Height'], $scale ) ?>px;">
<img name="zoneImage" id="zoneImage" src="<?= $zoneImage ?>" width="<?= reScale( $monitor['Width'], $scale ) ?>" height="<?= reScale( $monitor['Height'], $scale ) ?>" alt="Zone Image"/> <img name="zoneImage" id="zoneImage" src="<?php echo $zoneImage ?>" width="<?php echo reScale( $monitor['Width'], $scale ) ?>" height="<?php echo reScale( $monitor['Height'], $scale ) ?>" alt="Zone Image"/>
</div> </div>
</div> </div>
<table id="zonePoints" cellspacing="0"> <table id="zonePoints" cellspacing="0">
@ -233,10 +233,10 @@ for ( $i = 0; $i < $pointCols; $i++ )
<table cellspacing="0"> <table cellspacing="0">
<thead> <thead>
<tr> <tr>
<th><?= $SLANG['Point'] ?></th> <th><?php echo $SLANG['Point'] ?></th>
<th><?= $SLANG['X'] ?></th> <th><?php echo $SLANG['X'] ?></th>
<th><?= $SLANG['Y'] ?></th> <th><?php echo $SLANG['Y'] ?></th>
<th><?= $SLANG['Action'] ?></th> <th><?php echo $SLANG['Action'] ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -245,11 +245,11 @@ for ( $i = 0; $i < $pointCols; $i++ )
for ( $j = $i; $j < count($newZone['Points']); $j += 2 ) for ( $j = $i; $j < count($newZone['Points']); $j += 2 )
{ {
?> ?>
<tr id="row<?= $j ?>" onmouseover="highlightOn( <?= $j ?> )" onmouseout="highlightOff( <?= $j ?> )" onclick="setActivePoint( <?= $j ?> )"> <tr id="row<?php echo $j ?>" onmouseover="highlightOn( <?php echo $j ?> )" onmouseout="highlightOff( <?php echo $j ?> )" onclick="setActivePoint( <?php echo $j ?> )">
<td><?= $j+1 ?></td> <td><?php echo $j+1 ?></td>
<td><input name="newZone[Points][<?= $j ?>][x]" id="newZone[Points][<?= $j ?>][x]" size="5" value="<?= $newZone['Points'][$j]['x'] ?>" onchange="updateX( this, <?= $j ?> )"<?php if ( canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></td> <td><input name="newZone[Points][<?php echo $j ?>][x]" id="newZone[Points][<?php echo $j ?>][x]" size="5" value="<?php echo $newZone['Points'][$j]['x'] ?>" onchange="updateX( this, <?php echo $j ?> )"<?php if ( canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></td>
<td><input name="newZone[Points][<?= $j ?>][y]" id="newZone[Points][<?= $j ?>][y]" size="5" value="<?= $newZone['Points'][$j]['y'] ?>" onchange="updateY( this, <?= $j ?> )"<?php if ( canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></td> <td><input name="newZone[Points][<?php echo $j ?>][y]" id="newZone[Points][<?php echo $j ?>][y]" size="5" value="<?php echo $newZone['Points'][$j]['y'] ?>" onchange="updateY( this, <?php echo $j ?> )"<?php if ( canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></td>
<td><a href="#" onclick="addPoint( this, <?= $j ?> ); return( false );">+</a><?php if ( count($newZone['Points']) > 3 ) { ?>&nbsp;<a id="delete<?= $j ?>" href="#" onclick="delPoint( this, <?= $j ?> ); return(false);">&ndash;</a><?php } ?>&nbsp;<a id="cancel<?= $j ?>" href="#" onclick="unsetActivePoint( <?= $j ?> ); return( false );">X</a></td> <td><a href="#" onclick="addPoint( this, <?php echo $j ?> ); return( false );">+</a><?php if ( count($newZone['Points']) > 3 ) { ?>&nbsp;<a id="delete<?php echo $j ?>" href="#" onclick="delPoint( this, <?php echo $j ?> ); return(false);">&ndash;</a><?php } ?>&nbsp;<a id="cancel<?php echo $j ?>" href="#" onclick="unsetActivePoint( <?php echo $j ?> ); return( false );">X</a></td>
</tr> </tr>
<?php <?php
} }
@ -269,7 +269,7 @@ for ( $i = 0; $i < $pointCols; $i++ )
</tr> </tr>
</tbody> </tbody>
</table> </table>
<input type="submit" id="submitBtn" name="submitBtn" value="<?= $SLANG['Save'] ?>" onclick="return saveChanges( this )"<?php if (!canEdit( 'Monitors' ) || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?= $SLANG['Cancel'] ?>" onclick="closeWindow()"/> <input type="submit" id="submitBtn" name="submitBtn" value="<?php echo $SLANG['Save'] ?>" onclick="return saveChanges( this )"<?php if (!canEdit( 'Monitors' ) || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo $SLANG['Cancel'] ?>" onclick="closeWindow()"/>
</div> </div>
</form> </form>
</div> </div>

34
web/skins/classic/views/zones.php
View File

@ -49,8 +49,8 @@ xhtmlHeaders(__FILE__, $SLANG['Zones'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"><a href="#" onclick="closeWindow();"><?= $SLANG['Close'] ?></a></div> <div id="headerButtons"><a href="#" onclick="closeWindow();"><?php echo $SLANG['Close'] ?></a></div>
<h2><?= $SLANG['Zones'] ?></h2> <h2><?php echo $SLANG['Zones'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<map name="zoneMap" id="zoneMap"> <map name="zoneMap" id="zoneMap">
@ -58,24 +58,24 @@ xhtmlHeaders(__FILE__, $SLANG['Zones'] );
foreach( array_reverse($zones) as $zone ) foreach( array_reverse($zones) as $zone )
{ {
?> ?>
<area shape="poly" alt="<?= htmlspecialchars($zone['Name']) ?>" coords="<?= $zone['AreaCoords'] ?>" href="#" onclick="createPopup( '?view=zone&amp;mid=<?= $mid ?>&amp;zid=<?= $zone['Id'] ?>', 'zmZone', 'zone', <?= $monitor['Width'] ?>, <?= $monitor['Height'] ?> ); return( false );"/> <area shape="poly" alt="<?php echo htmlspecialchars($zone['Name']) ?>" coords="<?php echo $zone['AreaCoords'] ?>" href="#" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>', 'zmZone', 'zone', <?php echo $monitor['Width'] ?>, <?php echo $monitor['Height'] ?> ); return( false );"/>
<?php <?php
} }
?> ?>
<!--<area shape="default" nohref>--> <!--<area shape="default" nohref>-->
</map> </map>
<img src="<?= ZM_DIR_IMAGES.'/'.$image ?>" alt="zones" usemap="#zoneMap" width="<?= $monitor['Width'] ?>" height="<?= $monitor['Height'] ?>" border="0"/> <img src="<?php echo ZM_DIR_IMAGES.'/'.$image ?>" alt="zones" usemap="#zoneMap" width="<?php echo $monitor['Width'] ?>" height="<?php echo $monitor['Height'] ?>" border="0"/>
<form name="contentForm" id="contentForm" method="get" action="<?= $_SERVER['PHP_SELF'] ?>"> <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/> <input type="hidden" name="view" value="<?php echo $view ?>"/>
<input type="hidden" name="action" value="delete"/> <input type="hidden" name="action" value="delete"/>
<input type="hidden" name="mid" value="<?= $mid ?>"/> <input type="hidden" name="mid" value="<?php echo $mid ?>"/>
<table id="contentTable" class="major" cellspacing="0"> <table id="contentTable" class="major" cellspacing="0">
<thead> <thead>
<tr> <tr>
<th class="colName"><?= $SLANG['Name'] ?></th> <th class="colName"><?php echo $SLANG['Name'] ?></th>
<th class="colType"><?= $SLANG['Type'] ?></th> <th class="colType"><?php echo $SLANG['Type'] ?></th>
<th class="colUnits"><?= $SLANG['AreaUnits'] ?></th> <th class="colUnits"><?php echo $SLANG['AreaUnits'] ?></th>
<th class="colMark"><?= $SLANG['Mark'] ?></th> <th class="colMark"><?php echo $SLANG['Mark'] ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -84,10 +84,10 @@ foreach( $zones as $zone )
{ {
?> ?>
<tr> <tr>
<td class="colName"><a href="#" onclick="createPopup( '?view=zone&amp;mid=<?= $mid ?>&amp;zid=<?= $zone['Id'] ?>', 'zmZone', 'zone', <?= $monitor['Width'] ?>, <?= $monitor['Height'] ?> ); return( false );"><?= $zone['Name'] ?></a></td> <td class="colName"><a href="#" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>', 'zmZone', 'zone', <?php echo $monitor['Width'] ?>, <?php echo $monitor['Height'] ?> ); return( false );"><?php echo $zone['Name'] ?></a></td>
<td class="colType"><?= $zone['Type'] ?></td> <td class="colType"><?php echo $zone['Type'] ?></td>
<td class="colUnits"><?= $zone['Area'] ?>&nbsp;/&nbsp;<?= sprintf( "%.2f", ($zone['Area']*100)/($monitor['Width']*$monitor['Height']) ) ?></td> <td class="colUnits"><?php echo $zone['Area'] ?>&nbsp;/&nbsp;<?php echo sprintf( "%.2f", ($zone['Area']*100)/($monitor['Width']*$monitor['Height']) ) ?></td>
<td class="colMark"><input type="checkbox" name="markZids[]" value="<?= $zone['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></td> <td class="colMark"><input type="checkbox" name="markZids[]" value="<?php echo $zone['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></td>
</tr> </tr>
<?php <?php
} }
@ -95,8 +95,8 @@ foreach( $zones as $zone )
</tbody> </tbody>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="button" value="<?= $SLANG['AddNewZone'] ?>" onclick="createPopup( '?view=zone&amp;mid=<?= $mid ?>&amp;zid=0', 'zmZone', 'zone', <?= $monitor['Width'] ?>, <?= $monitor['Height'] ?> );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/> <input type="button" value="<?php echo $SLANG['AddNewZone'] ?>" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=0', 'zmZone', 'zone', <?php echo $monitor['Width'] ?>, <?php echo $monitor['Height'] ?> );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/>
<input type="submit" name="deleteBtn" value="<?= $SLANG['Delete'] ?>" disabled="disabled"/> <input type="submit" name="deleteBtn" value="<?php echo $SLANG['Delete'] ?>" disabled="disabled"/>
</div> </div>
</form> </form>
</div> </div>

10
web/skins/mobile/includes/control_functions.php
View File

@ -150,13 +150,13 @@ function controlPresets( $monitor, $cmds )
?> ?>
<div class="presetControls"> <div class="presetControls">
<div> <div>
<form method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<div class="hidden"> <div class="hidden">
<fieldset> <fieldset>
<input type="hidden" name="view" value="<?= $_REQUEST['view'] ?>"/> <input type="hidden" name="view" value="<?php echo $_REQUEST['view'] ?>"/>
<input type="hidden" name="action" value="control"/> <input type="hidden" name="action" value="control"/>
<input type="hidden" name="mid" value="<?= $monitor['Id'] ?>"/> <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>"/>
<input type="hidden" name="control" value="<?= $cmds['PresetGoto'] ?>"/> <input type="hidden" name="control" value="<?php echo $cmds['PresetGoto'] ?>"/>
</fieldset> </fieldset>
</div> </div>
<div> <div>
@ -164,7 +164,7 @@ function controlPresets( $monitor, $cmds )
for ( $i = 1; $i <= min($monitor['NumPresets'],MAX_PRESETS); $i++ ) for ( $i = 1; $i <= min($monitor['NumPresets'],MAX_PRESETS); $i++ )
{ {
?> ?>
<input type="submit" class="ptzNumBtn" title="<?= isset($labels[$i])?$labels[$i]:"" ?>" name="preset" value="<?= $i ?>"/> <input type="submit" class="ptzNumBtn" title="<?php echo isset($labels[$i])?$labels[$i]:"" ?>" name="preset" value="<?php echo $i ?>"/>
<?php <?php
} }
?> ?>

6
web/skins/mobile/includes/functions.php
View File

@ -36,16 +36,16 @@ function xhtmlHeaders( $file, $title )
<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd"> <!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title><?= ZM_WEB_TITLE_PREFIX ?> - <?= $title ?></title> <title><?php echo ZM_WEB_TITLE_PREFIX ?> - <?php echo $title ?></title>
<link rel="icon" type="image/ico" href="graphics/favicon.ico"/> <link rel="icon" type="image/ico" href="graphics/favicon.ico"/>
<link rel="shortcut icon" href="graphics/favicon.ico"/> <link rel="shortcut icon" href="graphics/favicon.ico"/>
<link rel="stylesheet" href="css/reset.css" type="text/css" media="screen"/> <link rel="stylesheet" href="css/reset.css" type="text/css" media="screen"/>
<link rel="stylesheet" href="<?= $skinCssFile ?>" type="text/css" media="screen"/> <link rel="stylesheet" href="<?php echo $skinCssFile ?>" type="text/css" media="screen"/>
<?php <?php
if ( $viewCssFile ) if ( $viewCssFile )
{ {
?> ?>
<link rel="stylesheet" href="<?= $viewCssFile ?>" type="text/css" media="screen"/> <link rel="stylesheet" href="<?php echo $viewCssFile ?>" type="text/css" media="screen"/>
<?php <?php
} }
if ( $viewCssPhpFile ) if ( $viewCssPhpFile )

18
web/skins/mobile/views/console.php
View File

@ -86,9 +86,9 @@ xhtmlHeaders( __FILE__, $SLANG['Console'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="systemTime"><a href="?view=<?= $view ?>"><?= preg_match( '/%/', DATE_FMT_CONSOLE_SHORT )?strftime( DATE_FMT_CONSOLE_SHORT ):date( DATE_FMT_CONSOLE_SHORT ) ?></a></div> <div id="systemTime"><a href="?view=<?php echo $view ?>"><?php echo preg_match( '/%/', DATE_FMT_CONSOLE_SHORT )?strftime( DATE_FMT_CONSOLE_SHORT ):date( DATE_FMT_CONSOLE_SHORT ) ?></a></div>
<div id="systemStats"><?= getLoad() ?>/<?= getDiskPercent() ?>%</div> <div id="systemStats"><?php echo getLoad() ?>/<?php echo getDiskPercent() ?>%</div>
<div id="systemState"><?= makeLink( "?view=state", $status, canEdit( 'System' ) ) ?></div> <div id="systemState"><?php echo makeLink( "?view=state", $status, canEdit( 'System' ) ) ?></div>
</div> </div>
<div id="content"> <div id="content">
<table id="contentTable"> <table id="contentTable">
@ -128,13 +128,13 @@ foreach( $monitors as $monitor )
if ( !$monitor['Enabled'] ) if ( !$monitor['Enabled'] )
$fclass .= " disabledText"; $fclass .= " disabledText";
?> ?>
<td class="colName"><?= makeLink( "?view=watch&amp;mid=".$monitor['Id'], substr( $monitor['Name'], 0, 8 ), $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td> <td class="colName"><?php echo makeLink( "?view=watch&amp;mid=".$monitor['Id'], substr( $monitor['Name'], 0, 8 ), $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
<td class="colFunction"><?= makeLink( "?view=function&amp;mid=".$monitor['Id'], "<span class=\"$fclass\">".substr( $monitor['Function'], 0, 4 )."</span>", canEdit( 'Monitors' ) ) ?></td> <td class="colFunction"><?php echo makeLink( "?view=function&amp;mid=".$monitor['Id'], "<span class=\"$fclass\">".substr( $monitor['Function'], 0, 4 )."</span>", canEdit( 'Monitors' ) ) ?></td>
<?php <?php
for ( $i = 0; $i < count($eventCounts); $i++ ) for ( $i = 0; $i < count($eventCounts); $i++ )
{ {
?> ?>
<td class="colEvents"><?= makeLink( "?view=events&amp;page=1".$monitor['eventCounts'][$i]['filter']['query'], $monitor['EventCount'.$i], canView( 'Events' ) ) ?></td> <td class="colEvents"><?php echo makeLink( "?view=events&amp;page=1".$monitor['eventCounts'][$i]['filter']['query'], $monitor['EventCount'.$i], canView( 'Events' ) ) ?></td>
<?php <?php
} }
?> ?>
@ -146,7 +146,7 @@ for ( $i = 0; $i < count($eventCounts); $i++ )
<?php <?php
if ( ZM_OPT_X10 ) { if ( ZM_OPT_X10 ) {
?> ?>
<td><?= makeLink( "?view=devices", $SLANG['Devices'], canView('Devices' ) ) ?></td> <td><?php echo makeLink( "?view=devices", $SLANG['Devices'], canView('Devices' ) ) ?></td>
<?php <?php
} else { } else {
?> ?>
@ -155,7 +155,7 @@ if ( ZM_OPT_X10 ) {
} }
if ( $cycleCount > 1 ) { if ( $cycleCount > 1 ) {
?> ?>
<td><?= makeLink( "?view=montage", $SLANG['Montage'], $running && canView( 'Stream' ) ) ?></td> <td><?php echo makeLink( "?view=montage", $SLANG['Montage'], $running && canView( 'Stream' ) ) ?></td>
<?php <?php
} else { } else {
?> ?>
@ -166,7 +166,7 @@ for ( $i = 0; $i < count($eventCounts); $i++ )
{ {
parseFilter( $eventCounts[$i]['filter'], false, '&amp;' ); parseFilter( $eventCounts[$i]['filter'], false, '&amp;' );
?> ?>
<td class="colEvents"><?= makeLink( "?view=events&amp;page=1".$eventCounts[$i]['filter']['query'], $eventCounts[$i]['total'], canView( 'Events' ) ) ?></td> <td class="colEvents"><?php echo makeLink( "?view=events&amp;page=1".$eventCounts[$i]['filter']['query'], $eventCounts[$i]['total'], canView( 'Events' ) ) ?></td>
<?php <?php
} }
?> ?>

10
web/skins/mobile/views/devices.php
View File

@ -37,7 +37,7 @@ xhtmlHeaders( __FILE__, $SLANG['Devices'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Devices'] ?></h2> <h2><?php echo $SLANG['Devices'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<table id="contentTable" class="major"> <table id="contentTable" class="major">
@ -58,15 +58,15 @@ foreach( $devices as $device )
} }
?> ?>
<tr> <tr>
<th scope="row" class="<?= $fclass ?>"><span class="<?= $fclass ?>"><?= substr( $device['Name'], 0, 16 ) ?></span></th> <th scope="row" class="<?php echo $fclass ?>"><span class="<?php echo $fclass ?>"><?php echo substr( $device['Name'], 0, 16 ) ?></span></th>
<td><?= makeLink( "?view=".$_REQUEST['view']."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=on", $SLANG['On'], canEdit('Devices') ) ?></td> <td><?php echo makeLink( "?view=".$_REQUEST['view']."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=on", $SLANG['On'], canEdit('Devices') ) ?></td>
<td><?= makeLink( "?view=".$_REQUEST['view']."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=off", $SLANG['Off'], canEdit('Devices') ) ?></td> <td><?php echo makeLink( "?view=".$_REQUEST['view']."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=off", $SLANG['Off'], canEdit('Devices') ) ?></td>
</tr> </tr>
<?php <?php
} }
?> ?>
</table> </table>
<p><a href="?view=console"><?= $SLANG['Console'] ?></a></p> <p><a href="?view=console"><?php echo $SLANG['Console'] ?></a></p>
</div> </div>
</div> </div>
</body> </body>

6
web/skins/mobile/views/error.php
View File

@ -23,11 +23,11 @@ xhtmlHeaders( __FILE__, $SLANG['Error'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h1>ZoneMinder <?= $SLANG['Error'] ?></h1> <h1>ZoneMinder <?php echo $SLANG['Error'] ?></h1>
</div> </div>
<div id="content"> <div id="content">
<p><strong><?= $SLANG['YouNoPerms'] ?></p> <p><strong><?php echo $SLANG['YouNoPerms'] ?></p>
<p><?= $SLANG['ContactAdmin'] ?></p> <p><?php echo $SLANG['ContactAdmin'] ?></p>
</div> </div>
</div> </div>
</body> </body>

8
web/skins/mobile/views/event.php
View File

@ -114,19 +114,19 @@ if ( canEdit( 'Events' ) )
{ {
?> ?>
<div id="headerButtons"> <div id="headerButtons">
<a href="?view=events&amp;action=delete&amp;mark_eid=<?= $_REQUEST['eid'] ?><?= $filterQuery ?><?= $sortQuery ?>&amp;limit=<?= $_REQUEST['limit'] ?>&amp;page=<?= $_REQUEST['page'] ?>"><?= $SLANG['Delete'] ?></a> <a href="?view=events&amp;action=delete&amp;mark_eid=<?php echo $_REQUEST['eid'] ?><?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $_REQUEST['limit'] ?>&amp;page=<?php echo $_REQUEST['page'] ?>"><?php echo $SLANG['Delete'] ?></a>
</div> </div>
<?php <?php
} }
?> ?>
<h2><?= makeLink( '?view=eventdetails&amp;eid='.$_REQUEST['eid'], $event['Name'].($event['Archived']?'*':''), canEdit( 'Events' ) ) ?></h2> <h2><?php echo makeLink( '?view=eventdetails&amp;eid='.$_REQUEST['eid'], $event['Name'].($event['Archived']?'*':''), canEdit( 'Events' ) ) ?></h2>
</div> </div>
<div id="content"> <div id="content">
<?php <?php
if ( $pagination ) if ( $pagination )
{ {
?> ?>
<h3 class="pagination"><?= $pagination ?></h3> <h3 class="pagination"><?php echo $pagination ?></h3>
<?php <?php
} }
?> ?>
@ -136,7 +136,7 @@ foreach ( $frames as $frame )
{ {
$imageData = getImageSrc( $event, $frame, $scale ); $imageData = getImageSrc( $event, $frame, $scale );
?> ?>
<a href="?view=frame&amp;eid=<?= $_REQUEST['eid'] ?>&amp;fid=<?= $frame['FrameId'] ?>"><img src="<?= viewImagePath( $imageData['thumbPath'] ) ?>" class="<?= $imageData['imageClass'] ?>" alt="<?= $frame['Type'] ?>/<?= $frame['Type']=='Alarm'?$frame['Score']:0 ?>"/></a> <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>"><img src="<?php echo viewImagePath( $imageData['thumbPath'] ) ?>" class="<?php echo $imageData['imageClass'] ?>" alt="<?php echo $frame['Type'] ?>/<?php echo $frame['Type']=='Alarm'?$frame['Score']:0 ?>"/></a>
<?php <?php
} }
?> ?>

36
web/skins/mobile/views/eventdetails.php
View File

@ -42,43 +42,43 @@ xhtmlHeaders( __FILE__, $SLANG['Event'].' - '.$_REQUEST['eid'] );
<div id="content"> <div id="content">
<table id="contentTable" class="major"> <table id="contentTable" class="major">
<tr> <tr>
<th scope="row"><?= $SLANG['Name'] ?></th> <th scope="row"><?php echo $SLANG['Name'] ?></th>
<td><?= htmlentities($event['Name']) ?><?= $event['Archived']?("(".$SLANG['Archived'].")"):"" ?></td> <td><?php echo htmlentities($event['Name']) ?><?php echo $event['Archived']?("(".$SLANG['Archived'].")"):"" ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Time'] ?></th> <th scope="row"><?php echo $SLANG['Time'] ?></th>
<td><?= htmlentities(strftime("%b %d, %H:%M",strtotime($event['StartTime']))) ?></td> <td><?php echo htmlentities(strftime("%b %d, %H:%M",strtotime($event['StartTime']))) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Duration'] ?></th> <th scope="row"><?php echo $SLANG['Duration'] ?></th>
<td><?= htmlentities($event['Length']) ?>s</td> <td><?php echo htmlentities($event['Length']) ?>s</td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Cause'] ?></th> <th scope="row"><?php echo $SLANG['Cause'] ?></th>
<td><?= htmlentities($event['Cause']) ?></td> <td><?php echo htmlentities($event['Cause']) ?></td>
</tr> </tr>
<?php if ( !empty($event['Notes']) ) { ?> <?php if ( !empty($event['Notes']) ) { ?>
<tr> <tr>
<th scope="row"><?= $SLANG['Notes'] ?></th> <th scope="row"><?php echo $SLANG['Notes'] ?></th>
<td><?= htmlentities($event['Notes']) ?></td> <td><?php echo htmlentities($event['Notes']) ?></td>
</tr> </tr>
<?php } ?> <?php } ?>
<tr> <tr>
<th scope="row"><?= $SLANG['Frames'] ?></th> <th scope="row"><?php echo $SLANG['Frames'] ?></th>
<td><?= $event['Frames'] ?> (<?= $event['AlarmFrames'] ?>)</td> <td><?php echo $event['Frames'] ?> (<?php echo $event['AlarmFrames'] ?>)</td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['Score'] ?></th> <th scope="row"><?php echo $SLANG['Score'] ?></th>
<td><?= $event['TotScore'] ?>/<?= $event['AvgScore'] ?>/<?= $event['MaxScore'] ?></td> <td><?php echo $event['TotScore'] ?>/<?php echo $event['AvgScore'] ?>/<?php echo $event['MaxScore'] ?></td>
</tr> </tr>
</table> </table>
<div id="eventImages"> <div id="eventImages">
<a href="?view=frame&amp;eid=<?= $_REQUEST['eid'] ?>&amp;fid=1"><img src="<?= viewImagePath( $image1['thumbPath'] ) ?>" alt="1"/></a> <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=1"><img src="<?php echo viewImagePath( $image1['thumbPath'] ) ?>" alt="1"/></a>
<a href="?view=frame&amp;eid=<?= $_REQUEST['eid'] ?>&amp;fid=<?= $frame['FrameId'] ?>"><img src="<?= viewImagePath( $image2['thumbPath'] ) ?>" alt="<?= $frame['FrameId'] ?>"/></a> <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>"><img src="<?php echo viewImagePath( $image2['thumbPath'] ) ?>" alt="<?php echo $frame['FrameId'] ?>"/></a>
</div> </div>
<div id="contenButtons"> <div id="contenButtons">
<a href="?view=event&amp;eid=<?= $_REQUEST['eid'] ?>&amp;page=1"><?= $SLANG['Frames'] ?></a> <a href="?view=event&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;page=1"><?php echo $SLANG['Frames'] ?></a>
<a href="?view=video&amp;eid=<?= $_REQUEST['eid'] ?>"><?= $SLANG['Video'] ?></a> <a href="?view=video&amp;eid=<?php echo $_REQUEST['eid'] ?>"><?php echo $SLANG['Video'] ?></a>
</div> </div>
</div> </div>
</div> </div>

28
web/skins/mobile/views/events.php
View File

@ -109,15 +109,15 @@ xhtmlHeaders( __FILE__, $SLANG['Events'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"><?= makeLink( "?view=filter", empty($_REQUEST['filterName'])?$SLANG['ChooseFilter']:$_REQUEST['filterName'], canView( 'Events' ) ) ?></div> <div id="headerButtons"><?php echo makeLink( "?view=filter", empty($_REQUEST['filterName'])?$SLANG['ChooseFilter']:$_REQUEST['filterName'], canView( 'Events' ) ) ?></div>
<h2><?= sprintf( $CLANG['EventCount'], $nEvents, zmVlang( $VLANG['Event'], $nEvents ) ) ?></h2> <h2><?php echo sprintf( $CLANG['EventCount'], $nEvents, zmVlang( $VLANG['Event'], $nEvents ) ) ?></h2>
</div> </div>
<div id="content"> <div id="content">
<?php <?php
if ( $pagination ) if ( $pagination )
{ {
?> ?>
<h3 class="pagination"><?= $pagination ?></h3> <h3 class="pagination"><?php echo $pagination ?></h3>
<?php <?php
} }
?> ?>
@ -130,27 +130,27 @@ if ( $pagination )
{ {
?> ?>
<tr> <tr>
<th class="colId"><a href="<?= sortHeader( 'Id', '&amp;' ) ?>"><?= substr( $SLANG['Id'], 0, 3 ) ?><?= sortTag( 'Id' ) ?></a></th> <th class="colId"><a href="<?php echo sortHeader( 'Id', '&amp;' ) ?>"><?php echo substr( $SLANG['Id'], 0, 3 ) ?><?php echo sortTag( 'Id' ) ?></a></th>
<th class="colTime"><a href="<?= sortHeader( 'StartTime', '&amp;' ) ?>"><?= substr( $SLANG['Time'], 0, 3 ) ?><?= sortTag( 'StartTime' ) ?></a></th> <th class="colTime"><a href="<?php echo sortHeader( 'StartTime', '&amp;' ) ?>"><?php echo substr( $SLANG['Time'], 0, 3 ) ?><?php echo sortTag( 'StartTime' ) ?></a></th>
<th class="colDuration"><a href="<?= sortHeader( 'Length', '&amp;' ) ?>"><?= substr( $SLANG['Duration'], 0, 3 ) ?><?= sortTag( 'Length' ) ?></a></th> <th class="colDuration"><a href="<?php echo sortHeader( 'Length', '&amp;' ) ?>"><?php echo substr( $SLANG['Duration'], 0, 3 ) ?><?php echo sortTag( 'Length' ) ?></a></th>
<th class="colFrames"><a href="<?= sortHeader( 'Frames', '&amp;' ) ?>"><?= substr( $SLANG['Frames'], 0, 3 ) ?><?= sortTag( 'Frames' ) ?></a></th> <th class="colFrames"><a href="<?php echo sortHeader( 'Frames', '&amp;' ) ?>"><?php echo substr( $SLANG['Frames'], 0, 3 ) ?><?php echo sortTag( 'Frames' ) ?></a></th>
<th class="colScore"><a href="<?= sortHeader( 'TotScore', '&amp;' ) ?>"><?= substr( $SLANG['Score'], 0, 3 ) ?><?= sortTag( 'TotScore' ) ?></a></th> <th class="colScore"><a href="<?php echo sortHeader( 'TotScore', '&amp;' ) ?>"><?php echo substr( $SLANG['Score'], 0, 3 ) ?><?php echo sortTag( 'TotScore' ) ?></a></th>
</tr> </tr>
<?php <?php
} }
?> ?>
<tr> <tr>
<td class="colId"><a href="?view=eventdetails&amp;eid=<?= $event['Id'] ?>&amp;page=1"><?= $event['Id'] ?><?php if ( $event['Archived'] ) echo "*" ?></a></td> <td class="colId"><a href="?view=eventdetails&amp;eid=<?php echo $event['Id'] ?>&amp;page=1"><?php echo $event['Id'] ?><?php if ( $event['Archived'] ) echo "*" ?></a></td>
<td class="colTime"><?= strftime( "%d/%H:%M", strtotime($event['StartTime']) ) ?></td> <td class="colTime"><?php echo strftime( "%d/%H:%M", strtotime($event['StartTime']) ) ?></td>
<td class="colDuration"><?= sprintf( "%d", $event['Length'] ) ?></td> <td class="colDuration"><?php echo sprintf( "%d", $event['Length'] ) ?></td>
<td class="colFrames"><a href="?view=event&amp;eid=<?= $event['Id'] ?>&amp;page=1"><?= $event['AlarmFrames'] ?></a></td> <td class="colFrames"><a href="?view=event&amp;eid=<?php echo $event['Id'] ?>&amp;page=1"><?php echo $event['AlarmFrames'] ?></a></td>
<td class="colScore"><a href="?view=frame&amp;eid=<?= $event['Id'] ?>&amp;fid=0"><?= $event['MaxScore'] ?></a></td> <td class="colScore"><a href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=0"><?php echo $event['MaxScore'] ?></a></td>
</tr> </tr>
<?php <?php
} }
?> ?>
</table> </table>
<p><a href="?view=console"><?= $SLANG['Console'] ?></a></p> <p><a href="?view=console"><?php echo $SLANG['Console'] ?></a></p>
</div> </div>
</div> </div>
</body> </body>

8
web/skins/mobile/views/filter.php
View File

@ -38,7 +38,7 @@ xhtmlHeaders( __FILE__, $SLANG['EventFilter'] );
<div id="header"> <div id="header">
</div> </div>
<div id="content"> <div id="content">
<form method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<div class="hidden"> <div class="hidden">
<fieldset> <fieldset>
<input type="hidden" name="view" value="events"/> <input type="hidden" name="view" value="events"/>
@ -50,17 +50,17 @@ if ( count($filterNames) > 0 )
{ {
?> ?>
<div> <div>
<label for="filterName"><?= $SLANG['UseFilter'] ?></label><?= buildSelect( "filterName", $filterNames ); ?> <label for="filterName"><?php echo $SLANG['UseFilter'] ?></label><?php echo buildSelect( "filterName", $filterNames ); ?>
</div> </div>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Submit'] ?>"/> <input type="submit" value="<?php echo $SLANG['Submit'] ?>"/>
</div> </div>
<?php <?php
} }
else else
{ {
?> ?>
<p><?= $SLANG['NoSavedFilters'] ?></p> <p><?php echo $SLANG['NoSavedFilters'] ?></p>
<?php <?php
} }
?> ?>

12
web/skins/mobile/views/frame.php
View File

@ -52,19 +52,19 @@ xhtmlHeaders( __FILE__, $SLANG['Frame'].' - '.$_REQUEST['eid'].'-'.$frame['Frame
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['Frame'] ?> <?= $_REQUEST['eid']."-".$frame['FrameId']." (".$frame['Score'].")" ?></h2> <h2><?php echo $SLANG['Frame'] ?> <?php echo $_REQUEST['eid']."-".$frame['FrameId']." (".$frame['Score'].")" ?></h2>
</div> </div>
<div id="content"> <div id="content">
<?php if ( $imageData['hasAnalImage'] ) { ?><a href="?view=frame&amp;eid=<?= $_REQUEST['eid'] ?>&amp;fid=<?= $frame['FrameId'] ?>&amp;show=<?= $imageData['isAnalImage']?"capt":"anal" ?>"><?php } ?><img src="<?= viewImagePath( $imageData['thumbPath'] ) ?>" class="<?= $imageData['imageClass'] ?>"/><?php if ( $imageData['hasAnalImage'] ) { ?></a><?php } ?> <?php if ( $imageData['hasAnalImage'] ) { ?><a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>&amp;show=<?php echo $imageData['isAnalImage']?"capt":"anal" ?>"><?php } ?><img src="<?php echo viewImagePath( $imageData['thumbPath'] ) ?>" class="<?php echo $imageData['imageClass'] ?>"/><?php if ( $imageData['hasAnalImage'] ) { ?></a><?php } ?>
<div id="contentButtons"> <div id="contentButtons">
<?php if ( $frame['FrameId'] > 1 ) { ?> <?php if ( $frame['FrameId'] > 1 ) { ?>
<a href="?view=frame&amp;eid=<?= $_REQUEST['eid'] ?>&amp;fid=<?= $firstFid ?>">&lt;&lt;</a> <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $firstFid ?>">&lt;&lt;</a>
<?php } if ( $frame['FrameId'] > 1 ) { ?> <?php } if ( $frame['FrameId'] > 1 ) { ?>
<a href="?view=frame&amp;eid=<?= $_REQUEST['eid'] ?>&amp;fid=<?= $prevFid ?>">&lt;</a> <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $prevFid ?>">&lt;</a>
<?php } if ( $frame['FrameId'] < $maxFid ) { ?> <?php } if ( $frame['FrameId'] < $maxFid ) { ?>
<a href="?view=frame&amp;eid=<?= $_REQUEST['eid'] ?>&amp;fid=<?= $nextFid ?>">&gt;</a> <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $nextFid ?>">&gt;</a>
<?php } if ( $frame['FrameId'] < $maxFid ) { ?> <?php } if ( $frame['FrameId'] < $maxFid ) { ?>
<a href="?view=frame&amp;eid=<?= $_REQUEST['eid'] ?>&amp;fid=<?= $lastFid ?>">&gt;&gt;</a> <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $lastFid ?>">&gt;&gt;</a>
<?php } ?> <?php } ?>
</div> </div>
</div> </div>

12
web/skins/mobile/views/function.php
View File

@ -30,15 +30,15 @@ xhtmlHeaders( __FILE__, $SLANG['Function'].' - '.$monitor['Name'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= sprintf( $CLANG['MonitorFunction'], $monitor['Name'] ) ?></h2> <h2><?php echo sprintf( $CLANG['MonitorFunction'], $monitor['Name'] ) ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<div class="hidden"> <div class="hidden">
<fieldset> <fieldset>
<input type="hidden" name="view" value="console"/> <input type="hidden" name="view" value="console"/>
<input type="hidden" name="action" value="function"/> <input type="hidden" name="action" value="function"/>
<input type="hidden" name="mid" value="<?= $_REQUEST['mid'] ?>"/> <input type="hidden" name="mid" value="<?php echo $_REQUEST['mid'] ?>"/>
</fieldset> </fieldset>
</div> </div>
<div> <div>
@ -47,17 +47,17 @@ xhtmlHeaders( __FILE__, $SLANG['Function'].' - '.$monitor['Name'] );
foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction ) foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction )
{ {
?> ?>
<option value="<?= $optFunction ?>"<?php if ( $optFunction == $monitor['Function'] ) { ?> selected="selected"<?php } ?>><?= $optFunction ?></option> <option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $monitor['Function'] ) { ?> selected="selected"<?php } ?>><?php echo $optFunction ?></option>
<?php <?php
} }
?> ?>
</select> </select>
</div> </div>
<div> <div>
<label for="newEnabled"><?= $SLANG['Enabled'] ?></label><input type="checkbox" name="newEnabled" id="newEnabled" value="1"<?php if ( !empty($monitor['Enabled']) ) { ?> checked="checked"<?php } ?>/> <label for="newEnabled"><?php echo $SLANG['Enabled'] ?></label><input type="checkbox" name="newEnabled" id="newEnabled" value="1"<?php if ( !empty($monitor['Enabled']) ) { ?> checked="checked"<?php } ?>/>
</div> </div>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Save'] ?>"/> <input type="submit" value="<?php echo $SLANG['Save'] ?>"/>
</div> </div>
</form> </form>
</div> </div>

12
web/skins/mobile/views/login.php
View File

@ -24,10 +24,10 @@ xhtmlHeaders( __FILE__, $SLANG['Login'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h1>ZoneMinder <?= $SLANG['Login'] ?></h1> <h1>ZoneMinder <?php echo $SLANG['Login'] ?></h1>
</div> </div>
<div id="content"> <div id="content">
<form method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<div class="hidden"> <div class="hidden">
<fieldset> <fieldset>
<input type="hidden" name="action" value="login"/> <input type="hidden" name="action" value="login"/>
@ -36,16 +36,16 @@ xhtmlHeaders( __FILE__, $SLANG['Login'] );
</div> </div>
<table id="contentTable" class="minor"> <table id="contentTable" class="minor">
<tr> <tr>
<th scope="row" class="colLeft"><?= $SLANG['Username'] ?></th> <th scope="row" class="colLeft"><?php echo $SLANG['Username'] ?></th>
<td class="colRight"><input type="text" name="username" value="<?= isset($username)?$username:"" ?>" size="12"/></td> <td class="colRight"><input type="text" name="username" value="<?php echo isset($username)?$username:"" ?>" size="12"/></td>
</tr> </tr>
<tr> <tr>
<th scope="row" class="colLeft"><?= $SLANG['Password'] ?></th> <th scope="row" class="colLeft"><?php echo $SLANG['Password'] ?></th>
<td class="colRight"><input type="password" name="password" value="" size="12"/></td> <td class="colRight"><input type="password" name="password" value="" size="12"/></td>
</tr> </tr>
</table> </table>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Login'] ?>"/> <input type="submit" value="<?php echo $SLANG['Login'] ?>"/>
</div> </div>
</form> </form>
</div> </div>

6
web/skins/mobile/views/montage.php
View File

@ -52,7 +52,7 @@ xhtmlHeaders( __FILE__, $SLANG['Montage'] );
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<div id="headerButtons"> <div id="headerButtons">
<a href="?view=<?= $_REQUEST['view'] ?>"><?= $SLANG['Refresh'] ?></a> <a href="?view=<?php echo $_REQUEST['view'] ?>"><?php echo $SLANG['Refresh'] ?></a>
</div> </div>
</div> </div>
<div id="content"> <div id="content">
@ -63,12 +63,12 @@ foreach( $monitors as $monitor )
$scale = getDeviceScale( $monitor['Width'], $monitor['Height'], $imagesPerLine*1.1 ); $scale = getDeviceScale( $monitor['Width'], $monitor['Height'], $imagesPerLine*1.1 );
$imagePath = getStreamSrc( array( "mode=single", "monitor=".$monitor['Id'], "scale=".$scale ), '&amp;' ); $imagePath = getStreamSrc( array( "mode=single", "monitor=".$monitor['Id'], "scale=".$scale ), '&amp;' );
?> ?>
<a href="?view=watch&amp;mid=<?= $monitor['Id'] ?>"><img src="<?= viewImagePath( $imagePath ) ?>" alt="<?= $monitor['Name'] ?>"/></a> <a href="?view=watch&amp;mid=<?php echo $monitor['Id'] ?>"><img src="<?php echo viewImagePath( $imagePath ) ?>" alt="<?php echo $monitor['Name'] ?>"/></a>
<?php <?php
} }
?> ?>
</div> </div>
<div id="contentButtons"><a href="?view=console"><?= $SLANG['Console'] ?></a></div> <div id="contentButtons"><a href="?view=console"><?php echo $SLANG['Console'] ?></a></div>
</div> </div>
</div> </div>
</body> </body>

14
web/skins/mobile/views/state.php
View File

@ -32,10 +32,10 @@ xhtmlHeaders( __FILE__, $SLANG['State'] );
<body> <body>
<div id="page"> <div id="page">
<div id="header"> <div id="header">
<h2><?= $SLANG['RunState'] ?></h2> <h2><?php echo $SLANG['RunState'] ?></h2>
</div> </div>
<div id="content"> <div id="content">
<form method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<div class="hidden"> <div class="hidden">
<fieldset> <fieldset>
<input type="hidden" name="view" value="console"/> <input type="hidden" name="view" value="console"/>
@ -47,14 +47,14 @@ xhtmlHeaders( __FILE__, $SLANG['State'] );
if ( $running ) if ( $running )
{ {
?> ?>
<option value="stop" selected="selected"><?= $SLANG['Stop'] ?></option> <option value="stop" selected="selected"><?php echo $SLANG['Stop'] ?></option>
<option value="restart"><?= $SLANG['Restart'] ?></option> <option value="restart"><?php echo $SLANG['Restart'] ?></option>
<?php <?php
} }
else else
{ {
?> ?>
<option value="start" selected="selected"><?= $SLANG['Start'] ?></option> <option value="start" selected="selected"><?php echo $SLANG['Start'] ?></option>
<?php <?php
} }
?> ?>
@ -62,13 +62,13 @@ else
foreach ( $states as $state ) foreach ( $states as $state )
{ {
?> ?>
<option value="<?= $state['Name'] ?>"><?= $state['Name'] ?></option> <option value="<?php echo $state['Name'] ?>"><?php echo $state['Name'] ?></option>
<?php <?php
} }
?> ?>
</select> </select>
<div id="contentButtons"> <div id="contentButtons">
<input type="submit" value="<?= $SLANG['Apply'] ?>"/> <input type="submit" value="<?php echo $SLANG['Apply'] ?>"/>
</div> </div>
</form> </form>
</div> </div>

46
web/skins/mobile/views/video.php
View File

@ -110,29 +110,29 @@ xhtmlHeaders( __FILE__, $SLANG['Video'].' - '.$event['Name'] );
<body> <body>
<div id="page"> <div id="page">
<div id="content"> <div id="content">
<form method="post" action="<?= $_SERVER['PHP_SELF'] ?>"> <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
<div class="hidden"> <div class="hidden">
<fieldset> <fieldset>
<input type="hidden" name="view" value="<?= $_REQUEST['view'] ?>"/> <input type="hidden" name="view" value="<?php echo $_REQUEST['view'] ?>"/>
<input type="hidden" name="eid" value="<?= $_REQUEST['eid'] ?>"/> <input type="hidden" name="eid" value="<?php echo $_REQUEST['eid'] ?>"/>
<input type="hidden" name="generate" value="1"/> <input type="hidden" name="generate" value="1"/>
</fieldset> </fieldset>
</div> </div>
<table id="contentTable" class="minor"> <table id="contentTable" class="minor">
<tr> <tr>
<th scope="row"><?= $SLANG['VideoFormat'] ?></th> <th scope="row"><?php echo $SLANG['VideoFormat'] ?></th>
<td><?= buildSelect( "videoFormat", $videoFormats ) ?></td> <td><?php echo buildSelect( "videoFormat", $videoFormats ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['FrameRate'] ?></th> <th scope="row"><?php echo $SLANG['FrameRate'] ?></th>
<td><?= buildSelect( "rate", $rates ) ?></td> <td><?php echo buildSelect( "rate", $rates ) ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><?= $SLANG['OverwriteExisting'] ?></th> <th scope="row"><?php echo $SLANG['OverwriteExisting'] ?></th>
<td><input type="checkbox" name="overwrite" value="1"<?php if ( isset($overwrite) ) { ?> checked="checked"<?php } ?>/></td> <td><input type="checkbox" name="overwrite" value="1"<?php if ( isset($overwrite) ) { ?> checked="checked"<?php } ?>/></td>
</tr> </tr>
</table> </table>
<div id="contentButtons"><input type="submit" value="<?= $SLANG['GenerateVideo'] ?>"/></div> <div id="contentButtons"><input type="submit" value="<?php echo $SLANG['GenerateVideo'] ?>"/></div>
</form> </form>
<?php <?php
if ( isset($videoFile) ) if ( isset($videoFile) )
@ -140,13 +140,13 @@ xhtmlHeaders( __FILE__, $SLANG['Video'].' - '.$event['Name'] );
if ( $videoFile ) if ( $videoFile )
{ {
?> ?>
<p class="infoText"><?= $SLANG['VideoGenSucceeded'] ?></p> <p class="infoText"><?php echo $SLANG['VideoGenSucceeded'] ?></p>
<?php <?php
} }
else else
{ {
?> ?>
<p class="errorText"><?= $SLANG['VideoGenFailed'] ?></p> <p class="errorText"><?php echo $SLANG['VideoGenFailed'] ?></p>
<?php <?php
} }
} }
@ -163,14 +163,14 @@ xhtmlHeaders( __FILE__, $SLANG['Video'].' - '.$event['Name'] );
if ( count($videoFiles) ) if ( count($videoFiles) )
{ {
?> ?>
<h3><?= $SLANG['VideoGenFiles'] ?></h3> <h3><?php echo $SLANG['VideoGenFiles'] ?></h3>
<table class="major"> <table class="major">
<tr> <tr>
<th><?= $SLANG['Format'] ?></th> <th><?php echo $SLANG['Format'] ?></th>
<th><?= $SLANG['Size'] ?></th> <th><?php echo $SLANG['Size'] ?></th>
<th><?= $SLANG['Rate'] ?></th> <th><?php echo $SLANG['Rate'] ?></th>
<th><?= $SLANG['Scale'] ?></th> <th><?php echo $SLANG['Scale'] ?></th>
<th><?= $SLANG['Action'] ?></th> <th><?php echo $SLANG['Action'] ?></th>
</tr> </tr>
<?php <?php
if ( count($videoFiles) > 0 ) if ( count($videoFiles) > 0 )
@ -199,11 +199,11 @@ xhtmlHeaders( __FILE__, $SLANG['Video'].' - '.$event['Name'] );
} }
?> ?>
<tr> <tr>
<td><?= $matches[4] ?></td> <td><?php echo $matches[4] ?></td>
<td><?= filesize( $file ) ?></td> <td><?php echo filesize( $file ) ?></td>
<td><?= $rateText ?></td> <td><?php echo $rateText ?></td>
<td><?= $scaleText ?></td> <td><?php echo $scaleText ?></td>
<td><a href="?view=<?= $_REQUEST['view'] ?>&amp;eid=<?= $_REQUEST['eid'] ?>&amp;download=<?= $index ?>"><?= $SLANG['View'] ?></a>&nbsp;/&nbsp;<a href="?view=<?= $_REQUEST['view'] ?>&amp;eid=<?= $_REQUEST['eid'] ?>&amp;delete=<?= $index ?>"><?= $SLANG['Delete'] ?></a></td> <td><a href="?view=<?php echo $_REQUEST['view'] ?>&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;download=<?php echo $index ?>"><?php echo $SLANG['View'] ?></a>&nbsp;/&nbsp;<a href="?view=<?php echo $_REQUEST['view'] ?>&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;delete=<?php echo $index ?>"><?php echo $SLANG['Delete'] ?></a></td>
</tr> </tr>
<?php <?php
$index++; $index++;
@ -216,7 +216,7 @@ xhtmlHeaders( __FILE__, $SLANG['Video'].' - '.$event['Name'] );
else else
{ {
?> ?>
<p class="warnText"><?= $SLANG['VideoGenNoFiles'] ?></p> <p class="warnText"><?php echo $SLANG['VideoGenNoFiles'] ?></p>
<?php <?php
} }
?> ?>

12
web/skins/mobile/views/watch.php
View File

@ -104,7 +104,7 @@ xhtmlHeaders( __FILE__, $monitor['Name'].' - '.$SLANG['Watch'] );
<body> <body>
<div id="page"> <div id="page">
<div id="content"> <div id="content">
<p class="<?= $class ?>"><?= makeLink( "?view=events&amp;page=1&amp;view=events&amp;page=1&amp;filter%5Bterms%5D%5B0%5D%5Battr%5D%3DMonitorId&amp;filter%5Bterms%5D%5B0%5D%5Bop%5D%3D%3D&amp;filter%5Bterms%5D%5B0%5D%5Bval%5D%3D".$monitor['Id']."&amp;sort_field=Id&amp;sort_desc=1", $monitor['Name'], canView( 'Events' ) ) ?>:&nbsp;<?= $statusString ?>&nbsp;-&nbsp;<?= $fpsString ?>&nbsp;fps</p> <p class="<?php echo $class ?>"><?php echo makeLink( "?view=events&amp;page=1&amp;view=events&amp;page=1&amp;filter%5Bterms%5D%5B0%5D%5Battr%5D%3DMonitorId&amp;filter%5Bterms%5D%5B0%5D%5Bop%5D%3D%3D&amp;filter%5Bterms%5D%5B0%5D%5Bval%5D%3D".$monitor['Id']."&amp;sort_field=Id&amp;sort_desc=1", $monitor['Name'], canView( 'Events' ) ) ?>:&nbsp;<?php echo $statusString ?>&nbsp;-&nbsp;<?php echo $fpsString ?>&nbsp;fps</p>
<p> <p>
<?php <?php
if ( $streamMode == "mpeg" ) if ( $streamMode == "mpeg" )
@ -121,7 +121,7 @@ elseif ( $streamMode == "jpeg" )
else else
{ {
?> ?>
<a href="?view=<?= $_REQUEST['view'] ?>&amp;mid=<?= $monitor['Id'] ?>"><?= outputImageStill( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] ); ?></a> <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $monitor['Id'] ?>"><?php echo outputImageStill( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] ); ?></a>
<?php <?php
} }
?> ?>
@ -133,7 +133,7 @@ if ( $showPtzControls )
require_once $includeFile; require_once $includeFile;
?> ?>
<div id="ptzControls"> <div id="ptzControls">
<?= ptzControls( $monitor ) ?> <?php echo ptzControls( $monitor ) ?>
</div> </div>
<?php <?php
} }
@ -141,9 +141,9 @@ if ( $nextMid != $monitor['Id'] || $prevMid != $monitor['Id'] )
{ {
?> ?>
<div id="contentButtons"> <div id="contentButtons">
<a href="?view=<?= $_REQUEST['view'] ?>&amp;mid=<?= $prevMid ?>"><?= $SLANG['Prev'] ?></a> <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $prevMid ?>"><?php echo $SLANG['Prev'] ?></a>
<a href="?view=console"><?= $SLANG['Console'] ?></a> <a href="?view=console"><?php echo $SLANG['Console'] ?></a>
<a href="?view=<?= $_REQUEST['view'] ?>&amp;mid=<?= $nextMid ?>"><?= $SLANG['Next'] ?></a> <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $nextMid ?>"><?php echo $SLANG['Next'] ?></a>
</div> </div>
<?php <?php
} }

2
zm.conf.in
View File

@ -19,7 +19,7 @@ ZM_PATH_BIN=@BINDIR@
ZM_PATH_LIB=@LIBDIR@ ZM_PATH_LIB=@LIBDIR@
# Path to ZoneMinder configuration (this file only at present) # Path to ZoneMinder configuration (this file only at present)
ZM_PATH_CONF=@SYSCONFDIR@ ZM_PATH_CONF=@ZM_CONFIG_DIR@
# Path to ZoneMinder web files # Path to ZoneMinder web files
ZM_PATH_WEB=@WEB_PREFIX@ ZM_PATH_WEB=@WEB_PREFIX@