From 79721f60df7472c705a5e6caadbb2044d266dacf Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Sat, 26 Apr 2014 01:59:26 +0400
Subject: [PATCH] Save IP in logs {user:ip} in log filename

---
 rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php   | 11 ++++++++---
 .../app/libraries/RainLoop/Config/Application.php     |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
index aa97e1f38..31a8ac8be 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -321,7 +321,12 @@ class Actions
 					$sFileName
 				);
 			}
-			
+
+			if (false !== \strpos($sFileName, '{user:ip}'))
+			{
+				$sFileName = \str_replace('{user:ip}', $this->Http()->GetClientIp(), $sFileName);
+			}
+
 			$this->ParseQueryAuthString();
 
 			$oAccount = $this->getAccountFromToken(false);
@@ -748,7 +753,7 @@ class Actions
 			if (!!$this->Config()->Get('logs', 'enable', true))
 			{
 				$sLogFileFullPath = \APP_PRIVATE_DATA.'logs/'.$this->compileLogFileName();
-				$sLogFileDir = dirname($sLogFileFullPath);
+				$sLogFileDir = \dirname($sLogFileFullPath);
 
 				if (!@is_dir($sLogFileDir))
 				{
@@ -770,7 +775,7 @@ class Actions
 					$oHttp->GetMethod().': '.$oHttp->GetHost(false, false).$oHttp->GetServer('REQUEST_URI', ''),
 					\MailSo\Log\Enumerations\Type::NOTE, 'REQUEST');
 
-				$this->oLogger->Write('[PHP:'.PHP_VERSION.'][RL:'.APP_VERSION.'][DATE:'.\gmdate('d.m.y').']');
+				$this->oLogger->Write('[PHP:'.PHP_VERSION.'][RL:'.APP_VERSION.'][DATE:'.\gmdate('d.m.y').'][IP:'.$oHttp->GetClientIp().']');
 			}
 		}
 
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 73cae08d9..405a38d9f 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -156,6 +156,7 @@ Patterns:
   {user:domain} - Replaced by user\'s domain name
                   If user is not logged in, value is set to "unknown"
   {user:uid}    - Replaced by user\'s UID regardless of account currently used
+  {user:ip}     - Replaced by user\'s IP address
 
 Examples:
   filename = "log-{date:Y-m-d}.txt"