From 574bec0638626f44f2ec02d7cae0020425ac1302 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Fri, 6 Jul 2001 00:03:51 +0000 Subject: [PATCH] Fixes and updates git-svn-id: file:///svn/phpbb/trunk@579 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/common.php | 9 +++-- phpBB/images/icon_edit.gif | Bin 0 -> 1316 bytes phpBB/images/icon_pm.gif | Bin 1035 -> 1326 bytes phpBB/images/icon_profile.gif | Bin 0 -> 1283 bytes phpBB/images/icon_quote.gif | Bin 0 -> 1318 bytes phpBB/viewtopic.php | 60 ++++++++++++++++++---------------- 6 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 phpBB/images/icon_edit.gif create mode 100644 phpBB/images/icon_profile.gif create mode 100644 phpBB/images/icon_quote.gif diff --git a/phpBB/common.php b/phpBB/common.php index 74754c5b12..d8db3c1e50 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -37,11 +37,11 @@ include('config.'.$phpEx); include('includes/constants.'.$phpEx); $url_images = "images"; -$images['quote'] = "$url_images/quote.gif"; +$images['quote'] = "$url_images/icon_quote.gif"; +$images['edit'] = "$url_images/icon_edit.gif"; $images['search_icon'] = "$url_images/search_icon.gif"; -$images['edit'] = "$url_images/edit.gif"; -$images['profile'] = "$url_images/profile.gif"; -$images['privmsg'] = "$url_images/icon_privmsg.gif"; +$images['profile'] = "$url_images/icon_profile.gif"; +$images['privmsg'] = "$url_images/icon_pm.gif"; $images['email'] = "$url_images/email.gif"; $images['delpost'] = "$url_images/edit.gif"; $images['ip'] = "$url_images/ip_logged.gif"; @@ -50,7 +50,6 @@ $images['icq'] = "$url_images/icq_add.gif"; $images['aim'] = "$url_images/aim.gif"; $images['yim'] = "$url_images/yim.gif"; $images['msnm'] = "$url_images/msnm.gif"; -$images['quote'] = "$url_images/quote.gif"; $images['posticon'] = "$url_images/posticon.gif"; $images['folder'] = "$url_images/folder.gif"; $images['new_folder'] = "$url_images/red_folder.gif"; diff --git a/phpBB/images/icon_edit.gif b/phpBB/images/icon_edit.gif new file mode 100644 index 0000000000000000000000000000000000000000..619bf4455c0f93b3a7c4a23e7bcd30891601da7c GIT binary patch literal 1316 zcmZ?wbhEHbv|$ip_|5Y~bYiy&!ps1**qN1W~Vr_4zVQp(?Z*Q++>7r)kqHg1+Y3HtG z@1f)9spsUS@8WIX>SO5UYvkc);^}AV&<`dwf$q=N+5N^N_Wh-3a#}FPK z9uNrvQBhGbF)^{Ru@SM!Igud=2??pGscC6x>FMbe6%}=Lbv{Ln{-w=<IT(lai*bOPjSZYu=W;Mca#( z?JQlnyJF4W>h%ZeHXrKsX6T4x=+Cm=xy5czf7036R^-^v^4%jxjvTmp|Ki1qhps<3eBgpP!mIg=bh49|}1b{M=iVN%*Ct zR|r1?GaH{mMsXVttE%f_uenxVT9yb$_y=4qc2ZbmlWP#b$6@O2y2JMEGq2W+ox)or?a#0kq{GawZU>)Em#;XvbZRsg3x`O?BFQ7O9Ag}g zD^GG^a1qG7mic^c#k0!g?94wu9+}_p@8@BDCWC+j3mVl{y;#&^cFU2S`D5deB~yZ4 u9bP&;Y}LzUbINXMvM&&Na)fQkw5(SvS1eogYSpT^C$CmBuV-Unum%7?@~kKT literal 0 HcmV?d00001 diff --git a/phpBB/images/icon_pm.gif b/phpBB/images/icon_pm.gif index d1988a015bb733a6e33634c5dd3f030c7cd61622..87900fc58a760c1144a98b71d435f13658b777c0 100644 GIT binary patch literal 1326 zcmZ?wbhEHbv|$ip_|CwfsHmu7>7r)kqHg1+Y3HtG@1f)9spsUS@8WIX>SO5UYvkc) z;^}AV~O)qMnlr(K!+N_OP^S0zI+FrD5XX(n_6>IiZuRlHoRpw%PON%$YNH&HA-#*Y4fBw{hE%mYv5s z_MY5-`R@N~J^!Dt{r`XMfvfkg-Me<^`h&wa9v;2*==kl&C+Q zSS#klhKEivE^0m=9t#&8?cy`edcv?Y*EI>5UF*IuRRKlbSzr zi!m^$%sX@F^>zL!#_DkgW*T>&TOghir%-UROEf3<#)`mXRtDLL$;=UkBJ8aDgly*A zJNtVJljZ?Y4tBk#<%O(!L^(nhIk84xGY#2u&2g_4gXlEXl8keEt3R^@3H@sjm#_Qt z;~gi9n&-iLti9j$gZ505wRC-ZJKlW5{qyr}nKU{6h$}QOah;H7Vp428)TDR9;V_SZ z!ves#p(jTLdvX6);VDdUM^qIruAyYk|u=%D_MF44y;>bWv`LGn)P}uGb;;&H2}-@VBP=# literal 1035 zcmZ?wbhEHbRA&%m_|CwfsHo`V<>Y0^5EK-Y?Zr@BU0hvVJ;#t?PBO!sIdj&oUAwiK zVej6(=UN!9-Me4NZ)kF4Igj1sIvQIrwZgcwTTgG0`FXl1qRhGaI*v zl){7$flcS9ak6b;5pZ1Lxky|mCHBA;O~(aFtxOWy1#2SLyXZ!&2xwf{v^gbS&A=fv zCvsW&M=ym_+jJRN8<_V`W!RQ=uisag-^F2};r0Cm_NSI+N9aE~+^rZe<3oc(cysH~ zNn7WX>$hCyXL(ZlN=Pkrx0K+Vwh6lyoIjN4ZN0^^ar3Kr%uU?#e#HunkN07r)kqHg1+Y3HtG@1f)9spsUS@8WIX>SO5UYvkc) z;^}AVR;9#RM{C?(;ZRY!|=;GsYhk!Ih2j5NAX5Cl)#?Aa4(qHK6-xc@r(0M zUtWCn>i_@$45MH)1du{N@h1x-1A{b!4oD1?Cm1;XF_?46?09&Lw~0eoE9S(8hliw{ z)O-p&HZD5K>t~d{0vNH>k(7f zw<`AZw%lkoe~ANArLV7zVq==RCPMI2{O6?>DEC=>aE;oTKC3qdl+nVlpl`?A={1!ZGim0*8HE&CkzIF3&dC zy=TqT=;n7KUog3?M_j<@#QpQ}{~FcV|A;FzsB>f}G_dnYBsBbyRR|DNbMc7hG2HWk zflV-NMPduvjI;yo{t^jH9g0mEN$v7w5mP%Pr4$4NRgYLCw(`daJnpqP7I8qB^-F|P zKkEyQC;bj$l1nC!s_Iu&7K21_o;Y?MzLU literal 0 HcmV?d00001 diff --git a/phpBB/images/icon_quote.gif b/phpBB/images/icon_quote.gif new file mode 100644 index 0000000000000000000000000000000000000000..e262b3f8a75bdf950e17eb632652c65fc1aa20c5 GIT binary patch literal 1318 zcmZ?wbhEHbv|$ip_|5SO5UYvkc);^}AV7v}|YT z%H0)f_ExVyP`CL|+wA#s=FI8o+1t47NXyP+9eYpi-Ft2S<-5m@-8*pg{<(9{4_$w7 z_{PJdw;mn8{rJS)CnxVcJ$3)twQJAs-Ftuf;q$YPo}YXC;{4N>7oWX){`~#>_us+b zKM;UDJxYv*04M|$f3h$#FeowTfH7psU9jWe*45Y7Cme2Ct02(HyTYC^!nN|^ z$p&GwN2lg`PuFYRUHX>GMu~ZC$f|%V|F+ynap08fP}hh%Q_<9OOn8AqS&zj=2PMM` z??l!(GK=s?%rZ$dYH;b15K>9;;cYF=y1F(oIYsvOmrPEk_5&AsCK

