Merge branch 'master' of github.com:ZoneMinder/zoneminder

web/ajax/modal.php

@@ -35,6 +35,10 @@ switch ( $modal ) {
     if ( !isset($_REQUEST['id']) ) ajaxError('Storage Id Not Provided');
     $data['html'] = getStorageModalHTML($_REQUEST['id']);
     break;
+  case 'server' :
+    if ( !isset($_REQUEST['id']) ) ajaxError('Storage Id Not Provided');
+    $data['html'] = getServerModalHTML($_REQUEST['id']);
+    break;
   case 'eventdetail' :
     $eid = isset($_REQUEST['eid']) ? $_REQUEST['eid'] : '';
     $eids = isset($_REQUEST['eids']) ? $_REQUEST['eids'] : '';

web/skins/classic/includes/functions.php

@@ -798,7 +798,7 @@ function getENoPermHTML() {
     $result .= '<div class="modal-dialog">'.PHP_EOL;
       $result .= '<div class="modal-content">'.PHP_EOL;
         $result .= '<div class="modal-header">'.PHP_EOL;
-          $result .= '<h5 class="modal-title" id="staticBackdropLabel">ZoneMinder ' .translate('Error'). '</h5>'.PHP_EOL;
+          $result .= '<h5 class="modal-title">ZoneMinder ' .translate('Error'). '</h5>'.PHP_EOL;
           $result .= '<button type="button" class="close" data-dismiss="modal" aria-label="Close">'.PHP_EOL;
             $result .= '<span aria-hidden="true">&times;</span>'.PHP_EOL;
           $result .= '</button>'.PHP_EOL;
@@ -942,7 +942,7 @@ function getStorageModalHTML($sid) {
     $result .= '<div class="modal-dialog">'.PHP_EOL;
       $result .= '<div class="modal-content">'.PHP_EOL;
         $result .= '<div class="modal-header">'.PHP_EOL;
-          $result .= '<h5 class="modal-title" id="staticBackdropLabel">' .translate('Storage').' - '.$newStorage->Name(). '</h5>'.PHP_EOL;
+          $result .= '<h5 class="modal-title">' .translate('Storage').' - '.$newStorage->Name(). '</h5>'.PHP_EOL;
           $result .= '<button type="button" class="close" data-dismiss="modal" aria-label="Close">'.PHP_EOL;
             $result .= '<span aria-hidden="true">&times;</span>'.PHP_EOL;
           $result .= '</button>'.PHP_EOL;
@@ -954,7 +954,7 @@ function getStorageModalHTML($sid) {
           $result .= '<input type="hidden" name="view" value="storage"/>'.PHP_EOL;
           $result .= '<input type="hidden" name="object" value="storage"/>'.PHP_EOL;
           $result .= '<input type="hidden" name="id" value="' .validHtmlStr($sid). '"/>'.PHP_EOL;
-          $result .= '<table id="contentTable" class="major table-sm">'.PHP_EOL;
+          $result .= '<table class="major table-sm">'.PHP_EOL;
             $result .= '<tbody>'.PHP_EOL;
               $result .= '<tr>'.PHP_EOL;
                 $result .= '<th class="text-right pr-3" scope="row">' .translate('Name'). '</th>'.PHP_EOL;
@@ -1056,7 +1056,7 @@ function getEventDetailHTML($eid='', $eids='') {
     $result .= '<div class="modal-dialog">'.PHP_EOL;
       $result .= '<div class="modal-content">'.PHP_EOL;
         $result .= '<div class="modal-header">'.PHP_EOL;
-          $result .= '<h5 class="modal-title" id="staticBackdropLabel">' .$title. '</h5>'.PHP_EOL;
+          $result .= '<h5 class="modal-title">' .$title. '</h5>'.PHP_EOL;
           $result .= '<button type="button" class="close" data-dismiss="modal" aria-label="Close">'.PHP_EOL;
             $result .= '<span aria-hidden="true">&times;</span>'.PHP_EOL;
           $result .= '</button>'.PHP_EOL;
@@ -1068,7 +1068,7 @@ function getEventDetailHTML($eid='', $eids='') {
             $result .= '<input type="hidden" name="action" value="eventdetail"/>'.PHP_EOL;
             $result .= '<input type="hidden" name="view" value="eventdetail"/>'.PHP_EOL;
             $result .= $inputs;
-            $result .= '<table id="contentTable" class="table-sm">'.PHP_EOL;
+            $result .= '<table class="table-sm">'.PHP_EOL;
               $result .= '<tbody>'.PHP_EOL;
                 $result .= '<tr>'.PHP_EOL;
                   $result .= '<th scope="row">' .translate('Cause'). '</th>'.PHP_EOL;
@@ -1104,6 +1104,104 @@ function getCSRFinputHTML() {
   return $result;
 }
 
+function getServerModalHTML($sid) {
+  $result = '';
+  $checked = ' checked="checked"';
+  $null = '';
+
+  if ( !canEdit('System') ) return;
+
+  $Server = new ZM\Server($sid);
+  if ( $sid and ! $Server->Id() ) return;
+
+  $result .= '<div class="modal fade" id="ServerModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">'.PHP_EOL;
+    $result .= '<div class="modal-dialog">'.PHP_EOL;
+      $result .= '<div class="modal-content">'.PHP_EOL;
+        $result .= '<div class="modal-header">'.PHP_EOL;
+          $result .= '<h5 class="modal-title">' .translate('Server').' - '.$Server->Name(). '</h5>'.PHP_EOL;
+          $result .= '<button type="button" class="close" data-dismiss="modal" aria-label="Close">'.PHP_EOL;
+            $result .= '<span aria-hidden="true">&times;</span>'.PHP_EOL;
+          $result .= '</button>'.PHP_EOL;
+        $result .= '</div>'.PHP_EOL;
+        $result .= '<div class="modal-body">'.PHP_EOL;
+        $result .= '<form name="contentForm" method="post" action="?view=server&action=save" class="validateFormOnSubmit">'.PHP_EOL;
+          // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+          $result .= getCSRFinputHTML();
+          $result .= '<input type="hidden" name="view" value="server"/>'.PHP_EOL;
+          $result .= '<input type="hidden" name="object" value="server"/>'.PHP_EOL;
+          $result .= '<input type="hidden" name="id" value="' .validHtmlStr($_REQUEST['id']). '"/>'.PHP_EOL;
+          $result .= '<table class="table-sm">'.PHP_EOL;
+            $result .= '<tbody>'.PHP_EOL;
+              $result .= '<tr>'.PHP_EOL;
+                $result .= '<th scope="row">' .translate('Name'). '</th>'.PHP_EOL;
+                $result .= '<td><input type="text" name="newServer[Name]" value="' .$Server->Name(). '"/></td>'.PHP_EOL;
+              $result .= '</tr>'.PHP_EOL;
+              $result .= '<tr>'.PHP_EOL;
+                $result .= '<th scope="row">' .translate('Protocol'). '</th>'.PHP_EOL;
+                $result .= '<td><input type="text" name="newServer[Protocol]" value="' .$Server->Protocol(). '"/></td>'.PHP_EOL;
+              $result .= '</tr>'.PHP_EOL;
+              $result .= '<tr>'.PHP_EOL;
+                $result .= '<th scope="row">' .translate('Hostname'). '</th>'.PHP_EOL;
+                $result .= '<td><input type="text" name="newServer[Hostname]" value="' .$Server->Hostname(). '"/></td>'.PHP_EOL;
+              $result .= '</tr>'.PHP_EOL;
+              $result .= '<tr>'.PHP_EOL;
+                $result .= '<th scope="row">' .translate('Port'). '</th>'.PHP_EOL;
+                $result .= '<td><input type="number" name="newServer[Port]" value="' .$Server->Port(). '"/></td>'.PHP_EOL;
+              $result .= '</tr>'.PHP_EOL;
+              $result .= '<tr>'.PHP_EOL;
+                $result .= '<th scope="row">' .translate('PathToIndex'). '</th>'.PHP_EOL;
+                $result .= '<td><input type="text" name="newServer[PathToIndex]" value="' .$Server->PathToIndex(). '"/></td>'.PHP_EOL;
+              $result .= '</tr>'.PHP_EOL;
+              $result .= '<tr>'.PHP_EOL;
+                $result .= '<th scope="row">' .translate('PathToZMS'). '</th>'.PHP_EOL;
+                $result .= '<td><input type="text" name="newServer[PathToZMS]" value="' .$Server->PathToZMS(). '"/></td>'.PHP_EOL;
+              $result .= '</tr>'.PHP_EOL;
+              $result .= '<tr>'.PHP_EOL;
+                $result .= '<th scope="row">' .translate('PathToApi'). '</th>'.PHP_EOL;
+                $result .= '<td><input type="text" name="newServer[PathToApi]" value="' .$Server->PathToApi(). '"/></td>'.PHP_EOL;
+              $result .= '</tr>'.PHP_EOL;
+              $result .= '<tr>'.PHP_EOL;
+                $result .= '<th scope="row">' .translate('RunStats'). '</th>'.PHP_EOL;
+                $result .= '<td>'.PHP_EOL;
+                  $result .= '<input type="radio" name="newServer[zmstats]" value="1"' .($Server->zmstats() ? $checked : $null). '/> Yes'.PHP_EOL;
+                  $result .= '<input type="radio" name="newServer[zmstats]" value="0"' .($Server->zmstats() ? $null : $checked). '/> No'.PHP_EOL;
+                $result .= '</td>'.PHP_EOL;
+              $result .= '</tr>'.PHP_EOL;
+              $result .= '<tr>'.PHP_EOL;
+                $result .= '<th scope="row">' .translate('RunAudit'). '</th>'.PHP_EOL;
+                $result .= '<td>'.PHP_EOL;
+                  $result .= '<input type="radio" name="newServer[zmaudit]" value="1"' .($Server->zmaudit() ? $checked : $null). '/> Yes'.PHP_EOL;
+                  $result .= '<input type="radio" name="newServer[zmaudit]" value="0"' .($Server->zmaudit() ? $null : $checked). '/> No'.PHP_EOL;
+                $result .= '</td>'.PHP_EOL;
+              $result .= '</tr>'.PHP_EOL;
+              $result .= '<tr>'.PHP_EOL;
+                $result .= '<th scope="row">' .translate('RunTrigger'). '</th>'.PHP_EOL;
+                $result .= '<td>'.PHP_EOL;
+                  $result .= '<input type="radio" name="newServer[zmtrigger]" value="1"' .($Server->zmtrigger() ? $checked : $null). '/> Yes'.PHP_EOL;
+                  $result .= '<input type="radio" name="newServer[zmtrigger]" value="0"' .($Server->zmtrigger() ? $null : $checked). '/> No'.PHP_EOL;
+                $result .= '</td>'.PHP_EOL;
+              $result .= '</tr>'.PHP_EOL;
+              $result .= '<tr>'.PHP_EOL;
+                $result .= '<th scope="row">' .translate('RunEventNotification'). '</th>'.PHP_EOL;
+                $result .= '<td>'.PHP_EOL;
+                  $result .= '<input type="radio" name="newServer[zmeventnotification]" value="1"' .($Server->zmeventnotification() ? $checked : $null). '/> Yes'.PHP_EOL;
+                  $result .= '<input type="radio" name="newServer[zmeventnotification]" value="0"' .($Server->zmeventnotification() ? $null : $checked). '/> No'.PHP_EOL;
+                $result .= '</td>'.PHP_EOL;
+              $result .= '</tr>'.PHP_EOL;
+            $result .= '</tbody>'.PHP_EOL;
+          $result .= '</table>'.PHP_EOL;
+        $result .= '</div>'.PHP_EOL;
+        $result .= '<div class="modal-footer">'.PHP_EOL;
+          $result .= '<button name="action" id="serverSubmitBtn" type="submit" class="btn btn-primary" value="Save">' .translate('Save'). '</button>'.PHP_EOL;
+          $result .= '<button type="button" class="btn btn-secondary" data-dismiss="modal">' .translate('Cancel'). '</button>'.PHP_EOL;
+        $result .= '</div>'.PHP_EOL;
+      $result .= '</div>'.PHP_EOL;
+    $result .= '</div>'.PHP_EOL;
+  $result .= '</div>'.PHP_EOL;
+
+  return $result;
+}
+
 function xhtmlFooter() {
   global $css;
   global $cspNonce;

web/skins/classic/views/js/options.js

@@ -1,3 +1,37 @@
+// Load the Server Modal HTML via Ajax call
+function getServerModal(sid) {
+  $j.getJSON(thisUrl + '?request=modal&modal=server&id=' + sid)
+      .done(function(data) {
+        if ( $j('#ServerModal').length ) {
+          $j('#ServerModal').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#ServerModal').modal('show');
+        // Manage the Save button
+        $j('#serverSubmitBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#serverModalForm').submit();
+        });
+      })
+      .fail(function(jqxhr, textStatus, error) {
+        console.log("Request Failed: " + textStatus + ", " + error);
+        console.log("Response Text: " + jqxhr.responseText);
+      });
+}
+
+function enableServerModal() {
+  $j(".serverCol").click(function(evt) {
+    evt.preventDefault();
+    var sid = $j(this).data('sid');
+    getServerModal(sid);
+  });
+  $j('#NewServerBtn').click(function(evt) {
+    evt.preventDefault();
+    getServerModal(0);
+  });
+}
+
 // Load the Storage Modal HTML via Ajax call
 function getStorageModal(sid) {
   $j.getJSON(thisUrl + '?request=modal&modal=storage&id=' + sid)
@@ -34,10 +68,13 @@ function enableStorageModal() {
 
 function initPage() {
   var NewStorageBtn = $j('#NewStorageBtn');
+  var NewServerBtn = $j('#NewServerBtn');
 
   if ( canEditSystem ) enableStorageModal();
+  if ( canEditSystem ) enableServerModal();
 
   NewStorageBtn.prop('disabled', !canEditSystem);
+  NewServerBtn.prop('disabled', !canEditSystem);
 }
 
 $j(document).ready(function() {

web/skins/classic/views/options.php

@@ -181,8 +181,9 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
           <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
         </div>
       </form>
-<?php
+      <?php
-} else if ( $tab == 'servers' ) { ?>
+} else if ( $tab == 'servers' ) {
+      ?>
       <form name="serversForm" method="post" action="?">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
@@ -209,47 +210,42 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
 			</tr>
           </thead>
           <tbody>
-<?php
+          <?php
-  $monitor_counts = dbFetchAssoc('SELECT Id,(SELECT COUNT(Id) FROM Monitors WHERE ServerId=Servers.Id) AS MonitorCount FROM Servers', 'Id', 'MonitorCount');
+          $monitor_counts = dbFetchAssoc('SELECT Id,(SELECT COUNT(Id) FROM Monitors WHERE ServerId=Servers.Id) AS MonitorCount FROM Servers', 'Id', 'MonitorCount');
-  foreach ( ZM\Server::find() as $Server ) {
+          foreach ( ZM\Server::find() as $Server ) {
-?>
+            $svr_opt = 'class="serverCol" data-sid="'.$Server->Id().'"';
+            ?>
             <tr>
-              <td class="colName"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->Name()), $canEdit) ?></td>
+              <td class="colName"><?php echo makeLink('#', validHtmlStr($Server->Name()), $canEdit, $svr_opt ) ?></td>
-              <td class="colUrl"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->Url()), $canEdit) ?></td>
+              <td class="colUrl"><?php echo makeLink('#', validHtmlStr($Server->Url()), $canEdit, $svr_opt ) ?></td>
-              <td class="colPathToIndex"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->PathToIndex()), $canEdit) ?></td>
+              <td class="colPathToIndex"><?php echo makeLink('#', validHtmlStr($Server->PathToIndex()), $canEdit, $svr_opt ) ?></td>
-              <td class="colPathToZMS"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->PathToZMS()), $canEdit) ?></td>
+              <td class="colPathToZMS"><?php echo makeLink('#', validHtmlStr($Server->PathToZMS()), $canEdit, $svr_opt ) ?></td>
-              <td class="colPathToApi"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->PathToApi()), $canEdit) ?></td>
               <td class="colStatus <?php if ( $Server->Status() == 'NotRunning' ) { echo 'danger'; } ?>">
-                  <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->Status()), $canEdit) ?></td>
+                  <?php echo makeLink('#', validHtmlStr($Server->Status()), $canEdit, $svr_opt) ?></td>
-              <td class="colMonitorCount">
+              <td class="colMonitorCount"><?php echo makeLink('#', validHtmlStr($monitor_counts[$Server->Id()]), $canEdit, $svr_opt) ?></td>
-                  <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($monitor_counts[$Server->Id()]), $canEdit) ?>
+              <td class="colCpuLoad <?php if ( $Server->CpuLoad() > 5 ) { echo 'danger'; } ?>"><?php echo makeLink('#', $Server->CpuLoad(), $canEdit, $svr_opt) ?></td>
-              </td>
-              <td class="colCpuLoad <?php if ( $Server->CpuLoad() > 5 ) { echo 'danger'; } ?>">
-                  <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server',$Server->CpuLoad(), $canEdit) ?>
-              </td>
               <td class="colMemory <?php if ( (!$Server->TotalMem()) or ($Server->FreeMem()/$Server->TotalMem() < .1) ) { echo 'danger'; } ?>">
