diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index 426d36b40..562e60a8c 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -20,6 +20,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # ==========================================================================
+
 use strict;
 use bytes;
 
@@ -62,57 +63,56 @@ if ( ! defined $interval ) {
   $interval = eval($Config{ZM_TELEMETRY_INTERVAL});
 }
 
-if ( $Config{ZM_TELEMETRY_DATA} or $force )
-{
-    print "Update agent starting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n";
+if ( $Config{ZM_TELEMETRY_DATA} or $force ) {
+  print "Update agent starting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n";
 
-    my $lastCheck = $Config{ZM_TELEMETRY_LAST_UPLOAD};
+  my $lastCheck = $Config{ZM_TELEMETRY_LAST_UPLOAD};
 
-    while( 1 ) {
-        my $now = time();
-        my $since_last_check = $now-$lastCheck;
-        Debug(" Last Check time (now($now) - lastCheck($lastCheck)) = $since_last_check > interval($interval) or force($force)");
-        if ( $since_last_check < 0 ) {
-          Warning( "Seconds since last check is negative! Which means that lastCheck is in the future!" );
-          next;
-        }
-        if ( ( ($now-$lastCheck) > $interval ) or $force ) {
-            print "Collecting data to send to ZoneMinder Telemetry server.\n";
-            my $dbh = zmDbConnect();
-            # Build the telemetry hash
-            # We should keep *BSD systems in mind when calling system commands
-            my %telemetry;
-            $telemetry{uuid} = getUUID($dbh);
-            $telemetry{ip} = getIP();
-            $telemetry{timestamp} = strftime( "%Y-%m-%dT%H:%M:%S%z", localtime() );
-            $telemetry{monitor_count} = countQuery($dbh,"Monitors");
-            $telemetry{event_count} = countQuery($dbh,"Events");
-            $telemetry{architecture} = runSysCmd("uname -p");
-            ($telemetry{kernel}, $telemetry{distro}, $telemetry{version}) = getDistro();
-            $telemetry{zm_version} = ZoneMinder::Base::ZM_VERSION;
-            $telemetry{system_memory} = totalmem();
-            $telemetry{processor_count} = cpu_count();
-            $telemetry{monitors} = getMonitorRef($dbh);
-
-            Info( "Sending data to ZoneMinder Telemetry server." );
-
-            my $result = jsonEncode( \%telemetry );
-
-            if ( sendData($result) ) {
-
-                my $sql = q`UPDATE Config SET Value = ? WHERE Name = 'ZM_TELEMETRY_LAST_UPLOAD'`;
-                my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-                my $res = $sth->execute( $now ) or die( "Can't execute: ".$sth->errstr() );
-                $sth->finish();
-                $Config{ZM_TELEMETRY_LAST_UPLOAD} = $now;
-            }
-            zmDbDisconnect();
-        } elsif ( -t STDIN ) {
-          print "Update agent sleeping for 1 hour because ($now-$lastCheck=$since_last_check > $interval\n";
-        } 
-        sleep( 3600 );
+  while( 1 ) {
+    my $now = time();
+    my $since_last_check = $now-$lastCheck;
+    Debug(" Last Check time (now($now) - lastCheck($lastCheck)) = $since_last_check > interval($interval) or force($force)");
+    if ( $since_last_check < 0 ) {
+      Warning( "Seconds since last check is negative! Which means that lastCheck is in the future!" );
+      next;
     }
-    print "Update agent exiting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n";
+    if ( ( ($now-$lastCheck) > $interval ) or $force ) {
+      print "Collecting data to send to ZoneMinder Telemetry server.\n";
+      my $dbh = zmDbConnect();
+# Build the telemetry hash
+# We should keep *BSD systems in mind when calling system commands
+      my %telemetry;
+      $telemetry{uuid} = getUUID($dbh);
+      $telemetry{ip} = getIP();
+      $telemetry{timestamp} = strftime( '%Y-%m-%dT%H:%M:%S%z', localtime() );
+      $telemetry{monitor_count} = countQuery($dbh,'Monitors');
+      $telemetry{event_count} = countQuery($dbh,'Events');
+      $telemetry{architecture} = runSysCmd('uname -p');
+      ($telemetry{kernel}, $telemetry{distro}, $telemetry{version}) = getDistro();
+      $telemetry{zm_version} = ZoneMinder::Base::ZM_VERSION;
+      $telemetry{system_memory} = totalmem();
+      $telemetry{processor_count} = cpu_count();
+      $telemetry{monitors} = getMonitorRef($dbh);
+
+      Info( 'Sending data to ZoneMinder Telemetry server.' );
+
+      my $result = jsonEncode( \%telemetry );
+
+      if ( sendData($result) ) {
+
+        my $sql = q`UPDATE Config SET Value = ? WHERE Name = 'ZM_TELEMETRY_LAST_UPLOAD'`;
+        my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+        my $res = $sth->execute( $now ) or die( "Can't execute: ".$sth->errstr() );
+        $sth->finish();
+        $Config{ZM_TELEMETRY_LAST_UPLOAD} = $now;
+      }
+      zmDbDisconnect();
+    } elsif ( -t STDIN ) {
+      print "Update agent sleeping for 1 hour because ($now-$lastCheck=$since_last_check > $interval\n";
+    } 
+    sleep( 3600 );
+  }
+  print 'Update agent exiting at '.strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n";
 }
 
 ###############
@@ -121,227 +121,227 @@ if ( $Config{ZM_TELEMETRY_DATA} or $force )
 
 # Find, verify, then run the supplied system command
 sub runSysCmd {
-    my $msg = shift;
-    my @arguments = split(/ /,$msg);
-    chomp($arguments[0]);
-    my $path  = qx( which $arguments[0] );
+  my $msg = shift;
+  my @arguments = split(/ /,$msg);
+  chomp($arguments[0]);
+  my $path  = qx( which $arguments[0] );
 
-    my $status = $? >> 8;
-    my $result = "";
-    if ( !$path || $status ) {
-        Warning( "Cannot find the $arguments[0] executable." );
-    } else {
-        chomp($path);
-        $arguments[0] = $path;
-        my $cmd = join(" ",@arguments);
-        $result = qx( $cmd );
-        chomp($result);
-    }
+  my $status = $? >> 8;
+  my $result = '';
+  if ( !$path || $status ) {
+    Warning( "Cannot find the $arguments[0] executable." );
+  } else {
+    chomp($path);
+    $arguments[0] = $path;
+    my $cmd = join(' ',@arguments);
+    $result = qx( $cmd );
+    chomp($result);
+  }
 
-return $result;
+  return $result;
 }
 
 # Upload message data to ZoneMinder telemetry server
 sub sendData {
-    my $msg = shift;
+  my $msg = shift;
 
-    my $ua = LWP::UserAgent->new;
-    my $server_endpoint = $Config{ZM_TELEMETRY_SERVER_ENDPOINT};
+  my $ua = LWP::UserAgent->new;
+  my $server_endpoint = $Config{ZM_TELEMETRY_SERVER_ENDPOINT};
 
-    if ( $Config{ZM_UPDATE_CHECK_PROXY} ) {
-        $ua->proxy( "https", $Config{ZM_UPDATE_CHECK_PROXY} );
-    }
+  if ( $Config{ZM_UPDATE_CHECK_PROXY} ) {
+    $ua->proxy( 'https', $Config{ZM_UPDATE_CHECK_PROXY} );
+  }
 
-    Debug("Posting telemetry data to: $server_endpoint");
+  Debug("Posting telemetry data to: $server_endpoint");
 
-    # set custom HTTP request header fields
-    my $req = HTTP::Request->new(POST => $server_endpoint);
-    $req->header('content-type' => 'application/x-www-form-urlencoded');
-    $req->header('content-length' => length($msg));
-    $req->header('connection' => 'Close');
- 
-    $req->content($msg);
- 
-    my $resp = $ua->request($req);
-    my $resp_msg = $resp->decoded_content;
-    my $resp_code = $resp->code;
-    if ($resp->is_success) {       
-        Info("Telemetry data uploaded successfully.");
-        Debug("Telemetry server upload success response message: $resp_msg");
-    } else {
-        Warning("Telemetry server returned HTTP POST error code: $resp_code");
-        Debug("Telemetry server upload failure response message: $resp_msg");
-    }
-return $resp->is_success;
+# set custom HTTP request header fields
+  my $req = HTTP::Request->new(POST => $server_endpoint);
+  $req->header('content-type' => 'application/x-www-form-urlencoded');
+  $req->header('content-length' => length($msg));
+  $req->header('connection' => 'Close');
+
+  $req->content($msg);
+
+  my $resp = $ua->request($req);
+  my $resp_msg = $resp->decoded_content;
+  my $resp_code = $resp->code;
+  if ($resp->is_success) {       
+    Info('Telemetry data uploaded successfully.');
+    Debug("Telemetry server upload success response message: $resp_msg");
+  } else {
+    Warning("Telemetry server returned HTTP POST error code: $resp_code");
+    Debug("Telemetry server upload failure response message: $resp_msg");
+  }
+  return $resp->is_success;
 }
 
 # Retrieves the UUID from the database. Creates a new UUID if one does not exist.
 sub getUUID {
-    my $dbh = shift;
-    my $uuid= "";
+  my $dbh = shift;
+  my $uuid= "";
 
-    # Verify the current UUID is valid and not nil
-    if (( $Config{ZM_TELEMETRY_UUID} =~ /([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i ) && ( $Config{ZM_TELEMETRY_UUID} ne "00000000-0000-0000-0000-000000000000" )) {
-        $uuid = $Config{ZM_TELEMETRY_UUID};
-    } else {
-        my $sql = "SELECT uuid()";
-        my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
-        $uuid = $Config{ZM_TELEMETRY_UUID} = $sth->fetchrow_array();
-        $sth->finish();
+# Verify the current UUID is valid and not nil
+  if (( $Config{ZM_TELEMETRY_UUID} =~ /([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i ) && ( $Config{ZM_TELEMETRY_UUID} ne "00000000-0000-0000-0000-000000000000" )) {
+    $uuid = $Config{ZM_TELEMETRY_UUID};
+  } else {
+    my $sql = 'SELECT uuid()';
+    my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
+    $uuid = $Config{ZM_TELEMETRY_UUID} = $sth->fetchrow_array();
+    $sth->finish();
 
-        $sql = "UPDATE Config set Value = ? WHERE Name = 'ZM_TELEMETRY_UUID'";
-        $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-        $res = $sth->execute( "$uuid" ) or die( "Can't execute: ".$sth->errstr() );
-        $sth->finish();
-    }
-    Debug("Using UUID of: $uuid");
+    $sql = "UPDATE Config set Value = ? WHERE Name = 'ZM_TELEMETRY_UUID'";
+    $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+    $res = $sth->execute( "$uuid" ) or die( "Can't execute: ".$sth->errstr() );
+    $sth->finish();
+  }
+  Debug("Using UUID of: $uuid");
 
-return $uuid;
+  return $uuid;
 }
 
 # Retrieves the local server's external IP address
 sub getIP {   
-    my $ipaddr = "0.0.0.0";
-    my $ua = LWP::UserAgent->new;
-    my $server_endpoint = "https://wiki.zoneminder.com/ip.php";
+  my $ipaddr = '0.0.0.0';
+  my $ua = LWP::UserAgent->new;
+  my $server_endpoint = 'https://wiki.zoneminder.com/ip.php';
 
-    my $req = HTTP::Request->new(GET => $server_endpoint);
-    my $resp = $ua->request($req);
+  my $req = HTTP::Request->new(GET => $server_endpoint);
+  my $resp = $ua->request($req);
 
-    if ($resp->is_success) {
-        $ipaddr = $resp->decoded_content;
-    }
+  if ($resp->is_success) {
+    $ipaddr = $resp->decoded_content;
+  }
 
-    Debug("Found external ip address of: $ipaddr");
+  Debug("Found external ip address of: $ipaddr");
 
-return $ipaddr;
+  return $ipaddr;
 }
 
 # As the name implies, just your average mysql count query
 sub countQuery {
-    my $dbh = shift;
-    my $table = shift;
+  my $dbh = shift;
+  my $table = shift;
 
-    my $sql = "SELECT count(*) FROM $table";
-    my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
-    my $count = $sth->fetchrow_array();
-    $sth->finish();
+  my $sql = "SELECT count(*) FROM $table";
+  my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+  my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
+  my $count = $sth->fetchrow_array();
+  $sth->finish();
 
-return $count
+  return $count
 }
 
 # Returns a reference to an array of hashes containing data from all monitors
 sub getMonitorRef {
-    my $dbh = shift;
+  my $dbh = shift;
 
-    my $sql = "SELECT Id,Name,Type,Function,Width,Height,Colours,MaxFPS,AlarmMaxFPS FROM Monitors";
-    my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
-    my $arrayref = $sth->fetchall_arrayref({});
+  my $sql = 'SELECT Id,Name,Type,Function,Width,Height,Colours,MaxFPS,AlarmMaxFPS FROM Monitors';
+  my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+  my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
+  my $arrayref = $sth->fetchall_arrayref({});
 
-return $arrayref;
+  return $arrayref;
 }
 
 sub getDistro {
-    my $kernel = "";
-    my $distro = "";
-    my $version = "";
-    my @uname = uname();
+  my $kernel = '';
+  my $distro = '';
+  my $version = '';
+  my @uname = uname();
 
-    if ( $uname[0] =~ /Linux/ ) {
-        Debug("Linux distro detected.");
-        ($kernel, $distro, $version) = linuxDistro();
-    } elsif ( $uname[0] =~ /.*BSD/ ) {
-        Debug("BSD distro detected.");
-        $kernel = $uname[3];
-        $distro = $uname[0];
-        $version = $uname[2];
-    } elsif ( $uname[0] =~ /Darwin/ ) {
-        Debug("Mac OS distro detected.");
-        $kernel = $uname[3];
-        $distro = runSysCmd("sw_vers -productName");
-        $version = runSysCmd("sw_vers -productVersion");
-    } elsif ( $uname[0] =~ /SunOS|Solaris/ ) {
-        Debug("Sun Solaris detected.");
-        $kernel = $uname[3];
-        $distro = $uname[1];
-        $version = $uname[2];   
-    } else {
-        Warning("ZoneMinder was unable to determine the host system. Please report.");
-        $kernel = "Unknown"; 
-        $distro = "Unknown";
-        $version = "Unknown";
-    }
+  if ( $uname[0] =~ /Linux/ ) {
+    Debug('Linux distro detected.');
+    ($kernel, $distro, $version) = linuxDistro();
+  } elsif ( $uname[0] =~ /.*BSD/ ) {
+    Debug('BSD distro detected.');
+    $kernel = $uname[3];
+    $distro = $uname[0];
+    $version = $uname[2];
+  } elsif ( $uname[0] =~ /Darwin/ ) {
+    Debug('Mac OS distro detected.');
+    $kernel = $uname[3];
+    $distro = runSysCmd('sw_vers -productName');
+    $version = runSysCmd('sw_vers -productVersion');
+  } elsif ( $uname[0] =~ /SunOS|Solaris/ ) {
+    Debug('Sun Solaris detected.');
+    $kernel = $uname[3];
+    $distro = $uname[1];
+    $version = $uname[2];   
+  } else {
+    Warning('ZoneMinder was unable to determine the host system. Please report.');
+    $kernel = 'Unknown'; 
+    $distro = 'Unknown';
+    $version = 'Unknown';
+  }
 
-return ($kernel, $distro, $version);
+  return ($kernel, $distro, $version);
 }
 
 sub linuxDistro {
-    my @uname = uname();
-    my $kernel = $uname[2];
-    my $distro = "Unknown Linux Distro";
-    my $version = "Unknown Linux Version";
-    my $found = 0;
+  my @uname = uname();
+  my $kernel = $uname[2];
+  my $distro = 'Unknown Linux Distro';
+  my $version = 'Unknown Linux Version';
+  my $found = 0;
 
-    # os-release is the standard for many new distros based on systemd
-    if ( -f "/etc/os-release" ) {
-        open(my $RELFILE,"<","/etc/os-release") or die( "Can't Open file: $!\n" );
+# os-release is the standard for many new distros based on systemd
+  if ( -f '/etc/os-release' ) {
+    open(my $RELFILE,'<','/etc/os-release') or die( "Can't Open file: $!\n" );
+    while (<$RELFILE>) {
+      if ( /^NAME=(")?(.*)(?(1)\1|).*$/ ) {
+        $distro = $2;
+      $found = 1;
+    }
+    if ( /^VERSION_ID=(")?(.*)(?(1)\1|).*$/ ) {
+      $version = $2;
+    $found = 1;
+    }
+    }
+    close $RELFILE;
+# exists on many distros but does not always contain useful information, such as redhat
+  } elsif ( -f '/etc/lsb-release' ) {
+    open(my $RELFILE,'<','/etc/lsb-release') or die( "Can't Open file: $!\n" );
+    while (<$RELFILE>) {
+      if ( /^DISTRIB_DESCRIPTION=(")?(.*)(?(1)\1|).*$/ ) {
+        $distro = $2;
+      $found = 1;
+    }
+    if ( /^DISTRIB_RELEASE=(")?(.*)(?(1)\1|).*$/ ) {
+      $version = $2;
+    $found = 1;
+    }
+    }
+    close $RELFILE;
+  }
+
+# If all else fails, search through a list of known release files until we find one
+  if ( !$found ) {
+    my @releasefile = ('/etc/SuSE-release', '/etc/redhat-release', '/etc/redhat_version',
+        '/etc/fedora-release', '/etc/slackware-release', '/etc/slackware-version',
+        '/etc/debian_release', '/etc/debian_version', '/etc/mandrake-release',
+        '/etc/yellowdog-release', '/etc/gentoo-release');
+    foreach (@releasefile) {
+      if ( -f $_ ) {
+        open(my $RELFILE,'<',$_) or die( "Can't Open file: $!\n" );
         while (<$RELFILE>) {
-            if ( /^NAME=(")?(.*)(?(1)\1|).*$/ ) {
-                $distro = $2;
-                $found = 1;
-            }
-            if ( /^VERSION_ID=(")?(.*)(?(1)\1|).*$/ ) {
-                $version = $2;
-                $found = 1;
-            }
+          if ( /(.*).* (\d+\.?\d*) .*/ ) {
+            $distro = $1;
+            $version = $2;
+            $found = 1;
+          }
         }
-        close $RELFILE;
-    # exists on many distros but does not always contain useful information, such as redhat
-    } elsif ( -f "/etc/lsb-release" ) {
-        open(my $RELFILE,"<","/etc/lsb-release") or die( "Can't Open file: $!\n" );
-        while (<$RELFILE>) {
-            if ( /^DISTRIB_DESCRIPTION=(")?(.*)(?(1)\1|).*$/ ) {
-                $distro = $2;
-                $found = 1;
-            }
-            if ( /^DISTRIB_RELEASE=(")?(.*)(?(1)\1|).*$/ ) {
-                $version = $2;
-                $found = 1;
-            }
-        }
-        close $RELFILE;
+        close $RELFILE;               
+        last;
+      }
     }
+  }
 
-    # If all else fails, search through a list of known release files until we find one
-    if ( !$found ) {
-        my @releasefile = ("/etc/SuSE-release", "/etc/redhat-release", "/etc/redhat_version",
-                        "/etc/fedora-release", "/etc/slackware-release", "/etc/slackware-version",
-                        "/etc/debian_release", "/etc/debian_version", "/etc/mandrake-release",
-                        "/etc/yellowdog-release", "/etc/gentoo-release");
-        foreach (@releasefile) {
-            if ( -f $_ ) {
-                open(my $RELFILE,"<",$_) or die( "Can't Open file: $!\n" );
-                while (<$RELFILE>) {
-                    if ( /(.*).* (\d+\.?\d*) .*/ ) {
-                        $distro = $1;
-                        $version = $2;
-                        $found = 1;
-                    }
-                }
-                close $RELFILE;               
-                last;
-            }
-        }
-    }
+  if ( !$found ) {
+    Warning('ZoneMinder was unable to determine Linux distro. Please report.');
+  }
 
-    if ( !$found ) {
-        Warning("ZoneMinder was unable to determine Linux distro. Please report.");
-    }
-
-return ($kernel, $distro, $version);
+  return ($kernel, $distro, $version);
 }
 
 1;
diff --git a/web/index.php b/web/index.php
index e691e1e1d..a8848118d 100644
--- a/web/index.php
+++ b/web/index.php
@@ -28,7 +28,7 @@ if ( $debug ) {
 }
 
 // Use new style autoglobals where possible
-if ( version_compare( phpversion(), "4.1.0", "<") ) {
+if ( version_compare( phpversion(), '4.1.0', '<') ) {
   $_SESSION = &$HTTP_SESSION_VARS;
   $_SERVER = &$HTTP_SERVER_VARS;
 }
@@ -37,7 +37,7 @@ if ( version_compare( phpversion(), "4.1.0", "<") ) {
 if ( false ) {
   ob_start();
   phpinfo( INFO_VARIABLES );
-  $fp = fopen( "/tmp/env.html", "w" );
+  $fp = fopen( '/tmp/env.html', 'w' );
   fwrite( $fp, ob_get_contents() );
   fclose( $fp );
   ob_end_clean();
@@ -114,10 +114,10 @@ $skinBase[] = $skin;
 $currentCookieParams = session_get_cookie_params(); 
 Logger::Debug('Setting cookie parameters to lifetime('.$currentCookieParams['lifetime'].') path('.$currentCookieParams['path'].') domain ('.$currentCookieParams['domain'].') secure('.$currentCookieParams['secure'].') httpOnly(1)');
 session_set_cookie_params( 
-    $currentCookieParams["lifetime"], 
-    $currentCookieParams["path"], 
-    $currentCookieParams["domain"],
-    $currentCookieParams["secure"], 
+    $currentCookieParams['lifetime'], 
+    $currentCookieParams['path'], 
+    $currentCookieParams['domain'],
+    $currentCookieParams['secure'], 
     true
 ); 
 
@@ -205,7 +205,7 @@ require_once( 'includes/actions.php' );
 
 # If I put this here, it protects all views and popups, but it has to go after actions.php because actions.php does the actual logging in.
 if ( ZM_OPT_USE_AUTH && ! isset($user) ) {
-	Logger::Debug("Redirecting to login" );
+  Logger::Debug("Redirecting to login" );
   $view = 'login';
   $request = null;
 }