From ac00ca0ad89002bfd9f54e5338068aad499ca0cd Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 4 Mar 2020 10:46:59 -0500
Subject: [PATCH] Only list enabled Storage Areas

---
 web/skins/classic/includes/functions.php | 4 ++--
 web/skins/classic/views/monitor.php      | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 3042a5488..6372aeb5f 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -352,7 +352,7 @@ if ( ZM_OPT_USE_AUTH and $user ) {
 ?>
   <p class="navbar-text">
     <i class="material-icons">account_circle</i>
-    <?php echo makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?>
+    <?php echo makePopupLink('?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == 'builtin')) ?>
   </p>
 <?php
 }
@@ -396,7 +396,7 @@ if ( (!ZM_OPT_USE_AUTH) or $user ) {
 ?>
 	  <li><?php echo translate('Storage') ?>:
 <?php
-  $storage_areas = ZM\Storage::find();
+  $storage_areas = ZM\Storage::find(array('Enabled'=>true));
   $storage_paths = null;
 	$storage_areas_with_no_server_id = array();
   foreach ( $storage_areas as $area ) {
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 928bffc13..ad9da17d8 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -901,9 +901,12 @@ if ( $monitor->Type() == 'Local' ) {
         <?php
         if ( $monitor->Type() == 'Remote' ) {
           ?>
-            <tr id="RTSPDescribe"<?php if ( $monitor->Protocol()!= 'rtsp' ) { echo ' style="display:none;"'; } ?>><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 ( $monitor->RTSPDescribe() ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr id="RTSPDescribe"<?php if ( $monitor->Protocol()!= 'rtsp' ) { echo ' style="display:none;"'; } ?>>
+              <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 ( $monitor->RTSPDescribe() ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
 <?php
-      }
+      } # end if monitor->Type() == 'Remote'
       break;
     }
   case 'storage' :
@@ -913,7 +916,7 @@ if ( $monitor->Type() == 'Local' ) {
             <td>
 <?php
       $storage_areas = array(0=>'Default');
-      foreach ( ZM\Storage::find(NULL, array('order'=>'lower(Name)')) as $Storage ) {
+      foreach ( ZM\Storage::find(array('Enabled'=>true), array('order'=>'lower(Name)')) as $Storage ) {
         $storage_areas[$Storage->Id()] = $Storage->Name();
       }
       echo htmlSelect('newMonitor[StorageId]', $storage_areas, $monitor->StorageId());