-                  <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', human_filesize($Server->FreeMem()) . ' / ' . human_filesize($Server->TotalMem()), $canEdit) ?>
+                  <?php echo makeLink('#', human_filesize($Server->FreeMem()) . ' / ' . human_filesize($Server->TotalMem()), $canEdit, $svr_opt) ?></td>
-              </td>
               <td class="colSwap <?php if ( (!$Server->TotalSwap()) or ($Server->FreeSwap()/$Server->TotalSwap() < .1) ) { echo 'danger'; } ?>">
-                <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', human_filesize($Server->FreeSwap()) . ' / ' . human_filesize($Server->TotalSwap()) , $canEdit) ?>
+                  <?php echo makeLink('#', human_filesize($Server->FreeSwap()) . ' / ' . human_filesize($Server->TotalSwap()) , $canEdit, $svr_opt) ?></td>
-              </td>
+              <td class="colStats"><?php echo makeLink('#', $Server->zmstats() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
-              <td class="colStats"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmstats() ? 'yes' : 'no', $canEdit) ?></td>
+              <td class="colAudit"><?php echo makeLink('#', $Server->zmaudit() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
-              <td class="colAudit"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmaudit() ? 'yes' : 'no', $canEdit) ?></td>
+              <td class="colTrigger"><?php echo makeLink('#', $Server->zmtrigger() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
-              <td class="colTrigger"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmtrigger() ? 'yes' : 'no', $canEdit) ?></td>
+              <td class="colEventNotification"><?php echo makeLink('#', $Server->zmeventnotification() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
-              <td class="colEventNotification"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmeventnotification() ? 'yes' : 'no', $canEdit) ?></td>
 
               <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Server->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
