Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2 modcp.php,1.43,1.44
|
From: Paul S. O. <ps...@us...> - 2001-11-13 17:36:30
|
Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv2504
Modified Files:
modcp.php
Log Message:
Language updates
Index: modcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/modcp.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** modcp.php 2001/11/03 01:12:53 1.43
--- modcp.php 2001/11/13 17:36:27 1.44
***************
*** 40,44 ****
if( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]) )
{
! $forum_id = (isset($HTTP_POST_VARS[POST_FORUM_URL])) ? $HTTP_POST_VARS[POST_FORUM_URL] : $HTTP_GET_VARS[POST_FORUM_URL];
}
else
--- 40,44 ----
if( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_URL]) )
{
! $forum_id = (isset($HTTP_POST_VARS[POST_FORUM_URL])) ? intval($HTTP_POST_VARS[POST_FORUM_URL]) : intval($HTTP_GET_VARS[POST_FORUM_URL]);
}
else
***************
*** 49,53 ****
if( isset($HTTP_GET_VARS[POST_POST_URL]) || isset($HTTP_POST_VARS[POST_POST_URL]) )
{
! $post_id = (isset($HTTP_POST_VARS[POST_POST_URL])) ? $HTTP_POST_VARS[POST_POST_URL] : $HTTP_GET_VARS[POST_POST_URL];
}
else
--- 49,53 ----
if( isset($HTTP_GET_VARS[POST_POST_URL]) || isset($HTTP_POST_VARS[POST_POST_URL]) )
{
! $post_id = (isset($HTTP_POST_VARS[POST_POST_URL])) ? intval($HTTP_POST_VARS[POST_POST_URL]) : intval($HTTP_GET_VARS[POST_POST_URL]);
}
else
***************
*** 58,62 ****
if( isset($HTTP_GET_VARS[POST_TOPIC_URL]) || isset($HTTP_POST_VARS[POST_TOPIC_URL]) )
{
! $topic_id = (isset($HTTP_POST_VARS[POST_TOPIC_URL])) ? $HTTP_POST_VARS[POST_TOPIC_URL] : $HTTP_GET_VARS[POST_TOPIC_URL];
}
else
--- 58,62 ----
if( isset($HTTP_GET_VARS[POST_TOPIC_URL]) || isset($HTTP_POST_VARS[POST_TOPIC_URL]) )
{
! $topic_id = (isset($HTTP_POST_VARS[POST_TOPIC_URL])) ? intval($HTTP_POST_VARS[POST_TOPIC_URL]) : intval($HTTP_GET_VARS[POST_TOPIC_URL]);
}
else
***************
*** 65,70 ****
}
! $confirm = ( $HTTP_POST_VARS['confirm'] ) ? TRUE : FALSE;
! $cancel = ( $HTTP_POST_VARS['cancel'] ) ? TRUE : FALSE;
//
--- 65,70 ----
}
! $confirm = ( $HTTP_POST_VARS['confirm'] ) ? TRUE : 0;
! $cancel = ( $HTTP_POST_VARS['cancel'] ) ? TRUE : 0;
//
***************
*** 320,334 ****
if( !empty($topic_id) )
{
! $next_page = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
! $return_message = $lang['to_return_forum'];
}
else
{
! $next_page = "modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id";
! $return_message = $lang['Return_to_modcp'];
}
! $message = $lang['Topics_Removed'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid($next_page) . "\">" . $lang['HERE'] . "</a> " . $return_message;
! message_die(GENERAL_MESSAGE, $message);
}
else
--- 320,337 ----
if( !empty($topic_id) )
{
! $redirect_page = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! $l_redirect = sprintf($lang['Click_return_forum'], "<a href=\"$redirect_page\">", "</a>");
}
else
{
! $redirect_page = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! $l_redirect = sprintf($lang['Click_return_modcp'], "<a href=\"$redirect_page\">", "</a>");
}
! $template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
! );
!
! message_die(GENERAL_MESSAGE, $lang['Topics_Removed'] . "<br /><br />" . $l_redirect);
}
else
***************
*** 440,455 ****
if( !empty($topic_id) )
{
! $next_page = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
! $return_message = $lang['to_return_topic'];
}
else
{
! $next_page = "modcp.$phpEx?" . POST_FORUM_URL . "=$old_forum_id";
! $return_message = $lang['Return_to_modcp'];
}
! $message = $lang['Topics_Moved'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid($next_page) . "\">" . $lang['HERE'] . "</a> " . $return_message;
! message_die(GENERAL_MESSAGE, $message);
}
else
--- 443,460 ----
if( !empty($topic_id) )
{
! $redirect_page = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
! $message = sprintf($lang['Click_return_topic'], "<a href=\"$redirect_page\">", "</a>");
}
else
{
! $redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! $message = sprintf($lang['Click_return_modcp'], "<a href=\"$redirect_page\">", "</a>");
}
! $template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
! );
! message_die(GENERAL_MESSAGE, $lang['Topics_Moved'] . "<br /><br />" . $message);
}
else
***************
*** 465,471 ****
{
$topics = $HTTP_POST_VARS['topic_id_list'];
for($i = 0; $i < count($topics); $i++)
{
! $hidden_fields .= '<input type="hidden" name="topic_id_list[]" value="' . $topics[$i] . '">';
}
}
--- 470,477 ----
{
$topics = $HTTP_POST_VARS['topic_id_list'];
+
for($i = 0; $i < count($topics); $i++)
{
! $hidden_fields .= '<input type="hidden" name="topic_id_list[]" value="' . intval($topics[$i]) . '">';
}
}
***************
*** 526,541 ****
if( !empty($topic_id) )
{
! $next_page = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
! $return_message = $lang['to_return_topic'];
}
else
{
! $next_page = "modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id";
! $return_message = $lang['Return_to_modcp'];
}
! $message = $lang['Topics_Locked'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid($next_page)."\">" . $lang['HERE'] . "</a> " . $return_message;
! message_die(GENERAL_MESSAGE, $message);
}
else
--- 532,549 ----
if( !empty($topic_id) )
{
! $redirect_page = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
! $message = sprintf($lang['Click_return_topic'], "<a href=\"$redirect_page\">", "</a>");
}
else
{
! $redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! $message = sprintf($lang['Click_return_modcp'], "<a href=\"$redirect_page\">", "</a>");
}
! $template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
! );
! message_die(GENERAL_MESSAGE, $lang['Topics_Locked'] . "<br /><br />" . $message);
}
else
***************
*** 610,625 ****
if( !empty($topic_id) )
{
! $next_page = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
! $return_message = $lang['to_return_topic'];
}
else
{
! $next_page = "modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id";
! $return_message = $lang['Return_to_modcp'];
}
! $msg = $lang['Topics_Unlocked'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid($next_page) . "\">" . $lang['HERE'] . "</a> " . $return_message;
- message_die(GENERAL_MESSAGE, $msg);
}
else
--- 618,636 ----
if( !empty($topic_id) )
{
! $redirect_page = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
! $message = sprintf($lang['Click_return_topic'], "<a href=\"$redirect_page\">", "</a>");
}
else
{
! $redirect_page = append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id");
! $message = sprintf($lang['Click_return_modcp'], "<a href=\"$redirect_page\">", "</a>");
}
+
+ $template->assign_vars(array(
+ "META" => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
+ );
! message_die(GENERAL_MESSAGE, $lang['Topics_Unlocked'] . "<br /><br />" . $message);
}
else
***************
*** 739,743 ****
sync("forum", $forum_id);
! $message = $lang['Topic_split'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$new_topic_id") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_topic'];
message_die(GENERAL_MESSAGE, $message);
}
--- 750,758 ----
sync("forum", $forum_id);
! $template->assign_vars(array(
! "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">')
! );
!
! $message = $lang['Topic_split'] . sprintf($lang['Click_return_topic'], "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
}
***************
*** 966,970 ****
"U_PROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$id"),
! "U_SEARCHPOSTS" => append_sid("search.$phpEx?a=" . urlencode($username) . "&f=all&b=0&d=DESC&c=100&dosearch=1"))
);
}
--- 981,985 ----
"U_PROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$id"),
! "U_SEARCHPOSTS" => append_sid("search.$phpEx?search_author=" . urlencode($username) . "&showresults=topics"))
);
}
***************
*** 1088,1102 ****
}
- $pagination = generate_pagination("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id", $forum_topics, $board_config['topics_per_page'], $start);
-
$template->assign_vars(array(
! "PAGINATION" => $pagination,
! "FORUM_ID" => $forum_id,
! "POST_FORUM_URL" => POST_FORUM_URL,
! "ON_PAGE" => (floor($start/$board_config['topics_per_page'])+1),
! "TOTAL_PAGES" => ceil($forum_topics/$board_config['topics_per_page']),
- "L_OF" => $lang['of'],
- "L_PAGE" => $lang['Page'],
"L_GOTO_PAGE" => $lang['Goto_page'])
);
--- 1103,1111 ----
}
$template->assign_vars(array(
! "PAGINATION" => generate_pagination("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id", $forum_topics, $board_config['topics_per_page'], $start),
!
! "PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $forum_topics / $board_config['topics_per_page'] )),
"L_GOTO_PAGE" => $lang['Goto_page'])
);
|
