From d78a5ee26cfad80866dc16164aebbf556d9db646 Mon Sep 17 00:00:00 2001
From: vanch3d <nicolas.vanlabeke@open.ac.uk>
Date: Fri, 27 Sep 2013 15:31:42 +0100
Subject: [PATCH] changed format of login logs - fixes #15

---
 app/controllers/login.controller.php | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/controllers/login.controller.php b/app/controllers/login.controller.php
index c18c94f..02b58a4 100644
--- a/app/controllers/login.controller.php
+++ b/app/controllers/login.controller.php
@@ -46,16 +46,26 @@ public function index()
 			if ($this->auth->login($this->post('username'), $this->post('password'))) {
 				//$this->app->flash('info', 'Your login was successful');
 				
-				$user=$this->auth->getUser();
+				$user= $this->auth->getUser();
+				$req = $this->app->request();
 				
-				$useragent = $this->app->request()->headers('USER_AGENT');
-				if ($useragent)
-				{
-					$log = $this->app->getLog();
-					$log->info(TutorController::ACTION_LOGIN . " | " . 
-							json_encode(array('user_agent'=> $useragent)));
-				}
+				$useragent = $req->headers('USER_AGENT') ?: "";
+				
+				$tmpl = '%action% | [%user% @ %IP%] | %message%';
+				$message = str_replace(array(
+						'%action%',
+						'%user%',
+						'%IP%',
+						'%message%'
+				), array(
+						TutorController::ACTION_LOGIN,
+						$user['username']?:"anon",
+						$req->getIp(),
+						json_encode(array('user_agent'=> $useragent))
+				), $tmpl);
 				
+				$log = $this->app->getLog();
+				$log->info($message);
 				$this->redirect('me.home');
 			}
 			else