Merged in monitor name restriction feature.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@852 e3e1d417-86f3-4887-817a-d78f3d33393fpull/27/merge
parent
4389b44ad6
commit
6998a2ee10
|
@ -109,6 +109,17 @@ opener.location.reload(true);
|
||||||
window.focus();
|
window.focus();
|
||||||
function validateForm(Form)
|
function validateForm(Form)
|
||||||
{
|
{
|
||||||
|
var errors = new Array();
|
||||||
|
|
||||||
|
if ( Form.elements['new_monitor[Name]'].value.search( /[^\w-]/ ) >= 0 )
|
||||||
|
{
|
||||||
|
errors[errors.length] = "<?= $zmSlangBadMonitorChars ?>";
|
||||||
|
}
|
||||||
|
if ( errors.length )
|
||||||
|
{
|
||||||
|
alert( errors.join( "\n" ) );
|
||||||
|
return( false );
|
||||||
|
}
|
||||||
return( true );
|
return( true );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -107,6 +107,7 @@ $zmSlangAutoEmailEvents = 'Automatically email details of all matching even
|
||||||
$zmSlangAutoMessageEvents = 'Automatically message details of all matching events';
|
$zmSlangAutoMessageEvents = 'Automatically message details of all matching events';
|
||||||
$zmSlangAutoUploadEvents = 'Automatically upload all matching events';
|
$zmSlangAutoUploadEvents = 'Automatically upload all matching events';
|
||||||
$zmSlangAvgBrScore = 'Avg.<br/>Score';
|
$zmSlangAvgBrScore = 'Avg.<br/>Score';
|
||||||
|
$zmSlangBadMonitorChars = 'Monitor Names may only contain alphanumeric characters plus hyphen and underscore';
|
||||||
$zmSlangBandwidth = 'Bandwidth';
|
$zmSlangBandwidth = 'Bandwidth';
|
||||||
$zmSlangBlobPx = 'Blob Px';
|
$zmSlangBlobPx = 'Blob Px';
|
||||||
$zmSlangBlobs = 'Blobs';
|
$zmSlangBlobs = 'Blobs';
|
||||||
|
|
Loading…
Reference in New Issue