Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/includes functions.php,1.77,1.78 page_header.php,1.55,1.56
|
From: Paul S. O. <ps...@us...> - 2001-10-25 23:21:14
|
Update of /cvsroot/phpbb/phpBB2/includes
In directory usw-pr-cvs1:/tmp/cvs-serv20465/includes
Modified Files:
functions.php page_header.php
Log Message:
Altered various language constructs + new quote changes for PM + altered pagination
Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -r1.77 -r1.78
*** functions.php 2001/10/16 14:43:03 1.77
--- functions.php 2001/10/25 23:21:11 1.78
***************
*** 30,39 ****
case 'postcount':
$sql = "SELECT COUNT(post_id) AS total
! FROM ".POSTS_TABLE;
break;
case 'usercount':
$sql = "SELECT COUNT(user_id) AS total
! FROM ". USERS_TABLE ."
WHERE user_id <> " . ANONYMOUS;
break;
--- 30,39 ----
case 'postcount':
$sql = "SELECT COUNT(post_id) AS total
! FROM " . POSTS_TABLE;
break;
case 'usercount':
$sql = "SELECT COUNT(user_id) AS total
! FROM " . USERS_TABLE . "
WHERE user_id <> " . ANONYMOUS;
break;
***************
*** 41,45 ****
case 'newestuser':
$sql = "SELECT user_id, username
! FROM ".USERS_TABLE."
WHERE user_id <> " . ANONYMOUS . "
ORDER BY user_id DESC
--- 41,45 ----
case 'newestuser':
$sql = "SELECT user_id, username
! FROM " . USERS_TABLE . "
WHERE user_id <> " . ANONYMOUS . "
ORDER BY user_id DESC
***************
*** 49,53 ****
case 'topiccount':
$sql = "SELECT SUM(forum_topics) AS total
! FROM ".FORUMS_TABLE;
break;
}
--- 49,53 ----
case 'topiccount':
$sql = "SELECT SUM(forum_topics) AS total
! FROM " . FORUMS_TABLE;
break;
}
***************
*** 83,95 ****
}
! if($db->sql_numrows($result))
{
- $myrow = $db->sql_fetchrowset($result);
- return($myrow[0]);
- }
- else
- {
message_die(GENERAL_ERROR, "No userdata for this user_id", "", __LINE__, __FILE__, $sql);
}
}
--- 83,95 ----
}
! if( !$db->sql_numrows($result) )
{
message_die(GENERAL_ERROR, "No userdata for this user_id", "", __LINE__, __FILE__, $sql);
}
+
+ $row = $db->sql_fetchrow($result);
+
+ return($row);
+
}
***************
*** 107,119 ****
}
! if($db->sql_numrows($result))
{
- $myrow = $db->sql_fetchrowset($result);
- return($myrow[0]);
- }
- else
- {
message_die(GENERAL_ERROR, "Tried obtaining data for a non-existent user", "", __LINE__, __FILE__, $sql);
}
}
--- 107,118 ----
}
! if( !$db->sql_numrows($result) )
{
message_die(GENERAL_ERROR, "Tried obtaining data for a non-existent user", "", __LINE__, __FILE__, $sql);
}
+
+ $row = $db->sql_fetchrow($result);
+
+ return($row);
}
***************
*** 227,245 ****
function init_userprefs($userdata)
{
! global $board_config, $theme, $images, $template, $lang, $phpEx, $phpbb_root_path;
! // if( !defined("IN_ADMIN") )
! // {
! if( !$board_config['override_user_style'] )
{
! if( $userdata['user_id'] != ANONYMOUS && isset($userdata['user_style']) )
! {
! $theme = setup_style($userdata['user_style']);
! if( !$theme )
! {
! $theme = setup_style($board_config['default_style']);
! }
! }
! else
{
$theme = setup_style($board_config['default_style']);
--- 226,238 ----
function init_userprefs($userdata)
{
! global $board_config, $theme, $images;
! global $template, $lang, $phpEx, $phpbb_root_path;
! if( !$board_config['override_user_style'] )
! {
! if( $userdata['user_id'] != ANONYMOUS && isset($userdata['user_style']) )
{
! $theme = setup_style($userdata['user_style']);
! if( !$theme )
{
$theme = setup_style($board_config['default_style']);
***************
*** 250,258 ****
$theme = setup_style($board_config['default_style']);
}
! // }
! // else
! // {
! // $theme = setup_style($board_config['default_admin_style']);
! // }
if( $userdata['user_id'] != ANONYMOUS )
--- 243,251 ----
$theme = setup_style($board_config['default_style']);
}
! }
! else
! {
! $theme = setup_style($board_config['default_style']);
! }
if( $userdata['user_id'] != ANONYMOUS )
***************
*** 263,272 ****
}
! if(!empty($userdata['user_dateformat']))
{
$board_config['default_dateformat'] = $userdata['user_dateformat'];
}
! if(isset($userdata['user_timezone']))
{
$board_config['board_timezone'] = $userdata['user_timezone'];
--- 256,265 ----
}
! if( !empty($userdata['user_dateformat']) )
{
$board_config['default_dateformat'] = $userdata['user_dateformat'];
}
! if( isset($userdata['user_timezone']) )
{
$board_config['board_timezone'] = $userdata['user_timezone'];
***************
*** 274,284 ****
}
! if(file_exists("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);
}
--- 267,277 ----
}
! 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);
}
***************
*** 303,308 ****
}
- // $template_path = ( defined('IN_ADMIN') ) ? 'admin/templates/' : 'templates/' ;
- // $template_name = ( defined('IN_ADMIN') ) ? $board_config['board_admin_template'] : $myrow['template_name'] ;
$template_path = 'templates/' ;
$template_name = $row['template_name'] ;
--- 296,299 ----
***************
*** 350,355 ****
$ip_sep = explode(".", $dotquad_ip);
return (sprintf("%02x%02x%02x%02x", $ip_sep[0], $ip_sep[1], $ip_sep[2], $ip_sep[3]));
-
- // return (( $ip_sep[0] * 0xFFFFFF + $ip_sep[0] ) + ( $ip_sep[1] * 0xFFFF + $ip_sep[1] ) + ( $ip_sep[2] * 0xFF + $ip_sep[2] ) + ( $ip_sep[3] ) );
}
--- 341,344 ----
***************
*** 358,363 ****
$hexipbang = explode(".",chunk_split($int_ip, 2, "."));
return hexdec($hexipbang[0]).".".hexdec($hexipbang[1]).".".hexdec($hexipbang[2]).".".hexdec($hexipbang[3]);
-
- // return sprintf( "%d.%d.%d.%d", ( ( $int_ip >> 24 ) & 0xFF ), ( ( $int_ip >> 16 ) & 0xFF ), ( ( $int_ip >> 8 ) & 0xFF ), ( ( $int_ip ) & 0xFF ) );
}
--- 347,350 ----
***************
*** 388,452 ****
$total_pages = ceil($num_items/$per_page);
! if($total_pages == 1)
{
return "";
}
! $on_page = floor($start_item/$per_page) + 1;
$page_string = "";
! $this_block_start = ($on_page < 10) ? 1 : floor($on_page/10) * 10;
! $this_block_end = ($on_page < 10) ? 9 : $this_block_start + 9;
! if($this_block_end > $total_pages)
{
- $this_block_end = $total_pages;
- }
! for($i = $this_block_start; $i <= $this_block_end; $i++)
! {
! $page_string .= ($i == $on_page) ? "<b>$i</b>" : "<a href=\"".append_sid($base_url . "&start=" . (($i - 1) * $per_page)) . "\">$i</a>";
! if($i < $this_block_end)
{
! $page_string .= ", ";
}
- }
! if($this_block_start > 1)
! {
! $page_string_prepend = "";
! for($i = 0; $i < $this_block_start; $i += 10)
{
! $page_string_prepend .= "<a href=\"" . append_sid($base_url . "&start=" . ($i * $per_page)) . "\">" . ( ($i == 0) ? ($i + 1) : $i) . " - " . ($i + 9) . "</a>, ";
! }
! $page_string = $page_string_prepend . $page_string;
! }
! if($this_block_end < $total_pages)
! {
! $page_string_append = ", ";
! if(!($total_pages%10))
! {
! $page_url = append_sid($base_url."&start=".( ( ($this_block_end + 1) * $per_page ) - $per_page ) );
! $page_string_append .= "<a href=\"$page_url\">$total_pages</a>";
! }
! else
! {
! for($i = $this_block_end + 1; $i < $total_pages; $i += 10)
{
! $page_string_append .= "<a href=\"" . append_sid($base_url . "&start=" . (($i * $per_page) - $per_page)) . "\">" . ( ($i == 0) ? ($i + 1) : $i) . " - " . ((($i + 9) < $total_pages) ? ($i + 9) : $total_pages) . "</a>";
! if($i < $total_pages - 10)
{
! $page_string_append .= ", ";
}
}
}
- $page_string .= $page_string_append;
}
! if($add_prevnext_text)
{
if($on_page > 1)
--- 375,450 ----
$total_pages = ceil($num_items/$per_page);
!
! if( $total_pages == 1 )
{
return "";
}
! $on_page = floor($start_item / $per_page) + 1;
$page_string = "";
! if( $total_pages > 8 )
{
! $init_page_max = ( $total_pages > 2 ) ? 2 : $total_pages;
!
! for($i = 1; $i < $init_page_max + 1; $i++)
{
! $page_string .= ($i == $on_page) ? "<b>$i</b>" : "<a href=\"" . append_sid($base_url . "&start=" . ( ( $i - 1 ) * $per_page )) . "\">$i</a>";
! if( $i < $init_page_max )
! {
! $page_string .= ", ";
! }
}
! if( $total_pages > 2 )
{
! if( $on_page > 1 && $on_page < $total_pages )
! {
! $page_string .= ( $on_page > 4 ) ? " ... " : ", ";
! $init_page_min = ( $on_page > 3 ) ? $on_page : 4;
! $init_page_max = ( $on_page < $total_pages - 3 ) ? $on_page : $total_pages - 3;
! for($i = $init_page_min - 1; $i < $init_page_max + 2; $i++)
! {
! $page_string .= ($i == $on_page) ? "<b>$i</b>" : "<a href=\"" . append_sid($base_url . "&start=" . ( ( $i - 1 ) * $per_page )) . "\">$i</a>";
! if( $i < $init_page_max + 1 )
! {
! $page_string .= ", ";
! }
! }
! $page_string .= ( $on_page < $total_pages - 3 ) ? " ... " : ", ";
! }
! else
! {
! $page_string .= " ... ";
! }
! for($i = $total_pages - 1; $i < $total_pages + 1; $i++)
{
! $page_string .= ($i == $on_page) ? "<b>$i</b>" : "<a href=\"" . append_sid($base_url . "&start=" . ( ( $i - 1 ) * $per_page )) . "\">$i</a>";
! if( $i < $total_pages )
{
! $page_string .= ", ";
}
}
+ }
+ }
+ else
+ {
+ for($i = 1; $i < $total_pages + 1; $i++)
+ {
+ $page_string .= ($i == $on_page) ? "<b>$i</b>" : "<a href=\"" . append_sid($base_url . "&start=" . ( ( $i - 1 ) * $per_page )) . "\">$i</a>";
+ if( $i < $total_pages )
+ {
+ $page_string .= ", ";
+ }
}
}
! if( $add_prevnext_text )
{
if($on_page > 1)
***************
*** 454,457 ****
--- 452,456 ----
$page_string = " <a href=\"" . append_sid($base_url . "&start=" . (($on_page - 2) * $per_page)) . "\">" . $lang['Previous'] . "</a> " . $page_string;
}
+
if($on_page < $total_pages)
{
***************
*** 459,465 ****
}
- $page_string = $lang['Goto_page'] . ": " . $page_string;
-
}
return $page_string;
--- 458,464 ----
}
}
+
+ $page_string = $lang['Goto_page'] . " " . $page_string;
return $page_string;
Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** page_header.php 2001/10/16 11:12:32 1.55
--- page_header.php 2001/10/25 23:21:12 1.56
***************
*** 143,153 ****
}
}
! $l_g_user_s = ($guests_online == 1) ? $lang['User'] : $lang['Users'];
! $l_h_user_s = ($logged_hidden_online == 1) ? $lang['User'] : $lang['Users'];
! $l_r_user_s = ($logged_visible_online == 1) ? $lang['User'] : $lang['Users'];
! $l_is_are = ($logged_visible_online == 1) ? $lang['is'] : $lang['are'];
! $online_userlist = ($logged_visible_online > 0) ? $lang['Registered'] . " $l_r_user_s: " . $online_userlist : $lang['Registered'] . " $l_r_user_s: " . $lang['None'];
//
// Obtain number of new private messages
--- 143,152 ----
}
}
+ $online_userlist = $lang['Registered_users'] . " " . $online_userlist;
! $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_online;
+ $l_online_users = ( $total_online_users == 1 ) ? sprintf($lang['Online_user'], $total_online_users, $logged_visible_online, $logged_hidden_online, $guests_online) : sprintf($lang['Online_users'], $total_online_users, $logged_visible_online, $logged_hidden_online, $guests_online);
+
//
// Obtain number of new private messages
***************
*** 169,174 ****
$new_pm_messages = $pm_result['new_messages'];
! $l_message_new = ( $new_pm_messages == 1 ) ? $lang['message'] : $lang['messages'];
! $l_privmsgs_text = $lang['You_have'] . " $new_pm_messages " . $lang['new'] . " $l_message_new";
}
else
--- 168,173 ----
$new_pm_messages = $pm_result['new_messages'];
! $l_message_new = ( $new_pm_messages == 1 ) ? $lang['New_pm'] : $lang['New_pms'];
! $l_privmsgs_text = sprintf($l_message_new, $new_pm_messages);
}
else
***************
*** 190,198 ****
"SITENAME" => $board_config['sitename'],
"PAGE_TITLE" => $page_title,
! "TOTAL_USERS_ONLINE" => $lang['There'] . " $l_is_are $logged_visible_online " . $lang['Registered'] . " $l_r_user_s, $logged_hidden_online " . $lang['Hidden'] . " $l_h_user_s ". $lang['and'] . " $guests_online " . $lang['Guest'] . " $l_g_user_s " . $lang['online'],
"LOGGED_IN_USER_LIST" => $online_userlist,
"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
"PRIVATE_MESSAGE_COUNT" => $new_pm_messages_session,
! "LAST_VISIT_DATE" => $s_last_visit,
"L_USERNAME" => $lang['Username'],
--- 189,197 ----
"SITENAME" => $board_config['sitename'],
"PAGE_TITLE" => $page_title,
! "TOTAL_USERS_ONLINE" => $l_online_users,
"LOGGED_IN_USER_LIST" => $online_userlist,
"PRIVATE_MESSAGE_INFO" => $l_privmsgs_text,
"PRIVATE_MESSAGE_COUNT" => $new_pm_messages_session,
! "LAST_VISIT_DATE" => $s_last_visit,
"L_USERNAME" => $lang['Username'],
***************
*** 200,204 ****
"L_LOGIN" => $lang['Login'],
"L_LOG_ME_IN" => $lang['Log_me_in'],
- "L_WELCOMETO" => $lang['Welcome_to'],
"L_INDEX" => $lang['Forum_Index'],
"L_REGISTER" => $lang['Register'],
--- 199,202 ----
***************
*** 217,225 ****
"L_LASTPOST" => $lang['Last_Post'],
"L_MODERATOR" => $lang['Moderator'],
! "L_NONEWPOSTS" => $lang['No_new_posts'],
! "L_NEWPOSTS" => $lang['New_posts'],
! "L_NONEWPOSTS_HOT" => $lang['No_new_posts_hot'],
! "L_NEWPOSTS_HOT" => $lang['New_posts_hot'],
! "L_TOPIC_IS_LOCKED" => $lang['Topic_is_locked'],
"L_POSTED" => $lang['Posted'],
"L_JOINED" => $lang['Joined'],
--- 215,225 ----
"L_LASTPOST" => $lang['Last_Post'],
"L_MODERATOR" => $lang['Moderator'],
! "L_NO_NEW_POSTS" => $lang['No_new_posts'],
! "L_NEW_POSTS" => $lang['New_posts'],
! "L_NO_NEW_POSTS_HOT" => $lang['No_new_posts_hot'],
! "L_NEW_POSTS_HOT" => $lang['New_posts_hot'],
! "L_TOPIC_IS_LOCKED" => $lang['Topic_is_locked'],
! "L_ANNOUNCEMENT" => $lang['Post_Announcement'],
! "L_STICKY" => $lang['Post_Sticky'],
"L_POSTED" => $lang['Posted'],
"L_JOINED" => $lang['Joined'],
***************
*** 243,246 ****
--- 243,248 ----
"U_GROUP_CP" => append_sid("groupcp.".$phpEx),
+ "S_CONTENT_DIRECTION" => $lang['DIRECTION'],
+ "S_CONTENT_ENCODING" => $lang['ENCODING'],
"S_TIMEZONE" => $lang['All_times'] . " " . $lang[$board_config['board_timezone']],
"S_LOGIN_ACTION" => append_sid("login.$phpEx"),
***************
*** 292,300 ****
if( !$userdata['session_logged_in'] )
{
! $template->assign_block_vars("user_logged_out", array());
}
else
{
! $template->assign_block_vars("user_logged_in", array());
}
--- 294,302 ----
if( !$userdata['session_logged_in'] )
{
! $template->assign_block_vars("switch_user_logged_out", array());
}
else
{
! $template->assign_block_vars("switch_user_logged_in", array());
}
|
