Merge branch 'ZoneMinder:master' into patch-135

web/includes/Monitor.php

@@ -948,7 +948,7 @@ public static function getStatuses() {
   function getMonitorStateHTML() {
     $html = '
 <div id="monitorStatus'.$this->Id().'" class="monitorStatus">
-<span class="MonitorName">'.$this->Name().'</span>
+<span class="MonitorName">'.$this->Name().' (id='.$this->Id().')</span>
   <div id="monitorState'.$this->Id().'" class="monitorState">
     <span>'.translate('State').':<span id="stateValue'.$this->Id().'">'.$this->Status().'</span></span>
     <span class="viewingFPS" id="viewingFPS'.$this->Id().'" title="'.translate('Viewing FPS').'"><span id="viewingFPSValue'.$this->Id().'"></span> fps</span>

web/includes/download_functions.php

@@ -23,7 +23,7 @@ function exportEvents(
   $export_root,
   $exportFormat,
   $exportCompressed,
-  $exportStructure = false,
+  $exportStructure = false
 ) {
 
   if (!(canView('Events') or canView('Snapshots'))) {