Merge branch 'release-1.34'

web/includes/Monitor.php

@@ -39,7 +39,7 @@ class Monitor extends ZM_Object {
     'Height' => null,
     'Colours' => 4,
     'Palette' =>  '0',
-    'Orientation' => null,
+    'Orientation' => 'ROTATE_0',
     'Deinterlacing' =>  0,
     'DecoderHWAccelName'  =>  null,
     'DecoderHWAccelDevice'  =>  null,

web/includes/Object.php

@@ -249,7 +249,7 @@ class ZM_Object {
           }
         }
       } else if ( array_key_exists($field, $this->defaults) ) {
-        if ( is_array($this->defaults[$field]) ) {
+        if ( is_array($this->defaults[$field]) and isset($this->defaults[$field]['default']) ) {
           $default = $this->defaults[$field]['default'];
         } else {
           $default = $this->defaults[$field];

web/skins/classic/views/events.php

@@ -258,7 +258,7 @@ while ( $event_row = dbFetchNext($results) ) {
       echo '<td class="colThumbnail">';
       $imgSrc = $event->getThumbnailSrc(array(),'&amp;');
       $streamSrc = $event->getStreamSrc(array(
-        'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single'), '&amp;');
+        'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single', 'rate'=>'400'), '&amp;');
 
       $imgHtml = '<img id="thumbnail'.$event->Id().'" src="'.$imgSrc.'" alt="'. validHtmlStr('Event '.$event->Id()) .'" style="width:'. validInt($event->ThumbnailWidth()) .'px;height:'. validInt($event->ThumbnailHeight()).'px;" stream_src="'.$streamSrc.'" still_src="'.$imgSrc.'"/>';
       echo '<a href="?view=event&amp;eid='. $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.$imgHtml.'</a>';

web/skins/classic/views/watch.php

@@ -76,7 +76,7 @@ if ( canView('Control') && $monitor->Type() == 'Local' ) {
         <div id="closeControl"><a href="#" data-on-click="<?php echo $popup ? 'closeWindow' : 'backWindow' ?>"><?php echo $popup ? translate('Close') : translate('Back') ?></a></div>
     </div>
 <?php
-if ( $monitor->Status() != 'Connected' ) {
+if ( $monitor->Status() != 'Connected' and $monitor->Type() != 'WebSite' ) {
   echo '<div class="warning">Monitor is not capturing. We will be unable to provide an image</div>';
 }
 ?>