From 5b505892a0d0eb127c8bbf1ff020b4fb15e75c03 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Fri, 6 Jul 2001 17:47:10 +0000 Subject: [PATCH] More images ... now CVS is back up git-svn-id: file:///svn/phpbb/trunk@585 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/common.php | 52 +++++++++++++++++++++++++++++----- phpBB/images/icon_aim.gif | Bin 0 -> 1275 bytes phpBB/images/icon_email.gif | Bin 0 -> 1280 bytes phpBB/images/icon_icq_add.gif | Bin 0 -> 1346 bytes phpBB/images/icon_msnm.gif | Bin 0 -> 1326 bytes phpBB/images/icon_yim.gif | Bin 0 -> 1308 bytes phpBB/viewtopic.php | 8 +++--- 7 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 phpBB/images/icon_aim.gif create mode 100644 phpBB/images/icon_email.gif create mode 100644 phpBB/images/icon_icq_add.gif create mode 100644 phpBB/images/icon_msnm.gif create mode 100644 phpBB/images/icon_yim.gif diff --git a/phpBB/common.php b/phpBB/common.php index 7b8fd285e6..f3ef262412 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -42,14 +42,14 @@ $images['edit'] = "$url_images/icon_edit.gif"; $images['search_icon'] = "$url_images/search_icon.gif"; $images['profile'] = "$url_images/icon_profile.gif"; $images['privmsg'] = "$url_images/icon_pm.gif"; -$images['email'] = "$url_images/email.gif"; +$images['email'] = "$url_images/icon_email.gif"; $images['delpost'] = "$url_images/edit.gif"; $images['ip'] = "$url_images/icon_ip.gif"; $images['www'] = "$url_images/icon_www.gif"; -$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['icq'] = "$url_images/icon_icq_add.gif"; +$images['aim'] = "$url_images/icon_aim.gif"; +$images['yim'] = "$url_images/icon_yim.gif"; +$images['msnm'] = "$url_images/icon_msnm.gif"; $images['posticon'] = "$url_images/posticon.gif"; $images['folder'] = "$url_images/folder.gif"; $images['new_folder'] = "$url_images/red_folder.gif"; @@ -65,9 +65,47 @@ include('includes/functions.'.$phpEx); include('includes/db.'.$phpEx); +// // Obtain and encode users IP -//$get_user_ip = ; -$user_ip = encode_ip(($HTTP_X_FORWARDED_FOR) ? $HTTP_X_FORWARDED_FOR : $REMOTE_ADDR); +// +if(!empty($HTTP_CLIENT_IP)) +{ + if(eregi("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_PROXY_USER)) + { + $client_ip = $HTTP_CLIENT_IP; + } +} +else if(!empty($HTTP_X_FORWADED_FOR)) +{ + if(strstr(",", $HTTP_X_FORWARDED_FOR)) + { + list($client_ip) = explode(",", $HTTP_X_FORWADED_FOR); + } + else + { + $client_ip = $HTTP_X_FORWARDED_FOR; + } +} +else if(!empty($HTTP_VIA)) +{ + if(eregi("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_PROXY_USER)) + { + $client_ip = $HTTP_VIA; + } +} +else if(!empty($HTTP_PROXY_USER)) +{ + if(eregi("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_PROXY_USER)) + { + $client_ip = $HTTP_PROXY_USER; + } +} +else +{ + $client_ip = $REMOTE_ADDR; +} +$user_ip = encode_ip($client_ip); + // // Setup forum wide options. diff --git a/phpBB/images/icon_aim.gif b/phpBB/images/icon_aim.gif new file mode 100644 index 0000000000000000000000000000000000000000..d892a331271bbe96d24d28fac293e1f499fb4688 GIT binary patch literal 1275 zcmZ?wbhEHbv|$ip_|5xnJ zDsqZuHacwP+G6&`{2E%eDwZy4Rxau`Zkl%PTJ|0~j-Gl>UivQH2ChDaZoWnyekPuN zre6MLJ^>C|jE<&U&gR@6CY+wOtln1qzK+7-?mQ8m9HH)_@&1xwUW(B^nn}L=sXjt! zKB76nVmYB=xsl>EsWNW44W0!}KE zv~_8-HfGJ+lDBAk(XySTD|c6{*;~E-K;7m;4aq`n86uroqCI8eQ!3?VmI?mTxG}Rq zddF-}+^M~4i)oY4AnQRn}4ga0>;{@*qHf7kT?W0U`n%>F+$`TxZH{|mGKFU|hHw*3Fm z{Qn2b|KF|t|F>_OJ%8?+^$lB&G;TZ6vh!HS-jn+;-#u{k{-Ns+4&Qiq^wy)}w;!Ll z`{d-kr>E{eJN@wa*+C21HUj6_79~3#GfW{%9_>+Z^fx(|a2V@T@PcU%& zW0=n&WAVYEnS(`GE9S(8g@;>pVhRd3Jy>|OTZ}*RPDMxS42vSaD-S(3Ejc+^!}F40 zhDQJC={jqc7$zS&etNb=@vA#0FF$2(Z2iC?n$_OOtYIYaMdH+!m6w-0+j_L#y3*|6 zRK6)Kc9YV{1_s@z3|a4OYa-Xm3Y1!SZ)-l_=<(=St|F_Ss9JEqn+d14uaDm+!&K~` zw4>nRJ{cA+t3y9d2#KZaiMcq*^=RX<8OGVi_Am-A;$2{0{>?_pB)ze*XNB3OCr71p zlzBul3LTEWy1k=#{j~$qf$#52)v#YLh;DXpaGfM>x#0-!EL~lJCjowYca^@9G^%i$ zGI#g4cMmq+WhAyk;y19XJ(aCZq@ixM@C}5)ziV zbc!g?7Ipy#nFp!7rUf@uXC!uIKAV}bY^B;PkpP1UayCai56>yQ=IK1Q;@QgQ^J?B% h9-PneSK;7-7O|`s3p>d literal 0 HcmV?d00001 diff --git a/phpBB/images/icon_email.gif b/phpBB/images/icon_email.gif new file mode 100644 index 0000000000000000000000000000000000000000..2ac811b2a584f64ca0cd338c9342fa6f8b9fc1fc GIT binary patch literal 1280 zcmZ?wbhEHbv|$ip_|5NakgcJ5mC9y*SmdQM*YF5U*NK89|- zMjn19o_?lY{$@S_K|x*>6%}r|4W0!}KE-+p}J?vs=Eo}Rk@ z?DWIuXCFO3_xQ#6r!Ox)d-d+!yZ`_HgFQ4#jD`TQA)xq^g^__lia`gY0hA{gIQ}u1 za>#fTBs4U0@QcNq*s$<$I}fA4Ob- zPT!Z!dU!s`qt6NAoVe2UY?vl3lqOlTZ8UXgeGV znkXBl5qD=nVY6tTvVGf|8AZuTlSR!1ZaBMgA8tD7r}HN~mw`_!XnER!1f|#4*2NkJ zF#a|bytX~`ve*e_*KWx+*ZyenJb_(*%= zgB0$2w>9Q{OJfsxaZ#INWkPMW()-)%=S$qLtrFp4d1di&_Kw6Y|0aeDvZ;$iBrv(C zELhOQsdVB&GoRax1&!(|3ITj-HD>d8g-UiTWI5JZ(#WYYse^$@WUfa`m(D7Sz;5kn z8B9z}4+EUIrJv1s9M2gUaH!uwPT|P}7okX}i5_f~4G!iLCR~~9#u;#MO7NtFr&A-+ zRz95;EoC6UtGqz<*^HDRgF`bjmaTj?D`#6}8Y3%@N;A8hPr~!L6^}fh&#U?N^7;IR jDu)9LSUL?3EbLHQ^O+bIaU}#3L`DT0q1H+fq4DLEo^M^JQkT_cF2m6|=i4GxbMa-B zW^TSG4QcAzl&!T$i7z!@YFgU0MO!J|di`=&-P(Dt?ccG-^QY%;&wD=a84<~01*Qjs zC2Yfc4B)MdzzA>vy8ti%6997{7!WML!psaz%*=L!gQ*1xh(NHkBAOFzZNbLI#@e20 z=ip#(XHRvY+L^mh$xc86@BaXIW(UkX%LzPYF= z?$>_HuP*(v^dI-79r`jtfY9N}?<++=G&ff@cVFo4SNE3=j#Uin#8;-u^kq^cZ9+{Q zuRA(WM*S2T2^-uNaZI1tW-+=Sq zI0Jw}@Ofsj+`P3>o1;He6yvpz;cy zR3G*O#~4*oiy{czRNPU;l!cR}ut!`ZuhGx7gjSwqr-<~|6})!;f0IQa(YbDKd}x_Q zbrGius-O3TP2qwx;Xt3%!(*BNr+_)?;Q%sytJtmUQCqbeLmN`tkFsWE12Q_&(~Y$=>8m_(P%jxGjCrH-oTa_-SF9;*g)rrHZQ<+D-s<(FHJFKTvu R_(czeob_j~5grHo{sRTDylemf literal 0 HcmV?d00001 diff --git a/phpBB/images/icon_msnm.gif b/phpBB/images/icon_msnm.gif new file mode 100644 index 0000000000000000000000000000000000000000..6288b79455e2848f8f1e38f2ac128c9791278da3 GIT binary patch literal 1326 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 Nu2?oJz=46m8UQPWceell literal 0 HcmV?d00001 diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 82ddc10785..1d101393f5 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1,6 +1,6 @@ " : ""; - $msn_img = ($postrow[$i]['user_msnm']) ? "" : ""; + $msn_img = ($postrow[$i]['user_msnm']) ? "" : ""; $yim_img = ($postrow[$i]['user_yim']) ? "" : ""; @@ -394,9 +394,9 @@ for($i = 0; $i < $total_posts; $i++) } $edit_img = "\"$l_editdelete\""; - $quote_img = "\"$l_replyquote\""; + $quote_img = "\"$l_replyquote\""; - if($is_auth['auth_mod']) + if($is_auth['auth_mod'] || $userdata['user_level'] == ADMIN) { $ip_img = "\"$l_viewip\"";