diff --git a/web/includes/functions.php b/web/includes/functions.php
index ad9e1814a..ada28dc0b 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -19,1680 +19,1670 @@
 // 
 
 // Compatibility functions
-if ( version_compare( phpversion(), "4.3.0", "<") )
-{
-    function ob_get_clean()
-    {
-        $buffer = ob_get_contents();
-        ob_end_clean();
-        return( $buffer );
-    }
+if ( version_compare( phpversion(), "4.3.0", "<") ) {
+  function ob_get_clean() {
+    $buffer = ob_get_contents();
+    ob_end_clean();
+    return( $buffer );
+  }
 }
 
-function userLogin( $username, $password="", $passwordHashed=false )
-{
-    global $user, $cookies;
+function userLogin( $username, $password="", $passwordHashed=false ) {
+  global $user, $cookies;
 
-	$sql = "select * from Users where Enabled = 1";
-	$sql_values = NULL;
-    if ( ZM_AUTH_TYPE == "builtin" )
-    {
-        if ( $passwordHashed ) {
-            $sql .= " AND Username=? AND Password=?";
-        } else {
-            $sql .= " AND Username=? AND Password=password(?)";
-        }
-		$sql_values = array( $username, $password );
+  $sql = "select * from Users where Enabled = 1";
+  $sql_values = NULL;
+  if ( ZM_AUTH_TYPE == "builtin" ) {
+    if ( $passwordHashed ) {
+      $sql .= " AND Username=? AND Password=?";
     } else {
-        $sql .= " AND Username = ?";
-		$sql_values = array( $username );
+      $sql .= " AND Username=? AND Password=password(?)";
     }
-    $_SESSION['username'] = $username;
-    if ( ZM_AUTH_RELAY == "plain" )
-    {
-        // Need to save this in session
-        $_SESSION['password'] = $password;
+    $sql_values = array( $username, $password );
+  } else {
+    $sql .= " AND Username = ?";
+    $sql_values = array( $username );
+  }
+  $_SESSION['username'] = $username;
+  if ( ZM_AUTH_RELAY == "plain" ) {
+    // Need to save this in session
+    $_SESSION['password'] = $password;
+  }
+  $_SESSION['remoteAddr'] = $_SERVER['REMOTE_ADDR']; // To help prevent session hijacking
+  if ( $dbUser = dbFetchOne( $sql, NULL, $sql_values ) ) {
+    Info( "Login successful for user \"$username\"" );
+    $_SESSION['user'] = $user = $dbUser;
+    if ( ZM_AUTH_TYPE == "builtin" ) {
+      $_SESSION['passwordHash'] = $user['Password'];
     }
-    $_SESSION['remoteAddr'] = $_SERVER['REMOTE_ADDR']; // To help prevent session hijacking
-    if ( $dbUser = dbFetchOne( $sql, NULL, $sql_values ) )
-    {
-        Info( "Login successful for user \"$username\"" );
-        $_SESSION['user'] = $user = $dbUser;
-        if ( ZM_AUTH_TYPE == "builtin" )
-        {
-            $_SESSION['passwordHash'] = $user['Password'];
-        }
-    }
-    else
-    {
-        Warning( "Login denied for user \"$username\"" );
-        unset( $user );
-    }
-    if ( $cookies )
-        session_write_close();
-}
-
-function userLogout()
-{
-    global $user;
-    $username = $user['Username'];
-
-    Info( "User \"$username\" logged out" );
-
-    unset( $_SESSION['user'] );
+  } else {
+    Warning( "Login denied for user \"$username\"" );
     unset( $user );
-
-    session_destroy();
+  }
+  if ( $cookies )
+    session_write_close();
 }
 
-function noCacheHeaders()
-{
-    header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");    // Date in the past
-    header("Last-Modified: ".gmdate( "D, d M Y H:i:s" )." GMT"); // always modified
-    header("Cache-Control: no-store, no-cache, must-revalidate");  // HTTP/1.1
-    header("Cache-Control: post-check=0, pre-check=0", false);
-    header("Pragma: no-cache");         // HTTP/1.0
+function userLogout() {
+  global $user;
+  $username = $user['Username'];
+
+  Info( "User \"$username\" logged out" );
+
+  unset( $_SESSION['user'] );
+  unset( $user );
+
+  session_destroy();
+}
+
+function noCacheHeaders() {
+  header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");    // Date in the past
+  header("Last-Modified: ".gmdate( "D, d M Y H:i:s" )." GMT"); // always modified
+  header("Cache-Control: no-store, no-cache, must-revalidate");  // HTTP/1.1
+  header("Cache-Control: post-check=0, pre-check=0", false);
+  header("Pragma: no-cache");         // HTTP/1.0
 }
 
 function CORSHeaders() {
-	if ( isset( $_SERVER['HTTP_ORIGIN'] ) ) {
+  if ( isset( $_SERVER['HTTP_ORIGIN'] ) ) {
 
-		# The following is left for future reference/use.
-		$valid = false;
-		$servers = dbFetchAll( 'SELECT * FROM Servers' );
-		if ( sizeof($servers) <= 1 ) {
-			# Only need CORSHeaders in the event that there are multiple servers in use.
-			return;
-		}
-		foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) {
-			$Server = new Server( $row );
-			if ( $_SERVER['HTTP_ORIGIN'] == $Server->Url() ) {
-				$valid = true;
-				header("Access-Control-Allow-Origin: " . $Server->Url() );
-				header("Access-Control-Allow-Headers: x-requested-with,x-request");
-			}
-		}
-		if ( ! $valid ) {
-			Warning( $_SERVER['HTTP_ORIGIN'] . " is not found in servers list." );
-		}
-	}
+# The following is left for future reference/use.
+    $valid = false;
+    $servers = dbFetchAll( 'SELECT * FROM Servers' );
+    if ( sizeof($servers) <= 1 ) {
+# Only need CORSHeaders in the event that there are multiple servers in use.
+      return;
+    }
+    foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) {
+      $Server = new Server( $row );
+      if ( $_SERVER['HTTP_ORIGIN'] == $Server->Url() ) {
+        $valid = true;
+        header("Access-Control-Allow-Origin: " . $Server->Url() );
+        header("Access-Control-Allow-Headers: x-requested-with,x-request");
+      }
+    }
+    if ( ! $valid ) {
+      Warning( $_SERVER['HTTP_ORIGIN'] . " is not found in servers list." );
+    }
+  }
 }
 
-function getAuthUser( $auth )
-{
-    if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == "hashed" && !empty($auth) )
+function getAuthUser( $auth ) {
+  if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == "hashed" && !empty($auth) )
+  {
+    $remoteAddr = "";
+    if ( ZM_AUTH_HASH_IPS )
     {
+      $remoteAddr = $_SERVER['REMOTE_ADDR'];
+      if ( !$remoteAddr )
+      {
+        Error( "Can't determine remote address for authentication, using empty string" );
         $remoteAddr = "";
-        if ( ZM_AUTH_HASH_IPS )
-        {
-            $remoteAddr = $_SERVER['REMOTE_ADDR'];
-            if ( !$remoteAddr )
-            {
-                Error( "Can't determine remote address for authentication, using empty string" );
-                $remoteAddr = "";
-            }
-        }
-
-        $sql = "select Username, Password, Enabled, Stream+0, Events+0, Control+0, Monitors+0, System+0, MonitorIds from Users where Enabled = 1";
-        foreach ( dbFetchAll( $sql ) as $user )
-        {
-            $now = time();
-            for ( $i = 0; $i < 2; $i++, $now -= (60*60) ) // Try for last two hours
-            {
-                $time = localtime( $now );
-                $authKey = ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$remoteAddr.$time[2].$time[3].$time[4].$time[5];
-                $authHash = md5( $authKey );
-
-                if ( $auth == $authHash )
-                {
-                    return( $user );
-                }
-            }
-        }
+      }
     }
-    Error( "Unable to authenticate user from auth hash '$auth'" );
-    return( false );
+
+    $sql = "select Username, Password, Enabled, Stream+0, Events+0, Control+0, Monitors+0, System+0, MonitorIds from Users where Enabled = 1";
+    foreach ( dbFetchAll( $sql ) as $user )
+    {
+      $now = time();
+      for ( $i = 0; $i < 2; $i++, $now -= (60*60) ) // Try for last two hours
+      {
+        $time = localtime( $now );
+        $authKey = ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$remoteAddr.$time[2].$time[3].$time[4].$time[5];
+        $authHash = md5( $authKey );
+
+        if ( $auth == $authHash )
+        {
+          return( $user );
+        }
+      }
+    }
+  }
+  Error( "Unable to authenticate user from auth hash '$auth'" );
+  return( false );
 }
 
 function generateAuthHash( $useRemoteAddr )
 {
-    if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == "hashed" )
+  if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == "hashed" )
+  {
+    $time = localtime();
+    if ( $useRemoteAddr )
     {
-        $time = localtime();
-        if ( $useRemoteAddr )
-        {
-            $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$_SESSION['remoteAddr'].$time[2].$time[3].$time[4].$time[5];
-        }
-        else
-        {
-            $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$time[2].$time[3].$time[4].$time[5];
-        }
-        $auth = md5( $authKey );
+      $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$_SESSION['remoteAddr'].$time[2].$time[3].$time[4].$time[5];
     }
     else
     {
-        $auth = "";
+      $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$time[2].$time[3].$time[4].$time[5];
     }
-    return( $auth );
+    $auth = md5( $authKey );
+  }
+  else
+  {
+    $auth = "";
+  }
+  return( $auth );
 }
 
 function getStreamSrc( $args, $querySep='&amp;' )
 {
-    $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
+  $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
 
-    if ( ZM_OPT_USE_AUTH )
+  if ( ZM_OPT_USE_AUTH )
+  {
+    if ( ZM_AUTH_RELAY == "hashed" )
     {
-        if ( ZM_AUTH_RELAY == "hashed" )
-        {
-            $args[] = "auth=".generateAuthHash( ZM_AUTH_HASH_IPS );
-        }
-        elseif ( ZM_AUTH_RELAY == "plain" )
-        {
-            $args[] = "user=".$_SESSION['username'];
-            $args[] = "pass=".$_SESSION['password'];
-        }
-        elseif ( ZM_AUTH_RELAY == "none" )
-        {
-            $args[] = "user=".$_SESSION['username'];
-        }
+      $args[] = "auth=".generateAuthHash( ZM_AUTH_HASH_IPS );
     }
-    if ( !in_array( "mode=single", $args ) && !empty($GLOBALS['connkey']) )
-    {   
-        $args[] = "connkey=".$GLOBALS['connkey'];
-    }       
-    if ( ZM_RAND_STREAM )
+    elseif ( ZM_AUTH_RELAY == "plain" )
     {
-        $args[] = "rand=".time();
+      $args[] = "user=".$_SESSION['username'];
+      $args[] = "pass=".$_SESSION['password'];
     }
+    elseif ( ZM_AUTH_RELAY == "none" )
+    {
+      $args[] = "user=".$_SESSION['username'];
+    }
+  }
+  if ( !in_array( "mode=single", $args ) && !empty($GLOBALS['connkey']) )
+  {   
+    $args[] = "connkey=".$GLOBALS['connkey'];
+  }       
+  if ( ZM_RAND_STREAM )
+  {
+    $args[] = "rand=".time();
+  }
 
-    if ( count($args) )
-    {
-        $streamSrc .= "?".join( $querySep, $args );
-    }
+  if ( count($args) )
+  {
+    $streamSrc .= "?".join( $querySep, $args );
+  }
 
-    return( $streamSrc );
+  return( $streamSrc );
 }
 
 function getMimeType( $file )
 {
-    if ( function_exists('mime_content_type') )
-    {
-        return( mime_content_type( $file ) );
-    }
-    elseif ( function_exists('finfo_file') )
-    {
-        $finfo = finfo_open( FILEINFO_MIME );
-        $mimeType = finfo_file( $finfo, $file );
-        finfo_close($finfo);
-        return( $mimeType );
-    }
-    return( trim( exec( 'file -bi '.escapeshellarg( $file ).' 2>/dev/null' ) ) );
+  if ( function_exists('mime_content_type') )
+  {
+    return( mime_content_type( $file ) );
+  }
+  elseif ( function_exists('finfo_file') )
+  {
+    $finfo = finfo_open( FILEINFO_MIME );
+    $mimeType = finfo_file( $finfo, $file );
+    finfo_close($finfo);
+    return( $mimeType );
+  }
+  return( trim( exec( 'file -bi '.escapeshellarg( $file ).' 2>/dev/null' ) ) );
 }
 
 function outputVideoStream( $id, $src, $width, $height, $format, $title="" )
 {
-    if ( file_exists( $src ) )
-        $mimeType = getMimeType( $src );
-    else
+  if ( file_exists( $src ) )
+    $mimeType = getMimeType( $src );
+  else
+  {
+    switch( $format )
     {
-        switch( $format )
+      case 'asf' :
+        $mimeType = "video/x-ms-asf";
+        break;
+      case 'avi' :
+      case 'wmv' :
+        $mimeType = "video/x-msvideo";
+        break;
+      case 'mov' :
+        $mimeType = "video/quicktime";
+        break;
+      case 'mpg' :
+      case 'mpeg' :
+        $mimeType = "video/mpeg";
+        break;
+      case 'swf' :
+        $mimeType = "application/x-shockwave-flash";
+        break;
+      case '3gp' :
+        $mimeType = "video/3gpp";
+        break;
+      default :
+        $mimeType = "video/$format";
+        break;
+    }
+  }
+  if ( !$mimeType || ($mimeType == 'application/octet-stream') )
+    $mimeType = 'video/'.$format;
+  $objectTag = false;
+  if ( ZM_WEB_USE_OBJECT_TAGS )
+  {
+    switch( $mimeType )
+    {
+      case "video/x-ms-asf" :
+      case "video/x-msvideo" :
+      case "video/mp4" :
         {
-            case 'asf' :
-                $mimeType = "video/x-ms-asf";
-                break;
-            case 'avi' :
-            case 'wmv' :
-                $mimeType = "video/x-msvideo";
-                break;
-            case 'mov' :
-                $mimeType = "video/quicktime";
-                break;
-            case 'mpg' :
-            case 'mpeg' :
-                $mimeType = "video/mpeg";
-                break;
-            case 'swf' :
-                $mimeType = "application/x-shockwave-flash";
-                break;
-            case '3gp' :
-                $mimeType = "video/3gpp";
-                break;
-            default :
-                $mimeType = "video/$format";
-                break;
+          if ( isWindows() )
+          {
+            ?>
+              <object id="<?php echo $id ?>" width="<?php echo validNum($width) ?>" height="<?php echo validNum($height) ?>"
+              classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
+              codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902"
+              standby="Loading Microsoft Windows Media Player components..."
+              type="<?php echo $mimeType ?>">
+              <param name="FileName" value="<?php echo $src ?>"/>
+              <param name="autoStart" value="1"/>
+              <param name="showControls" value="0"/>
+              <embed type="<?php echo $mimeType ?>"
+              pluginspage="http://www.microsoft.com/Windows/MediaPlayer/"
+              src="<?php echo $src ?>"
+              name="<?php echo validHtmlStr($title) ?>"
+              width="<?php echo validNum($width) ?>"
+              height="<?php echo validInt($height) ?>"
+              autostart="1"
+              showcontrols="0">
+              </embed>
+              </object>
+              <?php
+              $objectTag = true;
+          }
+          break;
+        }
+      case "video/quicktime" :
+        {
+          ?>
+            <object id="<?php echo $id ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"
+            classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
+            codebase="http://www.apple.com/qtactivex/qtplugin.cab"
+            type="<?php echo $mimeType ?>">
+            <param name="src" value="<?php echo $src ?>"/>
+            <param name="autoplay" VALUE="true"/>
+            <param name="controller" VALUE="false"/>
+            <embed type="<?php echo $mimeType ?>"
+            src="<?php echo $src ?>"
+            pluginspage="http://www.apple.com/quicktime/download/"
+            name="<?php echo validHtmlStr($title) ?>"
+            width="<?php echo validInt($width) ?>"
+            height="<?php echo validInt($height) ?>"
+            autoplay="true"
+            controller="true">
+            </embed>
+            </object>
+            <?php
+            $objectTag = true;
+          break;
+        }
+      case "application/x-shockwave-flash" :
+        {
+          ?>
+            <object id="<?php echo $id ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"
+            classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+            codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"
+            type="<?php echo $mimeType ?>">
+            <param name="movie" value="<?php echo $src ?>"/>
+            <param name="quality" value="high"/>
+            <param name="bgcolor" value="#ffffff"/>
+            <embed type="<?php echo $mimeType ?>"
+            pluginspage="http://www.macromedia.com/go/getflashplayer"
+            src="<?php echo $src ?>"
+            name="<?php echo validHtmlStr($title) ?>"
+            width="<?php echo validInt($width) ?>"
+            height="<?php echo validInt($height) ?>"
+            quality="high"
+            bgcolor="#ffffff">
+            </embed>
+            </object>
+            <?php
+            $objectTag = true;
+          break;
         }
     }
-    if ( !$mimeType || ($mimeType == 'application/octet-stream') )
-        $mimeType = 'video/'.$format;
-    $objectTag = false;
-    if ( ZM_WEB_USE_OBJECT_TAGS )
-    {
-        switch( $mimeType )
-        {
-            case "video/x-ms-asf" :
-            case "video/x-msvideo" :
-            case "video/mp4" :
-            {
-                if ( isWindows() )
-                {
-?>
-<object id="<?php echo $id ?>" width="<?php echo validNum($width) ?>" height="<?php echo validNum($height) ?>"
-classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
-codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902"
-standby="Loading Microsoft Windows Media Player components..."
-type="<?php echo $mimeType ?>">
-<param name="FileName" value="<?php echo $src ?>"/>
-<param name="autoStart" value="1"/>
-<param name="showControls" value="0"/>
-<embed type="<?php echo $mimeType ?>"
-pluginspage="http://www.microsoft.com/Windows/MediaPlayer/"
-src="<?php echo $src ?>"
-name="<?php echo validHtmlStr($title) ?>"
-width="<?php echo validNum($width) ?>"
-height="<?php echo validInt($height) ?>"
-autostart="1"
-showcontrols="0">
-</embed>
-</object>
-<?php
-                    $objectTag = true;
-                }
-                break;
-            }
-            case "video/quicktime" :
-            {
-?>
-<object id="<?php echo $id ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"
-classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
-codebase="http://www.apple.com/qtactivex/qtplugin.cab"
-type="<?php echo $mimeType ?>">
-<param name="src" value="<?php echo $src ?>"/>
-<param name="autoplay" VALUE="true"/>
-<param name="controller" VALUE="false"/>
-<embed type="<?php echo $mimeType ?>"
-src="<?php echo $src ?>"
-pluginspage="http://www.apple.com/quicktime/download/"
-name="<?php echo validHtmlStr($title) ?>"
-width="<?php echo validInt($width) ?>"
-height="<?php echo validInt($height) ?>"
-autoplay="true"
-controller="true">
-</embed>
-</object>
-<?php
-                $objectTag = true;
-                break;
-            }
-            case "application/x-shockwave-flash" :
-            {
-?>
-<object id="<?php echo $id ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"
-classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"
-type="<?php echo $mimeType ?>">
-<param name="movie" value="<?php echo $src ?>"/>
-<param name="quality" value="high"/>
-<param name="bgcolor" value="#ffffff"/>
-<embed type="<?php echo $mimeType ?>"
-pluginspage="http://www.macromedia.com/go/getflashplayer"
-src="<?php echo $src ?>"
-name="<?php echo validHtmlStr($title) ?>"
-width="<?php echo validInt($width) ?>"
-height="<?php echo validInt($height) ?>"
-quality="high"
-bgcolor="#ffffff">
-</embed>
-</object>
-<?php
-                $objectTag = true;
-                break;
-            }
-        }
-    }
-    if ( !$objectTag )
-    {
-?>
-<embed<?php echo isset($mimeType)?(' type="'.$mimeType.'"'):"" ?> 
-src="<?php echo $src ?>"
-name="<?php echo validHtmlStr($title) ?>"
-width="<?php echo validInt($width) ?>"
-height="<?php echo validInt($height) ?>"
-autostart="1"
-autoplay="1"
-showcontrols="0"
-controller="0">
-</embed>
-<?php
-    }
+  }
+  if ( !$objectTag )
+  {
+    ?>
+      <embed<?php echo isset($mimeType)?(' type="'.$mimeType.'"'):"" ?> 
+      src="<?php echo $src ?>"
+      name="<?php echo validHtmlStr($title) ?>"
+      width="<?php echo validInt($width) ?>"
+      height="<?php echo validInt($height) ?>"
+      autostart="1"
+      autoplay="1"
+      showcontrols="0"
+      controller="0">
+      </embed>
+      <?php
+  }
 }
 
 function outputImageStream( $id, $src, $width, $height, $title="" )
 {
-   if ( canStreamIframe() ) {
-?>
-<iframe id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo validHtmlStr($title) ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
-<?php
-   } else {
-?>
-<img id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo validHtmlStr($title) ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
-<?php
-   }
+  if ( canStreamIframe() ) {
+    ?>
+      <iframe id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo validHtmlStr($title) ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
+      <?php
+  } else {
+    ?>
+      <img id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo validHtmlStr($title) ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
+      <?php
+  }
 }
 
 function outputControlStream( $src, $width, $height, $monitor, $scale, $target )
 {
-?>
-<form name="ctrlForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" target="<?php echo $target ?>">
-<input type="hidden" name="view" value="blank">
-<input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>">
-<input type="hidden" name="action" value="control">
-<?php
-                if ( $monitor['CanMoveMap'] ) 
-                {
-?>
-<input type="hidden" name="control" value="moveMap">
-<?php
-                }
-                elseif ( $monitor['CanMoveRel'] )
-                {
-?>
-<input type="hidden" name="control" value="movePseudoMap">
-<?php
-                }
-                elseif ( $monitor['CanMoveCon'] )
-                {
-?>
-<input type="hidden" name="control" value="moveConMap">
-<?php
-                }
-?>
-<input type="hidden" name="scale" value="<?php echo $scale ?>">
-<input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>">
-</form>
-<?php
+  ?>
+    <form name="ctrlForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" target="<?php echo $target ?>">
+    <input type="hidden" name="view" value="blank">
+    <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>">
+    <input type="hidden" name="action" value="control">
+    <?php
+    if ( $monitor['CanMoveMap'] ) 
+    {
+      ?>
+        <input type="hidden" name="control" value="moveMap">
+        <?php
+    }
+  elseif ( $monitor['CanMoveRel'] )
+  {
+    ?>
+      <input type="hidden" name="control" value="movePseudoMap">
+      <?php
+  }
+  elseif ( $monitor['CanMoveCon'] )
+  {
+    ?>
+      <input type="hidden" name="control" value="moveConMap">
+      <?php
+  }
+  ?>
+    <input type="hidden" name="scale" value="<?php echo $scale ?>">
+    <input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>">
+    </form>
+    <?php
 }
 
 function outputHelperStream( $id, $src, $width, $height, $title="" )
 {
-?>
-<applet id="<?php echo $id ?>" code="com.charliemouse.cambozola.Viewer"
-archive="<?php echo ZM_PATH_CAMBOZOLA ?>"
-align="middle"
-width="<?php echo $width ?>"
-height="<?php echo $height ?>"
-title="<?php echo $title ?>">
-<param name="accessories" value="none"/>
-<param name="url" value="<?php echo $src ?>"/>
-</applet>
-<?php
+  ?>
+    <applet id="<?php echo $id ?>" code="com.charliemouse.cambozola.Viewer"
+    archive="<?php echo ZM_PATH_CAMBOZOLA ?>"
+    align="middle"
+    width="<?php echo $width ?>"
+    height="<?php echo $height ?>"
+    title="<?php echo $title ?>">
+    <param name="accessories" value="none"/>
+    <param name="url" value="<?php echo $src ?>"/>
+    </applet>
+    <?php
 }
 
 function outputImageStill( $id, $src, $width, $height, $title="" )
 {
-?>
-<img id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo $title ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
-<?php
+  ?>
+    <img id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo $title ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
+    <?php
 }
 
 function outputControlStill( $src, $width, $height, $monitor, $scale, $target )
 {
-?>
-<form name="ctrlForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" target="<?php echo $target ?>">
-<input type="hidden" name="view" value="blank">
-<input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>">
-<input type="hidden" name="action" value="control">
-<?php
-                if ( $monitor['CanMoveMap'] ) 
-                {
-?>
-<input type="hidden" name="control" value="moveMap">
-<?php
-                }
-                elseif ( $monitor['CanMoveRel'] )
-                {
-?>
-<input type="hidden" name="control" value="movePseudoMap">
-<?php
-                }
-                elseif ( $monitor['CanMoveCon'] )
-                {
-?>
-<input type="hidden" name="control" value="moveConMap">
-<?php
-                }
-?>
-<input type="hidden" name="scale" value="<?php echo $scale ?>">
-<input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>">
-</form>
-<?php
+  ?>
+    <form name="ctrlForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" target="<?php echo $target ?>">
+    <input type="hidden" name="view" value="blank">
+    <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>">
+    <input type="hidden" name="action" value="control">
+    <?php
+    if ( $monitor['CanMoveMap'] ) 
+    {
+      ?>
+        <input type="hidden" name="control" value="moveMap">
+        <?php
+    }
+  elseif ( $monitor['CanMoveRel'] )
+  {
+    ?>
+      <input type="hidden" name="control" value="movePseudoMap">
+      <?php
+  }
+  elseif ( $monitor['CanMoveCon'] )
+  {
+    ?>
+      <input type="hidden" name="control" value="moveConMap">
+      <?php
+  }
+  ?>
+    <input type="hidden" name="scale" value="<?php echo $scale ?>">
+    <input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>">
+    </form>
+    <?php
 }
 
 // Incoming args are shell-escaped. This function must escape any further arguments it cannot guarantee.
 function getZmuCommand( $args )
 {
-    $zmuCommand = ZMU_PATH;
+  $zmuCommand = ZMU_PATH;
 
-    if ( ZM_OPT_USE_AUTH )
+  if ( ZM_OPT_USE_AUTH )
+  {
+    if ( ZM_AUTH_RELAY == "hashed" )
     {
-        if ( ZM_AUTH_RELAY == "hashed" )
-        {
-            $zmuCommand .= " -A ".generateAuthHash( false );
-        }
-        elseif ( ZM_AUTH_RELAY == "plain" )
-        {
-			$zmuCommand .= " -U " .escapeshellarg($_SESSION['username'])." -P ".escapeshellarg($_SESSION['password']);
-        }
-        elseif ( ZM_AUTH_RELAY == "none" )
-        {
-            $zmuCommand .= " -U ".escapeshellarg($_SESSION['username']);
-        }
+      $zmuCommand .= " -A ".generateAuthHash( false );
     }
+    elseif ( ZM_AUTH_RELAY == "plain" )
+    {
+      $zmuCommand .= " -U " .escapeshellarg($_SESSION['username'])." -P ".escapeshellarg($_SESSION['password']);
+    }
+    elseif ( ZM_AUTH_RELAY == "none" )
+    {
+      $zmuCommand .= " -U ".escapeshellarg($_SESSION['username']);
+    }
+  }
 
-    $zmuCommand .= $args;
+  $zmuCommand .= $args;
 
-    return( $zmuCommand );
+  return( $zmuCommand );
 }
 
 function visibleMonitor( $mid )
 {
-    global $user;
+  global $user;
 
-    return( empty($user['MonitorIds']) || in_array( $mid, explode( ',', $user['MonitorIds'] ) ) );
+  return( empty($user['MonitorIds']) || in_array( $mid, explode( ',', $user['MonitorIds'] ) ) );
 }
 
 function canView( $area, $mid=false )
 {
-    global $user;
+  global $user;
 
-    return( ($user[$area] == 'View' || $user[$area] == 'Edit') && ( !$mid || visibleMonitor( $mid ) ) );
+  return( ($user[$area] == 'View' || $user[$area] == 'Edit') && ( !$mid || visibleMonitor( $mid ) ) );
 }
 
 function canEdit( $area, $mid=false )
 {
-    global $user;
+  global $user;
 
-    return( $user[$area] == 'Edit' && ( !$mid || visibleMonitor( $mid ) ) );
+  return( $user[$area] == 'Edit' && ( !$mid || visibleMonitor( $mid ) ) );
 }
 
 function getEventPath( $event )
 {
-	
-    if ( ZM_USE_DEEP_STORAGE )
-        $eventPath = $event['MonitorId'].'/'.strftime( "%y/%m/%d/%H/%M/%S", strtotime($event['StartTime']) );
-    else
-        $eventPath = $event['MonitorId'].'/'.$event['Id'];
-    return( $eventPath );
+
+  if ( ZM_USE_DEEP_STORAGE )
+    $eventPath = $event['MonitorId'].'/'.strftime( "%y/%m/%d/%H/%M/%S", strtotime($event['StartTime']) );
+  else
+    $eventPath = $event['MonitorId'].'/'.$event['Id'];
+  return( $eventPath );
 }
 
 function getEventDefaultVideoPath( $event ) {
   $Event = new Event( $event );
   return $Event->getStreamSrc( array( "mode=mpeg" ) );
-//$Event->Path().'/'.$event['DefaultVideo'];
+  //$Event->Path().'/'.$event['DefaultVideo'];
 }
 
 function deletePath( $path )
 {
-    if ( is_dir( $path ) )
-    {
-        system( escapeshellcmd( "rm -rf ".$path ) );
-    }
-    else
-    {
-        unlink( $path );
-    }
+  if ( is_dir( $path ) )
+  {
+    system( escapeshellcmd( "rm -rf ".$path ) );
+  }
+  else
+  {
+    unlink( $path );
+  }
 }
 
 function deleteEvent( $event ) {
 
-	if ( empty($event) ) {
-		Error( "Empty event passed to deleteEvent.");
-		return;
-	}
+  if ( empty($event) ) {
+    Error( "Empty event passed to deleteEvent.");
+    return;
+  }
 
-    if ( gettype($event) != 'array' ) {
-		# $event could be an eid, so turn it into an event hash
-        $event = new Event( $event );
-    }
+  if ( gettype($event) != 'array' ) {
+# $event could be an eid, so turn it into an event hash
+    $event = new Event( $event );
+  }
 
-    global $user;
+  global $user;
 
-    if ( $user['Events'] == 'Edit' ) {
-		$event->delete();
-    } # CAN EDIT
+  if ( $user['Events'] == 'Edit' ) {
+    $event->delete();
+  } # CAN EDIT
 }
 
 function makeLink( $url, $label, $condition=1, $options="" )
 {
-    $string = "";
-    if ( $condition )
-    {
-        $string .= '<a href="'.$url.'"'.($options?(' '.$options):'').'>';
-    }
-    $string .= $label;
-    if ( $condition )
-    {
-        $string .= '</a>';
-    }
-    return( $string );
+  $string = "";
+  if ( $condition )
+  {
+    $string .= '<a href="'.$url.'"'.($options?(' '.$options):'').'>';
+  }
+  $string .= $label;
+  if ( $condition )
+  {
+    $string .= '</a>';
+  }
+  return( $string );
 }
 
 function makePopupLink( $url, $winName, $winSize, $label, $condition=1, $options="" )
 {
-    $string = "";
-    if ( $condition )
-    {
-        if ( is_array( $winSize ) )
-            $popupParms = "'".$url."', '".$winName."', '".$winSize[0]."', ".$winSize[1].", ".$winSize[2];
-        else
-            $popupParms = "'".$url."', '".$winName."', '".$winSize."'";
+  $string = "";
+  if ( $condition )
+  {
+    if ( is_array( $winSize ) )
+      $popupParms = "'".$url."', '".$winName."', '".$winSize[0]."', ".$winSize[1].", ".$winSize[2];
+    else
+      $popupParms = "'".$url."', '".$winName."', '".$winSize."'";
 
-        $string .= '<a href="'.$url.'" onclick="createPopup( '.$popupParms.' ); return( false );"'.($options?(' '.$options):'').'>';
-    }
-    $string .= $label;
-    if ( $condition )
-    {
-        $string .= '</a>';
-    }
-    return( $string );
+    $string .= '<a href="'.$url.'" onclick="createPopup( '.$popupParms.' ); return( false );"'.($options?(' '.$options):'').'>';
+  }
+  $string .= $label;
+  if ( $condition )
+  {
+    $string .= '</a>';
+  }
+  return( $string );
 }
 
 function makePopupButton( $url, $winName, $winSize, $buttonValue, $condition=1, $options="" )
 {
-    if ( is_array( $winSize ) )
-        $popupParms = "'".$url."', '".$winName."', '".$winSize[0]."', ".$winSize[1].", ".$winSize[2];
-    else
-        $popupParms = "'".$url."', '".$winName."', '".$winSize."'";
-    $string = '<input type="button" value="'.$buttonValue.'" onclick="createPopup( '.$popupParms.' ); return( false );"'.($condition?'':' disabled="disabled"').($options?(' '.$options):'').'/>';
-    return( $string );
+  if ( is_array( $winSize ) )
+    $popupParms = "'".$url."', '".$winName."', '".$winSize[0]."', ".$winSize[1].", ".$winSize[2];
+  else
+    $popupParms = "'".$url."', '".$winName."', '".$winSize."'";
+  $string = '<input type="button" value="'.$buttonValue.'" onclick="createPopup( '.$popupParms.' ); return( false );"'.($condition?'':' disabled="disabled"').($options?(' '.$options):'').'/>';
+  return( $string );
 }
 
 function truncText( $text, $length, $deslash=1 )
 {       
-    return( preg_replace( "/^(.{".$length.",}?)\b.*$/", "\\1&hellip;", ($deslash?stripslashes($text):$text) ) );       
+  return( preg_replace( "/^(.{".$length.",}?)\b.*$/", "\\1&hellip;", ($deslash?stripslashes($text):$text) ) );       
 }               
 
 function htmlSelect( $name, $contents, $values, $behaviors=false ) {
 
-    $behaviourText = "";
-    if ( !empty($behaviours) ) {
-        if ( is_array($behaviours) ) {
-            foreach ( $behaviours as $event=>$action ) {
-                $behaviourText .= ' '.$event.'="'.$action.'"';
-            }
-        } else {
-            $behaviourText = ' onchange="'.$behaviours.'"';
-        }
+  $behaviourText = "";
+  if ( !empty($behaviours) ) {
+    if ( is_array($behaviours) ) {
+      foreach ( $behaviours as $event=>$action ) {
+        $behaviourText .= ' '.$event.'="'.$action.'"';
+      }
+    } else {
+      $behaviourText = ' onchange="'.$behaviours.'"';
     }
-	$html = "<select name=\"$name\" id=\"$name\"$behaviourText>";
-	foreach ( $contents as $value=>$text ) {
-		$selected = is_array( $values ) ? in_array( $value, $values ) : $value==$values;
-		$html .= "<option value=\"$value\"".($selected?" selected=\"selected\"":'').">$text</option>";
-	}
-	$html .= "</select>";
-	return $html;
+  }
+  $html = "<select name=\"$name\" id=\"$name\"$behaviourText>";
+  foreach ( $contents as $value=>$text ) {
+    $selected = is_array( $values ) ? in_array( $value, $values ) : $value==$values;
+    $html .= "<option value=\"$value\"".($selected?" selected=\"selected\"":'').">$text</option>";
+  }
+  $html .= "</select>";
+  return $html;
 }
 
 function buildSelect( $name, $contents, $behaviours=false )
 {
-    $value = "";
-    if ( preg_match( "/^\s*(\w+)\s*(\[.*\])?\s*$/", $name, $matches ) && count($matches) > 2 )
+  $value = "";
+  if ( preg_match( "/^\s*(\w+)\s*(\[.*\])?\s*$/", $name, $matches ) && count($matches) > 2 )
+  {
+    $arr = $matches[1];
+    if ( isset($GLOBALS[$arr]) )
+      $value = $GLOBALS[$arr];
+    elseif ( isset($_REQUEST[$arr]) )
+      $value = $_REQUEST[$arr];
+    if ( !preg_match_all( "/\[\s*['\"]?(\w+)[\"']?\s*\]/", $matches[2], $matches ) )
     {
-        $arr = $matches[1];
-        if ( isset($GLOBALS[$arr]) )
-            $value = $GLOBALS[$arr];
-        elseif ( isset($_REQUEST[$arr]) )
-            $value = $_REQUEST[$arr];
-        if ( !preg_match_all( "/\[\s*['\"]?(\w+)[\"']?\s*\]/", $matches[2], $matches ) )
-        {
-            Fatal( "Can't parse selector '$name'" );
-        }
-        for ( $i = 0; $i < count($matches[1]); $i++ )
-        {
-            $idx = $matches[1][$i];
-            $value = isset($value[$idx])?$value[$idx]:false;
-        }
+      Fatal( "Can't parse selector '$name'" );
+    }
+    for ( $i = 0; $i < count($matches[1]); $i++ )
+    {
+      $idx = $matches[1][$i];
+      $value = isset($value[$idx])?$value[$idx]:false;
+    }
+  }
+  else
+  {
+    if ( isset($GLOBALS[$name]) )
+      $value = $GLOBALS[$name];
+    elseif ( isset($_REQUEST[$name]) )
+      $value = $_REQUEST[$name];
+  }
+  ob_start();
+  $behaviourText = "";
+  if ( !empty($behaviours) )
+  {
+    if ( is_array($behaviours) )
+    {
+      foreach ( $behaviours as $event=>$action )
+      {
+        $behaviourText .= ' '.$event.'="'.$action.'"';
+      }
     }
     else
     {
-        if ( isset($GLOBALS[$name]) )
-            $value = $GLOBALS[$name];
-        elseif ( isset($_REQUEST[$name]) )
-            $value = $_REQUEST[$name];
+      $behaviourText = ' onchange="'.$behaviours.'"';
     }
-    ob_start();
-    $behaviourText = "";
-    if ( !empty($behaviours) )
-    {
-        if ( is_array($behaviours) )
-        {
-            foreach ( $behaviours as $event=>$action )
-            {
-                $behaviourText .= ' '.$event.'="'.$action.'"';
-            }
-        }
-        else
-        {
-            $behaviourText = ' onchange="'.$behaviours.'"';
-        }
-    }
-?>
-<select name="<?php echo $name ?>" id="<?php echo $name ?>"<?php echo $behaviourText ?>>
-<?php
+  }
+  ?>
+    <select name="<?php echo $name ?>" id="<?php echo $name ?>"<?php echo $behaviourText ?>>
+    <?php
     foreach ( $contents as $contentValue => $contentText )
     {
-?>
-<option value="<?php echo $contentValue ?>"<?php if ( $value == $contentValue ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($contentText) ?></option>
-<?php
+      ?>
+        <option value="<?php echo $contentValue ?>"<?php if ( $value == $contentValue ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($contentText) ?></option>
+        <?php
     }
-?>
-</select>
-<?php
+  ?>
+    </select>
+    <?php
     $html = ob_get_contents();
-    ob_end_clean();
-    
-    return( $html );
+  ob_end_clean();
+
+  return( $html );
 }
 
 function getFormChanges( $values, $newValues, $types=false, $columns=false )
 {
-    $changes = array();
-    if ( !$types )
-        $types = array();
+  $changes = array();
+  if ( !$types )
+    $types = array();
 
-    foreach( $newValues as $key=>$value )
+  foreach( $newValues as $key=>$value )
+  {
+    if ( $columns && !$columns[$key] )
+      continue;
+
+    if ( !isset($types[$key]) )
+      $types[$key] = false;
+    switch( $types[$key] )
     {
-        if ( $columns && !$columns[$key] )
-            continue;
-
-        if ( !isset($types[$key]) )
-            $types[$key] = false;
-        switch( $types[$key] )
+      case 'set' :
         {
-            case 'set' :
+          if ( is_array( $newValues[$key] ) )
+          {
+            if ( join(',',$newValues[$key]) != $values[$key] )
             {
-                if ( is_array( $newValues[$key] ) )
-                {
-                    if ( join(',',$newValues[$key]) != $values[$key] )
-                    {
-                        $changes[$key] = "$key = ".dbEscape(join(',',$newValues[$key]));
-                    }
-                }
-                elseif ( $values[$key] )
-                {
-                    $changes[$key] = "$key = ''";
-                }
-                break;
-            }
-            case 'image' :
-            {
-                if ( is_array( $newValues[$key] ) )
-                {
-                    $imageData = getimagesize( $newValues[$key]['tmp_name'] );
-                    $changes[$key.'Width'] = $key."Width = ".$imageData[0];
-                    $changes[$key.'Height'] = $key."Height = ".$imageData[1];
-                    $changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'";
-                    $changes[$key.'Size'] = $key."Size = ".$newValues[$key]['size'];
-                    ob_start();
-                    readfile( $newValues[$key]['tmp_name'] );
-                    $changes[$key] = $key." = ".dbEscape( ob_get_contents() );
-                    ob_end_clean();
-                }
-                else
-                {
-                    $changes[$key] = "$key = ".dbEscape($value);
-                }
-                break;
-            }
-            case 'document' :
-            {
-                if ( is_array( $newValues[$key] ) )
-                {
-                    $imageData = getimagesize( $newValues[$key]['tmp_name'] );
-                    $changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'";
-                    $changes[$key.'Size'] = $key."Size = ".$newValues[$key]['size'];
-                    ob_start();
-                    readfile( $newValues[$key]['tmp_name'] );
-                    $changes[$key] = $key." = ".dbEscape( ob_get_contents() );
-                    ob_end_clean();
-                }
-                else
-                {
-                    $changes[$key] = "$key = ".dbEscape($value);
-                }
-                break;
-            }
-            case 'file' :
-            {
-                $changes[$key.'Type'] = $key."Type = ".dbEscape($newValues[$key]['type']);
-                $changes[$key.'Size'] = $key."Size = ".dbEscape($newValues[$key]['size']);
-                ob_start();
-                readfile( $newValues[$key]['tmp_name'] );
-                $changes[$key] = $key." = '".dbEscape( ob_get_contents() )."'";
-                ob_end_clean();
-                break;
-            }
-            case 'raw' :
-            {
-                if ( $values[$key] != $value )
-                {
-                    $changes[$key] = "$key = ".dbEscape($value);
-                }
-                break;
-            }
-            default :
-            {
-                if ( !isset($values[$key]) || ($values[$key] != $value) )
-                {
-                    $changes[$key] = "$key = ".dbEscape(trim($value));
-                }
-                break;
+              $changes[$key] = "$key = ".dbEscape(join(',',$newValues[$key]));
             }
+          }
+          elseif ( $values[$key] )
+          {
+            $changes[$key] = "$key = ''";
+          }
+          break;
+        }
+      case 'image' :
+        {
+          if ( is_array( $newValues[$key] ) )
+          {
+            $imageData = getimagesize( $newValues[$key]['tmp_name'] );
+            $changes[$key.'Width'] = $key."Width = ".$imageData[0];
+            $changes[$key.'Height'] = $key."Height = ".$imageData[1];
+            $changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'";
+            $changes[$key.'Size'] = $key."Size = ".$newValues[$key]['size'];
+            ob_start();
+            readfile( $newValues[$key]['tmp_name'] );
+            $changes[$key] = $key." = ".dbEscape( ob_get_contents() );
+            ob_end_clean();
+          }
+          else
+          {
+            $changes[$key] = "$key = ".dbEscape($value);
+          }
+          break;
+        }
+      case 'document' :
+        {
+          if ( is_array( $newValues[$key] ) )
+          {
+            $imageData = getimagesize( $newValues[$key]['tmp_name'] );
+            $changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'";
+            $changes[$key.'Size'] = $key."Size = ".$newValues[$key]['size'];
+            ob_start();
+            readfile( $newValues[$key]['tmp_name'] );
+            $changes[$key] = $key." = ".dbEscape( ob_get_contents() );
+            ob_end_clean();
+          }
+          else
+          {
+            $changes[$key] = "$key = ".dbEscape($value);
+          }
+          break;
+        }
+      case 'file' :
+        {
+          $changes[$key.'Type'] = $key."Type = ".dbEscape($newValues[$key]['type']);
+          $changes[$key.'Size'] = $key."Size = ".dbEscape($newValues[$key]['size']);
+          ob_start();
+          readfile( $newValues[$key]['tmp_name'] );
+          $changes[$key] = $key." = '".dbEscape( ob_get_contents() )."'";
+          ob_end_clean();
+          break;
+        }
+      case 'raw' :
+        {
+          if ( $values[$key] != $value )
+          {
+            $changes[$key] = "$key = ".dbEscape($value);
+          }
+          break;
+        }
+      default :
+        {
+          if ( !isset($values[$key]) || ($values[$key] != $value) )
+          {
+            $changes[$key] = "$key = ".dbEscape(trim($value));
+          }
+          break;
         }
     }
-    foreach( $values as $key=>$value )
+  }
+  foreach( $values as $key=>$value )
+  {
+    if ( !empty($columns[$key]) )
     {
-        if ( !empty($columns[$key]) )
+      if ( !empty($types[$key]) )
+      {
+        if ( $types[$key] == 'toggle' )
         {
-            if ( !empty($types[$key]) )
-            {
-                if ( $types[$key] == 'toggle' )
-                {
-                    if ( !isset($newValues[$key]) && !empty($value) )
-                    {
-                        $changes[$key] = "$key = 0";
-                    }
-                }
-                else if ( $types[$key] == 'set' )
-                {
-                    $changes[$key] = "$key = ''";
-                }
-            }
+          if ( !isset($newValues[$key]) && !empty($value) )
+          {
+            $changes[$key] = "$key = 0";
+          }
         }
+        else if ( $types[$key] == 'set' )
+        {
+          $changes[$key] = "$key = ''";
+        }
+      }
     }
-    return( $changes );
+  }
+  return( $changes );
 }
 
 function getBrowser( &$browser, &$version )
 {
-    if ( isset($_SESSION['browser']) )
+  if ( isset($_SESSION['browser']) )
+  {
+    $browser = $_SESSION['browser'];
+    $version = $_SESSION['version'];
+  }
+  else
+  {
+    if (( preg_match( '/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $logVersion)) || (preg_match( '/.*Trident.*rv:(.*?)(;|\))/', $_SERVER['HTTP_USER_AGENT'], $logVersion)))
     {
-        $browser = $_SESSION['browser'];
-        $version = $_SESSION['version'];
+      $version = $logVersion[1];
+      $browser = 'ie';
+    }
+    elseif ( preg_match( '/Chrome\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
+    {
+      $version = $logVersion[1];
+      // Check for old version of Chrome with bug 5876
+      if ( $version < 7 )
+      {
+        $browser = 'oldchrome';
+      }
+      else
+      {
+        $browser = 'chrome';
+      }
+    }
+    elseif ( preg_match( '/Safari\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
+    {
+      $version = $logVersion[1];
+      $browser = 'safari';
+    }
+    elseif ( preg_match( '/Opera[ \/]([0-9].[0-9]{1,2})/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
+    {
+      $version = $logVersion[1];
+      $browser = 'opera';
+    }
+    elseif ( preg_match( '/Konqueror\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
+    {
+      $version = $logVersion[1];
+      $browser = 'konqueror';
+    }
+    elseif ( preg_match( '/Mozilla\/([0-9].[0-9]{1,2})/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
+    {
+      $version = $logVersion[1];
+      $browser = 'mozilla';
     }
     else
     {
-	if (( preg_match( '/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $logVersion)) || (preg_match( '/.*Trident.*rv:(.*?)(;|\))/', $_SERVER['HTTP_USER_AGENT'], $logVersion)))
-        {
-            $version = $logVersion[1];
-            $browser = 'ie';
-        }
-        elseif ( preg_match( '/Chrome\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
-        {
-            $version = $logVersion[1];
-            // Check for old version of Chrome with bug 5876
-            if ( $version < 7 )
-            {
-                $browser = 'oldchrome';
-            }
-            else
-            {
-                $browser = 'chrome';
-            }
-        }
-        elseif ( preg_match( '/Safari\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
-        {
-            $version = $logVersion[1];
-            $browser = 'safari';
-        }
-        elseif ( preg_match( '/Opera[ \/]([0-9].[0-9]{1,2})/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
-        {
-            $version = $logVersion[1];
-            $browser = 'opera';
-        }
-        elseif ( preg_match( '/Konqueror\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
-        {
-            $version = $logVersion[1];
-            $browser = 'konqueror';
-        }
-        elseif ( preg_match( '/Mozilla\/([0-9].[0-9]{1,2})/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
-        {
-            $version = $logVersion[1];
-            $browser = 'mozilla';
-        }
-        else
-        {
-            $version = 0;
-            $browser = 'unknown';
-        }
-        $_SESSION['browser'] = $browser;
-        $_SESSION['version'] = $version;
+      $version = 0;
+      $browser = 'unknown';
     }
+    $_SESSION['browser'] = $browser;
+    $_SESSION['version'] = $version;
+  }
 }
 
 function isMozilla()
 {
-    getBrowser( $browser, $version );
+  getBrowser( $browser, $version );
 
-    return( $browser == "mozilla" );
+  return( $browser == "mozilla" );
 }
 
 function isKonqueror()
 {
-   getBrowser( $browser, $version );
+  getBrowser( $browser, $version );
 
-   return( $browser == "konqueror" );
+  return( $browser == "konqueror" );
 }
 
 function isInternetExplorer()
 {
-    getBrowser( $browser, $version );
+  getBrowser( $browser, $version );
 
-    return( $browser == "ie" );
+  return( $browser == "ie" );
 }
 
 function isOldChrome()
 {
-    getBrowser( $browser, $version );
+  getBrowser( $browser, $version );
 
-    return( $browser == "oldchrome" );
+  return( $browser == "oldchrome" );
 }
 
 function isChrome()
 {
-    getBrowser( $browser, $version );
+  getBrowser( $browser, $version );
 
-    return( $browser == "chrome" );
+  return( $browser == "chrome" );
 }
 
 function isOpera()
 {
-    getBrowser( $browser, $version );
+  getBrowser( $browser, $version );
 
-    return( $browser == "opera" );
+  return( $browser == "opera" );
 }
 
 function isSafari()
 {
-    getBrowser( $browser, $version );
+  getBrowser( $browser, $version );
 
-    return( $browser == "safari" );
+  return( $browser == "safari" );
 }
 
 function isWindows()
 {
-    return ( preg_match( '/Win/', $_SERVER['HTTP_USER_AGENT'] ) );
+  return ( preg_match( '/Win/', $_SERVER['HTTP_USER_AGENT'] ) );
 }
 
 function canStreamIframe()
 {
-   return( isKonqueror() );
+  return( isKonqueror() );
 }
 
 function canStreamNative()
 {
-   // Old versions of Chrome can display the stream, but then it blocks everything else (Chrome bug 5876)
-   return( ZM_WEB_CAN_STREAM == "yes" || ( ZM_WEB_CAN_STREAM == "auto" && (!isInternetExplorer() && !isOldChrome()) ) );
+  // Old versions of Chrome can display the stream, but then it blocks everything else (Chrome bug 5876)
+  return( ZM_WEB_CAN_STREAM == "yes" || ( ZM_WEB_CAN_STREAM == "auto" && (!isInternetExplorer() && !isOldChrome()) ) );
 }
 
 function canStreamApplet()
 {
-    if ( (ZM_OPT_CAMBOZOLA && !file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) )
-    {
-        Warning ( "ZM_OPT_CAMBOZOLA is enabled, but the system cannot find ".ZM_PATH_WEB."/".ZM_PATH_CAMBOZOLA );
-    }
+  if ( (ZM_OPT_CAMBOZOLA && !file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) )
+  {
+    Warning ( "ZM_OPT_CAMBOZOLA is enabled, but the system cannot find ".ZM_PATH_WEB."/".ZM_PATH_CAMBOZOLA );
+  }
 
-    return( (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) );
+  return( (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) );
 }
 
 function canStream()
 {
-    return( canStreamNative() | canStreamApplet() );
+  return( canStreamNative() | canStreamApplet() );
 }
 
 function packageControl( $command )
 {
-    $string = ZM_PATH_BIN.'/zmpkg.pl '.escapeshellarg( $command );
-    $string .= " 2>/dev/null >&- <&- >/dev/null";
-    exec( $string );
+  $string = ZM_PATH_BIN.'/zmpkg.pl '.escapeshellarg( $command );
+  $string .= " 2>/dev/null >&- <&- >/dev/null";
+  exec( $string );
 }
 
 function daemonControl( $command, $daemon=false, $args=false )
 {
-    $string = ZM_PATH_BIN."/zmdc.pl $command";
-    if ( $daemon )
+  $string = ZM_PATH_BIN."/zmdc.pl $command";
+  if ( $daemon )
+  {
+    $string .= " $daemon";
+    if ( $args )
     {
-        $string .= " $daemon";
-        if ( $args )
-        {
-            $string .= " $args";
-        }
+      $string .= " $args";
     }
-    $string .= " 2>/dev/null >&- <&- >/dev/null";
-    exec( $string );
+  }
+  $string .= " 2>/dev/null >&- <&- >/dev/null";
+  exec( $string );
 }
 
 function zmcControl( $monitor, $mode=false )
 {
-	$row = NULL;
-    if ( $monitor['Type'] == "Local" )
-    {
-		$row = dbFetchOne( "select count(if(Function!='None',1,NULL)) as ActiveCount from Monitors where Device = ?", NULL, array($monitor['Device']) );
-        $zmcArgs = "-d ".$monitor['Device'];
-    }
-    else
-    {
-		$row = dbFetchOne( "select count(if(Function!='None',1,NULL)) as ActiveCount from Monitors where Id = ?", NULL, array($monitor['Id']) );
-        $zmcArgs = "-m ".$monitor['Id'];
-    }
-    $activeCount = $row['ActiveCount'];
+  $row = NULL;
+  if ( $monitor['Type'] == "Local" )
+  {
+    $row = dbFetchOne( "select count(if(Function!='None',1,NULL)) as ActiveCount from Monitors where Device = ?", NULL, array($monitor['Device']) );
+    $zmcArgs = "-d ".$monitor['Device'];
+  }
+  else
+  {
+    $row = dbFetchOne( "select count(if(Function!='None',1,NULL)) as ActiveCount from Monitors where Id = ?", NULL, array($monitor['Id']) );
+    $zmcArgs = "-m ".$monitor['Id'];
+  }
+  $activeCount = $row['ActiveCount'];
 
-    if ( !$activeCount || $mode == "stop" )
+  if ( !$activeCount || $mode == "stop" )
+  {
+    daemonControl( "stop", "zmc", $zmcArgs );
+  }
+  else
+  {
+    if ( $mode == "restart" )
     {
-        daemonControl( "stop", "zmc", $zmcArgs );
-    }
-    else
-    {
-        if ( $mode == "restart" )
-        {
-            daemonControl( "stop", "zmc", $zmcArgs );
-        }
-        daemonControl( "start", "zmc", $zmcArgs );
+      daemonControl( "stop", "zmc", $zmcArgs );
     }
+    daemonControl( "start", "zmc", $zmcArgs );
+  }
 }
 
 function zmaControl( $monitor, $mode=false )
 {
-    if ( !is_array( $monitor ) )
+  if ( !is_array( $monitor ) )
+  {
+    $monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) );
+  }
+  if ( !$monitor || $monitor['Function'] == 'None' || $monitor['Function'] == 'Monitor' || $mode == "stop" )
+  {
+    if ( ZM_OPT_CONTROL )
     {
-        $monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) );
+      daemonControl( "stop", "zmtrack.pl", "-m ".$monitor['Id'] );
     }
-    if ( !$monitor || $monitor['Function'] == 'None' || $monitor['Function'] == 'Monitor' || $mode == "stop" )
+    daemonControl( "stop", "zma", "-m ".$monitor['Id'] );
+    if ( ZM_OPT_FRAME_SERVER )
     {
-        if ( ZM_OPT_CONTROL )
-        {
-            daemonControl( "stop", "zmtrack.pl", "-m ".$monitor['Id'] );
-        }
-        daemonControl( "stop", "zma", "-m ".$monitor['Id'] );
-        if ( ZM_OPT_FRAME_SERVER )
-        {
-            daemonControl( "stop", "zmf", "-m ".$monitor['Id'] );
-        }
+      daemonControl( "stop", "zmf", "-m ".$monitor['Id'] );
     }
-    else
+  }
+  else
+  {
+    if ( $mode == "restart" )
     {
-        if ( $mode == "restart" )
-        {
-            if ( ZM_OPT_CONTROL )
-            {
-                daemonControl( "stop", "zmtrack.pl", "-m ".$monitor['Id'] );
-            }
-            daemonControl( "stop", "zma", "-m ".$monitor['Id'] );
-            if ( ZM_OPT_FRAME_SERVER )
-            {
-                daemonControl( "stop", "zmf", "-m ".$monitor['Id'] );
-            }
-        }
-        if ( ZM_OPT_FRAME_SERVER )
-        {
-            daemonControl( "start", "zmf", "-m ".$monitor['Id'] );
-        }
-        daemonControl( "start", "zma", "-m ".$monitor['Id'] );
-        if ( ZM_OPT_CONTROL && $monitor['Controllable'] && $monitor['TrackMotion'] && ( $monitor['Function'] == 'Modect' || $monitor['Function'] == 'Mocord' ) )
-        {
-            daemonControl( "start", "zmtrack.pl", "-m ".$monitor['Id'] );
-        }
-        if ( $mode == "reload" )
-        {
-            daemonControl( "reload", "zma", "-m ".$monitor['Id'] );
-        }
+      if ( ZM_OPT_CONTROL )
+      {
+        daemonControl( "stop", "zmtrack.pl", "-m ".$monitor['Id'] );
+      }
+      daemonControl( "stop", "zma", "-m ".$monitor['Id'] );
+      if ( ZM_OPT_FRAME_SERVER )
+      {
+        daemonControl( "stop", "zmf", "-m ".$monitor['Id'] );
+      }
     }
+    if ( ZM_OPT_FRAME_SERVER )
+    {
+      daemonControl( "start", "zmf", "-m ".$monitor['Id'] );
+    }
+    daemonControl( "start", "zma", "-m ".$monitor['Id'] );
+    if ( ZM_OPT_CONTROL && $monitor['Controllable'] && $monitor['TrackMotion'] && ( $monitor['Function'] == 'Modect' || $monitor['Function'] == 'Mocord' ) )
+    {
+      daemonControl( "start", "zmtrack.pl", "-m ".$monitor['Id'] );
+    }
+    if ( $mode == "reload" )
+    {
+      daemonControl( "reload", "zma", "-m ".$monitor['Id'] );
+    }
+  }
 }
 
 function initDaemonStatus()
 {
-    global $daemon_status;
+  global $daemon_status;
 
-    if ( !isset($daemon_status) )
+  if ( !isset($daemon_status) )
+  {
+    if ( daemonCheck() )
     {
-        if ( daemonCheck() )
-        {
-            $string = ZM_PATH_BIN."/zmdc.pl status";
-            $daemon_status = shell_exec( $string );
-        }
-        else
-        {
-            $daemon_status = "";
-        }
+      $string = ZM_PATH_BIN."/zmdc.pl status";
+      $daemon_status = shell_exec( $string );
     }
+    else
+    {
+      $daemon_status = "";
+    }
+  }
 }
 
 function daemonStatus( $daemon, $args=false )
 {
-    global $daemon_status;
+  global $daemon_status;
 
-    initDaemonStatus();
-    
-    $string = "$daemon";
-    if ( $args )
-        $string .= " $args";
-    return( strpos( $daemon_status, "'$string' running" ) !== false );
+  initDaemonStatus();
+
+  $string = "$daemon";
+  if ( $args )
+    $string .= " $args";
+  return( strpos( $daemon_status, "'$string' running" ) !== false );
 }
 
 function zmcStatus( $monitor )
 {
-    if ( $monitor['Type'] == 'Local' )
-    {
-        $zmcArgs = "-d ".$monitor['Device'];
-    }
-    else
-    {
-        $zmcArgs = "-m ".$monitor['Id'];
-    }
-    return( daemonStatus( "zmc", $zmcArgs ) );
+  if ( $monitor['Type'] == 'Local' )
+  {
+    $zmcArgs = "-d ".$monitor['Device'];
+  }
+  else
+  {
+    $zmcArgs = "-m ".$monitor['Id'];
+  }
+  return( daemonStatus( "zmc", $zmcArgs ) );
 }
 
 function zmaStatus( $monitor )
 {
-    if ( is_array( $monitor ) )
-    {
-        $monitor = $monitor['Id'];
-    }
-    return( daemonStatus( "zma", "-m $monitor" ) );
+  if ( is_array( $monitor ) )
+  {
+    $monitor = $monitor['Id'];
+  }
+  return( daemonStatus( "zma", "-m $monitor" ) );
 }
 
 function daemonCheck( $daemon=false, $args=false )
 {
-    $string = ZM_PATH_BIN."/zmdc.pl check";
-    if ( $daemon )
-    {
-        $string .= " $daemon";
-        if ( $args )
-            $string .= " $args";
-    }
-    $result = exec( $string );
-    return( preg_match( '/running/', $result ) );
+  $string = ZM_PATH_BIN."/zmdc.pl check";
+  if ( $daemon )
+  {
+    $string .= " $daemon";
+    if ( $args )
+      $string .= " $args";
+  }
+  $result = exec( $string );
+  return( preg_match( '/running/', $result ) );
 }
 
 function zmcCheck( $monitor )
 {
-    if ( $monitor['Type'] == 'Local' )
-    {
-        $zmcArgs = "-d ".$monitor['Device'];
-    }
-    else
-    {
-        $zmcArgs = "-m ".$monitor['Id'];
-    }
-    return( daemonCheck( "zmc", $zmcArgs ) );
+  if ( $monitor['Type'] == 'Local' )
+  {
+    $zmcArgs = "-d ".$monitor['Device'];
+  }
+  else
+  {
+    $zmcArgs = "-m ".$monitor['Id'];
+  }
+  return( daemonCheck( "zmc", $zmcArgs ) );
 }
 
 function zmaCheck( $monitor )
 {
-    if ( is_array( $monitor ) )
-    {
-        $monitor = $monitor['Id'];
-    }
-    return( daemonCheck( "zma", "-m $monitor" ) );
+  if ( is_array( $monitor ) )
+  {
+    $monitor = $monitor['Id'];
+  }
+  return( daemonCheck( "zma", "-m $monitor" ) );
 }
 
-function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false )
-{
-	require_once('includes/Storage.php');
-    $eventPath = getEventPath( $event );
-	$Storage = new Storage( $event['StorageId'] );
+function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false ) {
+  $Storage = new Storage( $event['StorageId'] );
+  $Event = new Event( $event );
+  $eventPath = $Event->Path();
 
-    if ( !is_array($frame) )
-        $frame = array( 'FrameId'=>$frame, 'Type'=>'' );
+  if ( !is_array($frame) )
+    $frame = array( 'FrameId'=>$frame, 'Type'=>'' );
 
-    //echo "S:$scale, CO:$captureOnly<br>";
-    $currEvent = dbFetchOne( 'SELECT M.SaveJPEGs FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = '.$event['Id'] );
-    if ( $currEvent['SaveJPEGs'] == "4" ) {
-        # Snapshot only mode
-        $captImage = "snapshot.jpg";
-    } else {
-        $captImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg", $frame['FrameId'] );
-        if ( $currEvent['SaveJPEGs'] == "0" ) {
-          # No JPEG saving, must pull from video
-          if ( ! file_exists( $Storage->Path() .'/'.$eventPath.'/'.$captImage ) ) {
-            # Generate the frame JPG
-            # See issue #1379
-          }
-        }
+
+  if ( file_exists( $eventPath.'/snapshot.jpg' ) ) {
+    $captImage = "snapshot.jpg";
+  } else {
+    $captImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg", $frame['FrameId'] );
+    if ( ! file_exists( $eventPath.'/'.$captImage ) ) {
+# Generate the frame JPG
+      if ( $Event->DefaultVideo() ) {
+        $command ='ffmpeg -v 0 -i '.$eventPath.'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$frame['FrameId'].'),setpts=PTS-STARTPTS" '.$eventPath.'/'.$captImage;
+        Debug( "Running $command" );
+        $output = array();
+        $retval = 0;
+        exec( $command, $output, $retval );
+        Debug("Retval: $retval, output: " . implode("\n", $output));
+      } else {
+        Error("Can't create frame images from video becuase there is no video file for this event (".$Event->DefaultVideo() );
+      }
     }
-    $captPath = $eventPath.'/'.$captImage;
-    $thumbCaptPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$captImage;
-    //echo "CI:$captImage, CP:$captPath, TCP:$thumbCaptPath<br>";
+  }
 
-    $analImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-analyse.jpg", $frame['FrameId'] );
-    $analPath = $eventPath.'/'.$analImage;
+  $captPath = $eventPath.'/'.$captImage;
+  if ( ! file_exists( $captPath ) ) {
+    Error( "Capture file does not exist at $captPath" );
+    return '';
+  }
+  $thumbCaptPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$captImage;
+  
+  //echo "CI:$captImage, CP:$captPath, TCP:$thumbCaptPath<br>";
 
-    $analFile =  $Storage->Path()."/".$analPath;
-    $thumbAnalPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$analImage;
-    //echo "AI:$analImage, AP:$analPath, TAP:$thumbAnalPath<br>";
+  $analImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-analyse.jpg", $frame['FrameId'] );
+  $analPath = $eventPath.'/'.$analImage;
 
-    $alarmFrame = $frame['Type']=='Alarm';
+  $thumbAnalPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$analImage;
+  //echo "AI:$analImage, AP:$analPath, TAP:$thumbAnalPath<br>";
 
-    $hasAnalImage = $alarmFrame && file_exists( $analFile ) && filesize( $analFile );
-    $isAnalImage = $hasAnalImage && !$captureOnly;
+  $alarmFrame = $frame['Type']=='Alarm';
 
-    if ( !ZM_WEB_SCALE_THUMBS || $scale >= SCALE_BASE || !function_exists( 'imagecreatefromjpeg' ) )
-    {
-        $imagePath = $thumbPath = $isAnalImage?$analPath:$captPath;
-        $imageFile = $Storage->Path()."/".$imagePath;
-        $thumbFile = $Storage->Path()."/".$thumbPath;
-    }
+  $hasAnalImage = $alarmFrame && file_exists( $analPath ) && filesize( $analPath );
+  $isAnalImage = $hasAnalImage && !$captureOnly;
+
+  if ( !ZM_WEB_SCALE_THUMBS || $scale >= SCALE_BASE || !function_exists( 'imagecreatefromjpeg' ) ) {
+    $imagePath = $thumbPath = $isAnalImage?$analPath:$captPath;
+    $imageFile = $imagePath;
+    $thumbFile = $thumbPath;
+  } else {
+    if ( version_compare( phpversion(), "4.3.10", ">=") )
+      $fraction = sprintf( "%.3F", $scale/SCALE_BASE );
     else
-    {
-        if ( version_compare( phpversion(), "4.3.10", ">=") )
-            $fraction = sprintf( "%.3F", $scale/SCALE_BASE );
-        else
-            $fraction = sprintf( "%.3f", $scale/SCALE_BASE );
-        $scale = (int)round( $scale );
+      $fraction = sprintf( "%.3f", $scale/SCALE_BASE );
+    $scale = (int)round( $scale );
 
-        $thumbCaptPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $thumbCaptPath );
-        $thumbAnalPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $thumbAnalPath );
+    $thumbCaptPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $thumbCaptPath );
+    $thumbAnalPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $thumbAnalPath );
 
-        if ( $isAnalImage )
-        {
-            $imagePath = $analPath;
-            $thumbPath = $thumbAnalPath;
-        }
-        else
-        {
-            $imagePath = $captPath;
-            $thumbPath = $thumbCaptPath;
-        }
-
-        $imageFile = $Storage->Path()."/".$imagePath;
-        //$thumbFile = ZM_DIR_EVENTS."/".$thumbPath;
-        $thumbFile = $thumbPath;
-        if ( $overwrite || !file_exists( $thumbFile ) || !filesize( $thumbFile ) )
-        {
-            // Get new dimensions
-            list( $imageWidth, $imageHeight ) = getimagesize( $imageFile );
-            $thumbWidth = $imageWidth * $fraction;
-            $thumbHeight = $imageHeight * $fraction;
-
-            // Resample
-            $thumbImage = imagecreatetruecolor( $thumbWidth, $thumbHeight );
-            $image = imagecreatefromjpeg( $imageFile );
-            imagecopyresampled( $thumbImage, $image, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imageWidth, $imageHeight );
-
-            if ( !imagejpeg( $thumbImage, $thumbFile ) )
-                Error( "Can't create thumbnail '$thumbPath'" );
-        }
+    if ( $isAnalImage ) {
+      $imagePath = $analPath;
+      $thumbPath = $thumbAnalPath;
+    } else {
+      $imagePath = $captPath;
+      $thumbPath = $thumbCaptPath;
     }
 
-    $imageData = array(
-        'eventPath' => $eventPath,
-        'imagePath' => $imagePath,
-        'thumbPath' => $thumbPath,
-        'imageFile' => $imageFile,
-        'thumbFile' => $thumbFile,
-        'imageClass' => $alarmFrame?"alarm":"normal",
-        'isAnalImage' => $isAnalImage,
-        'hasAnalImage' => $hasAnalImage,
-    );
+    $imageFile = $imagePath;
+    $thumbFile = $thumbPath;
+    if ( $overwrite || !file_exists( $thumbFile ) || !filesize( $thumbFile ) )
+    {
+      // Get new dimensions
+      list( $imageWidth, $imageHeight ) = getimagesize( $imageFile );
+      $thumbWidth = $imageWidth * $fraction;
+      $thumbHeight = $imageHeight * $fraction;
 
-    //echo "IP:$imagePath<br>";
-    //echo "TP:$thumbPath<br>";
-    return( $imageData );
+      // Resample
+      $thumbImage = imagecreatetruecolor( $thumbWidth, $thumbHeight );
+      $image = imagecreatefromjpeg( $imageFile );
+      imagecopyresampled( $thumbImage, $image, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imageWidth, $imageHeight );
+
+      if ( !imagejpeg( $thumbImage, $thumbFile ) )
+        Error( "Can't create thumbnail '$thumbPath'" );
+    }
+  }
+
+  $imageData = array(
+      'eventPath' => $eventPath,
+      'imagePath' => $imagePath,
+      'thumbPath' => $thumbPath,
+      'imageFile' => $imageFile,
+      'thumbFile' => $thumbFile,
+      'imageClass' => $alarmFrame?"alarm":"normal",
+      'isAnalImage' => $isAnalImage,
+      'hasAnalImage' => $hasAnalImage,
+      );
+
+  return( $imageData );
 }
 
 function viewImagePath( $path, $querySep='&amp;' )
 {
-    if ( strncmp( $path, ZM_DIR_IMAGES, strlen(ZM_DIR_IMAGES) ) == 0 )
-    {
-        // Thumbnails
-        return( $path );
-    }
-    elseif ( strpos( ZM_DIR_EVENTS, '/' ) === 0 )
-    {
-        return( '?view=image'.$querySep.'path='.$path );
-    }
-    return( ZM_DIR_EVENTS.'/'.$path );
+  if ( strncmp( $path, ZM_DIR_IMAGES, strlen(ZM_DIR_IMAGES) ) == 0 )
+  {
+    // Thumbnails
+    return( $path );
+  }
+  elseif ( strpos( ZM_DIR_EVENTS, '/' ) === 0 )
+  {
+    return( '?view=image'.$querySep.'path='.$path );
+  }
+  return( ZM_DIR_EVENTS.'/'.$path );
 }
 
 function createListThumbnail( $event, $overwrite=false )
 {
-    # Load the frame with the highest score to use as a thumbnail
-    if ( !($frame = dbFetchOne( "SELECT * FROM Frames WHERE EventId=? AND Score=? ORDER BY FrameId LIMIT 1", NULL, array( $event['Id'], $event['MaxScore'] ) )) )
-        return( false );
+# Load the frame with the highest score to use as a thumbnail
+  if ( !($frame = dbFetchOne( "SELECT * FROM Frames WHERE EventId=? AND Score=? ORDER BY FrameId LIMIT 1", NULL, array( $event['Id'], $event['MaxScore'] ) )) )
+    return( false );
 
-    $frameId = $frame['FrameId'];
+  $frameId = $frame['FrameId'];
 
-    if ( ZM_WEB_LIST_THUMB_WIDTH )
-    {
-        $thumbWidth = ZM_WEB_LIST_THUMB_WIDTH;
-        $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_WIDTH)/$event['Width'];
-        $thumbHeight = reScale( $event['Height'], $scale );
-    }
-    elseif ( ZM_WEB_LIST_THUMB_HEIGHT )
-    {
-        $thumbHeight = ZM_WEB_LIST_THUMB_HEIGHT;
-        $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_HEIGHT)/$event['Height'];
-        $thumbWidth = reScale( $event['Width'], $scale );
-    }
-    else
-    {
-        Fatal( "No thumbnail width or height specified, please check in Options->Web" );
-    }
+  if ( ZM_WEB_LIST_THUMB_WIDTH )
+  {
+    $thumbWidth = ZM_WEB_LIST_THUMB_WIDTH;
+    $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_WIDTH)/$event['Width'];
+    $thumbHeight = reScale( $event['Height'], $scale );
+  }
+  elseif ( ZM_WEB_LIST_THUMB_HEIGHT )
+  {
+    $thumbHeight = ZM_WEB_LIST_THUMB_HEIGHT;
+    $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_HEIGHT)/$event['Height'];
+    $thumbWidth = reScale( $event['Width'], $scale );
+  }
+  else
+  {
+    Fatal( "No thumbnail width or height specified, please check in Options->Web" );
+  }
 
-    $imageData = getImageSrc( $event, $frame, $scale, false, $overwrite );
-    $thumbData = $frame;
-    $thumbData['Path'] = $imageData['thumbPath'];
-    $thumbData['Width'] = (int)$thumbWidth;
-    $thumbData['Height'] = (int)$thumbHeight;
+  $imageData = getImageSrc( $event, $frame, $scale, false, $overwrite );
+  if ( ! $imageData ) {
+    return ( false );;
+  }
+  $thumbData = $frame;
+  $thumbData['Path'] = $imageData['thumbPath'];
+  $thumbData['Width'] = (int)$thumbWidth;
+  $thumbData['Height'] = (int)$thumbHeight;
 
-    return( $thumbData );
+  return( $thumbData );
 }
 
 function createVideo( $event, $format, $rate, $scale, $overwrite=false )
 {
-    $command = ZM_PATH_BIN."/zmvideo.pl -e ".$event['Id']." -f ".$format." -r ".sprintf( "%.2F", ($rate/RATE_BASE) );
-    if ( preg_match( '/\d+x\d+/', $scale ) )
-        $command .= " -S ".$scale;
+  $command = ZM_PATH_BIN."/zmvideo.pl -e ".$event['Id']." -f ".$format." -r ".sprintf( "%.2F", ($rate/RATE_BASE) );
+  if ( preg_match( '/\d+x\d+/', $scale ) )
+    $command .= " -S ".$scale;
+  else
+    if ( version_compare( phpversion(), "4.3.10", ">=") )
+      $command .= " -s ".sprintf( "%.2F", ($scale/SCALE_BASE) );
     else
-        if ( version_compare( phpversion(), "4.3.10", ">=") )
-            $command .= " -s ".sprintf( "%.2F", ($scale/SCALE_BASE) );
-        else
-            $command .= " -s ".sprintf( "%.2f", ($scale/SCALE_BASE) );
-    if ( $overwrite )
-        $command .= " -o";
-    $result = exec( escapeshellcmd( $command ), $output, $status );
-    return( $status?"":rtrim($result) );
+      $command .= " -s ".sprintf( "%.2f", ($scale/SCALE_BASE) );
+  if ( $overwrite )
+    $command .= " -o";
+  $result = exec( escapeshellcmd( $command ), $output, $status );
+  return( $status?"":rtrim($result) );
 }
 
 function executeFilter( $filter )
 {
-    $command = ZM_PATH_BIN."/zmfilter.pl --filter ".escapeshellarg($filter);
-    $result = exec( $command, $output, $status );
-    dbQuery( "delete from Filters where Name like '_TempFilter%'" );
-    return( $status );
+  $command = ZM_PATH_BIN."/zmfilter.pl --filter ".escapeshellarg($filter);
+  $result = exec( $command, $output, $status );
+  dbQuery( "delete from Filters where Name like '_TempFilter%'" );
+  return( $status );
 }
 
 function reScale( $dimension, $dummy )
 {
-    for ( $i = 1; $i < func_num_args(); $i++ )
-    {
-        $scale = func_get_arg( $i );
-        if ( !empty($scale) && $scale != SCALE_BASE )
-            $dimension = (int)(($dimension*$scale)/SCALE_BASE);
-    }
-    return( $dimension );
+  for ( $i = 1; $i < func_num_args(); $i++ )
+  {
+    $scale = func_get_arg( $i );
+    if ( !empty($scale) && $scale != SCALE_BASE )
+      $dimension = (int)(($dimension*$scale)/SCALE_BASE);
+  }
+  return( $dimension );
 }
 
 function deScale( $dimension, $dummy )
 {
-    for ( $i = 1; $i < func_num_args(); $i++ )
-    {
-        $scale = func_get_arg( $i );
-        if ( !empty($scale) && $scale != SCALE_BASE )
-            $dimension = (int)(($dimension*SCALE_BASE)/$scale);
-    }
-    return( $dimension );
+  for ( $i = 1; $i < func_num_args(); $i++ )
+  {
+    $scale = func_get_arg( $i );
+    if ( !empty($scale) && $scale != SCALE_BASE )
+      $dimension = (int)(($dimension*SCALE_BASE)/$scale);
+  }
+  return( $dimension );
 }
 
 function monitorLimitSql()
 {
-    global $user;
-    if ( !empty($user['MonitorIds']) )
-        $midSql = " and MonitorId in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
-    else
-        $midSql = '';
-    return( $midSql );
+  global $user;
+  if ( !empty($user['MonitorIds']) )
+    $midSql = " and MonitorId in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
+  else
+    $midSql = '';
+  return( $midSql );
 }
 
 function parseSort( $saveToSession=false, $querySep='&amp;' )
 {
-    global $sortQuery, $sortColumn, $sortOrder; // Outputs
+  global $sortQuery, $sortColumn, $sortOrder; // Outputs
 
-    if ( empty($_REQUEST['sort_field']) )
-    {
-        $_REQUEST['sort_field'] = ZM_WEB_EVENT_SORT_FIELD;
-        $_REQUEST['sort_asc'] = (ZM_WEB_EVENT_SORT_ORDER == "asc");
-    }
-    switch( $_REQUEST['sort_field'] )
-    {
-        case 'Id' :
-            $sortColumn = "E.Id";
-            break;
-        case 'MonitorName' :
-            $sortColumn = "M.Name";
-            break;
-        case 'Name' :
-            $sortColumn = "E.Name";
-            break;
-        case 'Cause' :
-            $sortColumn = "E.Cause";
-            break;
-        case 'DateTime' :
-            $_REQUEST['sort_field'] = 'StartTime';
-        case 'StartTime' :
-            $sortColumn = "E.StartTime";
-            break;
-        case 'Length' :
-            $sortColumn = "E.Length";
-            break;
-        case 'Frames' :
-            $sortColumn = "E.Frames";
-            break;
-        case 'AlarmFrames' :
-            $sortColumn = "E.AlarmFrames";
-            break;
-        case 'TotScore' :
-            $sortColumn = "E.TotScore";
-            break;
-        case 'AvgScore' :
-            $sortColumn = "E.AvgScore";
-            break;
-        case 'MaxScore' :
-            $sortColumn = "E.MaxScore";
-            break;
-        default:
-            $sortColumn = "E.StartTime";
-            break;
-    }
-    $sortOrder = $_REQUEST['sort_asc']?"asc":"desc";
-    if ( !$_REQUEST['sort_asc'] )
-        $_REQUEST['sort_asc'] = 0;
-    $sortQuery = $querySep."sort_field=".validHtmlStr($_REQUEST['sort_field']).$querySep."sort_asc=".validHtmlStr($_REQUEST['sort_asc']);
-    if ( !isset($_REQUEST['limit']) )
-        $_REQUEST['limit'] = "";
-    if ( $saveToSession )
-    {
-        $_SESSION['sort_field'] = validHtmlStr($_REQUEST['sort_field']);
-        $_SESSION['sort_asc'] = validHtmlStr($_REQUEST['sort_asc']);
-    }
+  if ( empty($_REQUEST['sort_field']) )
+  {
+    $_REQUEST['sort_field'] = ZM_WEB_EVENT_SORT_FIELD;
+    $_REQUEST['sort_asc'] = (ZM_WEB_EVENT_SORT_ORDER == "asc");
+  }
+  switch( $_REQUEST['sort_field'] )
+  {
+    case 'Id' :
+      $sortColumn = "E.Id";
+      break;
+    case 'MonitorName' :
+      $sortColumn = "M.Name";
+      break;
+    case 'Name' :
+      $sortColumn = "E.Name";
+      break;
+    case 'Cause' :
+      $sortColumn = "E.Cause";
+      break;
+    case 'DateTime' :
+      $_REQUEST['sort_field'] = 'StartTime';
+    case 'StartTime' :
+      $sortColumn = "E.StartTime";
+      break;
+    case 'Length' :
+      $sortColumn = "E.Length";
+      break;
+    case 'Frames' :
+      $sortColumn = "E.Frames";
+      break;
+    case 'AlarmFrames' :
+      $sortColumn = "E.AlarmFrames";
+      break;
+    case 'TotScore' :
+      $sortColumn = "E.TotScore";
+      break;
+    case 'AvgScore' :
+      $sortColumn = "E.AvgScore";
+      break;
+    case 'MaxScore' :
+      $sortColumn = "E.MaxScore";
+      break;
+    default:
+      $sortColumn = "E.StartTime";
+      break;
+  }
+  $sortOrder = $_REQUEST['sort_asc']?"asc":"desc";
+  if ( !$_REQUEST['sort_asc'] )
+    $_REQUEST['sort_asc'] = 0;
+  $sortQuery = $querySep."sort_field=".validHtmlStr($_REQUEST['sort_field']).$querySep."sort_asc=".validHtmlStr($_REQUEST['sort_asc']);
+  if ( !isset($_REQUEST['limit']) )
+    $_REQUEST['limit'] = "";
+  if ( $saveToSession )
+  {
+    $_SESSION['sort_field'] = validHtmlStr($_REQUEST['sort_field']);
+    $_SESSION['sort_asc'] = validHtmlStr($_REQUEST['sort_asc']);
+  }
 }
 
 function parseFilter( &$filter, $saveToSession=false, $querySep='&amp;' )
 {
-    $filter['query'] = ''; 
-    $filter['sql'] = '';
-    $filter['fields'] = '';
+  $filter['query'] = ''; 
+  $filter['sql'] = '';
+  $filter['fields'] = '';
 
-    if ( isset($filter['terms']) && count($filter['terms']) )
+  if ( isset($filter['terms']) && count($filter['terms']) )
+  {
+    for ( $i = 0; $i < count($filter['terms']); $i++ )
     {
-        for ( $i = 0; $i < count($filter['terms']); $i++ )
+      if ( isset($filter['terms'][$i]['cnj']) )
+      {
+        $filter['query'] .= $querySep."filter[terms][$i][cnj]=".urlencode($filter['terms'][$i]['cnj']);
+        $filter['sql'] .= " ".$filter['terms'][$i]['cnj']." ";
+        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][cnj]\" value=\"".htmlspecialchars($filter['terms'][$i]['cnj'])."\"/>\n";
+      }
+      if ( isset($filter['terms'][$i]['obr']) )
+      {
+        $filter['query'] .= $querySep."filter[terms][$i][obr]=".urlencode($filter['terms'][$i]['obr']);
+        $filter['sql'] .= " ".str_repeat( "(", $filter['terms'][$i]['obr'] )." ";
+        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][obr]\" value=\"".htmlspecialchars($filter['terms'][$i]['obr'])."\"/>\n";
+      }
+      if ( isset($filter['terms'][$i]['attr']) )
+      {
+        $filter['query'] .= $querySep."filter[terms][$i][attr]=".urlencode($filter['terms'][$i]['attr']);
+        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][attr]\" value=\"".htmlspecialchars($filter['terms'][$i]['attr'])."\"/>\n";
+        switch ( $filter['terms'][$i]['attr'] )
         {
-            if ( isset($filter['terms'][$i]['cnj']) )
-            {
-                $filter['query'] .= $querySep."filter[terms][$i][cnj]=".urlencode($filter['terms'][$i]['cnj']);
-                $filter['sql'] .= " ".$filter['terms'][$i]['cnj']." ";
-                $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][cnj]\" value=\"".htmlspecialchars($filter['terms'][$i]['cnj'])."\"/>\n";
-            }
-            if ( isset($filter['terms'][$i]['obr']) )
-            {
-                $filter['query'] .= $querySep."filter[terms][$i][obr]=".urlencode($filter['terms'][$i]['obr']);
-                $filter['sql'] .= " ".str_repeat( "(", $filter['terms'][$i]['obr'] )." ";
-                $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][obr]\" value=\"".htmlspecialchars($filter['terms'][$i]['obr'])."\"/>\n";
-            }
-            if ( isset($filter['terms'][$i]['attr']) )
-            {
-                $filter['query'] .= $querySep."filter[terms][$i][attr]=".urlencode($filter['terms'][$i]['attr']);
-                $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][attr]\" value=\"".htmlspecialchars($filter['terms'][$i]['attr'])."\"/>\n";
-                switch ( $filter['terms'][$i]['attr'] )
-                {
-                    case 'MonitorName':
-                        $filter['sql'] .= 'M.'.preg_replace( '/^Monitor/', '', $filter['terms'][$i]['attr'] );
-                        break;
-                    case 'ServerId':
-                        $filter['sql'] .= 'M.ServerId';
-                        break;
-                    case 'DateTime':
-                        $filter['sql'] .= "E.StartTime";
-                        break;
-                    case 'Date':
-                        $filter['sql'] .= "to_days( E.StartTime )";
-                        break;
-                    case 'Time':
-                        $filter['sql'] .= "extract( hour_second from E.StartTime )";
-                        break;
-                    case 'Weekday':
-                        $filter['sql'] .= "weekday( E.StartTime )";
-                        break;
-                    case 'Id':
-                    case 'Name':
-                    case 'MonitorId':
-					case 'StorageId':
-                    case 'Length':
-                    case 'Frames':
-                    case 'AlarmFrames':
-                    case 'TotScore':
-                    case 'AvgScore':
-                    case 'MaxScore':
-                    case 'Cause':
-                    case 'Notes':
-                    case 'Archived':
-                        $filter['sql'] .= 'E.'.$filter['terms'][$i]['attr'];
-                        break;
-                    case 'DiskPercent':
-                        $filter['sql'] .= getDiskPercent();
-                        break;
-                    case 'DiskBlocks':
-                        $filter['sql'] .= getDiskBlocks();
-                        break;
-                    case 'SystemLoad':
-                        $filter['sql'] .= getLoad();
-                        break;
-                }
-                $valueList = array();
-                foreach ( preg_split( '/["\'\s]*?,["\'\s]*?/', preg_replace( '/^["\']+?(.+)["\']+?$/', '$1', $filter['terms'][$i]['val'] ) ) as $value )
-                {
-                    switch ( $filter['terms'][$i]['attr'] )
-                    {
-                        case 'MonitorName':
-                        case 'Name':
-                        case 'Cause':
-                        case 'Notes':
-                            $value = dbEscape($value);
-                            break;
-						case 'ServerId':
-                            if ( $value == 'ZM_SERVER_ID' ) {
-                                $value = ZM_SERVER_ID;
-                            } else {
-                                $value = dbEscape($value);
-                            }
-                        case 'DateTime':
-                            $value = "'".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."'";
-                            break;
-                        case 'Date':
-                            $value = "to_days( '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";
-                            break;
-                        case 'Time':
-                            $value = "extract( hour_second from '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";
-                            break;
-                        default :
-                            $value = dbEscape($value);
-                            break;
-                    }
-                    $valueList[] = $value;
-                }
-
-                switch ( $filter['terms'][$i]['op'] )
-                {
-                    case '=' :
-                    case '!=' :
-                    case '>=' :
-                    case '>' :
-                    case '<' :
-                    case '<=' :
-                        $filter['sql'] .= " ".$filter['terms'][$i]['op']." $value";
-                        break;
-                    case '=~' :
-                        $filter['sql'] .= " regexp ".$value;
-                        break;
-                    case '!~' :
-                        $filter['sql'] .= " not regexp ".$value;
-                        break;
-                    case '=[]' :
-                        $filter['sql'] .= " in (".join( ",", $valueList ).")";
-                        break;
-                    case '![]' :
-                        $filter['sql'] .= " not in (".join( ",", $valueList ).")";
-                        break;
-                }
-
-                $filter['query'] .= $querySep."filter[terms][$i][op]=".urlencode($filter['terms'][$i]['op']);
-                $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][op]\" value=\"".htmlspecialchars($filter['terms'][$i]['op'])."\"/>\n";
-                $filter['query'] .= $querySep."filter[terms][$i][val]=".urlencode($filter['terms'][$i]['val']);
-                $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][val]\" value=\"".htmlspecialchars($filter['terms'][$i]['val'])."\"/>\n";
-            }
-            if ( isset($filter['terms'][$i]['cbr']) )
-            {
-                $filter['query'] .= $querySep."filter[terms][$i][cbr]=".urlencode($filter['terms'][$i]['cbr']);
-                $filter['sql'] .= " ".str_repeat( ")", $filter['terms'][$i]['cbr'] )." ";
-                $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][cbr]\" value=\"".htmlspecialchars($filter['terms'][$i]['cbr'])."\"/>\n";
-            }
+          case 'MonitorName':
+            $filter['sql'] .= 'M.'.preg_replace( '/^Monitor/', '', $filter['terms'][$i]['attr'] );
+            break;
+          case 'ServerId':
+            $filter['sql'] .= 'M.ServerId';
+            break;
+          case 'DateTime':
+            $filter['sql'] .= "E.StartTime";
+            break;
+          case 'Date':
+            $filter['sql'] .= "to_days( E.StartTime )";
+            break;
+          case 'Time':
+            $filter['sql'] .= "extract( hour_second from E.StartTime )";
+            break;
+          case 'Weekday':
+            $filter['sql'] .= "weekday( E.StartTime )";
+            break;
+          case 'Id':
+          case 'Name':
+          case 'MonitorId':
+          case 'StorageId':
+          case 'Length':
+          case 'Frames':
+          case 'AlarmFrames':
+          case 'TotScore':
+          case 'AvgScore':
+          case 'MaxScore':
+          case 'Cause':
+          case 'Notes':
+          case 'Archived':
+            $filter['sql'] .= 'E.'.$filter['terms'][$i]['attr'];
+            break;
+          case 'DiskPercent':
+            $filter['sql'] .= getDiskPercent();
+            break;
+          case 'DiskBlocks':
+            $filter['sql'] .= getDiskBlocks();
+            break;
+          case 'SystemLoad':
+            $filter['sql'] .= getLoad();
+            break;
         }
-        if ( $filter['sql'] )
-            $filter['sql'] = " and ( ".$filter['sql']." )";
-        if ( $saveToSession )
+        $valueList = array();
+        foreach ( preg_split( '/["\'\s]*?,["\'\s]*?/', preg_replace( '/^["\']+?(.+)["\']+?$/', '$1', $filter['terms'][$i]['val'] ) ) as $value )
         {
-            $_SESSION['filter'] = $filter;
+          switch ( $filter['terms'][$i]['attr'] )
+          {
+            case 'MonitorName':
+            case 'Name':
+            case 'Cause':
+            case 'Notes':
+              $value = dbEscape($value);
+              break;
+            case 'ServerId':
+              if ( $value == 'ZM_SERVER_ID' ) {
+                $value = ZM_SERVER_ID;
+              } else {
+                $value = dbEscape($value);
+              }
+            case 'DateTime':
+              $value = "'".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."'";
+              break;
+            case 'Date':
+              $value = "to_days( '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";
+              break;
+            case 'Time':
+              $value = "extract( hour_second from '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";
+              break;
+            default :
+              $value = dbEscape($value);
+              break;
+          }
+          $valueList[] = $value;
         }
+
+        switch ( $filter['terms'][$i]['op'] )
+        {
+          case '=' :
+          case '!=' :
+          case '>=' :
+          case '>' :
+          case '<' :
+          case '<=' :
+            $filter['sql'] .= " ".$filter['terms'][$i]['op']." $value";
+            break;
+          case '=~' :
+            $filter['sql'] .= " regexp ".$value;
+            break;
+          case '!~' :
+            $filter['sql'] .= " not regexp ".$value;
+            break;
+          case '=[]' :
+            $filter['sql'] .= " in (".join( ",", $valueList ).")";
+            break;
+          case '![]' :
+            $filter['sql'] .= " not in (".join( ",", $valueList ).")";
+            break;
+        }
+
+        $filter['query'] .= $querySep."filter[terms][$i][op]=".urlencode($filter['terms'][$i]['op']);
+        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][op]\" value=\"".htmlspecialchars($filter['terms'][$i]['op'])."\"/>\n";
+        $filter['query'] .= $querySep."filter[terms][$i][val]=".urlencode($filter['terms'][$i]['val']);
+        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][val]\" value=\"".htmlspecialchars($filter['terms'][$i]['val'])."\"/>\n";
+      }
+      if ( isset($filter['terms'][$i]['cbr']) )
+      {
+        $filter['query'] .= $querySep."filter[terms][$i][cbr]=".urlencode($filter['terms'][$i]['cbr']);
+        $filter['sql'] .= " ".str_repeat( ")", $filter['terms'][$i]['cbr'] )." ";
+        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][cbr]\" value=\"".htmlspecialchars($filter['terms'][$i]['cbr'])."\"/>\n";
+      }
     }
+    if ( $filter['sql'] )
+      $filter['sql'] = " and ( ".$filter['sql']." )";
+    if ( $saveToSession )
+    {
+      $_SESSION['filter'] = $filter;
+    }
+  }
 }
 
 function addFilterTerm( $filter, $position, $term=false )
 {
-    if ( $position < 0 )
-        $position = 0;
-    elseif( $position > count($filter['terms']) )
-        $position = count($filter['terms']);
-    if ( $term && $position == 0 )
-        unset( $term['cnj'] );
-    array_splice( $filter['terms'], $position, 0, array( $term?$term:array() ) );
-    
-    return( $filter );
+  if ( $position < 0 )
+    $position = 0;
+  elseif( $position > count($filter['terms']) )
+    $position = count($filter['terms']);
+  if ( $term && $position == 0 )
+    unset( $term['cnj'] );
+  array_splice( $filter['terms'], $position, 0, array( $term?$term:array() ) );
+
+  return( $filter );
 }
 
 function delFilterTerm( $filter, $position )
 {
-    if ( $position < 0 )
-        $position = 0;
-    elseif( $position >= count($filter['terms']) )
-        $position = count($filter['terms']);
-    array_splice( $filter['terms'], $position, 1 );
-    
-    return( $filter );
+  if ( $position < 0 )
+    $position = 0;
+  elseif( $position >= count($filter['terms']) )
+    $position = count($filter['terms']);
+  array_splice( $filter['terms'], $position, 1 );
+
+  return( $filter );
 }
 
 function getPagination( $pages, $page, $maxShortcuts, $query, $querySep='&amp;' )
 {
-    global $view;
+  global $view;
 
-    $pageText = "";
-    if ( $pages > 1 )
+  $pageText = "";
+  if ( $pages > 1 )
+  {
+    if ( $page )
     {
-        if ( $page )
+      if ( $page < 0 )
+        $page = 1;
+      if ( $page > $pages )
+        $page = $pages;
+
+      if ( $page > 1 )
+      {
+        if ( false && $page > 2 )
         {
-            if ( $page < 0 )
-                $page = 1;
-            if ( $page > $pages )
-                $page = $pages;
-
-            if ( $page > 1 )
-            {
-                if ( false && $page > 2 )
-                {
-                    $pageText .= '<a href="?view='.$view.$querySep.'page=1'.$query.'">&lt;&lt;</a>';
-                }
-                $pageText .= '<a href="?view='.$view.$querySep.'page='.($page-1).$query.'">&lt;</a>';
-
-                $newPages = array();
-                $pagesUsed = array();
-                $lo_exp = max(2,log($page-1)/log($maxShortcuts));
-                for ( $i = 0; $i < $maxShortcuts; $i++ )
-                {
-                    $newPage = round($page-pow($lo_exp,$i));
-                    if ( isset($pagesUsed[$newPage]) )
-                        continue;
-                    if ( $newPage <= 1 )
-                        break;
-                    $pagesUsed[$newPage] = true;
-                    array_unshift( $newPages, $newPage );
-                }
-                if ( !isset($pagesUsed[1]) )
-                    array_unshift( $newPages, 1 );
-
-                foreach ( $newPages as $newPage )
-                {
-                    $pageText .= '<a href="?view='.$view.$querySep.'page='.$newPage.$query.'">'.$newPage.'</a>&nbsp;';
-                }
-
-            }
-            $pageText .= '-&nbsp;'.$page.'&nbsp;-';
-            if ( $page < $pages )
-            {
-                $newPages = array();
-                $pagesUsed = array();
-                $hi_exp = max(2,log($pages-$page)/log($maxShortcuts));
-                for ( $i = 0; $i < $maxShortcuts; $i++ )
-                {
-                    $newPage = round($page+pow($hi_exp,$i));
-                    if ( isset($pagesUsed[$newPage]) )
-                        continue;
-                    if ( $newPage > $pages )
-                        break;
-                    $pagesUsed[$newPage] = true;
-                    array_push( $newPages, $newPage );
-                }
-                if ( !isset($pagesUsed[$pages]) )
-                    array_push( $newPages, $pages );
-
-                foreach ( $newPages as $newPage )
-                {
-                    $pageText .= '&nbsp;<a href="?view='.$view.$querySep.'page='.$newPage.$query.'">'.$newPage.'</a>';
-                }
-                $pageText .= '<a href="?view='.$view.$querySep.'page='.($page+1).$query.'">&gt;</a>';
-                if ( false && $page < ($pages-1) )
-                {
-                    $pageText .= '<a href="?view='.$view.$querySep.'page='.$pages.$query.'">&gt;&gt;</a>';
-                }
-            }
+          $pageText .= '<a href="?view='.$view.$querySep.'page=1'.$query.'">&lt;&lt;</a>';
         }
+        $pageText .= '<a href="?view='.$view.$querySep.'page='.($page-1).$query.'">&lt;</a>';
+
+        $newPages = array();
+        $pagesUsed = array();
+        $lo_exp = max(2,log($page-1)/log($maxShortcuts));
+        for ( $i = 0; $i < $maxShortcuts; $i++ )
+        {
+          $newPage = round($page-pow($lo_exp,$i));
+          if ( isset($pagesUsed[$newPage]) )
+            continue;
+          if ( $newPage <= 1 )
+            break;
+          $pagesUsed[$newPage] = true;
+          array_unshift( $newPages, $newPage );
+        }
+        if ( !isset($pagesUsed[1]) )
+          array_unshift( $newPages, 1 );
+
+        foreach ( $newPages as $newPage )
+        {
+          $pageText .= '<a href="?view='.$view.$querySep.'page='.$newPage.$query.'">'.$newPage.'</a>&nbsp;';
+        }
+
+      }
+      $pageText .= '-&nbsp;'.$page.'&nbsp;-';
+      if ( $page < $pages )
+      {
+        $newPages = array();
+        $pagesUsed = array();
+        $hi_exp = max(2,log($pages-$page)/log($maxShortcuts));
+        for ( $i = 0; $i < $maxShortcuts; $i++ )
+        {
+          $newPage = round($page+pow($hi_exp,$i));
+          if ( isset($pagesUsed[$newPage]) )
+            continue;
+          if ( $newPage > $pages )
+            break;
+          $pagesUsed[$newPage] = true;
+          array_push( $newPages, $newPage );
+        }
+        if ( !isset($pagesUsed[$pages]) )
+          array_push( $newPages, $pages );
+
+        foreach ( $newPages as $newPage )
+        {
+          $pageText .= '&nbsp;<a href="?view='.$view.$querySep.'page='.$newPage.$query.'">'.$newPage.'</a>';
+        }
+        $pageText .= '<a href="?view='.$view.$querySep.'page='.($page+1).$query.'">&gt;</a>';
+        if ( false && $page < ($pages-1) )
+        {
+          $pageText .= '<a href="?view='.$view.$querySep.'page='.$pages.$query.'">&gt;&gt;</a>';
+        }
+      }
     }
-    return( $pageText );
+  }
+  return( $pageText );
 }
 
 function sortHeader( $field, $querySep='&amp;' )
 {
-    global $view;
-    return( '?view='.$view.$querySep.'page=1'.$_REQUEST['filter']['query'].$querySep.'sort_field='.$field.$querySep.'sort_asc='.($_REQUEST['sort_field'] == $field?!$_REQUEST['sort_asc']:0).$querySep.'limit='.$_REQUEST['limit'] );
+  global $view;
+  return( '?view='.$view.$querySep.'page=1'.$_REQUEST['filter']['query'].$querySep.'sort_field='.$field.$querySep.'sort_asc='.($_REQUEST['sort_field'] == $field?!$_REQUEST['sort_asc']:0).$querySep.'limit='.$_REQUEST['limit'] );
 }
 
 function sortTag( $field )
 {
-    if ( $_REQUEST['sort_field'] == $field )
-        if ( $_REQUEST['sort_asc'] )
-            return( "(^)" );
-        else
-            return( "(v)" );
-    return( false );
+  if ( $_REQUEST['sort_field'] == $field )
+    if ( $_REQUEST['sort_asc'] )
+      return( "(^)" );
+    else
+      return( "(v)" );
+  return( false );
 }
 
 function getLoad()
 {
-    $load = sys_getloadavg();
-    return( $load[0] );
+  $load = sys_getloadavg();
+  return( $load[0] );
 }
 
 function getDiskPercent()
 {
-    $total = disk_total_space(ZM_DIR_EVENTS);
-    $space = round(($total - disk_free_space(ZM_DIR_EVENTS)) / $total * 100);
-    return( $space );
+  $total = disk_total_space(ZM_DIR_EVENTS);
+  $space = round(($total - disk_free_space(ZM_DIR_EVENTS)) / $total * 100);
+  return( $space );
 }
 
 function getDiskBlocks()
 {
-    $df = shell_exec( 'df '.ZM_DIR_EVENTS );
-    $space = -1;
-    if ( preg_match( '/\s(\d+)\s+\d+\s+\d+%/ms', $df, $matches ) )
-        $space = $matches[1];
-    return( $space );
+  $df = shell_exec( 'df '.ZM_DIR_EVENTS );
+  $space = -1;
+  if ( preg_match( '/\s(\d+)\s+\d+\s+\d+%/ms', $df, $matches ) )
+    $space = $matches[1];
+  return( $space );
 }
 
 // Function to fix a problem whereby the built in PHP session handling 
@@ -1700,684 +1690,684 @@ function getDiskBlocks()
 // fieldset tag, neither of which will work with strict XHTML Basic.
 function sidField()
 {
-    if ( SID )
-    {
-        list( $sessname, $sessid ) = explode( "=", SID );
-?>
-<input type="hidden" name="<?php echo $sessname ?>" value="<?php echo $sessid ?>"/>
-<?php
-    }
+  if ( SID )
+  {
+    list( $sessname, $sessid ) = explode( "=", SID );
+    ?>
+      <input type="hidden" name="<?php echo $sessname ?>" value="<?php echo $sessid ?>"/>
+      <?php
+  }
 }
 
 function verNum( $version )
 {
-    $vNum = "";
-    $maxFields = 3;
-    $vFields = explode( ".", $version );
-    array_splice( $vFields, $maxFields );
-    while ( count($vFields) < $maxFields )
+  $vNum = "";
+  $maxFields = 3;
+  $vFields = explode( ".", $version );
+  array_splice( $vFields, $maxFields );
+  while ( count($vFields) < $maxFields )
+  {
+    $vFields[] = 0;
+  }
+  foreach ( $vFields as $vField )
+  {
+    $vField = sprintf( "%02d", $vField );
+    while ( strlen($vField) < 2 )
     {
-        $vFields[] = 0;
+      $vField = "0".$vField;
     }
-    foreach ( $vFields as $vField )
-    {
-        $vField = sprintf( "%02d", $vField );
-        while ( strlen($vField) < 2 )
-        {
-            $vField = "0".$vField;
-        }
-        $vNum .= $vField;
-    }
-    return( $vNum );
+    $vNum .= $vField;
+  }
+  return( $vNum );
 }
 
 function fixSequences()
 {
-    $sequence = 1;
-    $sql = "select * from Monitors order by Sequence asc, Id asc";
-    foreach( dbFetchAll( $sql ) as $monitor )
+  $sequence = 1;
+  $sql = "select * from Monitors order by Sequence asc, Id asc";
+  foreach( dbFetchAll( $sql ) as $monitor )
+  {
+    if ( $monitor['Sequence'] != $sequence )
     {
-        if ( $monitor['Sequence'] != $sequence )
-        {
-            dbQuery( 'update Monitors set Sequence = ? WHERE Id=?', array( $sequence, $monitor['Id'] ) );
-        }
-        $sequence++;
+      dbQuery( 'update Monitors set Sequence = ? WHERE Id=?', array( $sequence, $monitor['Id'] ) );
     }
+    $sequence++;
+  }
 }
 
 function firstSet()
 {
-    foreach ( func_get_args() as $arg )
-    {
-        if ( !empty( $arg ) )
-            return( $arg );
-    }
+  foreach ( func_get_args() as $arg )
+  {
+    if ( !empty( $arg ) )
+      return( $arg );
+  }
 }
 
 function linesIntersect( $line1, $line2 )
 {
-    global $debug;
+  global $debug;
 
-    $min_x1 = min( $line1[0]['x'], $line1[1]['x'] );
-    $max_x1 = max( $line1[0]['x'], $line1[1]['x'] );
-    $min_x2 = min( $line2[0]['x'], $line2[1]['x'] );
-    $max_x2 = max( $line2[0]['x'], $line2[1]['x'] );
-    $min_y1 = min( $line1[0]['y'], $line1[1]['y'] );
-    $max_y1 = max( $line1[0]['y'], $line1[1]['y'] );
-    $min_y2 = min( $line2[0]['y'], $line2[1]['y'] );
-    $max_y2 = max( $line2[0]['y'], $line2[1]['y'] );
+  $min_x1 = min( $line1[0]['x'], $line1[1]['x'] );
+  $max_x1 = max( $line1[0]['x'], $line1[1]['x'] );
+  $min_x2 = min( $line2[0]['x'], $line2[1]['x'] );
+  $max_x2 = max( $line2[0]['x'], $line2[1]['x'] );
+  $min_y1 = min( $line1[0]['y'], $line1[1]['y'] );
+  $max_y1 = max( $line1[0]['y'], $line1[1]['y'] );
+  $min_y2 = min( $line2[0]['y'], $line2[1]['y'] );
+  $max_y2 = max( $line2[0]['y'], $line2[1]['y'] );
 
-    // Checking if bounding boxes intersect
-    if ( $max_x1 < $min_x2 || $max_x2 < $min_x1 ||$max_y1 < $min_y2 || $max_y2 < $min_y1 )
-    {
-        if ( $debug ) echo "Not intersecting, out of bounds<br>";
-        return( false );
-    }
-
-    $dx1 = $line1[1]['x'] - $line1[0]['x'];
-    $dy1 = $line1[1]['y'] - $line1[0]['y'];
-    $dx2 = $line2[1]['x'] - $line2[0]['x'];
-    $dy2 = $line2[1]['y'] - $line2[0]['y'];
-
-    if ( $dx1 )
-    {
-        $m1 = $dy1/$dx1;
-        $b1 = $line1[0]['y'] - ($m1 * $line1[0]['x']);
-    }
-    else
-    {
-        $b1 = $line1[0]['y'];
-    }
-    if ( $dx2 )
-    {
-        $m2 = $dy2/$dx2;
-        $b2 = $line2[0]['y'] - ($m2 * $line2[0]['x']);
-    }
-    else
-    {
-        $b2 = $line2[0]['y'];
-    }
-
-    if ( $dx1 && $dx2 ) // Both not vertical
-    {
-        if ( $m1 != $m2 ) // Not parallel or colinear
-        {
-            $x = ( $b2 - $b1 ) / ( $m1 - $m2 );
-
-            if ( $x >= $min_x1 && $x <= $max_x1 && $x >= $min_x2 && $x <= $max_x2 )
-            {
-                if ( $debug ) echo "Intersecting, at x $x<br>";
-                return( true );
-            }
-            else
-            {
-                if ( $debug ) echo "Not intersecting, out of range at x $x<br>";
-                return( false );
-            }
-        }
-        elseif ( $b1 == $b2 )
-        {
-            // Colinear, must overlap due to box check, intersect? 
-            if ( $debug ) echo "Intersecting, colinear<br>";
-            return( true );
-        }
-        else
-        {
-            // Parallel
-            if ( $debug ) echo "Not intersecting, parallel<br>";
-            return( false );
-        }
-    }
-    elseif ( !$dx1 ) // Line 1 is vertical
-    {
-        $y = ( $m2 * $line1[0]['x'] ) * $b2;
-        if ( $y >= $min_y1 && $y <= $max_y1 )
-        {
-            if ( $debug ) echo "Intersecting, at y $y<br>";
-            return( true );
-        }
-        else
-        {
-            if ( $debug ) echo "Not intersecting, out of range at y $y<br>";
-            return( false );
-        }
-    }
-    elseif ( !$dx2 ) // Line 2 is vertical
-    {
-        $y = ( $m1 * $line2[0]['x'] ) * $b1;
-        if ( $y >= $min_y2 && $y <= $max_y2 )
-        {
-            if ( $debug ) echo "Intersecting, at y $y<br>";
-            return( true );
-        }
-        else
-        {
-            if ( $debug ) echo "Not intersecting, out of range at y $y<br>";
-            return( false );
-        }
-    }
-    else // Both lines are vertical
-    {
-        if ( $line1[0]['x'] == $line2[0]['x'] )
-        {
-            // Colinear, must overlap due to box check, intersect? 
-            if ( $debug ) echo "Intersecting, vertical, colinear<br>";
-            return( true );
-        }
-        else
-        {
-            // Parallel
-            if ( $debug ) echo "Not intersecting, vertical, parallel<br>";
-            return( false );
-        }
-    }
-    if ( $debug ) echo "Whoops, unexpected scenario<br>";
+  // Checking if bounding boxes intersect
+  if ( $max_x1 < $min_x2 || $max_x2 < $min_x1 ||$max_y1 < $min_y2 || $max_y2 < $min_y1 )
+  {
+    if ( $debug ) echo "Not intersecting, out of bounds<br>";
     return( false );
+  }
+
+  $dx1 = $line1[1]['x'] - $line1[0]['x'];
+  $dy1 = $line1[1]['y'] - $line1[0]['y'];
+  $dx2 = $line2[1]['x'] - $line2[0]['x'];
+  $dy2 = $line2[1]['y'] - $line2[0]['y'];
+
+  if ( $dx1 )
+  {
+    $m1 = $dy1/$dx1;
+    $b1 = $line1[0]['y'] - ($m1 * $line1[0]['x']);
+  }
+  else
+  {
+    $b1 = $line1[0]['y'];
+  }
+  if ( $dx2 )
+  {
+    $m2 = $dy2/$dx2;
+    $b2 = $line2[0]['y'] - ($m2 * $line2[0]['x']);
+  }
+  else
+  {
+    $b2 = $line2[0]['y'];
+  }
+
+  if ( $dx1 && $dx2 ) // Both not vertical
+  {
+    if ( $m1 != $m2 ) // Not parallel or colinear
+    {
+      $x = ( $b2 - $b1 ) / ( $m1 - $m2 );
+
+      if ( $x >= $min_x1 && $x <= $max_x1 && $x >= $min_x2 && $x <= $max_x2 )
+      {
+        if ( $debug ) echo "Intersecting, at x $x<br>";
+        return( true );
+      }
+      else
+      {
+        if ( $debug ) echo "Not intersecting, out of range at x $x<br>";
+        return( false );
+      }
+    }
+    elseif ( $b1 == $b2 )
+    {
+      // Colinear, must overlap due to box check, intersect? 
+      if ( $debug ) echo "Intersecting, colinear<br>";
+      return( true );
+    }
+    else
+    {
+      // Parallel
+      if ( $debug ) echo "Not intersecting, parallel<br>";
+      return( false );
+    }
+  }
+  elseif ( !$dx1 ) // Line 1 is vertical
+  {
+    $y = ( $m2 * $line1[0]['x'] ) * $b2;
+    if ( $y >= $min_y1 && $y <= $max_y1 )
+    {
+      if ( $debug ) echo "Intersecting, at y $y<br>";
+      return( true );
+    }
+    else
+    {
+      if ( $debug ) echo "Not intersecting, out of range at y $y<br>";
+      return( false );
+    }
+  }
+  elseif ( !$dx2 ) // Line 2 is vertical
+  {
+    $y = ( $m1 * $line2[0]['x'] ) * $b1;
+    if ( $y >= $min_y2 && $y <= $max_y2 )
+    {
+      if ( $debug ) echo "Intersecting, at y $y<br>";
+      return( true );
+    }
+    else
+    {
+      if ( $debug ) echo "Not intersecting, out of range at y $y<br>";
+      return( false );
+    }
+  }
+  else // Both lines are vertical
+  {
+    if ( $line1[0]['x'] == $line2[0]['x'] )
+    {
+      // Colinear, must overlap due to box check, intersect? 
+      if ( $debug ) echo "Intersecting, vertical, colinear<br>";
+      return( true );
+    }
+    else
+    {
+      // Parallel
+      if ( $debug ) echo "Not intersecting, vertical, parallel<br>";
+      return( false );
+    }
+  }
+  if ( $debug ) echo "Whoops, unexpected scenario<br>";
+  return( false );
 }
 
 function isSelfIntersecting( $points )
 {
-    global $debug;
+  global $debug;
 
-    $n_coords = count($points);
-    $edges = array();
-    for ( $j = 0, $i = $n_coords-1; $j < $n_coords; $i = $j++ )
-    {
-        $edges[] = array( $points[$i], $points[$j] );
-    }
+  $n_coords = count($points);
+  $edges = array();
+  for ( $j = 0, $i = $n_coords-1; $j < $n_coords; $i = $j++ )
+  {
+    $edges[] = array( $points[$i], $points[$j] );
+  }
 
-    for ( $i = 0; $i <= ($n_coords-2); $i++ )
+  for ( $i = 0; $i <= ($n_coords-2); $i++ )
+  {
+    for ( $j = $i+2; $j < $n_coords+min(0,$i-1); $j++ )
     {
-        for ( $j = $i+2; $j < $n_coords+min(0,$i-1); $j++ )
-        {
-            if ( $debug ) echo "Checking $i and $j<br>";
-            if ( linesIntersect( $edges[$i], $edges[$j] ) )
-            {
-                if ( $debug ) echo "Lines $i and $j intersect<br>";
-                return( true );
-            }
-        }
+      if ( $debug ) echo "Checking $i and $j<br>";
+      if ( linesIntersect( $edges[$i], $edges[$j] ) )
+      {
+        if ( $debug ) echo "Lines $i and $j intersect<br>";
+        return( true );
+      }
     }
-    return( false );
+  }
+  return( false );
 }
 
 function getPolyCentre( $points, $area=0 )
 {
-    $cx = 0.0;
-    $cy = 0.0;
-    if ( !$area )
-        $area = getPolyArea( $points );
-    for ( $i = 0, $j = count($points)-1; $i < count($points); $j = $i++ )
-    {
-        $ct = ($points[$i]['x'] * $points[$j]['y']) - ($points[$j]['x'] * $points[$i]['y']);
-        $cx += ($points[$i]['x'] + $points[$j]['x']) * ct;
-        $cy += ($points[$i]['y'] + $points[$j]['y']) * ct;
-    }
-    $cx = intval(round(abs($cx/(6.0*$area))));
-    $cy = intval(round(abs($cy/(6.0*$area))));
-    printf( "X:%cx, Y:$cy<br>" );
-    return( array( 'x'=>$cx, 'y'=>$cy ) );
+  $cx = 0.0;
+  $cy = 0.0;
+  if ( !$area )
+    $area = getPolyArea( $points );
+  for ( $i = 0, $j = count($points)-1; $i < count($points); $j = $i++ )
+  {
+    $ct = ($points[$i]['x'] * $points[$j]['y']) - ($points[$j]['x'] * $points[$i]['y']);
+    $cx += ($points[$i]['x'] + $points[$j]['x']) * ct;
+    $cy += ($points[$i]['y'] + $points[$j]['y']) * ct;
+  }
+  $cx = intval(round(abs($cx/(6.0*$area))));
+  $cy = intval(round(abs($cy/(6.0*$area))));
+  printf( "X:%cx, Y:$cy<br>" );
+  return( array( 'x'=>$cx, 'y'=>$cy ) );
 }
 
 function _CompareXY( $a, $b )
 {
-    if ( $a['min_y'] == $b['min_y'] )
-        return( intval($a['min_x'] - $b['min_x']) );
-    else
-        return( intval($a['min_y'] - $b['min_y']) );
+  if ( $a['min_y'] == $b['min_y'] )
+    return( intval($a['min_x'] - $b['min_x']) );
+  else
+    return( intval($a['min_y'] - $b['min_y']) );
 }
 
 function _CompareX( $a, $b )
 {
-    return( intval($a['min_x'] - $b['min_x']) );
+  return( intval($a['min_x'] - $b['min_x']) );
 }
 
 function getPolyArea( $points )
 {
-    global $debug;
+  global $debug;
 
-    $n_coords = count($points);
-    $global_edges = array();
-    for ( $j = 0, $i = $n_coords-1; $j < $n_coords; $i = $j++ )
-    {
-        $x1 = $points[$i]['x'];
-        $x2 = $points[$j]['x'];
-        $y1 = $points[$i]['y'];
-        $y2 = $points[$j]['y'];
+  $n_coords = count($points);
+  $global_edges = array();
+  for ( $j = 0, $i = $n_coords-1; $j < $n_coords; $i = $j++ )
+  {
+    $x1 = $points[$i]['x'];
+    $x2 = $points[$j]['x'];
+    $y1 = $points[$i]['y'];
+    $y2 = $points[$j]['y'];
 
-        //printf( "x1:%d,y1:%d x2:%d,y2:%d\n", x1, y1, x2, y2 );
-        if ( $y1 == $y2 )
-            continue;
+    //printf( "x1:%d,y1:%d x2:%d,y2:%d\n", x1, y1, x2, y2 );
+    if ( $y1 == $y2 )
+      continue;
 
-        $dx = $x2 - $x1;
-        $dy = $y2 - $y1;
+    $dx = $x2 - $x1;
+    $dy = $y2 - $y1;
 
-        $global_edges[] = array(
-            "min_y" => $y1<$y2?$y1:$y2,
-            "max_y" => ($y1<$y2?$y2:$y1)+1,
-            "min_x" => $y1<$y2?$x1:$x2,
-            "_1_m" => $dx/$dy,
+    $global_edges[] = array(
+        "min_y" => $y1<$y2?$y1:$y2,
+        "max_y" => ($y1<$y2?$y2:$y1)+1,
+        "min_x" => $y1<$y2?$x1:$x2,
+        "_1_m" => $dx/$dy,
         );
+  }
+
+  usort( $global_edges, "_CompareXY" );
+
+  if ( $debug )
+  {
+    for ( $i = 0; $i < count($global_edges); $i++ )
+    {
+      printf( "%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>", $i, $global_edges[$i]['min_y'], $global_edges[$i]['max_y'], $global_edges[$i]['min_x'], $global_edges[$i]['_1_m'] );
     }
+  }
 
-    usort( $global_edges, "_CompareXY" );
-
+  $area = 0.0;
+  $active_edges = array();
+  $y = $global_edges[0]['min_y'];
+  do 
+  {
+    for ( $i = 0; $i < count($global_edges); $i++ )
+    {
+      if ( $global_edges[$i]['min_y'] == $y )
+      {
+        if ( $debug ) printf( "Moving global edge<br>" );
+        $active_edges[] = $global_edges[$i];
+        array_splice( $global_edges, $i, 1 );
+        $i--;
+      }
+      else
+      {
+        break;
+      }
+    }
+    usort( $active_edges, "_CompareX" );
     if ( $debug )
     {
-        for ( $i = 0; $i < count($global_edges); $i++ )
-        {
-            printf( "%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>", $i, $global_edges[$i]['min_y'], $global_edges[$i]['max_y'], $global_edges[$i]['min_x'], $global_edges[$i]['_1_m'] );
-        }
+      for ( $i = 0; $i < count($active_edges); $i++ )
+      {
+        printf( "%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>", $y, $i, $active_edges[$i]['min_y'], $active_edges[$i]['max_y'], $active_edges[$i]['min_x'], $active_edges[$i]['_1_m'] );
+      }
     }
-
-    $area = 0.0;
-    $active_edges = array();
-    $y = $global_edges[0]['min_y'];
-    do 
+    $last_x = 0;
+    $row_area = 0;
+    $parity = false;
+    for ( $i = 0; $i < count($active_edges); $i++ )
     {
-        for ( $i = 0; $i < count($global_edges); $i++ )
-        {
-            if ( $global_edges[$i]['min_y'] == $y )
-            {
-                if ( $debug ) printf( "Moving global edge<br>" );
-                $active_edges[] = $global_edges[$i];
-                array_splice( $global_edges, $i, 1 );
-                $i--;
-            }
-            else
-            {
-                break;
-            }
-        }
-        usort( $active_edges, "_CompareX" );
-        if ( $debug )
-        {
-            for ( $i = 0; $i < count($active_edges); $i++ )
-            {
-                printf( "%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>", $y, $i, $active_edges[$i]['min_y'], $active_edges[$i]['max_y'], $active_edges[$i]['min_x'], $active_edges[$i]['_1_m'] );
-            }
-        }
-        $last_x = 0;
-        $row_area = 0;
-        $parity = false;
-        for ( $i = 0; $i < count($active_edges); $i++ )
-        {
-            $x = intval(round($active_edges[$i]['min_x']));
-            if ( $parity )
-            {
-                $row_area += ($x - $last_x)+1;
-                $area += $row_area;
-            }
-            if ( $active_edges[$i]['max_y'] != $y )
-                $parity = !$parity;
-            $last_x = $x;
-        }
-        if ( $debug ) printf( "%d: Area:%d<br>", $y, $row_area );
-        $y++;
-        for ( $i = 0; $i < count($active_edges); $i++ )
-        {
-            if ( $y >= $active_edges[$i]['max_y'] ) // Or >= as per sheets
-            {
-                if ( $debug ) printf( "Deleting active_edge<br>" );
-                array_splice( $active_edges, $i, 1 );
-                $i--;
-            }
-            else
-            {
-                $active_edges[$i]['min_x'] += $active_edges[$i]['_1_m'];
-            }
-        }
-    } while ( count($global_edges) || count($active_edges) );
-    if ( $debug ) printf( "Area:%d<br>", $area );
-    return( $area );
+      $x = intval(round($active_edges[$i]['min_x']));
+      if ( $parity )
+      {
+        $row_area += ($x - $last_x)+1;
+        $area += $row_area;
+      }
+      if ( $active_edges[$i]['max_y'] != $y )
+        $parity = !$parity;
+      $last_x = $x;
+    }
+    if ( $debug ) printf( "%d: Area:%d<br>", $y, $row_area );
+    $y++;
+    for ( $i = 0; $i < count($active_edges); $i++ )
+    {
+      if ( $y >= $active_edges[$i]['max_y'] ) // Or >= as per sheets
+      {
+        if ( $debug ) printf( "Deleting active_edge<br>" );
+        array_splice( $active_edges, $i, 1 );
+        $i--;
+      }
+      else
+      {
+        $active_edges[$i]['min_x'] += $active_edges[$i]['_1_m'];
+      }
+    }
+  } while ( count($global_edges) || count($active_edges) );
+  if ( $debug ) printf( "Area:%d<br>", $area );
+  return( $area );
 }
 
 function getPolyAreaOld( $points )
 {
-    $area = 0.0;
-    $edge = 0.0;
-    for ( $i = 0, $j = count($points)-1; $i < count($points); $j = $i++ )
-    {
-        $x_diff = ($points[$i]['x'] - $points[$j]['x']);
-        $y_diff = ($points[$i]['y'] - $points[$j]['y']);
-        $y_sum = ($points[$i]['y'] + $points[$j]['y']);
-        $trap_edge = sqrt(pow(abs($x_diff)+1,2) + pow(abs($y_diff)+1,2) );
-        $edge += $trap_edge;
-        $trap_area = ($x_diff * $y_sum );
-        $area += $trap_area;
-        printf( "%d->%d, %d-%d=%.2f, %d+%d=%.2f(%.2f), %.2f, %.2f<br>", i, j, $points[$i]['x'], $points[$j]['x'], $x_diff, $points[$i]['y'], $points[$j]['y'], $y_sum, $y_diff, $trap_area, $trap_edge );
-    }
-    $edge = intval(round(abs($edge)));
-    $area = intval(round((abs($area)+$edge)/2));
-    echo "E:$edge<br>";
-    echo "A:$area<br>";
-    return( $area );
+  $area = 0.0;
+  $edge = 0.0;
+  for ( $i = 0, $j = count($points)-1; $i < count($points); $j = $i++ )
+  {
+    $x_diff = ($points[$i]['x'] - $points[$j]['x']);
+    $y_diff = ($points[$i]['y'] - $points[$j]['y']);
+    $y_sum = ($points[$i]['y'] + $points[$j]['y']);
+    $trap_edge = sqrt(pow(abs($x_diff)+1,2) + pow(abs($y_diff)+1,2) );
+    $edge += $trap_edge;
+    $trap_area = ($x_diff * $y_sum );
+    $area += $trap_area;
+    printf( "%d->%d, %d-%d=%.2f, %d+%d=%.2f(%.2f), %.2f, %.2f<br>", i, j, $points[$i]['x'], $points[$j]['x'], $x_diff, $points[$i]['y'], $points[$j]['y'], $y_sum, $y_diff, $trap_area, $trap_edge );
+  }
+  $edge = intval(round(abs($edge)));
+  $area = intval(round((abs($area)+$edge)/2));
+  echo "E:$edge<br>";
+  echo "A:$area<br>";
+  return( $area );
 }
 
 function mapCoords( $a )
 {
-    return( $a['x'].",".$a['y'] );
+  return( $a['x'].",".$a['y'] );
 }
 
 function pointsToCoords( $points )
 {
-    return( join( " ", array_map( "mapCoords", $points ) ) );
+  return( join( " ", array_map( "mapCoords", $points ) ) );
 }
 
 function coordsToPoints( $coords )
 {
-    $points = array();
-    if ( preg_match_all( '/(\d+,\d+)+/', $coords, $matches ) )
+  $points = array();
+  if ( preg_match_all( '/(\d+,\d+)+/', $coords, $matches ) )
+  {
+    for ( $i = 0; $i < count($matches[1]); $i++ )
     {
-        for ( $i = 0; $i < count($matches[1]); $i++ )
-        {
-            if ( preg_match( '/(\d+),(\d+)/', $matches[1][$i], $cmatches ) )
-            {
-                $points[] = array( 'x'=>$cmatches[1], 'y'=>$cmatches[2] );
-            }
-            else
-            {
-                echo( "Bogus coordinates '".$matches[$i]."'" );
-                return( false );
-            }
-        }
-    }
-    else
-    {
-        echo( "Bogus coordinate string '$coords'" );
+      if ( preg_match( '/(\d+),(\d+)/', $matches[1][$i], $cmatches ) )
+      {
+        $points[] = array( 'x'=>$cmatches[1], 'y'=>$cmatches[2] );
+      }
+      else
+      {
+        echo( "Bogus coordinates '".$matches[$i]."'" );
         return( false );
+      }
     }
-    return( $points );
+  }
+  else
+  {
+    echo( "Bogus coordinate string '$coords'" );
+    return( false );
+  }
+  return( $points );
 }
 
 function getLanguages()
 {
-    $langs = array();
-    foreach ( glob("lang/*_*.php") as $file )
-    {
-        preg_match( '/([^\/]+_.+)\.php/', $file, $matches );
-        $langs[$matches[1]] = $matches[1];
-    }
-    return( $langs );
+  $langs = array();
+  foreach ( glob("lang/*_*.php") as $file )
+  {
+    preg_match( '/([^\/]+_.+)\.php/', $file, $matches );
+    $langs[$matches[1]] = $matches[1];
+  }
+  return( $langs );
 }
 
 function trimString( $string, $length )
 {
-    return( preg_replace( '/^(.{'.$length.',}?)\b.*$/', '\\1&hellip;', $string ) );
+  return( preg_replace( '/^(.{'.$length.',}?)\b.*$/', '\\1&hellip;', $string ) );
 }
 
 function monitorIdsToNames( $ids )
 {
-    global $mITN_monitors;
-    if ( !$mITN_monitors )
+  global $mITN_monitors;
+  if ( !$mITN_monitors )
+  {
+    $sql = "select Id, Name from Monitors";
+    foreach( dbFetchAll( $sql ) as $monitor )
     {
-        $sql = "select Id, Name from Monitors";
-        foreach( dbFetchAll( $sql ) as $monitor )
-        {
-            $mITN_monitors[$monitor['Id']] = $monitor;
-        }
+      $mITN_monitors[$monitor['Id']] = $monitor;
     }
-    $names = array();
-    foreach ( preg_split( '/\s*,\s*/', $ids ) as $id )
+  }
+  $names = array();
+  foreach ( preg_split( '/\s*,\s*/', $ids ) as $id )
+  {
+    if ( visibleMonitor( $id ) )
     {
-        if ( visibleMonitor( $id ) )
-        {
-            if ( isset($mITN_monitors[$id]) )
-            {
-                $names[] = $mITN_monitors[$id]['Name'];
-            }
-        }
+      if ( isset($mITN_monitors[$id]) )
+      {
+        $names[] = $mITN_monitors[$id]['Name'];
+      }
     }
-    $name_string = join( ', ', $names );
-    return( $name_string );
+  }
+  $name_string = join( ', ', $names );
+  return( $name_string );
 }
 
 function initX10Status()
 {
-    global $x10_status;
+  global $x10_status;
 
-    if ( !isset($x10_status) )
-    {
-        $socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
-        if ( $socket < 0 )
-        {
-            Fatal( "socket_create() failed: ".socket_strerror($socket) );
-        }
-        $sock_file = ZM_PATH_SOCKS.'/zmx10.sock';
-        if ( @socket_connect( $socket, $sock_file ) )
-        {
-            $command = "status";
-            if ( !socket_write( $socket, $command ) )
-            {
-                Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
-            }
-            socket_shutdown( $socket, 1 );
-            $x10Output = "";
-            while ( $x10Response = socket_read( $socket, 256 ) )
-            {
-                $x10Output .= $x10Response;
-            }
-            socket_close( $socket );
-        }
-        else
-        {
-            // Can't connect so use script
-            $command = ZM_PATH_BIN."/zmx10.pl --command status";
-            //$command .= " 2>/dev/null >&- <&- >/dev/null";
-
-            $x10Output = exec( escapeshellcmd( $command ) );
-        }
-        foreach ( explode( "\n", $x10Output ) as $x10Response )
-        {
-            if ( preg_match( "/^(\d+)\s+(.+)$/", $x10Response, $matches ) )
-            {
-                $x10_status[$matches[1]] = $matches[2];
-            }
-        }
-    }
-}
-
-function getDeviceStatusX10( $key )
-{
-    global $x10_status;
-
-    initX10Status();
-
-    if ( empty($x10_status[$key]) || !($status = $x10_status[$key]) )
-        $status = "unknown";
-    return( $status );
-}
-
-function setDeviceStatusX10( $key, $status )
-{
+  if ( !isset($x10_status) )
+  {
     $socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
     if ( $socket < 0 )
     {
-        Fatal( "socket_create() failed: ".socket_strerror($socket) );
+      Fatal( "socket_create() failed: ".socket_strerror($socket) );
     }
     $sock_file = ZM_PATH_SOCKS.'/zmx10.sock';
     if ( @socket_connect( $socket, $sock_file ) )
     {
-        $command = "$status;$key";
-        if ( !socket_write( $socket, $command ) )
-        {
-            Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
-        }
-        socket_shutdown( $socket, 1 );
-        $x10Response = socket_read( $socket, 256 );
-        socket_close( $socket );
+      $command = "status";
+      if ( !socket_write( $socket, $command ) )
+      {
+        Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
+      }
+      socket_shutdown( $socket, 1 );
+      $x10Output = "";
+      while ( $x10Response = socket_read( $socket, 256 ) )
+      {
+        $x10Output .= $x10Response;
+      }
+      socket_close( $socket );
     }
     else
     {
-        // Can't connect so use script
-        $command = ZM_PATH_BIN.'/zmx10.pl --command '.escapeshellarg( $status );
-        $command .= ' --unit-code '.escapeshellarg( $key );
-        //$command .= " 2>/dev/null >&- <&- >/dev/null";
-        $x10Response = exec( $command );
+      // Can't connect so use script
+      $command = ZM_PATH_BIN."/zmx10.pl --command status";
+      //$command .= " 2>/dev/null >&- <&- >/dev/null";
+
+      $x10Output = exec( escapeshellcmd( $command ) );
     }
-    if ( preg_match( '/^'.$key.'\s+(.*)/', $x10Response, $matches ) )
-        $status = $matches[1];
-    else
-        $status = "unknown";
-    return( $status );
+    foreach ( explode( "\n", $x10Output ) as $x10Response )
+    {
+      if ( preg_match( "/^(\d+)\s+(.+)$/", $x10Response, $matches ) )
+      {
+        $x10_status[$matches[1]] = $matches[2];
+      }
+    }
+  }
+}
+
+function getDeviceStatusX10( $key )
+{
+  global $x10_status;
+
+  initX10Status();
+
+  if ( empty($x10_status[$key]) || !($status = $x10_status[$key]) )
+    $status = "unknown";
+  return( $status );
+}
+
+function setDeviceStatusX10( $key, $status )
+{
+  $socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
+  if ( $socket < 0 )
+  {
+    Fatal( "socket_create() failed: ".socket_strerror($socket) );
+  }
+  $sock_file = ZM_PATH_SOCKS.'/zmx10.sock';
+  if ( @socket_connect( $socket, $sock_file ) )
+  {
+    $command = "$status;$key";
+    if ( !socket_write( $socket, $command ) )
+    {
+      Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
+    }
+    socket_shutdown( $socket, 1 );
+    $x10Response = socket_read( $socket, 256 );
+    socket_close( $socket );
+  }
+  else
+  {
+    // Can't connect so use script
+    $command = ZM_PATH_BIN.'/zmx10.pl --command '.escapeshellarg( $status );
+    $command .= ' --unit-code '.escapeshellarg( $key );
+    //$command .= " 2>/dev/null >&- <&- >/dev/null";
+    $x10Response = exec( $command );
+  }
+  if ( preg_match( '/^'.$key.'\s+(.*)/', $x10Response, $matches ) )
+    $status = $matches[1];
+  else
+    $status = "unknown";
+  return( $status );
 }
 
 function logState()
 {
-    $state = 'ok';
+  $state = 'ok';
 
-    $levelCounts = array(
-        Logger::FATAL => array( ZM_LOG_ALERT_FAT_COUNT, ZM_LOG_ALARM_FAT_COUNT ),
-        Logger::ERROR => array( ZM_LOG_ALERT_ERR_COUNT, ZM_LOG_ALARM_ERR_COUNT ),
-        Logger::WARNING => array( ZM_LOG_ALERT_WAR_COUNT, ZM_LOG_ALARM_WAR_COUNT ),
-    );
+  $levelCounts = array(
+      Logger::FATAL => array( ZM_LOG_ALERT_FAT_COUNT, ZM_LOG_ALARM_FAT_COUNT ),
+      Logger::ERROR => array( ZM_LOG_ALERT_ERR_COUNT, ZM_LOG_ALARM_ERR_COUNT ),
+      Logger::WARNING => array( ZM_LOG_ALERT_WAR_COUNT, ZM_LOG_ALARM_WAR_COUNT ),
+      );
 
-    $sql = "select Level, count(Level) as LevelCount from Logs where Level < ".Logger::INFO." and TimeKey > unix_timestamp(now() - interval ".ZM_LOG_CHECK_PERIOD." second) group by Level order by Level asc";
-    $counts = dbFetchAll( $sql );
+  $sql = "select Level, count(Level) as LevelCount from Logs where Level < ".Logger::INFO." and TimeKey > unix_timestamp(now() - interval ".ZM_LOG_CHECK_PERIOD." second) group by Level order by Level asc";
+  $counts = dbFetchAll( $sql );
 
-    foreach ( $counts as $count )
+  foreach ( $counts as $count )
+  {
+    if ( $count['Level'] <= Logger::PANIC )
+      $count['Level'] = Logger::FATAL;
+    if ( !($levelCount = $levelCounts[$count['Level']]) )
     {
-        if ( $count['Level'] <= Logger::PANIC )
-            $count['Level'] = Logger::FATAL;
-        if ( !($levelCount = $levelCounts[$count['Level']]) )
-        {
-            Error( "Unexpected Log level ".$count['Level'] );
-            next;
-        }
-        if ( $levelCount[1] && $count['LevelCount'] >= $levelCount[1] )
-        {
-            $state = 'alarm';
-            break;
-        }
-        elseif ( $levelCount[0] && $count['LevelCount'] >= $levelCount[0] )
-        {
-            $state = 'alert';
-        }
+      Error( "Unexpected Log level ".$count['Level'] );
+      next;
     }
-    return( $state );
+    if ( $levelCount[1] && $count['LevelCount'] >= $levelCount[1] )
+    {
+      $state = 'alarm';
+      break;
+    }
+    elseif ( $levelCount[0] && $count['LevelCount'] >= $levelCount[0] )
+    {
+      $state = 'alert';
+    }
+  }
+  return( $state );
 }
 
 function isVector ( &$array )
 {
-    $next_key = 0;
-    foreach ( array_keys($array) as $key )
-    {
-        if ( !is_int( $key ) )
-            return( false );
-        if ( $key != $next_key++ )
-            return( false );
-    }
-    return( true );
+  $next_key = 0;
+  foreach ( array_keys($array) as $key )
+  {
+    if ( !is_int( $key ) )
+      return( false );
+    if ( $key != $next_key++ )
+      return( false );
+  }
+  return( true );
 }
 
 function checkJsonError($value)
 {
-    if ( function_exists('json_last_error') )
+  if ( function_exists('json_last_error') )
+  {
+    $value = var_export($value,true);
+    switch( json_last_error() )
     {
-        $value = var_export($value,true);
-        switch( json_last_error() )
-        {
-            case JSON_ERROR_DEPTH :
-                Fatal( "Unable to decode JSON string '$value', maximum stack depth exceeded" );
-            case JSON_ERROR_CTRL_CHAR :
-                Fatal( "Unable to decode JSON string '$value', unexpected control character found" );
-            case JSON_ERROR_STATE_MISMATCH :
-                Fatal( "Unable to decode JSON string '$value', invalid or malformed JSON" );
-            case JSON_ERROR_SYNTAX :
-                Fatal( "Unable to decode JSON string '$value', syntax error" );
-            default :
-                Fatal( "Unable to decode JSON string '$value', unexpected error ".json_last_error() );
-            case JSON_ERROR_NONE:
-                break;
-        }
+      case JSON_ERROR_DEPTH :
+        Fatal( "Unable to decode JSON string '$value', maximum stack depth exceeded" );
+      case JSON_ERROR_CTRL_CHAR :
+        Fatal( "Unable to decode JSON string '$value', unexpected control character found" );
+      case JSON_ERROR_STATE_MISMATCH :
+        Fatal( "Unable to decode JSON string '$value', invalid or malformed JSON" );
+      case JSON_ERROR_SYNTAX :
+        Fatal( "Unable to decode JSON string '$value', syntax error" );
+      default :
+        Fatal( "Unable to decode JSON string '$value', unexpected error ".json_last_error() );
+      case JSON_ERROR_NONE:
+        break;
     }
+  }
 }
 
 function jsonEncode( &$value )
 {
-    if ( function_exists('json_encode') )
-    {
-        $string = json_encode( $value );
-        checkJsonError($value);
-        return( $string );
-    }
+  if ( function_exists('json_encode') )
+  {
+    $string = json_encode( $value );
+    checkJsonError($value);
+    return( $string );
+  }
 
-    switch ( gettype($value) )
-    {
-        case 'double':
-        case 'integer':
-            return( $value );
-        case 'boolean':
-            return( $value?'true':'false' );
-        case 'string':
-            return( '"'.preg_replace( "/\r?\n/", '\\n', addcslashes($value,'"\\/') ).'"' );
-        case 'NULL':
-            return( 'null' );
-        case 'object':
-            return( '"Object '.addcslashes(get_class($value),'"\\/').'"' );
-        case 'array':
-            if ( isVector( $value ) )
-                return( '['.join( ',', array_map( 'jsonEncode', $value) ).']' );
-            else
-            {
-                $result = '{';
-                foreach ($value as $subkey => $subvalue )
-                {
-                    if ( $result != '{' )
-                        $result .= ',';
-                    $result .= '"'.$subkey.'":'.jsonEncode( $subvalue );
-                }
-                return( $result.'}' );
-            }
-        default:
-            return( '"'.addcslashes(gettype($value),'"\\/').'"' );
-    }
+  switch ( gettype($value) )
+  {
+    case 'double':
+    case 'integer':
+      return( $value );
+    case 'boolean':
+      return( $value?'true':'false' );
+    case 'string':
+      return( '"'.preg_replace( "/\r?\n/", '\\n', addcslashes($value,'"\\/') ).'"' );
+    case 'NULL':
+      return( 'null' );
+    case 'object':
+      return( '"Object '.addcslashes(get_class($value),'"\\/').'"' );
+    case 'array':
+      if ( isVector( $value ) )
+        return( '['.join( ',', array_map( 'jsonEncode', $value) ).']' );
+      else
+      {
+        $result = '{';
+        foreach ($value as $subkey => $subvalue )
+        {
+          if ( $result != '{' )
+            $result .= ',';
+          $result .= '"'.$subkey.'":'.jsonEncode( $subvalue );
+        }
+        return( $result.'}' );
+      }
+    default:
+      return( '"'.addcslashes(gettype($value),'"\\/').'"' );
+  }
 }
 
 function jsonDecode( $value )
 {
-    if ( function_exists('json_decode') )
-    {
-        $object = json_decode( $value, true );
-        checkJsonError($value);
-        return( $object );
-    }
+  if ( function_exists('json_decode') )
+  {
+    $object = json_decode( $value, true );
+    checkJsonError($value);
+    return( $object );
+  }
 
-    $comment = false;
-    $unescape = false;
-    $out = '$result=';
-    for ( $i = 0; $i < strlen($value); $i++ )
+  $comment = false;
+  $unescape = false;
+  $out = '$result=';
+  for ( $i = 0; $i < strlen($value); $i++ )
+  {
+    if ( !$comment )
     {
-        if ( !$comment )
-        {
-            if ( ($value[$i] == '{') || ($value[$i] == '[') )
-                $out .= ' array(';
+      if ( ($value[$i] == '{') || ($value[$i] == '[') )
+        $out .= ' array(';
             else if ( ($value[$i] == '}') || ($value[$i] == ']') )
-                $out .= ')';
+            $out .= ')';
             else if ( $value[$i] == ':' )
-                $out .= '=>';
+            $out .= '=>';
             else
-                $out .= $value[$i];         
-        }
-        else if ( !$unescape )
-        {
+            $out .= $value[$i];         
+            }
+            else if ( !$unescape )
+            {
             if ( $value[$i] == '\\' )
-                $unescape = true;
+            $unescape = true;
             else
-                $out .= $value[$i];
-        }
-        else
-        {
+            $out .= $value[$i];
+            }
+            else
+            {
             if ( $value[$i] != '/' )
-                $out .= '\\';
+            $out .= '\\';
             $out .= $value[$i];
             $unescape = false;
-        }
-        if ( $value[$i] == '"' )
-            $comment = !$comment;
-    }
-    eval( $out.';' );
-    return( $result );
+            }
+            if ( $value[$i] == '"' )
+              $comment = !$comment;
+  }
+  eval( $out.';' );
+  return( $result );
 }
 
 define( 'HTTP_STATUS_OK', 200 );
@@ -2386,118 +2376,118 @@ define( 'HTTP_STATUS_FORBIDDEN', 403 );
 
 function ajaxError( $message, $code=HTTP_STATUS_OK )
 {
-    Error( $message );
-    if ( function_exists( 'ajaxCleanup' ) )
-        ajaxCleanup();
-    if ( $code == HTTP_STATUS_OK )
-    {
-        $response = array( 'result'=>'Error', 'message'=>$message );
-        header( "Content-type: text/plain" );
-        exit( jsonEncode( $response ) );
-    }
-    header( "HTTP/1.0 $code $message" );
-    exit();
+  Error( $message );
+  if ( function_exists( 'ajaxCleanup' ) )
+    ajaxCleanup();
+  if ( $code == HTTP_STATUS_OK )
+  {
+    $response = array( 'result'=>'Error', 'message'=>$message );
+    header( "Content-type: text/plain" );
+    exit( jsonEncode( $response ) );
+  }
+  header( "HTTP/1.0 $code $message" );
+  exit();
 }
 
 function ajaxResponse( $result=false )
 {
-    if ( function_exists( 'ajaxCleanup' ) )
-        ajaxCleanup();
-    $response = array( 'result'=>'Ok' );
-    if ( is_array( $result ) )
-        $response = array_merge( $response, $result );
-    elseif ( !empty($result) )
-        $response['message'] = $result;
-    header( "Content-type: text/plain" );
-    exit( jsonEncode( $response ) );
+  if ( function_exists( 'ajaxCleanup' ) )
+    ajaxCleanup();
+  $response = array( 'result'=>'Ok' );
+  if ( is_array( $result ) )
+    $response = array_merge( $response, $result );
+  elseif ( !empty($result) )
+    $response['message'] = $result;
+  header( "Content-type: text/plain" );
+  exit( jsonEncode( $response ) );
 }
 
 function generateConnKey()
 {
-    return( rand( 1, 999999 ) );
+  return( rand( 1, 999999 ) );
 }
 
 function detaintPath( $path )
 {
-    // Remove any absolute paths, or relative ones that want to go up
-    $path = preg_replace( '/\.(?:\.+[\\/][\\/]*)+/', '', $path );
-    $path = preg_replace( '/^[\\/]+/', '', $path );
-    return( $path );
+  // Remove any absolute paths, or relative ones that want to go up
+  $path = preg_replace( '/\.(?:\.+[\\/][\\/]*)+/', '', $path );
+  $path = preg_replace( '/^[\\/]+/', '', $path );
+  return( $path );
 }
 
 function getSkinFile( $file )
 {
-    global $skinBase;
-    $skinFile = false;
-    foreach ( $skinBase as $skin )
-    {
-        $tempSkinFile = detaintPath( 'skins'.'/'.$skin.'/'.$file );
-        if ( file_exists( $tempSkinFile ) )
-            $skinFile = $tempSkinFile;
-    }
-    return( $skinFile );
+  global $skinBase;
+  $skinFile = false;
+  foreach ( $skinBase as $skin )
+  {
+    $tempSkinFile = detaintPath( 'skins'.'/'.$skin.'/'.$file );
+    if ( file_exists( $tempSkinFile ) )
+      $skinFile = $tempSkinFile;
+  }
+  return( $skinFile );
 }
 
 function getSkinIncludes( $file, $includeBase=false, $asOverride=false )
 {
-    global $skinBase;
-    $skinFile = false;
-    foreach ( $skinBase as $skin )
-    {
-        $tempSkinFile = detaintPath( 'skins'.'/'.$skin.'/'.$file );
-        if ( file_exists( $tempSkinFile ) )
-            $skinFile = $tempSkinFile;
-    }
-    $includeFiles = array();
-    if ( $asOverride )
-    {
-        if ( $skinFile )
-            $includeFiles[] = $skinFile;
-        else if ( $includeBase )
-            $includeFiles[] = $file;
-    }
-    else
-    {
-        if ( $includeBase )
-            $includeFiles[] = $file;
-        if ( $skinFile )
-            $includeFiles[] = $skinFile;
-    }
-    return( $includeFiles );
+  global $skinBase;
+  $skinFile = false;
+  foreach ( $skinBase as $skin )
+  {
+    $tempSkinFile = detaintPath( 'skins'.'/'.$skin.'/'.$file );
+    if ( file_exists( $tempSkinFile ) )
+      $skinFile = $tempSkinFile;
+  }
+  $includeFiles = array();
+  if ( $asOverride )
+  {
+    if ( $skinFile )
+      $includeFiles[] = $skinFile;
+    else if ( $includeBase )
+      $includeFiles[] = $file;
+  }
+  else
+  {
+    if ( $includeBase )
+      $includeFiles[] = $file;
+    if ( $skinFile )
+      $includeFiles[] = $skinFile;
+  }
+  return( $includeFiles );
 }
 
 function requestVar( $name, $default="" )
 {
-    return( isset($_REQUEST[$name])?validHtmlStr($_REQUEST[$name]):$default );
+  return( isset($_REQUEST[$name])?validHtmlStr($_REQUEST[$name]):$default );
 }
 
 // For numbers etc in javascript or tags etc
 function validInt( $input )
 {
-    return( preg_replace( '/\D/', '', $input ) );
+  return( preg_replace( '/\D/', '', $input ) );
 }
 
 function validNum( $input )
 {
-    return( preg_replace( '/[^\d.-]/', '', $input ) );
+  return( preg_replace( '/[^\d.-]/', '', $input ) );
 }
 
 // For general strings
 function validStr( $input )
 {
-    return( strip_tags( $input ) );
+  return( strip_tags( $input ) );
 }
 
 // For strings in javascript or tags etc, expected to be in quotes so further quotes escaped rather than converted
 function validJsStr( $input )
 {
-    return( strip_tags( addslashes( $input ) ) );
+  return( strip_tags( addslashes( $input ) ) );
 }
 
 // For general text in pages outside of tags or quotes so quotes converted to entities
 function validHtmlStr( $input )
 {
-    return( htmlspecialchars( $input, ENT_QUOTES ) );
+  return( htmlspecialchars( $input, ENT_QUOTES ) );
 }
 
 ?>