diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index b62d85d4a..cb7e30087 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -104,6 +104,8 @@ $opTypes = array(
'!~' => translate('OpNotMatches'),
'=[]' => translate('OpIn'),
'![]' => translate('OpNotIn'),
+ 'IS' => translate('OpIs'),
+ 'IS NOT' => translate('OpIsNot'),
);
$archiveTypes = array(
diff --git a/web/skins/classic/views/group.php b/web/skins/classic/views/group.php
index 9f00555dd..0e71040c7 100644
--- a/web/skins/classic/views/group.php
+++ b/web/skins/classic/views/group.php
@@ -87,9 +87,11 @@ function get_children($Group) {
}
$kids = get_children($newGroup);
-$kids[] = $newGroup->Id();
+if ( $newGroup->Id() )
+ $kids[] = $newGroup->Id();
+$sql = 'SELECT Id,Name from Groups'.(count($kids)?' WHERE Id NOT IN ('.implode(',',array_map(function(){return '?';}, $kids )).')' : '').' ORDER BY Name';
$options = array(''=>'None');
-foreach ( dbFetchAll( 'SELECT Id,Name from Groups WHERE Id NOT IN ('.implode(',',array_map(function(){return '?';}, $kids )).') ORDER BY Name', null, $kids ) as $option ) {
+foreach ( dbFetchAll( $sql, null, $kids ) as $option ) {
$options[$option['Id']] = $option['Name'];
}
echo htmlSelect( 'newGroup[ParentId]', $options, $newGroup->ParentId(), array('onchange'=>'configureButtons(this);' ));
diff --git a/web/skins/classic/views/js/add_monitors.js b/web/skins/classic/views/js/add_monitors.js
new file mode 100644
index 000000000..a94fd2200
--- /dev/null
+++ b/web/skins/classic/views/js/add_monitors.js
@@ -0,0 +1,89 @@
+
+var probeReq = new Request.JSON( { url:thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getProbeResponse } );
+
+function probe( url_e ) {
+ probeReq.send( "request=add_monitors&action=probe&url="+url_e.value );
+}
+
+var ProbeResults;
+
+function getProbeResponse( respObj, respText ) {
+ if ( checkStreamForErrors( "getProbeResponse", respObj ) )
+ return;
+//alert(respText);
+
+ if ( respObj.Streams ) {
+ parseStreams( respObj.Streams );
+ } else {
+ alert("No Streams");
+ }
+} // end function getProbeResponse
+
+function parseStreams( Streams ) {
+ ProbeResults = Array();
+
+ var results_div = $j('#url_results')[0];
+ if ( ! results_div ) {
+ console.log("No results div found.");
+ return;
+ }
+ results_div.innerHTML = '';
+ var html = '';
+
+ for( i in Streams ) {
+ var stream = Streams[i];
+ if ( stream.url ) {
+ html += '
'+stream.url;
+ if ( stream.Monitor.Id ) {
+ html += ' is already entered into the system by Monitor ' + stream.Monitor.Id + ' ' + stream.Monitor.Name + ' ';
+ html += '';
+ } else {
+ html += '';
+ }
+ html += '
';
+ ProbeResults[stream.url] = stream;
+ } else {
+ //console.log(stream);
+ }
+ } // end for eah Stream
+
+ results_div.innerHTML = html;
+}
+
+function addMonitor(url) {
+ if ( ! ProbeResults[url] ) {
+ alert("Monitor for url " + url + " not found in probe results." );
+ return;
+ }
+ var Stream = ProbeResults[url];
+ var Monitor = Stream.Monitor;
+
+ popup_url = '?view=monitor&newMonitor[Path]='+url;
+ keys = Object.keys( Monitor );
+ for ( i in Monitor ) {
+ if ( ! Monitor[i] )
+ continue;
+ if ( Monitor[i] == 'null' )
+ Monitor[i]='';
+ popup_url += '&newMonitor['+i+']='+Monitor[i];
+ }
+ createPopup( popup_url, 'zmMonitor0', 'monitor' );
+}
+
+function import_csv( form ) {
+ var formData = new FormData( form );
+ console.log(formData);
+ //formData.append('file', $('#file')[0].files[0]);
+
+ $j.ajax({
+ url : thisUrl+"?request=add_monitors&action=import",
+ type : 'POST',
+ data : formData,
+ processData: false, // tell jQuery not to process the data
+ contentType: false, // tell jQuery not to set contentType
+ success : function(data) {
+ var json = JSON.parse(data);
+ parseStreams( json.Streams );
+ }
+ });
+}
diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js
index 9675a96b5..3ba206f81 100644
--- a/web/skins/classic/views/js/console.js
+++ b/web/skins/classic/views/js/console.js
@@ -19,7 +19,7 @@ function setButtonStates( element ) {
form.deleteBtn.disabled = (checked==0);
}
-function addMonitor( element) {
+function addMonitor(element) {
var form = element.form;
var dupParam;
var monitorId=-1;
diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php
index 97a60dd8c..470bb92b8 100644
--- a/web/skins/classic/views/js/monitor.js.php
+++ b/web/skins/classic/views/js/monitor.js.php
@@ -97,7 +97,7 @@ function validateForm( form ) {
errors[errors.length] = "";
if ( !form.elements['newMonitor[WarmupCount]'].value || !(parseInt(form.elements['newMonitor[WarmupCount]'].value) >= 0 ) )
errors[errors.length] = "";
- 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] = "";
if ( !form.elements['newMonitor[PostEventCount]'].value || !(parseInt(form.elements['newMonitor[PostEventCount]'].value) >= 0 ) )
errors[errors.length] = "";
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 3fe8c5b87..364e79b91 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -7,11 +7,10 @@ function Monitor( monitorData ) {
this.status = null;
this.alarmState = STATE_IDLE;
this.lastAlarmState = STATE_IDLE;
- this.streamCmdParms = "view=request&request=stream&connkey="+this.connKey;
+ this.streamCmdParms = 'view=request&request=stream&connkey='+this.connKey;
+ this.onclick = monitorData.onclick;
if ( auth_hash )
this.streamCmdParms += '&auth='+auth_hash;
- else
- console.log("No auth_hash");
this.streamCmdTimer = null;
this.start = function( delay ) {
@@ -34,7 +33,8 @@ function Monitor( monitorData ) {
if ( this.streamCmdTimer )
this.streamCmdTimer = clearTimeout( this.streamCmdTimer );
- var stream = $j('#liveStream'+this.id )[0];
+ var stream = $j('#liveStream'+this.id)[0];
+
if ( respObj.result == 'Ok' ) {
this.status = respObj.status;
this.alarmState = this.status.state;
@@ -83,42 +83,100 @@ function Monitor( monitorData ) {
// Try to reload the image stream.
if ( stream )
stream.src = stream.src.replace( /auth=\w+/i, 'auth='+this.status.auth );
- console.log("Changed auth to " + this.status.auth );
+ console.log("Changed auth from " + auth_hash + " to " + this.status.auth );
+ auth_hash = this.status.auth;
}
- } // end if haev a new auth hash
+ } // end if have a new auth hash
} else {
console.error( respObj.message );
// Try to reload the image stream.
- if ( stream )
+ if ( stream ) {
+ console.log('Reloading stream: ' + stream.src );
stream.src = stream.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
- }
+ } else {
+ console.log( 'No stream to reload?' );
+ }
+ } // end if Ok or not
var streamCmdTimeout = statusRefreshTimeout;
- if ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT )
- streamCmdTimeout = streamCmdTimeout/5;
+ // The idea here is if we are alarmed, do updates faster. However, there is a timeout in the php side which isn't getting modified, so this may cause a problem. Also the server may only be able to update so fast.
+ //if ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT ) {
+ //streamCmdTimeout = streamCmdTimeout/5;
+ //}
this.streamCmdTimer = this.streamCmdQuery.delay( streamCmdTimeout, this );
this.lastAlarmState = this.alarmState;
};
this.streamCmdQuery = function( resent ) {
- //if ( resent )
- //console.log( this.connKey+": Resending" );
+ if ( resent )
+ console.log( this.connKey+": Resending" );
//this.streamCmdReq.cancel();
this.streamCmdReq.send( this.streamCmdParms+"&command="+CMD_QUERY );
};
+ this.onError = function( text, error ) {
+ console.log('onerror: ' + text + ' error:'+error);
+ };
+ this.onFailure = function( xhr ) {
+ console.log('onFailure: ' );
+ console.log(xhr );
+ };
- this.streamCmdReq = new Request.JSON( { url: this.server_url, method: 'get', timeout: AJAX_TIMEOUT, onSuccess: this.getStreamCmdResponse.bind( this ), onTimeout: this.streamCmdQuery.bind( this, true ), link: 'cancel' } );
+ this.streamCmdReq = new Request.JSON( {
+ url: this.server_url,
+ method: 'get',
+ timeout: 1000+AJAX_TIMEOUT,
+ onSuccess: this.getStreamCmdResponse.bind( this ),
+ onTimeout: this.streamCmdQuery.bind( this, true ),
+ onError: this.onError.bind(this),
+ onFailure: this.onFailure.bind(this),
+ link: 'cancel'
+ } );
requestQueue.addRequest( "cmdReq"+this.id, this.streamCmdReq );
}
function selectLayout( element ) {
- layout = $(element).get('value')
- var cssFile = skinPath+'/css/'+Cookie.read('zmCSS')+'/views/'+layout;
- if ( $('dynamicStyles') )
- $('dynamicStyles').destroy();
- new Asset.css( cssFile, { id: 'dynamicStyles' } );
- Cookie.write( 'zmMontageLayout', layout, { duration: 10*365 } );
- if ( layout != 'montage_freeform.css' ) {
+ layout = $j(element).val();
+
+ if ( layout_id = parseInt(layout) ) {
+ layout = layouts[layout];
+ console.log(layout);
+
+ for ( var i = 0; i < monitors.length; i++ ) {
+ monitor = monitors[i];
+ // Need to clear the current positioning, and apply the new
+
+ monitor_frame = $j('#monitorFrame'+monitor.id);
+ if ( ! monitor_frame ) {
+ console.log("Error finding frame for " + monitor.id );
+ continue;
+ }
+
+ // Apply default layout options, like float left
+ if ( layout.Positions['default'] ) {
+ styles = layout.Positions['default'];
+ for ( style in styles ) {
+ monitor_frame.css(style, styles[style]);
+ }
+ } else {
+ console.log("No default styles to apply" + layout.Positions);
+ } // end if default styles
+
+ if ( layout.Positions['mId'+monitor.id] ) {
+ styles = layout.Positions['mId'+monitor.id];
+ for ( style in styles ) {
+ monitor_frame.css(style, styles[style]);
+ console.log("Applying " + style + ' : ' + styles[style] );
+ }
+ } else {
+ console.log("No Monitor styles to apply");
+ } // end if specific monitor style
+ } // end foreach monitor
+ } // end if a stored layout
+ if ( ! layout ) {
+ return;
+ }
+ Cookie.write( 'zmMontageLayout', layout_id, { duration: 10*365 } );
+ if ( layouts[layout_id].Name != 'Freeform' ) { // 'montage_freeform.css' ) {
Cookie.write( 'zmMontageScale', '', { duration: 10*365 } );
$('scale').set('value', '' );
$('width').set('value', '');
@@ -152,6 +210,17 @@ function changeSize() {
for ( var x = 0; x < monitors.length; x++ ) {
var monitor = monitors[x];
+
+ // Scale the frame
+ monitor_frame = $j('#monitorFrame'+monitor.id);
+ if ( ! monitor_frame ) {
+ console.log("Error finding frame for " + monitor.id );
+ continue;
+ }
+ if ( width )
+ monitor_frame.css('width',width+'px');
+ if ( height )
+ monitor_frame.css('height',height+'px');
/*Stream could be an applet so can't use moo tools*/
var streamImg = $( 'liveStream'+monitor.id );
if ( streamImg ) {
@@ -181,13 +250,32 @@ function changeSize() {
function changeScale() {
var scale = $('scale').get('value');
-
+ $('width').set('value', '');
+ $('height').set('value', '');
+ Cookie.write( 'zmMontageScale', scale, { duration: 10*365 } );
+ Cookie.write( 'zmMontageWidth', '', { duration: 10*365 } );
+ Cookie.write( 'zmMontageHeight', '', { duration: 10*365 } );
+ if ( ! scale ) {
+ selectLayout('#zmMontageLayout');
+ return;
+ }
for ( var x = 0; x < monitors.length; x++ ) {
var monitor = monitors[x];
var newWidth = ( monitorData[x].width * scale ) / SCALE_BASE;
var newHeight = ( monitorData[x].height * scale ) / SCALE_BASE;
+
+ // Scale the frame
+ monitor_frame = $j('#monitorFrame'+monitor.id);
+ if ( ! monitor_frame ) {
+ console.log("Error finding frame for " + monitor.id );
+ continue;
+ }
+ if ( width )
+ monitor_frame.css('width',width+'px');
+ if ( height )
+ monitor_frame.css('height',height+'px');
/*Stream could be an applet so can't use moo tools*/
- var streamImg = document.getElementById( 'liveStream'+monitor.id );
+ var streamImg = $j('#liveStream'+monitor.id )[0];
if ( streamImg ) {
if ( streamImg.nodeName == 'IMG' ) {
var src = streamImg.src;
@@ -208,22 +296,72 @@ function changeScale() {
zonesSVG.style.height = newHeight + "px";
}
}
- $('width').set('value', '');
- $('height').set('value', '');
- Cookie.write( 'zmMontageScale', scale, { duration: 10*365 } );
- Cookie.write( 'zmMontageWidth', '', { duration: 10*365 } );
- Cookie.write( 'zmMontageHeight', '', { duration: 10*365 } );
+}
+
+function toGrid(value) {
+ return Math.round(value / 80) * 80;
+}
+
+// Makes monitorFrames draggable.
+function edit_layout(button) {
+
+ // Turn off the onclick on the image.
+
+ for ( var i = 0; i < monitors.length; i++ ) {
+ var monitor = monitors[i];
+ monitor_feed = $j('#imageFeed'+monitor.id)[0];
+ monitor_feed.onclick='';
+ };
+
+ $j('#monitors .monitorFrame').draggable({
+ cursor: 'crosshair',
+ //revert: 'invalid'
+ });
+ $j('#SaveLayout').show();
+ $j('#EditLayout').hide();
+} // end function edit_layout
+
+function save_layout(button) {
+ var form=button.form;
+ // In fixed positioning, order doesn't matter. In floating positioning, it does.
+ var Positions = {};
+ for ( var i = 0; i < monitors.length; i++ ) {
+ var monitor = monitors[i];
+ monitor_frame = $j('#monitorFrame'+monitor.id);
+
+ Positions['mId'+monitor.id] = {
+ width: monitor_frame.css('width'),
+ height: monitor_frame.css('height'),
+ top: monitor_frame.css('top'),
+ bottom: monitor_frame.css('bottom'),
+ left: monitor_frame.css('left'),
+ right: monitor_frame.css('right'),
+ position: monitor_frame.css('position'),
+ float: monitor_frame.css('float'),
+ };
+ } // end foreach monitor
+ form.Positions.value = JSON.stringify( Positions );
+ form.submit();
+}
+function cancel_layout(button) {
+ $j('#SaveLayout').hide();
+ $j('#EditLayout').show();
+ for ( var i = 0; i < monitors.length; i++ ) {
+ var monitor = monitors[i];
+ monitor_feed = $j('#imageFeed'+monitor.id);
+ monitor_feed.click( monitor.onclick );
+ };
+ selectLayout('#zmMontageLayout');
}
var monitors = new Array();
function initPage() {
for ( var i = 0; i < monitorData.length; i++ ) {
- monitors[i] = new Monitor( monitorData[i] );
- var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
- monitors[i].start( delay );
+ monitors[i] = new Monitor(monitorData[i]);
+ var delay = Math.round( (Math.random()+0.75)*statusRefreshTimeout );
+ monitors[i].start(delay);
}
- selectLayout($('layout'));
+ selectLayout('#zmMontageLayout');
}
-
// Kick everything off
window.addEvent( 'domready', initPage );
diff --git a/web/skins/classic/views/js/montage.js.php b/web/skins/classic/views/js/montage.js.php
index cd065a355..b6470da3f 100644
--- a/web/skins/classic/views/js/montage.js.php
+++ b/web/skins/classic/views/js/montage.js.php
@@ -31,12 +31,22 @@ var monitorData = new Array();
foreach ( $monitors as $monitor ) {
?>
monitorData[monitorData.length] = {
- 'id': Id() ?>,
- 'connKey': connKey() ?>,
- 'width': Width() ?>,
- 'height':Height() ?>,
- 'server_url': 'Server()->Url().(ZM_MIN_STREAMING_PORT?':'.(ZM_MIN_STREAMING_PORT+$monitor->Id()):'').$_SERVER['PHP_SELF'] ?>'
+ 'id': Id() ?>,
+ 'connKey': connKey() ?>,
+ 'width': Width() ?>,
+ 'height':Height() ?>,
+ 'server_url': 'Server()->Url().(ZM_MIN_STREAMING_PORT?':'.(ZM_MIN_STREAMING_PORT+$monitor->Id()):'').$_SERVER['PHP_SELF'] ?>',
+ 'onclick': function(){createPopup( '?view=watch&mid=Id() ?>', 'zmWatchId() ?>', 'watch', Width(), $monitor->PopupScale() ); ?>, Height(), $monitor->PopupScale() ); ?> );}
};
+layouts = new Array();
+layouts[0] = {}; // reserved, should hold which fields to clear when transitioning
+
+layouts[Id() ?>] = {"Name":"Name()?>","Positions":Positions() ?>};
+
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 340fec26b..ef15bf1e8 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -665,7 +665,7 @@ if ( ZM_HAS_V4L && ($tab != 'misc' || $monitor->Type()!= 'Local') ) {
-
+
"lower('Name')"));
+$layoutsById = array();
+foreach ( $layouts as $l ) {
+ $layoutsById[$l->Id()] = $l->Name();
+}
-$layouts = array(
- 'montage_freeform.css' => translate('MtgDefault'),
- 'montage_2wide.css' => translate('Mtg2widgrd'),
- 'montage_3wide.css' => translate('Mtg3widgrd'),
- 'montage_4wide.css' => translate('Mtg4widgrd'),
- 'montage_3wide50enlarge.css' => translate('Mtg3widgrx'),
-);
+
+session_start();
$layout = '';
-if ( isset($_COOKIE['zmMontageLayout']) )
- $layout = $_COOKIE['zmMontageLayout'];
+if ( isset($_COOKIE['zmMontageLayout']) ) {
+ $layout = $_SESSION['zmMontageLayout'] = $_COOKIE['zmMontageLayout'];
+Warning("Setting layout by cookie");
+} elseif ( isset($_SESSION['zmMontageLayout']) ) {
+ $layout = $_SESSION['zmMontageLayout'];
+Warning("Setting layout by session");
+}
$options = array();
-if ( isset($_COOKIE['zmMontageWidth']) and $_COOKIE['zmMontageWidth'] )
- $options['width'] = $_COOKIE['zmMontageWidth'];
-else
+if ( isset($_COOKIE['zmMontageWidth']) and $_COOKIE['zmMontageWidth'] ) {
+ $_SESSION['zmMontageWidth'] = $options['width'] = $_COOKIE['zmMontageWidth'];
+} elseif ( isset($_SESSION['zmMontageWidth']) and $_SESSION['zmMontageWidth'] ) {
+ $options['width'] = $_SESSION['zmMontageWidth'];
+} else
$options['width'] = '';
+
if ( isset($_COOKIE['zmMontageHeight']) and $_COOKIE['zmMontageHeight'] )
- $options['height'] = $_COOKIE['zmMontageHeight'];
+ $_SESSION['zmMontageHeight'] = $options['height'] = $_COOKIE['zmMontageHeight'];
+else if ( isset($_SESSION['zmMontageHeight']) and $_SESSION['zmMontageHeight'] )
+ $options['height'] = $_SESSION['zmMontageHeight'];
else
$options['height'] = '';
+session_write_close();
+
if ( $scale )
$options['scale'] = $scale;
ob_start();
-# This will end up with the group_id of the deepest selection
-$group_id = Group::get_group_dropdowns();
-$group_dropdowns = ob_get_contents();
+include('_monitor_filters.php');
+$filterbar = ob_get_contents();
ob_end_clean();
-$groupSql = Group::get_group_sql( $group_id );
-
-$monitor_id = 0;
-if ( isset( $_REQUEST['monitor_id'] ) ) {
- $monitor_id = $_REQUEST['monitor_id'];
-} else if ( isset($_COOKIE['zmMonitorId']) ) {
- $monitor_id = $_COOKIE['zmMonitorId'];
-}
-
$monitors = array();
-$monitors_dropdown = array( '' => 'All' );
-$sql = "SELECT * FROM Monitors WHERE Function != 'None'";
-if ( $groupSql ) { $sql .= ' AND ' . $groupSql; };
-if ( $monitor_id ) { $sql .= ' AND Id='.$monitor_id; };
-
-$sql .= ' ORDER BY Sequence';
-foreach( dbFetchAll( $sql ) as $row ) {
- if ( !visibleMonitor( $row['Id'] ) ) {
+foreach( $displayMonitors as &$row ) {
+ if ( $row['Function'] == 'None' )
continue;
- }
$row['Scale'] = $scale;
$row['PopupScale'] = reScale( SCALE_BASE, $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
@@ -116,14 +112,13 @@ foreach( dbFetchAll( $sql ) as $row ) {
if ( ZM_OPT_CONTROL && $row['ControlId'] && $row['Controllable'] )
$showControl = true;
$row['connKey'] = generateConnKey();
- $Monitor = $monitors[] = new Monitor( $row );
- $monitors_dropdown[$Monitor->Id()] = $Monitor->Name();
if ( ! isset( $widths[$row['Width']] ) ) {
$widths[$row['Width']] = $row['Width'];
}
if ( ! isset( $heights[$row['Height']] ) ) {
$heights[$row['Height']] = $row['Height'];
}
+ $monitors[] = new Monitor( $row );
} # end foreach Monitor
xhtmlHeaders(__FILE__, translate('Montage') );
@@ -141,26 +136,36 @@ if ( $showControl ) {
}
if ( $showZones ) {
?>
- Hide Zones
+ Hide Zones
- Show Zones
+ Show Zones
-