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

Implement duplicate RTSPSTreamName check

This commit is contained in:
Isaac Connor 2021-04-17 11:51:12 -04:00
parent 03767236d9
commit d598edc7df
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/lang/en_gb.php
View File

@ -323,6 +323,7 @@ $SLANG = array(
'DoNativeMotionDetection'=> 'Do Native Motion Detection',
'Download' => 'Download',
'DuplicateMonitorName' => 'Duplicate Monitor Name',
'DuplicateRTSPStreamName' => 'Duplicate RTSP Stream Name',
'Duration' => 'Duration',
'Edit' => 'Edit',
'EditControl' => 'Edit Control',

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

@ -28,12 +28,16 @@ controlOptions['.$control->Id().'][0] = '.
?>
var monitorNames = new Object();
var rtspStreamNames = new Object();
<?php
$query = empty($_REQUEST['mid']) ? dbQuery('SELECT Name FROM Monitors') : dbQuery('SELECT Name FROM Monitors WHERE Id != ?', array($_REQUEST['mid']) );
if ( $query ) {
while ( $name = dbFetchNext($query, 'Name') ) {
$query = empty($_REQUEST['mid']) ?
dbQuery('SELECT Name,RTSPStreamName FROM Monitors') :
dbQuery('SELECT Name,RTSPStreamName FROM Monitors WHERE Id != ?', array($_REQUEST['mid']) );
if ($query) {
while ($row = dbFetchNext($query)) {
echo '
monitorNames[\''.validJsStr($name).'\'] = true;
monitorNames[\''.validJsStr($row['Name']).'\'] = true;
rtspStreamNames[\''.validJsStr($row['RTSPStreamName']).'\'] = true;
';
} // end foreach
} # end if query
@ -86,8 +90,6 @@ function validateForm( form ) {
if (form.elements['newMonitor[VideoWriter]'].value == '1' /* Encode */) {
var parameters = form.elements['newMonitor[EncoderParameters]'].value.replace(/[^#a-zA-Z]/g, "");
console.log("encoding value" + parameters);
if (parameters == '' || parameters == '#Linesbeginningwith#areacomment#Forchangingqualityusethecrfoption#isbestisworstquality#crf' ) {
errors[errors.length] = '<?php echo translate('BadEncoderParameters') ?>';
}
@ -145,9 +147,14 @@ console.log("encoding value" + parameters);
errors[errors.length] = "<?php echo translate('BadSignalCheckColour') ?>";
if ( !form.elements['newMonitor[WebColour]'].value || !form.elements['newMonitor[WebColour]'].value.match( /^[#0-9a-zA-Z]+$/ ) )
errors[errors.length] = "<?php echo translate('BadWebColour') ?>";
}
if ( form.elements['newMonitor[RTSPStreamName]'].value
&&
rtspStreamNames[form.elements['newMonitor[RTSPStreamName]'].value]
)
errors[errors.length] = "<?php echo translate('DuplicateRTSPStreamName') ?>";
if ( errors.length ) {
alert(errors.join("\n"));
return false;