makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various updates for message.php and others

Browse source 
git-svn-id: file:///svn/phpbb/trunk@560 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
uid42062 2001-07-04 23:33:02 +00:00
parent 523ec50f28
commit 14c6a0a4af
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
phpBB/index.php
View file

@ -68,7 +68,7 @@ if($userdata['user_id'] != ANONYMOUS)
WHERE topic_time > $last_update_time"; WHERE topic_time > $last_update_time";
if(!$s_topic_times = $db->sql_query($sql)) if(!$s_topic_times = $db->sql_query($sql))
{ {
error_die(SQL_QUERY, "Could not query topic times.", __LINE__, __FILE__); message_die(SQL_QUERY, "Could not query topic times.", __LINE__, __FILE__);
} }
if($db->sql_numrows($s_topic_times)) if($db->sql_numrows($s_topic_times))
@ -85,7 +85,7 @@ if($userdata['user_id'] != ANONYMOUS)
WHERE user_id = " . $userdata['user_id']; WHERE user_id = " . $userdata['user_id'];
if(!$s_topic_times = $db->sql_query($sql)) if(!$s_topic_times = $db->sql_query($sql))
{ {
error_die(SQL_QUERY, "Could not update user topics list.", __LINE__, __FILE__); message_die(SQL_QUERY, "Could not update user topics list.", __LINE__, __FILE__);
} }
} }
} }
@ -121,7 +121,7 @@ $sql = "SELECT c.cat_id, c.cat_title, c.cat_order
ORDER BY c.cat_order"; ORDER BY c.cat_order";
if(!$q_categories = $db->sql_query($sql)) if(!$q_categories = $db->sql_query($sql))
{ {
error_die(SQL_QUERY, "Could not query categories list.", __LINE__, __FILE__); message_die(GENERAL_ERROR, "Could not query categories list", "", __LINE__, __FILE__, $sql);
} }
$total_categories = $db->sql_numrows(); $total_categories = $db->sql_numrows();
@ -184,15 +184,7 @@ if($total_categories)
if(!$q_forums = $db->sql_query($sql)) if(!$q_forums = $db->sql_query($sql))
{ {
if(DEBUG) message_die(GENERAL_ERROR, "Could not query forums information", "", __LINE__, __FILE__, $sql);
{
$error = $db->sql_error();
error_die(SQL_QUERY, "Could not query forums information.<br>Reason: ".$error['message']."<br>Query: $sql", __LINE__, __FILE__);
}
else
{
error_die(SQL_QUERY, "Could not query forums information.", __LINE__, __FILE__);
}
} }
$total_forums = $db->sql_numrows($q_forums); $total_forums = $db->sql_numrows($q_forums);
$forum_rows = $db->sql_fetchrowset($q_forums); $forum_rows = $db->sql_fetchrowset($q_forums);
@ -210,7 +202,7 @@ if($total_categories)
ORDER BY f.forum_id, u.user_id"; ORDER BY f.forum_id, u.user_id";
if(!$q_forum_mods = $db->sql_query($sql)) if(!$q_forum_mods = $db->sql_query($sql))
{ {
error_die(SQL_QUERY, "Could not query forum moderator information.", __LINE__, __FILE__); message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql);
} }
$forum_mods_list = $db->sql_fetchrowset($q_forum_mods); $forum_mods_list = $db->sql_fetchrowset($q_forum_mods);
@ -241,7 +233,6 @@ if($total_categories)
if( $is_auth_ary[$forum_id]['auth_view'] && ( ($forum_rows[$j]['cat_id'] == $cat_id && $viewcat == -1) || $cat_id == $viewcat) ) if( $is_auth_ary[$forum_id]['auth_view'] && ( ($forum_rows[$j]['cat_id'] == $cat_id && $viewcat == -1) || $cat_id == $viewcat) )
{ {
if(!$gen_cat[$cat_id]) if(!$gen_cat[$cat_id])
{ {
$template->assign_block_vars("catrow", array( $template->assign_block_vars("catrow", array(
@ -287,14 +278,11 @@ if($total_categories)
$last_post .= "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $forum_rows[$j]['user_id']) . "\">" . $last_poster . "</a>&nbsp;"; $last_post .= "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $forum_rows[$j]['user_id']) . "\">" . $last_poster . "</a>&nbsp;";
$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $forum_rows[$j]['topic_last_post_id']) . "#" . $forum_rows[$j]['topic_last_post_id'] . "\"><img src=\"" . $images['latest_reply'] . "\" width=\"20\" height=\"11\" border=\"0\" alt=\"View Latest Post\"></a>"; $last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $forum_rows[$j]['topic_last_post_id']) . "#" . $forum_rows[$j]['topic_last_post_id'] . "\"><img src=\"" . $images['latest_reply'] . "\" width=\"20\" height=\"11\" border=\"0\" alt=\"View Latest Post\"></a>";
} }
else else
{ {
$last_post = $lang['No_Posts'];
$last_post = "No Posts";
$forum_rows[$j]['forum_name'] = stripslashes($forum_rows[$j]['forum_name']); $forum_rows[$j]['forum_name'] = stripslashes($forum_rows[$j]['forum_name']);
} }
unset($moderators_links); unset($moderators_links);
@ -351,7 +339,7 @@ if($total_categories)
}// if ... total_categories }// if ... total_categories
else else
{ {
error_die(GENERAL_ERROR, "There are no Categories or Forums on this board."); message_die(GENERAL_MESSAGE, "There are no Categories or Forums on this board", "", __LINE__, __FILE__, $sql);
} }
$template->pparse("body"); $template->pparse("body");