Last visit addition

git-svn-id: file:///svn/phpbb/trunk@427 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/db/mysql_schema.sql

@@ -270,6 +270,7 @@ CREATE TABLE phpbb_session (
    session_user_id int(11) DEFAULT '0' NOT NULL,
    session_start int(11) DEFAULT '0' NOT NULL,
    session_time int(11) DEFAULT '0' NOT NULL, 
+   session_last_visit int(11) DEFAULT '0' NOT NULL, 
    session_ip char(8) DEFAULT '0' NOT NULL,
    session_page int(11) DEFAULT '0' NOT NULL,
    session_logged_in tinyint(1) DEFAULT '0' NOT NULL,

phpBB/db/postgres_schema.sql

@@ -283,6 +283,7 @@ CREATE TABLE phpbb_session (
    session_user_id int4 DEFAULT '0' NOT NULL,
    session_start int4 DEFAULT '0' NOT NULL,
    session_time int4 DEFAULT '0' NOT NULL, 
+   session_last_visit int4 DEFAULT '0' NOT NULL, 
    session_ip char(8) DEFAULT '0' NOT NULL,
    session_page int4 DEFAULT '0' NOT NULL,
    session_logged_in int2 DEFAULT '0' NOT NULL,

phpBB/includes/page_header.php

@@ -41,6 +41,9 @@ if($userdata['session_logged_in'])
 
 	$u_login_logout = "login.$phpEx?submit=logout";
 	$l_login_logout = $lang['Logout']." : ".$userdata["username"]."";
+
+	$l_last_visit = "You last visited on";
+	$s_last_visit = create_date($board_config['default_dateformat'], $userdata['session_last_visit'], $board_config['default_timezone']);
 }
 else
 {
@@ -159,6 +162,7 @@ $template->assign_vars(array(
 	"L_MESSAGE" => $lang['Message'],
 	"L_BY" => $lang['by'],
 	"L_LOGIN_LOGOUT" => $l_login_logout, 
+	"L_LAST_VISIT" => $l_last_visit,
 
 	"U_INDEX" => append_sid("index.".$phpEx),
 	"U_REGISTER" => append_sid("profile.".$phpEx."?mode=register"),
@@ -175,6 +179,7 @@ $template->assign_vars(array(
 	"S_TIMEZONE" => $s_timezone,
 	"S_LOGIN_ACTION" => append_sid("login.$phpEx"),
 	"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"),
+	"S_LAST_VISIT_DATE" => $s_last_visit, 
 
 	"T_HEAD_STYLESHEET" => $theme['head_stylesheet'],
 	"T_BODY_BACKGROUND" => $theme['body_background'],
@@ -208,7 +213,7 @@ $template->assign_vars(array(
 	"T_IMG4" => $theme['img4'])
 );
 
-header ("Expires: " . gmdate("D, d M Y H:i:s", time()+30) . " GMT"); 
+header ("Expires: " . gmdate("D, d M Y H:i:s", time()) . " GMT"); 
 header ("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
 
 $template->pparse("overall_header");

phpBB/includes/sessions.php

@@ -90,6 +90,12 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
 			$result = $db->sql_query($sql_delete_same_user);
 		}
 	
+		//
+		// Try and pull the last time stored
+		// in a cookie, if it exists
+		//
+		$sessiondata['lastvisit'] = (!empty($sessiondata['sessiontime'])) ? $sessiondata['sessiontime'] : $current_time;
+
 		$sql_update = "UPDATE ".SESSIONS_TABLE."
 			SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login
 			WHERE (session_id = '".$sessiondata['sessionid']."')
@@ -103,9 +109,9 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
 			$session_id = mt_rand();
 			
 			$sql_insert = "INSERT INTO ".SESSIONS_TABLE."
-				(session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in)
+				(session_id, session_user_id, session_start, session_time, session_last_visit, session_ip, session_page, session_logged_in)
 				VALUES
-				('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login)";
+				('$session_id', $user_id, $current_time, $current_time, ".$sessiondata['lastvisit'].", '$user_ip', $page_id, $login)";
 			$result = $db->sql_query($sql_insert);
 			if(!$result)
 			{
@@ -155,10 +161,9 @@ function session_begin($user_id, $user_ip, $page_id, $session_length, $login = 0
 		setcookie($cookiename, $serialised_cookiedata, ($current_time+$cookielife), $cookiepath, $cookiedomain, $cookiesecure);
 
 		$SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=".$sessiondata['sessionid'] : "";
-
 	}
 
-	return $session_id;
+	return $sessiondata['lastvisit'];
 
 } // session_begin
 
@@ -360,7 +365,7 @@ function session_pagestart($user_ip, $thispage_id, $session_length)
 			error_die(SESSION_CREATE);
 		}
 	}
-	$userdata['session_id'] = $result;
+	$userdata['session_last_visit'] = $result;
 	$userdata['session_ip'] = $user_ip;
 
 	return $userdata;

phpBB/language/lang_english.php

@@ -75,6 +75,8 @@ $lang['Goto_page'] = "Goto page";
 $lang['Page'] = "Page"; // Followed by the current page number then 'of x' where x is total pages
 $lang['of'] = "of"; // See Page above
 
+$lang['You_last_visit'] = "You last visited on";
+
 //
 // Global Header strings
 //

phpBB/templates/PSO/overall_header.tpl

@@ -38,6 +38,9 @@
 			</tr>
 		</table></td>
 	</tr>
+	<tr>
+		<td width="100%"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{L_LAST_VISIT} {S_LAST_VISIT_DATE}</font></td>
+	</tr>
 </table></div>
 
 <br clear="all" /><br />