Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.92,1.93 sessions.php,1.39,1.40 page_header.php,1.76,1.77
|
From: Paul S. O. <ps...@us...> - 2001-12-14 02:39:47
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv11288/includes
Modified Files:
functions.php sessions.php page_header.php
Log Message:
Remove guest user topic tracking via cookies, update viewtopic to re-fix highlighting of search terms, add lang capability to images, various other issues, removed remote avatar size reduction
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -r1.92 -r1.93
*** functions.php 2001/12/11 08:43:05 1.92
--- functions.php 2001/12/14 02:39:44 1.93
***************
*** 281,302 ****
}
! if( file_exists($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.".$phpEx) )
{
! include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
}
! else
! {
! include($phpbb_root_path . 'language/lang_english/lang_main.' . $phpEx);
! }
if( defined("IN_ADMIN") )
{
! if( file_exists($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.".$phpEx) )
{
! include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
}
! else
{
! include($phpbb_root_path . 'language/lang_english/lang_admin.' . $phpEx);
}
}
--- 281,308 ----
}
! if( !file_exists($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_main.".$phpEx) )
{
! $board_config['default_lang'] = "english";
}
!
! include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx);
if( defined("IN_ADMIN") )
{
! if( !file_exists($phpbb_root_path . "language/lang_" . $board_config['default_lang'] . "/lang_admin.".$phpEx) )
{
! $board_config['default_lang'] = "english";
}
!
! include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
! }
!
! while( list($key, $value) = @each($images) )
! {
! if( strstr($value, "_lang") )
{
! $new_value = str_replace("_lang", "_" . $board_config['default_lang'], $value);
!
! $images[$key] = ( !file_exists($new_value) ) ? $new_value : str_replace("_lang", "_english", $value);
}
}
***************
*** 325,333 ****
$template_name = $row['template_name'] ;
! $template = new Template($phpbb_root_path . $template_path . $template_name);
if( $template )
{
! $current_template_path = $template_path . $template_name . '/';
@include($phpbb_root_path . $template_path . $template_name . '/' . $template_name . '.cfg');
--- 331,339 ----
$template_name = $row['template_name'] ;
! $template = new Template($phpbb_root_path . $template_path . $template_name, $db);
if( $template )
{
! $current_template_path = $template_path . $template_name;
@include($phpbb_root_path . $template_path . $template_name . '/' . $template_name . '.cfg');
***************
*** 1178,1185 ****
}
-
-
//
! // this does exactly what preg_quote() does in PHP 4-ish: http://www.php.net/manual/en/function.preg-quote.php
//
// This function is here because the 2nd paramter to preg_quote was added in some
--- 1184,1190 ----
}
//
! // this does exactly what preg_quote() does in PHP 4-ish:
! // http://www.php.net/manual/en/function.preg-quote.php
//
// This function is here because the 2nd paramter to preg_quote was added in some
***************
*** 1196,1200 ****
return $text;
}
-
! ?>
--- 1201,1204 ----
return $text;
}
! ?>
\ No newline at end of file
Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/sessions.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** sessions.php 2001/12/05 00:20:56 1.39
--- sessions.php 2001/12/14 02:39:44 1.40
***************
*** 51,133 ****
$sessionmethod = SESSION_METHOD_GET;
}
$current_time = time();
$expiry_time = $current_time - $session_length;
//
! // Initial ban check against IP and userid
//
! ereg("(..)(..)(..)(..)", $user_ip, $user_ip_parts);
!
! $sql = "SELECT ban_ip, ban_userid
! FROM " . BANLIST_TABLE . "
! WHERE ban_ip = '" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . $user_ip_parts[4] . "'
! OR ban_ip = '" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . "ff'
! OR ban_ip = '" . $user_ip_parts[1] . $user_ip_parts[2] . "ffff'
! OR ban_ip = '" . $user_ip_parts[1] . "ffffff'
! OR ban_userid = $user_id";
! $result = $db->sql_query($sql);
! if (!$result)
{
- message_die(CRITICAL_ERROR, "Couldn't obtain ban information.", "", __LINE__, __FILE__, $sql);
- }
-
- $ban_info = $db->sql_fetchrow($result);
-
- //
- // Check for user and ip ban ...
- //
- if($ban_info['ban_ip'] || $ban_info['ban_userid'])
- {
- message_die(CRITICAL_MESSAGE, 'You_been_banned');
- }
- else
- {
//
! // Try and pull the last time stored
! // in a cookie, if it exists
//
! if( $user_id != ANONYMOUS )
{
! //
! // This is a 'work-around' since I managed to
! // freeze the schema without re-visiting sessions,
! // what's needed is a session timer in the user table
! // + the user_lastvisit ... damn damn damn damn and blast
! //
! $sql = "SELECT user_autologin_key, user_lastvisit
! FROM " . USERS_TABLE . "
! WHERE user_id = $user_id";
! $result = $db->sql_query($sql);
! if( !$result )
! {
! message_die(CRITICAL_ERROR, "Couldn't obtain lastvisit data from user table", "", __LINE__, __FILE__, $sql);
! }
!
! $row = $db->sql_fetchrow($result);
! $sessiondata['lastvisit'] = $row['user_lastvisit'];
! if( $auto_create )
{
! if( isset($sessiondata['autologinid']) )
{
! if( $sessiondata['autologinid'] == $row['user_autologin_key'] )
! {
! $login = 1;
! $enable_autologin = 1;
! }
! else
! {
! $login = 0;
! $enable_autologin = 0;
! $user_id = ANONYMOUS;
!
! $sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
! }
}
else
{
! $login = 0;
! $enable_autologin = 0;
$user_id = ANONYMOUS;
--- 51,96 ----
$sessionmethod = SESSION_METHOD_GET;
}
+
$current_time = time();
$expiry_time = $current_time - $session_length;
//
! // Try and pull the last time stored
! // in a cookie, if it exists
//
! if( $user_id != ANONYMOUS )
{
//
! // This is a 'work-around' since I managed to
! // freeze the schema without re-visiting sessions,
! // what's needed is a session timer in the user table
! // + the user_lastvisit ... damn damn damn damn and blast
//
! $sql = "SELECT user_autologin_key, user_session_time, user_email
! FROM " . USERS_TABLE . "
! WHERE user_id = $user_id";
! $result = $db->sql_query($sql);
! if( !$result )
{
! message_die(CRITICAL_ERROR, "Couldn't obtain lastvisit data from user table", "", __LINE__, __FILE__, $sql);
! }
!
! $row = $db->sql_fetchrow($result);
! $sessiondata['lastvisit'] = ( $row['user_session_time'] > 0 ) ? $row['user_session_time'] : $current_time;
! if( $auto_create )
! {
! if( isset($sessiondata['autologinid']) )
{
! if( $sessiondata['autologinid'] == $row['user_autologin_key'] )
{
! $login = 1;
! $enable_autologin = 1;
}
else
{
! $login = 0;
! $enable_autologin = 0;
$user_id = ANONYMOUS;
***************
*** 137,151 ****
else
{
! $login = 1;
}
}
else
{
! $login = 0;
! $enable_autologin = 0;
!
! $sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
}
$sql = "UPDATE " . SESSIONS_TABLE . "
SET session_user_id = $user_id, session_start = $current_time, session_last_visit = " . $sessiondata['lastvisit'] . ", session_time = $current_time, session_page = $page_id, session_logged_in = $login
--- 100,158 ----
else
{
! $login = 0;
! $enable_autologin = 0;
! $user_id = ANONYMOUS;
!
! $sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
}
}
else
{
! $login = 1;
}
+ }
+ else
+ {
+ $login = 0;
+ $enable_autologin = 0;
+ $sessiondata['lastvisit'] = ( !empty($sessiondata['lastvisit']) ) ? $sessiondata['lastvisit'] : $current_time;
+ }
+
+ //
+ // Initial ban check against user id, IP and email address
+ //
+ ereg("(..)(..)(..)(..)", $user_ip, $user_ip_parts);
+
+ $sql = "SELECT ban_ip, ban_userid, ban_email
+ FROM " . BANLIST_TABLE . "
+ WHERE ban_ip = '" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . $user_ip_parts[4] . "'
+ OR ban_ip = '" . $user_ip_parts[1] . $user_ip_parts[2] . $user_ip_parts[3] . "ff'
+ OR ban_ip = '" . $user_ip_parts[1] . $user_ip_parts[2] . "ffff'
+ OR ban_ip = '" . $user_ip_parts[1] . "ffffff'
+ OR ban_userid = $user_id";
+ if( $user_id != ANONYMOUS )
+ {
+ $sql .= " OR ban_email LIKE '" . $row['user_email'] . "'
+ OR ban_email LIKE '" . substr($row['user_email'], strpos($row['user_email'], "@")) . "'";
+ }
+ $result = $db->sql_query($sql);
+ if( !$result )
+ {
+ message_die(CRITICAL_ERROR, "Couldn't obtain ban information.", "", __LINE__, __FILE__, $sql);
+ }
+
+ $ban_info = $db->sql_fetchrow($result);
+
+ if( $ban_info['ban_ip'] || $ban_info['ban_userid'] || $ban_info['ban_email'] )
+ {
+ message_die(CRITICAL_MESSAGE, 'You_been_banned');
+ }
+
+ //
+ // Create or update the session
+ //
+ if( !$auto_create )
+ {
$sql = "UPDATE " . SESSIONS_TABLE . "
SET session_user_id = $user_id, session_start = $current_time, session_last_visit = " . $sessiondata['lastvisit'] . ", session_time = $current_time, session_page = $page_id, session_logged_in = $login
***************
*** 153,201 ****
AND session_ip = '$user_ip'";
$result = $db->sql_query($sql);
!
! if( !$result || !$db->sql_affectedrows() )
{
! $session_id = md5(uniqid($user_ip));
! $sql = "INSERT INTO " . SESSIONS_TABLE . "
! (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, " . $sessiondata['lastvisit'] . ", '$user_ip', $page_id, $login)";
! $result = $db->sql_query($sql);
! if(!$result)
! {
! message_die(CRITICAL_ERROR, "Error creating new session : session_begin", "", __LINE__, __FILE__, $sql);
! }
}
! if( $user_id != ANONYMOUS )
{
! $autologin_sql = "";
! if( $enable_autologin && $sessionmethod = SESSION_METHOD_COOKIE )
! {
! mt_srand( (double) microtime() * 1000000);
! $autologin_key = md5(uniqid(mt_rand()));
! $sessiondata['autologinid'] = $autologin_key;
! $autologin_sql = ", user_autologin_key = '$autologin_key'";
! }
! $sql_auto = "UPDATE " . USERS_TABLE . "
! SET user_lastvisit = " . time() . $autologin_sql . "
! WHERE user_id = $user_id";
! $result = $db->sql_query($sql_auto);
! if(!$result)
! {
! message_die(CRITICAL_ERROR, "Couldn't update users autologin key : session_begin", "", __LINE__, __FILE__, $sql);
! }
}
! $sessiondata['userid'] = $user_id;
! $serialised_cookiedata = serialize($sessiondata);
! setcookie($cookiename . '_data', $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
! setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
! $SID = ($sessionmethod == SESSION_METHOD_GET) ? "sid=" . $session_id : "";
! }
return $session_id;
--- 160,216 ----
AND session_ip = '$user_ip'";
$result = $db->sql_query($sql);
! if(!$result)
{
! message_die(CRITICAL_ERROR, "Error updating current session : session_begin", "", __LINE__, __FILE__, $sql);
! }
! }
! else
! {
! mt_srand( (double) microtime() * 1000000);
! $session_id = md5(uniqid(mt_rand()));
! $sql = "INSERT INTO " . SESSIONS_TABLE . "
! (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, " . $sessiondata['lastvisit'] . ", '$user_ip', $page_id, $login)";
! $result = $db->sql_query($sql);
! if(!$result)
! {
! message_die(CRITICAL_ERROR, "Error creating new session : session_begin", "", __LINE__, __FILE__, $sql);
}
+ }
! if( $user_id != ANONYMOUS )
! {
! $autologin_sql = "";
! if( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE )
{
! mt_srand( (double) microtime() * 1000000);
! $autologin_key = md5(uniqid(mt_rand()));
! $sessiondata['autologinid'] = $autologin_key;
! $autologin_sql = $autologin_key;
! }
! else
! {
! $autologin_sql = "";
! }
! $sql_auto = "UPDATE " . USERS_TABLE . "
! SET user_lastvisit = " . $sessiondata['lastvisit'] . ", user_session_time = $current_time, user_session_page = $page_id, user_autologin_key ='$autologin_id'
! WHERE user_id = $user_id";
! $result = $db->sql_query($sql_auto);
! if(!$result)
! {
! message_die(CRITICAL_ERROR, "Couldn't update users autologin key : session_begin", "", __LINE__, __FILE__, $sql);
}
+ }
! $sessiondata['userid'] = $user_id;
! $serialised_cookiedata = serialize($sessiondata);
! setcookie($cookiename . '_data', $serialised_cookiedata, ($current_time + 31536000), $cookiepath, $cookiedomain, $cookiesecure);
! setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
! $SID = ( $sessionmethod == SESSION_METHOD_GET ) ? "sid=" . $session_id : "";
return $session_id;
***************
*** 247,252 ****
FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
WHERE s.session_id = '$session_id'
! AND s.session_ip = '$user_ip'
! AND u.user_id = s.session_user_id";
$result = $db->sql_query($sql);
if( !$result )
--- 262,267 ----
FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
WHERE s.session_id = '$session_id'
! AND u.user_id = s.session_user_id
! AND s.session_ip = '$user_ip'";
$result = $db->sql_query($sql);
if( !$result )
***************
*** 264,309 ****
$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? "sid=" . $session_id : "";
- if( empty($HTTP_COOKIE_VARS[$cookiename . '_data']) )
- {
- if( !empty($userdata['user_autologin']) && $sessionmethod = SESSION_METHOD_COOKIE )
- {
- $sessiondata['autologinid'] = $autologin_key;
- }
- $sessiondata['userid'] = $user_id;
- $sessiondata['lastvisit'] = $userdata['session_last_visit'];
-
- $serialised_cookiedata = serialize($sessiondata);
- // session_send_cookie("_data", $serialised_cookiedata, ($current_time + 31536000));
- setcookie($board_config['cookie_name'] . "_data", $serialised_cookiedata, ($current_time + 31536000), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
- setcookie($board_config['cookie_name'] . "_sid", $HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_sid"], 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
- }
-
//
// Only update session DB a minute or so after last update
//
! if( $current_time - $userdata['session_time'] > 60 )
{
! $sql = "UPDATE " . SESSIONS_TABLE . "
! SET session_time = $current_time, session_page = $thispage_id
! WHERE session_id = '" . $userdata['session_id'] . "'
! AND session_ip = '$user_ip'
! AND session_user_id = " . $userdata['user_id'];
! $result = $db->sql_query($sql);
! if( !$result )
{
! message_die(CRITICAL_ERROR, "Error updating sessions table : session_pagestart", "", __LINE__, __FILE__, $sql);
! }
! if( $user_id != ANONYMOUS )
{
$sql = "UPDATE " . USERS_TABLE . "
! SET user_lastvisit = $current_time
WHERE user_id = " . $userdata['user_id'];
- $result = $db->sql_query($sql);
- if( !$result )
- {
- message_die(CRITICAL_ERROR, "Error updating users table : session_pagestart (GET)", "", __LINE__, __FILE__, $sql);
- }
}
//
--- 279,310 ----
$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? "sid=" . $session_id : "";
//
// Only update session DB a minute or so after last update
//
! $last_update = ( $userdata['user_id'] == ANONYMOUS ) ? $userdata['session_time'] : $userdata['user_session_time'];
!
! if( $current_time - $last_update > 60 )
{
! if( $userdata['user_id'] == ANONYMOUS )
{
! $sessiondata['lastvisit'] = $current_time;
! $sql = "UPDATE " . SESSIONS_TABLE . "
! SET session_time = $current_time, session_page = $thispage_id
! WHERE session_id = '" . $userdata['session_id'] . "'
! AND session_user_id = " . $userdata['user_id'] . "
! AND session_ip = '$user_ip'";
! }
! else
{
$sql = "UPDATE " . USERS_TABLE . "
! SET user_session_time = $current_time, user_session_page = $thispage_id
WHERE user_id = " . $userdata['user_id'];
}
+ $result = $db->sql_query($sql);
+ if( !$result )
+ {
+ message_die(CRITICAL_ERROR, "Error updating sessions table : session_pagestart", "", __LINE__, __FILE__, $sql);
+ }
//
***************
*** 312,316 ****
$expiry_time = $current_time - $board_config['session_length'];
$sql = "DELETE FROM " . SESSIONS_TABLE . "
! WHERE session_time < $expiry_time";
$result = $db->sql_query($sql);
if( !$result )
--- 313,318 ----
$expiry_time = $current_time - $board_config['session_length'];
$sql = "DELETE FROM " . SESSIONS_TABLE . "
! WHERE session_time < $expiry_time
! AND session_id <> '$session_id'";
$result = $db->sql_query($sql);
if( !$result )
***************
*** 318,335 ****
message_die(CRITICAL_ERROR, "Error clearing sessions table : session_pagestart", "", __LINE__, __FILE__, $sql);
}
-
- return $userdata;
}
! //
! // We didn't need to update session
! // so just return userdata
! //
return $userdata;
}
}
- else
- {
- }
//
// If we reach here then no (valid) session exists. So we'll create a new one,
--- 320,331 ----
message_die(CRITICAL_ERROR, "Error clearing sessions table : session_pagestart", "", __LINE__, __FILE__, $sql);
}
}
!
! setcookie($board_config['cookie_name'] . '_data', serialize($sessiondata), ($current_time + 31536000), $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
! setcookie($board_config['cookie_name'] . '_sid', $session_id, 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
return $userdata;
}
}
//
// If we reach here then no (valid) session exists. So we'll create a new one,
***************
*** 349,354 ****
FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
WHERE s.session_id = '$result_id'
! AND s.session_ip = '$user_ip'
! AND u.user_id = s.session_user_id";
$result = $db->sql_query($sql);
if ( !$result )
--- 345,350 ----
FROM " . SESSIONS_TABLE . " s, " . USERS_TABLE . " u
WHERE s.session_id = '$result_id'
! AND u.user_id = s.session_user_id
! AND s.session_ip = '$user_ip'";
$result = $db->sql_query($sql);
if ( !$result )
***************
*** 446,477 ****
} // session_end()
-
- //
- // This checks to see if we're @ the 20 cookie limit
- // if we are it re-sends the session id. This isn't a great
- // solution but it does work, although resulting in
- // more cookies being sent than necessary. Will re-evaluate
- // this in 2.2
- //
- function session_send_cookie($append_name, $set_value, $last_time)
- {
- global $board_config;
- global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $SID;
-
- setcookie($board_config['cookie_name'] . $append_name, $set_value, $last_time, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
-
- $cookie_count = 0;
- while( list(, $value) = each($HTTP_COOKIE_VARS) )
- {
- $cookie_count += count($value);
- }
-
- if( $cookie_count == 20 )
- {
- setcookie($board_config['cookie_name'] . "_sid", stripslashes($HTTP_COOKIE_VARS[$board_config['cookie_name'] . "_sid"]), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
- }
-
- return;
- }
//
--- 442,445 ----
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -r1.76 -r1.77
*** page_header.php 2001/12/10 01:19:12 1.76
--- page_header.php 2001/12/14 02:39:44 1.77
***************
*** 84,88 ****
}
! $s_last_visit = create_date($board_config['default_dateformat'], $userdata['session_last_visit'], $board_config['board_timezone']);
//
--- 84,88 ----
}
! $s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : "";
//
***************
*** 93,97 ****
FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
WHERE u.user_id = s.session_user_id
! AND s.session_time >= ".( time() - 300 );
$result = $db->sql_query($sql);
if(!$result)
--- 93,99 ----
FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
WHERE u.user_id = s.session_user_id
! AND ( s.session_time >= ".( time() - 300 ) . "
! OR u.user_session_time >= " . ( time() - 300 ) . " )
! ORDER BY u.user_session_time DESC";
$result = $db->sql_query($sql);
if(!$result)
***************
*** 246,262 ****
"PRIVMSG_IMG" => $icon_pm,
- "FORUM_IMG" => $images['forum'],
- "FORUM_NEW_IMG" => $images['forum_new'],
- "FORUM_LOCKED_IMG" => $images['forum_locked'],
- "FOLDER_IMG" => $images['folder'],
- "FOLDER_NEW_IMG" => $images['folder_new'],
- "FOLDER_HOT_IMG" => $images['folder_hot'],
- "FOLDER_HOT_NEW_IMG" => $images['folder_hot_new'],
- "FOLDER_LOCKED_IMG" => $images['folder_locked'],
- "FOLDER_LOCKED_NEW_IMG" => $images['folder_locked_new'],
- "FOLDER_STICKY_IMG" => $images['folder_sticky'],
- "FOLDER_STICKY_NEW_IMG" => $images['folder_sticky_new'],
- "FOLDER_ANNOUNCE_IMG" => $images['folder_announce'],
- "FOLDER_ANNOUNCE_NEW_IMG" => $images['folder_announce_new'],
"L_USERNAME" => $lang['Username'],
--- 248,251 ----
|
