Merge branch 'master' into storageareas

.github/stale.yml

@@ -0,0 +1,26 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - "Under Review"
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Label to use when marking an issue as stale
+staleLabel: stale
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

web/skins/classic/js/skin.js.php

@@ -34,6 +34,8 @@ var skinPath = "<?php echo ZM_SKIN_PATH ?>";
 
 var canEditSystem = <?php echo canEdit('System' )?'true':'false' ?>;
 var canViewSystem = <?php echo canView('System' )?'true':'false' ?>;
+var canEditEvents = <?php echo canEdit('Events' )?'true':'false' ?>;
+var canViewEvents = <?php echo canView('Events' )?'true':'false' ?>;
 
 var canEditGroups = <?php echo canEdit('Groups' )?'true':'false' ?>;
 

web/skins/classic/views/events.php

@@ -142,7 +142,6 @@ if ( $pages > 1 ) {
 $count = 0;
 $disk_space_total = 0;
 
-Logger::Debug("EventSql: $eventsSql");
 $results = dbQuery($eventsSql);
 while ( $event_row = dbFetchNext($results) ) {
   $event = new Event($event_row);
@@ -173,7 +172,7 @@ while ( $event_row = dbFetchNext($results) ) {
     }
     if ( ZM_WEB_EVENT_DISK_SPACE ) {
 ?>
-              <th class="colDiskSpace"><a href="<?php echo sortHeader( 'DiskSpace' ) ?>"><?php echo translate('DiskSpace') ?><?php echo sortTag( 'DiskSpace' ) ?></a></th>
+              <th class="colDiskSpace"><a href="<?php echo sortHeader('DiskSpace') ?>"><?php echo translate('DiskSpace') ?><?php echo sortTag('DiskSpace') ?></a></th>
 <?php
     }
     if ( ZM_WEB_LIST_THUMBS ) {
@@ -182,7 +181,7 @@ while ( $event_row = dbFetchNext($results) ) {
 <?php
     }
 ?>
-              <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" onclick="toggleCheckbox( this, 'markEids' );"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/></th>
+              <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" onclick="toggleCheckbox(this, 'markEids');"/></th>
             </tr>
 <?php
   }
@@ -226,7 +225,7 @@ while ( $event_row = dbFetchNext($results) ) {
       echo '</td>';
   } // end if ZM_WEB_LIST_THUMBS
 ?>
-              <td class="colMark"><input type="checkbox" name="markEids[]" value="<?php echo $event->Id() ?>" onclick="configureButton( this, 'markEids' );"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/></td>
+              <td class="colMark"><input type="checkbox" name="markEids[]" value="<?php echo $event->Id() ?>" onclick="configureButton(this, 'markEids');"/></td>
             </tr>
 <?php
 }

web/skins/classic/views/js/events.js

@@ -11,13 +11,13 @@ function toggleCheckbox( element, name ) {
   for (var i = 0; i < form.elements.length; i++)
     if (form.elements[i].name.indexOf(name) == 0)
       form.elements[i].checked = checked;
-  form.viewBtn.disabled = !checked;
-  form.editBtn.disabled = !checked;
+  form.viewBtn.disabled = !(canViewEvents && checked);
+  form.editBtn.disabled = !(canEditEvents && checked);
   form.archiveBtn.disabled = unarchivedEvents?!checked:true;
-  form.unarchiveBtn.disabled = archivedEvents?!checked:true;
-  form.downloadBtn.disabled = !checked;
-  form.exportBtn.disabled = !checked;
-  form.deleteBtn.disabled = !checked;
+  form.unarchiveBtn.disabled = !(canEditEvents && archivedEvents && checked);
+  form.downloadBtn.disabled = !(canViewEvents && checked);
+  form.exportBtn.disabled = !(canViewEvents && checked);
+  form.deleteBtn.disabled = !(canEditEvents && checked);
 }
 
 function configureButton( element, name ) {
@@ -35,16 +35,20 @@ function configureButton( element, name ) {
   }
   if ( !element.checked )
     form.toggleCheck.checked = false;
-  form.viewBtn.disabled = !checked;
-  form.editBtn.disabled = !checked;
+  form.viewBtn.disabled = !(canViewEvents && checked);
+  form.editBtn.disabled = !(canEditEvents && checked);
   form.archiveBtn.disabled = (!checked)||(!unarchivedEvents);
-  form.unarchiveBtn.disabled = (!checked)||(!archivedEvents);
-  form.downloadBtn.disabled = !checked;
-  form.exportBtn.disabled = !checked;
-  form.deleteBtn.disabled = !checked;
+  form.unarchiveBtn.disabled = !(canEditEvents && checked && archivedEvents);
+  form.downloadBtn.disabled = !(canViewEvents && checked);
+  form.exportBtn.disabled = !(canViewEvents && checked);
+  form.deleteBtn.disabled = !(canEditEvents && checked);
 }
 
 function deleteEvents( element, name ) {
+  if ( ! canEditEvents ) {
+    alert("You do not have permission to delete events.");
+    return;
+  }
   var form = element.form;
   var count = 0;
   for (var i = 0; i < form.elements.length; i++) {
@@ -64,6 +68,10 @@ function deleteEvents( element, name ) {
 }
 
 function editEvents( element, name ) {
+  if ( ! canEditEvents ) {
+    alert("You do not have permission to delete events.");
+    return;
+  }
   var form = element.form;
   var eids = new Array();
   for (var i = 0; i < form.elements.length; i++) {
@@ -125,6 +133,10 @@ function archiveEvents( element, name ) {
 }
 
 function unarchiveEvents(element, name) {
+  if ( ! canEditEvents ) {
+    alert("You do not have permission to delete events.");
+    return;
+  }
   var form = element.form;
   form.elements['action'].value = 'unarchive';
   form.submit();

web/skins/classic/views/monitor.php

@@ -923,7 +923,7 @@ if ( $monitor->Type() == 'Local' ) {
 			0 => 'Disabled',
 			1 => 'X264 Encode',
 			);
-	if ($monitor->Type() == 'FFMpeg' )
+	if ($monitor->Type() == 'Ffmpeg' )
 		$videowriteropts[2]='H264 Camera Passthrough';
 	echo htmlselect( 'newMonitor[VideoWriter]', $videowriteropts, $monitor->VideoWriter() );
 ?>