From 8082f491db030d3bbb8cc1f16cb12bf7e49994ee Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Thu, 23 Jun 2011 21:12:47 +0000
Subject: [PATCH] Fixed problem with environment variable parsing and
 detainting.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3461 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 scripts/ZoneMinder/lib/ZoneMinder/Logger.pm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 9fb1b44cf..a822c20ec 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -246,12 +246,12 @@ sub initialise( @ )
     }
 
     my $level;
-    $tempLevel = $level if ( $level = $this->getTargettedEnv('LOG_LEVEL') );
+    $tempLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL')) );
 
-    $tempTermLevel = $level if ( $level = $this->getTargettedEnv('LOG_LEVEL_TERM') );
-    $tempDatabaseLevel = $level if ( $level = $this->getTargettedEnv('LOG_LEVEL_DATABASE') );
-    $tempFileLevel = $level if ( $level = $this->getTargettedEnv('LOG_LEVEL_FILE') );
-    $tempSyslogLevel = $level if ( $level = $this->getTargettedEnv('LOG_LEVEL_SYSLOG') );
+    $tempTermLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_TERM')) );
+    $tempDatabaseLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_DATABASE')) );
+    $tempFileLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_FILE')) );
+    $tempSyslogLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_SYSLOG')) );
 
     if ( ZM_LOG_DEBUG )
     {
@@ -336,7 +336,8 @@ sub getTargettedEnv( $ )
     my $this = shift;
     my $name = shift;
     my $envName = $name."_".$this->{id};
-    my $value = $ENV{$envName} if ( defined($ENV{$envName}) );
+    my $value;
+    $value = $ENV{$envName} if ( defined($ENV{$envName}) );
     if ( !defined($value) && $this->{id} ne $this->{idRoot} )
     {
         $envName = $name."_".$this->{idRoot};
@@ -346,6 +347,10 @@ sub getTargettedEnv( $ )
     {
         $value = $ENV{$name} if ( defined($ENV{$name}) );
     }
+    if ( defined($value) )
+    {
+        ( $value ) = $value =~ m/(.*)/;
+    }
     return( $value );
 }