-			</tr>
+            </tr>
 <?php } #end foreach Server ?>
           </tbody>
         </table>
         <div id="contentButtons">
-        <?php echo makePopupButton('?view=server&id=0', 'zmServer', 'server', translate('AddNewServer'), canEdit('System')); ?>
+          <button type="button" id="NewServerBtn" value="<?php echo translate('AddNewServer') ?>" disabled="disabled"><?php echo translate('AddNewServer') ?></button>
           <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
         </div>
       </form>
-<?php
+      <?php
-} else if ( $tab == 'storage' ) { ?>
+} else if ( $tab == 'storage' ) { 
+      ?>
       <form name="storageForm" method="post" action="?">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
@@ -270,14 +266,17 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
             </tr>
           </thead>
           <tbody>
-<?php foreach( ZM\Storage::find( null, array('order'=>'lower(Name)') ) as $Storage ) { ?>
+          <?php
+          foreach( ZM\Storage::find( null, array('order'=>'lower(Name)') ) as $Storage ) { 
+            $str_opt = 'class="storageCol" data-sid="'.$Storage->Id().'"';
+            ?>
             <tr>
-              <td class="colId"><?php echo makeLink('#', validHtmlStr($Storage->Id()), $canEdit, 'class="storageCol" data-sid="'.$Storage->Id().'"' ) ?></td>
+              <td class="colId"><?php echo makeLink('#', validHtmlStr($Storage->Id()), $canEdit, $str_opt ) ?></td>
-              <td class="colName"><?php echo makeLink('#', validHtmlStr($Storage->Name()), $canEdit, 'class="storageCol" data-sid="'.$Storage->Id().'"' ) ?></td>
+              <td class="colName"><?php echo makeLink('#', validHtmlStr($Storage->Name()), $canEdit, $str_opt ) ?></td>
-              <td class="colPath"><?php echo makeLink('#', validHtmlStr($Storage->Path()), $canEdit, 'class="storageCol" data-sid="'.$Storage->Id().'"' ) ?></td>
+              <td class="colPath"><?php echo makeLink('#', validHtmlStr($Storage->Path()), $canEdit, $str_opt ) ?></td>
-              <td class="colType"><?php echo makeLink('#', validHtmlStr($Storage->Type()), $canEdit, 'class="storageCol" data-sid="'.$Storage->Id().'"' ) ?></td>
+              <td class="colType"><?php echo makeLink('#', validHtmlStr($Storage->Type()), $canEdit, $str_opt ) ?></td>
-              <td class="colScheme"><?php echo makeLink('#', validHtmlStr($Storage->Scheme()), $canEdit, 'class="storageCol" data-sid="'.$Storage->Id().'"' ) ?></td>
+              <td class="colScheme"><?php echo makeLink('#', validHtmlStr($Storage->Scheme()), $canEdit, $str_opt ) ?></td>
-              <td class="colServer"><?php echo makeLink('#', validHtmlStr($Storage->Server()->Name()), $canEdit, 'class="storageCol" data-sid="'.$Storage->Id().'"' ) ?></td>
+              <td class="colServer"><?php echo makeLink('#', validHtmlStr($Storage->Server()->Name()), $canEdit, $str_opt ) ?></td>
               <td class="colDiskSpace"><?php echo human_filesize($Storage->disk_used_space()) . ' of ' . human_filesize($Storage->disk_total_space()) ?></td>
               <td class="ColEvents"><?php echo $Storage->EventCount().' using '.human_filesize($Storage->event_disk_space()) ?></td>
               <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Storage->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( $Storage->EventCount() or !$canEdit ) { ?> disabled="disabled"<?php } ?><?php echo $Storage->EventCount() ? ' title="Can\'t delete as long as there are events stored here."' : ''?>/></td>

web/skins/classic/views/server.php

@@ -1,113 +0,0 @@
-<?php
-//
-// ZoneMinder web user view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canEdit('System') ) {
-  $view = 'error';
-  return;
-}
-
-$Server = new ZM\Server($_REQUEST['id']);
-if ( $_REQUEST['id'] and ! $Server->Id() ) {
-  $view = 'error';
-  return;
-}
-
-$focusWindow = true;
-
-xhtmlHeaders(__FILE__, translate('Server').' - '.$Server->Name());
-getBodyTopHTML();
-?>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Server').' - '.$Server->Name() ?></h2>
-    </div>
-    <div id="content">
-      <form name="contentForm" method="post" action="?" class="validateFormOnSubmit">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="object" value="server"/>
-        <input type="hidden" name="id" value="<?php echo validHtmlStr($_REQUEST['id']) ?>"/>
-        <table id="contentTable" class="major">
-          <tbody>
-            <tr>
-              <th scope="row"><?php echo translate('Name') ?></th>
-              <td><input type="text" name="newServer[Name]" value="<?php echo $Server->Name() ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Protocol') ?></th>
-              <td><input type="text" name="newServer[Protocol]" value="<?php echo $Server->Protocol() ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Hostname') ?></th>
-              <td><input type="text" name="newServer[Hostname]" value="<?php echo $Server->Hostname() ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Port') ?></th>
-              <td><input type="number" name="newServer[Port]" value="<?php echo $Server->Port() ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('PathToIndex') ?></th>
-              <td><input type="text" name="newServer[PathToIndex]" value="<?php echo $Server->PathToIndex() ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('PathToZMS') ?></th>
-              <td><input type="text" name="newServer[PathToZMS]" value="<?php echo $Server->PathToZMS() ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('PathToApi') ?></th>
-              <td><input type="text" name="newServer[PathToApi]" value="<?php echo $Server->PathToApi() ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('RunStats') ?></th>
-              <td>
-                <input type="radio" name="newServer[zmstats]" value="1"<?php echo $Server->zmstats() ? ' checked="checked"' : '' ?>/> Yes
-                <input type="radio" name="newServer[zmstats]" value="0"<?php echo $Server->zmstats() ? '' : ' checked="checked"' ?>/> No
-              </td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('RunAudit') ?></th>
-              <td>
-                <input type="radio" name="newServer[zmaudit]" value="1"<?php echo $Server->zmaudit() ? ' checked="checked"' : '' ?>/> Yes
-                <input type="radio" name="newServer[zmaudit]" value="0"<?php echo $Server->zmaudit() ? '' : ' checked="checked"' ?>/> No
-              </td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('RunTrigger') ?></th>
-              <td>
-                <input type="radio" name="newServer[zmtrigger]" value="1"<?php echo $Server->zmtrigger() ? ' checked="checked"' : '' ?>/> Yes
-                <input type="radio" name="newServer[zmtrigger]" value="0"<?php echo $Server->zmtrigger() ? '' : ' checked="checked"' ?>/> No
-              </td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('RunEventNotification') ?></th>
-              <td>
-                <input type="radio" name="newServer[zmeventnotification]" value="1"<?php echo $Server->zmeventnotification() ? ' checked="checked"' : '' ?>/> Yes
-                <input type="radio" name="newServer[zmeventnotification]" value="0"<?php echo $Server->zmeventnotification() ? '' : ' checked="checked"' ?>/> No
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <div id="contentButtons">
-          <button type="submit" name="action" value="Save" ><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
-        </div>
-      </form>
-    </div>
-  </div>
-<?php xhtmlFooter() ?>