Skip to content

Commit c08c3ef

Browse files
author
Till Brehm
committed
Merge branch 'master' into 'master'
Implement Issue #4357 Shows last ip that was used to login successfully with this useraccount. Logins from admins using loginAs are ignored Implementiert Issue #4357 Zeigt die IP-Adresse des letzten erfolgreichen Logins auf dem Dashboard an. Verändert die gespeicherte IP-Adresse nicht, wenn man sich via "Einloggen als" angemeldet hat. Needed Database-Changes: ``` ALTER TABLE `sys_user` ADD `last_login_ip` VARCHAR(50) NULL AFTER `lost_password_reqtime`; ALTER TABLE `sys_user` ADD `last_login_at` BIGINT(20) NULL AFTER `last_login_ip`; ``` Tested/Working on Ubuntu 16.04 LTS See merge request !493
2 parents 6636fa8 + cbf62d4 commit c08c3ef

File tree

29 files changed

+42
-4
lines changed

29 files changed

+42
-4
lines changed

install/sql/incremental/upd_dev_collection.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ ALTER TABLE `mail_mailinglist` ADD `mail_footer` mediumtext;
1010
ALTER TABLE `mail_mailinglist` ADD `subscribe_policy` enum('disabled','confirm','approval','both','none') NOT NULL DEFAULT 'confirm';
1111
ALTER TABLE `mail_mailinglist` ADD `posting_policy` enum('closed','moderated','free') NOT NULL DEFAULT 'free';
1212
ALTER TABLE `web_domain` CHANGE `folder_directive_snippets` `folder_directive_snippets` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NULL;
13+
ALTER TABLE `sys_user` ADD `last_login_ip` VARCHAR(50) NULL AFTER `lost_password_reqtime`;
14+
ALTER TABLE `sys_user` ADD `last_login_at` BIGINT(20) NULL AFTER `last_login_ip`;

install/sql/ispconfig3.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,6 +1813,8 @@ CREATE TABLE `sys_user` (
18131813
`lost_password_function` tinyint(1) NOT NULL default '1',
18141814
`lost_password_hash` VARCHAR(50) NOT NULL default '',
18151815
`lost_password_reqtime` DATETIME NULL default NULL,
1816+
`last_login_ip` varchar(50) DEFAULT NULL,
1817+
`last_login_at` bigint(20) DEFAULT NULL,
18161818
PRIMARY KEY (`userid`)
18171819
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
18181820

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
22
$wb['welcome_user_txt'] = 'Welcome %s';
33
$wb['available_modules_txt'] = 'Available Modules';
4+
$wb['last_login_ip'] = "Last login from %s at %s";
45
?>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
22
$wb['welcome_user_txt'] = 'Добре дошъл %s';
33
$wb['available_modules_txt'] = 'Налични Модули';
4+
$wb['last_login_ip'] = "Last login from %s at %s";
45
?>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
22
$wb['welcome_user_txt'] = 'Bem-vindo %s';
33
$wb['available_modules_txt'] = 'Módulos Disponíveis';
4+
$wb['last_login_ip'] = "Last login from %s at %s";
45
?>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
22
$wb['welcome_user_txt'] = 'Bienvenue %s';
33
$wb['available_modules_txt'] = 'Modules disponibles';
4+
$wb['last_login_ip'] = "Last login from %s at %s";
45
?>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22
$wb['welcome_user_txt'] = 'Vítejte %s';
33
$wb['available_modules_txt'] = 'Dostupné moduly';
4+
$wb['last_login_ip'] = "Last login from %s at %s";
45
?>
5-
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
22
$wb['welcome_user_txt'] = 'Herzlich willkommen %s';
33
$wb['available_modules_txt'] = 'Verfügbare Module';
4+
$wb['last_login_ip'] = "Letzter Login erfolgte von IP %s am %s";
45
?>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
22
$wb['welcome_user_txt'] = 'Velkommen %s';
33
$wb['available_modules_txt'] = 'Tilgængelige Moduler';
4+
$wb['last_login_ip'] = "Last login from %s at %s";
45
?>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
22
$wb['welcome_user_txt'] = 'Καλωσήρθατε %s';
33
$wb['available_modules_txt'] = 'Διαθέσιμες επιλογές';
4+
$wb['last_login_ip'] = "Last login from %s at %s";
45
?>

0 commit comments

Comments
 (0)