Merge branch 'master' into storageareas

web/skins/classic/includes/functions.php

@@ -190,6 +190,12 @@ echo output_link_if_exists( array(
 <?php } ?>
   <script src="<?php echo cache_bust($skinJsFile) ?>"></script>
   <script src="js/logger.js"></script>
+<?php 
+  if ($basename == 'watch') {
+  // This is used in the log popup for the export function. Not sure if it's used anywhere else
+?>
+<script type="text/javascript" src="js/overlay.js"></script>
+<?php } ?>
 <?php
   if ( $viewJsFile ) {
 ?>

web/skins/classic/views/monitorprobe.php

@@ -288,7 +288,7 @@ function probeNetwork() {
       if ( isset($macBases[$macRoot]) ) {
         $macBase = $macBases[$macRoot];
         $camera = call_user_func($macBase['probeFunc'], $ip);
-        $sourceDesc = htmlspecialchars(serialize($camera['monitor']));
+        $sourceDesc = base64_encode(serialize($camera['monitor']));
         $sourceString = $camera['model'].' @ '.$host;
         if ( isset($monitors[$ip]) ) {
           $monitor = $monitors[$ip];