From 8c4604a78e89834afb8f352152480be9d954726d Mon Sep 17 00:00:00 2001 From: geetakshi Date: Sun, 16 Mar 2014 03:32:08 +0530 Subject: [PATCH 1/5] [ticket/8309] Renaming "Last visit" to "Last activity" PHPBB3-8309 --- phpBB/includes/ucp/ucp_main.php | 2 +- phpBB/language/en/memberlist.php | 2 +- phpBB/memberlist.php | 2 +- phpBB/styles/prosilver/template/memberlist_body.html | 2 +- phpBB/styles/prosilver/template/memberlist_view.html | 2 +- phpBB/styles/prosilver/template/ucp_main_front.html | 2 +- phpBB/styles/subsilver2/template/memberlist_view.html | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 3ccf3e3545..1cae814cb5 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -189,7 +189,7 @@ class ucp_main $template->assign_vars(array( 'USER_COLOR' => (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '', 'JOINED' => $user->format_date($user->data['user_regdate']), - 'VISITED' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit), + 'LAST_ACTIVITY' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit), 'WARNINGS' => ($user->data['user_warnings']) ? $user->data['user_warnings'] : 0, 'POSTS' => ($user->data['user_posts']) ? $user->data['user_posts'] : 0, 'POSTS_DAY' => $user->lang('POST_DAY', $posts_per_day), diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 83f5e4107e..0b3983ae1e 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -135,5 +135,5 @@ $lang = array_merge($lang, array( 'USERS_PER_PAGE' => 'Users per page', 'VIEWING_PROFILE' => 'Viewing profile - %s', - 'VISITED' => 'Last visited', + 'LAST_ACTIVITY' => 'Last activity', )); diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 8db2fef2a3..22be25bf3d 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1703,7 +1703,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f 'AGE' => $age, 'RANK_TITLE' => $rank_title, 'JOINED' => $user->format_date($data['user_regdate']), - 'VISITED' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit), + 'LAST_ACTIVITY' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit), 'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0, 'WARNINGS' => isset($data['user_warnings']) ? $data['user_warnings'] : 0, diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 511c7b22c0..9e66a8b020 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -113,7 +113,7 @@ {memberrow.POSTS}{memberrow.POSTS}
{memberrow.custom_fields.PROFILE_FIELD_VALUE}
  {memberrow.JOINED} - {memberrow.VISITED}  + {memberrow.LAST_ACTIVITY}  diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index 6dc8293551..0273760d8d 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -85,7 +85,7 @@
{L_JOINED}{L_COLON}
{JOINED}
-
{L_VISITED}{L_COLON}
{VISITED}
+
{L_LAST_ACTIVITY}{L_COLON}
{LAST_ACTIVITY}
{L_WARNINGS}{L_COLON}
{WARNINGS} [ {L_VIEW_NOTES} | {L_WARN_USER} ]
diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html index eca224f2d9..2f9b5e559b 100644 --- a/phpBB/styles/prosilver/template/ucp_main_front.html +++ b/phpBB/styles/prosilver/template/ucp_main_front.html @@ -60,7 +60,7 @@
{L_JOINED}{L_COLON}
{JOINED}
-
{L_VISITED}{L_COLON}
{LAST_VISIT_YOU}
+
{L_LAST_ACTIVITY}{L_COLON}
{LAST_VISIT_YOU}
{L_TOTAL_POSTS}{L_COLON}
{POSTS} | {L_SEARCH_YOUR_POSTS}
({POSTS_DAY} / {POSTS_PCT}){POSTS}
{L_ACTIVE_IN_FORUM}{L_COLON}
{ACTIVE_FORUM}
({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})
{L_ACTIVE_IN_TOPIC}{L_COLON}
{ACTIVE_TOPIC}
({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html index 28f4da4fef..72eeef5a0c 100644 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ b/phpBB/styles/subsilver2/template/memberlist_view.html @@ -72,8 +72,8 @@ {JOINED} - {L_VISITED}{L_COLON} - {VISITED} + {L_LAST_ACTIVITY}{L_COLON} + {LAST_ACTIVITY} From 0bf758f00f86fa3164439bd528a69d230b823397 Mon Sep 17 00:00:00 2001 From: geetakshi Date: Sun, 16 Mar 2014 03:37:21 +0530 Subject: [PATCH 2/5] [ticket/8309] Rename $last_visit to $last_activity PHPBB3-8309 --- phpBB/includes/acp/acp_users.php | 4 ++-- phpBB/includes/ucp/ucp_main.php | 2 +- phpBB/memberlist.php | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index c944f5f96f..f74d49efd9 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1018,7 +1018,7 @@ class acp_users $s_action_options .= ''; } - $last_visit = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit']; + $last_activity = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit']; $inactive_reason = ''; if ($user_row['user_type'] == USER_INACTIVE) @@ -1084,7 +1084,7 @@ class acp_users 'USER' => $user_row['username'], 'USER_REGISTERED' => $user->format_date($user_row['user_regdate']), 'REGISTERED_IP' => ($ip == 'hostname') ? gethostbyaddr($user_row['user_ip']) : $user_row['user_ip'], - 'USER_LASTACTIVE' => ($last_visit) ? $user->format_date($last_visit) : ' - ', + 'USER_LASTACTIVE' => ($last_activity) ? $user->format_date($last_activity) : ' - ', 'USER_EMAIL' => $user_row['user_email'], 'USER_WARNINGS' => $user_row['user_warnings'], 'USER_POSTS' => $user_row['user_posts'], diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 1cae814cb5..67bb56efae 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -189,7 +189,7 @@ class ucp_main $template->assign_vars(array( 'USER_COLOR' => (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '', 'JOINED' => $user->format_date($user->data['user_regdate']), - 'LAST_ACTIVITY' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit), + 'LAST_ACTIVITY' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity), 'WARNINGS' => ($user->data['user_warnings']) ? $user->data['user_warnings'] : 0, 'POSTS' => ($user->data['user_posts']) ? $user->data['user_posts'] : 0, 'POSTS_DAY' => $user->lang('POST_DAY', $posts_per_day), diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 22be25bf3d..9f0ac93545 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1666,11 +1666,11 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f if ($data['user_allow_viewonline'] || $auth->acl_get('u_viewonline')) { - $last_visit = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit']; + $last_activity = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit']; } else { - $last_visit = ''; + $last_activity = ''; } $age = ''; @@ -1703,7 +1703,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f 'AGE' => $age, 'RANK_TITLE' => $rank_title, 'JOINED' => $user->format_date($data['user_regdate']), - 'LAST_ACTIVITY' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit), + 'LAST_ACTIVITY' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity), 'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0, 'WARNINGS' => isset($data['user_warnings']) ? $data['user_warnings'] : 0, From 6a1967514d09c14fa1cada7ff8ef0c925f3072a0 Mon Sep 17 00:00:00 2001 From: geetakshi Date: Sun, 16 Mar 2014 14:27:34 +0530 Subject: [PATCH 3/5] [ticket/8309] Moving key to get keys in alphabetical order PHPBB3-8309 --- phpBB/language/en/memberlist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 0b3983ae1e..3228b4fffc 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -85,6 +85,7 @@ $lang = array_merge($lang, array( 'IM_USER' => 'Send an instant message', 'LAST_ACTIVE' => 'Last active', + 'LAST_ACTIVITY' => 'Last activity', 'LESS_THAN' => 'Less than', 'LIST_USERS' => array( 1 => '%d user', @@ -135,5 +136,4 @@ $lang = array_merge($lang, array( 'USERS_PER_PAGE' => 'Users per page', 'VIEWING_PROFILE' => 'Viewing profile - %s', - 'LAST_ACTIVITY' => 'Last activity', )); From 66ed9881dfb143dc0d430132cf351f64ecc73bcb Mon Sep 17 00:00:00 2001 From: geetakshi Date: Mon, 17 Mar 2014 21:08:03 +0530 Subject: [PATCH 4/5] [ticket/8309] Removing key with similar function to avoid redundancy PHPBB3-8309 --- phpBB/includes/ucp/ucp_main.php | 2 +- phpBB/language/en/memberlist.php | 1 - phpBB/memberlist.php | 2 +- phpBB/styles/prosilver/template/memberlist_body.html | 2 +- phpBB/styles/prosilver/template/memberlist_view.html | 2 +- phpBB/styles/prosilver/template/ucp_main_front.html | 2 +- phpBB/styles/subsilver2/template/memberlist_view.html | 4 ++-- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 67bb56efae..086f347154 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -189,7 +189,7 @@ class ucp_main $template->assign_vars(array( 'USER_COLOR' => (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '', 'JOINED' => $user->format_date($user->data['user_regdate']), - 'LAST_ACTIVITY' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity), + 'LAST_ACTIVE' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity), 'WARNINGS' => ($user->data['user_warnings']) ? $user->data['user_warnings'] : 0, 'POSTS' => ($user->data['user_posts']) ? $user->data['user_posts'] : 0, 'POSTS_DAY' => $user->lang('POST_DAY', $posts_per_day), diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 3228b4fffc..c7f301fb8c 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -85,7 +85,6 @@ $lang = array_merge($lang, array( 'IM_USER' => 'Send an instant message', 'LAST_ACTIVE' => 'Last active', - 'LAST_ACTIVITY' => 'Last activity', 'LESS_THAN' => 'Less than', 'LIST_USERS' => array( 1 => '%d user', diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 9f0ac93545..c980daff21 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1703,7 +1703,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f 'AGE' => $age, 'RANK_TITLE' => $rank_title, 'JOINED' => $user->format_date($data['user_regdate']), - 'LAST_ACTIVITY' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity), + 'LAST_ACTIVE' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity), 'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0, 'WARNINGS' => isset($data['user_warnings']) ? $data['user_warnings'] : 0, diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 9e66a8b020..7ba289cfd6 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -113,7 +113,7 @@ {memberrow.POSTS}{memberrow.POSTS}
{memberrow.custom_fields.PROFILE_FIELD_VALUE}
  {memberrow.JOINED} - {memberrow.LAST_ACTIVITY}  + {memberrow.LAST_ACTIVE}  diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index 0273760d8d..874db3c9a7 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -85,7 +85,7 @@
{L_JOINED}{L_COLON}
{JOINED}
-
{L_LAST_ACTIVITY}{L_COLON}
{LAST_ACTIVITY}
+
{L_LAST_ACTIVE}{L_COLON}
{LAST_ACTIVE}
{L_WARNINGS}{L_COLON}
{WARNINGS} [ {L_VIEW_NOTES} | {L_WARN_USER} ]
diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html index 2f9b5e559b..861cf87c92 100644 --- a/phpBB/styles/prosilver/template/ucp_main_front.html +++ b/phpBB/styles/prosilver/template/ucp_main_front.html @@ -60,7 +60,7 @@
{L_JOINED}{L_COLON}
{JOINED}
-
{L_LAST_ACTIVITY}{L_COLON}
{LAST_VISIT_YOU}
+
{L_LAST_ACTIVE}{L_COLON}
{LAST_VISIT_YOU}
{L_TOTAL_POSTS}{L_COLON}
{POSTS} | {L_SEARCH_YOUR_POSTS}
({POSTS_DAY} / {POSTS_PCT}){POSTS}
{L_ACTIVE_IN_FORUM}{L_COLON}
{ACTIVE_FORUM}
({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})
{L_ACTIVE_IN_TOPIC}{L_COLON}
{ACTIVE_TOPIC}
({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})
diff --git a/phpBB/styles/subsilver2/template/memberlist_view.html b/phpBB/styles/subsilver2/template/memberlist_view.html index 72eeef5a0c..022d185430 100644 --- a/phpBB/styles/subsilver2/template/memberlist_view.html +++ b/phpBB/styles/subsilver2/template/memberlist_view.html @@ -72,8 +72,8 @@ {JOINED} - {L_LAST_ACTIVITY}{L_COLON} - {LAST_ACTIVITY} + {L_LAST_ACTIVE}{L_COLON} + {LAST_ACTIVE} From 9a3011c2dd844a13d9d08192fe5463941a08ffcd Mon Sep 17 00:00:00 2001 From: geetakshi Date: Thu, 20 Mar 2014 01:48:52 +0530 Subject: [PATCH 5/5] [ticket/8309] Changing $last_activity to $last_active PHPBB3-8309 --- phpBB/includes/acp/acp_users.php | 4 ++-- phpBB/includes/ucp/ucp_main.php | 2 +- phpBB/memberlist.php | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index f74d49efd9..b1913eb6b3 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1018,7 +1018,7 @@ class acp_users $s_action_options .= ''; } - $last_activity = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit']; + $last_active = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit']; $inactive_reason = ''; if ($user_row['user_type'] == USER_INACTIVE) @@ -1084,7 +1084,7 @@ class acp_users 'USER' => $user_row['username'], 'USER_REGISTERED' => $user->format_date($user_row['user_regdate']), 'REGISTERED_IP' => ($ip == 'hostname') ? gethostbyaddr($user_row['user_ip']) : $user_row['user_ip'], - 'USER_LASTACTIVE' => ($last_activity) ? $user->format_date($last_activity) : ' - ', + 'USER_LASTACTIVE' => ($last_active) ? $user->format_date($last_active) : ' - ', 'USER_EMAIL' => $user_row['user_email'], 'USER_WARNINGS' => $user_row['user_warnings'], 'USER_POSTS' => $user_row['user_posts'], diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 086f347154..f0ce21fb48 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -189,7 +189,7 @@ class ucp_main $template->assign_vars(array( 'USER_COLOR' => (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '', 'JOINED' => $user->format_date($user->data['user_regdate']), - 'LAST_ACTIVE' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity), + 'LAST_ACTIVE' => (empty($last_active)) ? ' - ' : $user->format_date($last_active), 'WARNINGS' => ($user->data['user_warnings']) ? $user->data['user_warnings'] : 0, 'POSTS' => ($user->data['user_posts']) ? $user->data['user_posts'] : 0, 'POSTS_DAY' => $user->lang('POST_DAY', $posts_per_day), diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index c980daff21..738b0be01c 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1666,11 +1666,11 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f if ($data['user_allow_viewonline'] || $auth->acl_get('u_viewonline')) { - $last_activity = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit']; + $last_active = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit']; } else { - $last_activity = ''; + $last_active = ''; } $age = ''; @@ -1703,7 +1703,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f 'AGE' => $age, 'RANK_TITLE' => $rank_title, 'JOINED' => $user->format_date($data['user_regdate']), - 'LAST_ACTIVE' => (empty($last_activity)) ? ' - ' : $user->format_date($last_activity), + 'LAST_ACTIVE' => (empty($last_active)) ? ' - ' : $user->format_date($last_active), 'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0, 'WARNINGS' => isset($data['user_warnings']) ? $data['user_warnings'] : 0,