Add RTSP Describe checkbox to web console

web/includes/actions.php

@@ -422,7 +422,8 @@ if ( !empty($action) )
                 'TrackMotion' => 'toggle',
                 'Enabled' => 'toggle',
                 'DoNativeMotDet' => 'toggle',
-                'Exif' => 'toggle'
+                'Exif' => 'toggle',
+                'RTSPDescribe' => 'toggle',
             );
 
             $columns = getTableColumns( 'Monitors' );

web/lang/en_gb.php

@@ -256,6 +256,7 @@ $SLANG = array(
     'DefaultScale'          => 'Default Scale',
     'DefaultView'           => 'Default View',
     'Deinterlacing'         => 'Deinterlacing',
+    'RTSPDescribe'         => 'Use RTSP Response Media URL',
     'Delay'                 => 'Delay',
     'DeleteAndNext'         => 'Delete & Next',
     'DeleteAndPrev'         => 'Delete & Prev',
@@ -903,7 +904,13 @@ $OLANG = array(
 	'OPTIONS_EXIF' => array(
 		'Help' => "Enable this option to embed EXIF data into each jpeg frame."
 	),
-
+	'OPTIONS_RTSPDESCRIBE' => array(
+		'Help' => "Sometimes, during the intial RTSP handshake, the camera will send an updated media URL. ".
+		          "Enable this option to tell ZoneMinder to use this URL. Disable this option to ignore the ".
+		          "value from the camera and use the value as entered in the monitor configuration~~~~". 
+		          "Generally this should be enabled. However, there are cases where the camera can get its".
+		          "own URL incorrect, such as when the camera is streaming through a firewall"
+	),
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",

web/skins/classic/views/monitor.php

@@ -78,6 +78,7 @@ if ( ! empty($_REQUEST['mid']) ) {
         'Height' => "240",
         'Orientation' => "0",
         'Deinterlacing' => 0,
+        'RTSPDescribe' => 0,
         'LabelFormat' => '%N - %d/%m/%y %H:%M:%S',
         'LabelX' => 0,
         'LabelY' => 0,
@@ -563,6 +564,12 @@ if ( $tab != 'source' )
     <input type="hidden" name="newMonitor[Deinterlacing]" value="<?php echo validHtmlStr($newMonitor['Deinterlacing']) ?>"/>
 <?php
 }
+if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Protocol'] != 'RTSP'))
+{
+?>
+    <input type="hidden" name="newMonitor[RTSPDescribe]" value="<?php echo validHtmlStr($newMonitor['RTSPDescribe']) ?>"/>
+<?php
+}
 if ( $tab != 'timestamp' )
 {
 ?>
@@ -823,6 +830,14 @@ switch ( $tab )
 <?php
         }
 ?>
+<?php
+        if ( $newMonitor['Type'] == "Remote" )
+        {
+?>
+            <tr><td><?php echo translate('RTSPDescribe') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_RTSPDESCRIBE', 'zmOptionHelp', 'optionhelp', '?' ) ?>) </td><td><input type="checkbox" name="newMonitor[RTSPDescribe]" value="1"<?php if ( !empty($newMonitor['RTSPDescribe']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+<?php
+        }
+?>
 <?php
         break;
     }