OXwLSCZ!zU zkT6hk=v*-8=ci{E=G*tnF#< z1}6;x0o|4xObqfZ5fd{G>qfZn+rBYy=+w1%;NWI-t|PG5{1HcMk4cxrVh8&T3M$-k z6$&Y?nnpJs@##rvsxSvQ9c17R2=iPzH9TzP(+L4wPY!b>v~i}nYU%BC=F8x^&^SX| zhv6tw&N0p9bGUhqG;>uv>s-#j%pq`qq5j{=bOxq^1d~9^!og~W!pkL- x^AcVzoe}5ta@m}+SD8!;gr+btEt!_}YUPS$t6r^IRrlo8YSs;WA_5Ey)&S%WQxyOJ literal 0 HcmV?d00001 diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index ddee1421aa..82ddc10785 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -53,7 +53,7 @@ $start = (isset($HTTP_GET_VARS['start'])) ? $HTTP_GET_VARS['start'] : 0; // Find topic id if user requested a newer // or older topic // -if( isset($HTTP_GET_VARS["view"]) ) +if( isset($HTTP_GET_VARS["view"]) && empty($HTTP_GET_VARS[POST_POST_URL]) ) { if($HTTP_GET_VARS["view"] == "next") { @@ -67,13 +67,15 @@ if( isset($HTTP_GET_VARS["view"]) ) } $sql = "SELECT t.topic_id - FROM " . TOPICS_TABLE . " t, " . TOPICS_TABLE . " t2 + FROM " . TOPICS_TABLE . " t, " . TOPICS_TABLE . " t2, " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2 WHERE t2.topic_id = $topic_id + AND p2.post_id = t2.topic_last_post_id AND t.forum_id = t2.forum_id - AND t.topic_time $sql_condition t2.topic_time - ORDER BY t.topic_time $sql_ordering + AND p.post_id = t.topic_last_post_id + AND p.post_time $sql_condition p2.post_time + AND p.topic_id = t.topic_id + ORDER BY p.post_time $sql_ordering LIMIT 1"; - if(!$result = $db->sql_query($sql)) { message_die(GENERAL_ERROR, "Couldn't obtain newer/older topic information", "", __LINE__, __FILE__, $sql); @@ -273,7 +275,8 @@ $template->assign_vars(array( "U_VIEW_OLDER_TOPIC" => $view_prev_topic_url, "U_VIEW_NEWER_TOPIC" => $view_next_topic_url, "U_POST_NEW_TOPIC" => $new_topic_url, - "U_POST_REPLY_TOPIC" => $reply_topic_url)); + "U_POST_REPLY_TOPIC" => $reply_topic_url) +); // // Update the topic view counter @@ -308,6 +311,10 @@ for($i = 0; $i < $total_posts; $i++) { $poster_avatar = (strstr("http", $postrow[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "" : ""; } + else + { + $poster_avatar = ""; + } // // Generate ranks @@ -321,7 +328,7 @@ for($i = 0; $i < $total_posts; $i++) { for($j = 0; $j < count($ranksrow); $j++) { - if($postrow[$i]['user_rank'] == $ranksrow[$j]['rank_special']) + if($postrow[$i]['user_rank'] == $ranksrow[$j]['rank_id'] && $ranksrow[$j]['rank_special']) { $poster_rank = $ranksrow[$j]['rank_title']; $rank_image = ($ranksrow[$j]['rank_image']) ? "" : ""; @@ -332,7 +339,7 @@ for($i = 0; $i < $total_posts; $i++) { for($j = 0; $j < count($ranksrow); $j++) { - if($postrow[$i]['user_posts'] > $ranksrow[$j]['rank_min'] && $postrow[$i]['user_posts'] < $ranksrow[$j]['rank_max']) + if($postrow[$i]['user_posts'] > $ranksrow[$j]['rank_min'] && $postrow[$i]['user_posts'] < $ranksrow[$j]['rank_max'] && !$ranksrow[$j]['rank_special']) { $poster_rank = $ranksrow[$j]['rank_title']; $rank_image = ($ranksrow[$j]['rank_image']) ? "" : ""; @@ -349,21 +356,21 @@ for($i = 0; $i < $total_posts; $i++) $poster_rank = $lang['Guest']; } - $profile_img = "\"$l_profileof"; + $profile_img = "\"$l_profileof"; $search_img = ""; - $pm_img = "\"""; + $pm_img = "\"""; - $email_img = ($postrow[$i]['user_viewemail'] == 1) ? "\"$l_email" : ""; + $email_img = ($postrow[$i]['user_viewemail'] == 1) ? "\"$l_email" : ""; - $www_img = ($postrow[$i]['user_website']) ? "\"$l_viewsite\"" : ""; + $www_img = ($postrow[$i]['user_website']) ? "\"$l_viewsite\"" : ""; if($postrow[$i]['user_icq']) { - $icq_status_img = "\"$l_icqstatus\""; + $icq_status_img = "\"$l_icqstatus\""; - $icq_add_img = "\"$l_icq\""; + $icq_add_img = "\"$l_icq\""; } else { @@ -371,34 +378,31 @@ for($i = 0; $i < $total_posts; $i++) $icq_add_img = ""; } - $aim_img = ($postrow[$i]['user_aim']) ? "" : ""; + $aim_img = ($postrow[$i]['user_aim']) ? "" : ""; - $msn_img = ($postrow[$i]['user_msnm']) ? "" : ""; + $msn_img = ($postrow[$i]['user_msnm']) ? "" : ""; - $yim_img = ($postrow[$i]['user_yim']) ? "" : ""; + $yim_img = ($postrow[$i]['user_yim']) ? "" : ""; if($i == 0) { - $edit_post_url = append_sid("posting.$phpEx?mode=editpost&".POST_POST_URL."=".$postrow[$i]['post_id']."&".POST_TOPIC_URL."=$topic_id&".POST_FORUM_URL."=$forum_id&is_first_post=1"); + $edit_post_url = append_sid("posting.$phpEx?mode=editpost&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&" . POST_TOPIC_URL . "=$topic_id&" . POST_FORUM_URL . "=$forum_id&is_first_post=1"); } else { - $edit_post_url = append_sid("posting.$phpEx?mode=editpost&".POST_POST_URL."=".$postrow[$i]['post_id']."&".POST_TOPIC_URL."=$topic_id&".POST_FORUM_URL."=$forum_id"); + $edit_post_url = append_sid("posting.$phpEx?mode=editpost&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&" . POST_TOPIC_URL . "=$topic_id&" . POST_FORUM_URL . "=$forum_id"); } - $edit_img = "\"$l_editdelete\""; + $edit_img = "\"$l_editdelete\""; - $quote_img = "\"$l_replyquote\""; - - $pmsg_img = "\"$l_sendpmsg\""; + $quote_img = "\"$l_replyquote\""; if($is_auth['auth_mod']) { - $ip_img = "\"$l_viewip\""; + $ip_img = "\"$l_viewip\""; - $delpost_img = "\"$l_delete\""; + $delpost_img = "\"$l_delete\""; } - $post_subject = ($postrow[$i]['post_subject'] != "") ? stripslashes($postrow[$i]['post_subject']) : $topic_title; $bbcode_uid = $postrow[$i]['bbcode_uid']; @@ -431,11 +435,11 @@ for($i = 0; $i < $total_posts; $i++) // if(!($i % 2)) { - $color = "#".$theme['td_color1']; + $color = "#" . $theme['td_color1']; } else { - $color = "#".$theme['td_color2']; + $color = "#" . $theme['td_color2']; } $message = eregi_replace("\[addsig]$", "

_________________
" . nl2br($user_sig), $message);