Merge pull request #53 from VSEphpbb/issue/47

Add IP Lookup Info to Emails

Author: DavidIQ

event/listener.php

@@ -148,6 +148,7 @@ public function delete_logs_security($event)
 			$user_data = array(
 				'USERNAME'		=> $this->user->data['username'],
 				'IP_ADDRESS'	=> $this->user->ip,
+				'HOST_NAME'		=> @gethostbyaddr($this->user->ip),
 				'TIME'			=> $this->user->format_date(time(), $this->config['default_dateformat'], true),
 				'LOG_MODE'		=> $event['mode'],
 			);
@@ -209,6 +210,7 @@ public function acp_login_notification($event)
 			$this->send_message(array(
 				'USERNAME'		=> $this->user->data['username'],
 				'IP_ADDRESS'	=> $this->user->ip,
+				'HOST_NAME'		=> @gethostbyaddr($this->user->ip),
 				'LOGIN_TIME'	=> $this->user->format_date(time(), $this->config['default_dateformat'], true),
 			), 'acp_login', $this->user->data['user_email']);
 		}
@@ -240,6 +242,7 @@ public function email_change_notification($event)
 				'NEW_EMAIL'		=> $new_email,
 				'OLD_EMAIL'		=> $old_email,
 				'IP_ADDRESS'	=> $this->user->ip,
+				'HOST_NAME'		=> @gethostbyaddr($this->user->ip),
 				'CONTACT'		=> !empty($this->config['sec_contact_name']) ? $this->config['sec_contact_name'] : $this->language->lang('ACP_CONTACT_ADMIN'),
 			), 'email_change', $old_email);
 		}

language/en/email/acp_login.txt

@@ -1,5 +1,5 @@
 Subject: {SITENAME} Admin Control Panel Login
 
-The user "{USERNAME}" recently logged into the Admin Control Panel on {LOGIN_TIME} from the IP address {IP_ADDRESS}.
+The user "{USERNAME}" recently logged into the Admin Control Panel on {LOGIN_TIME} from the IP address {IP_ADDRESS} ({HOST_NAME}).
 
 {EMAIL_SIG}

language/en/email/acp_logs.txt

@@ -1,6 +1,6 @@
 Subject: {SITENAME} {LOG_MODE} log deletion attempted
 
-The user "{USERNAME}" recently attempted to delete the following {LOG_MODE} logs on {TIME} from the IP address {IP_ADDRESS}:
+The user "{USERNAME}" recently attempted to delete the following {LOG_MODE} logs on {TIME} from the IP address {IP_ADDRESS} ({HOST_NAME}):
 
 {LOGS_SELECTED}
 

language/en/email/email_change.txt

@@ -2,6 +2,6 @@ Subject: {SITENAME} Account Email Address Changed
 
 The email address associated with the account "{USERNAME}" has recently been changed from "{OLD_EMAIL}" to "{NEW_EMAIL}".
 
-If you are the owner of this account and did not authorise this change, immediately reset your account password and please notify {CONTACT} that a possible security breach has been made from the IP address {IP_ADDRESS} against your account (They will have received a copy of this email).
+If you are the owner of this account and did not authorise this change, immediately reset your account password and please notify {CONTACT} that a possible security breach has been made from the IP address {IP_ADDRESS} ({HOST_NAME}) against your account (They will have received a copy of this email).
 
 {EMAIL_SIG}

tests/event/email_change_notification_test.php

@@ -33,6 +33,7 @@ public function email_change_notification_data()
 					'NEW_EMAIL'		=> 'new@mail.tld',
 					'OLD_EMAIL'		=> 'old@mail.tld',
 					'IP_ADDRESS'	=> '1:1:1',
+					'HOST_NAME'		=> false,
 					'CONTACT'		=> 'admin@mail.tld',
 				)
 			),
@@ -89,6 +90,7 @@ public function email_change_notification_data()
 					'NEW_EMAIL'		=> 'new@mail.tld',
 					'OLD_EMAIL'		=> 'old@mail.tld',
 					'IP_ADDRESS'	=> '1:1:1',
+					'HOST_NAME'		=> false,
 					'CONTACT'		=> 'admin@mail.tld',
 				)
 			),

tests/event/login_notification_test.php

@@ -23,6 +23,7 @@ public function acp_login_notification_data()
 			array(true, true, 'foo', '1:1:1', array(
 				'USERNAME' => 'foo',
 				'IP_ADDRESS' => '1:1:1',
+				'HOST_NAME' => false,
 				'LOGIN_TIME' => '',
 			)),
 			array(true, false, null, null, array()),