From ba497ee911af037bd1276a050757d822fb612418 Mon Sep 17 00:00:00 2001 From: tongyifan <565813476@qq.com> Date: Mon, 20 May 2019 21:58:55 +0800 Subject: [PATCH] edit sticky pic and some text, fix a bug --- comment.php | 4 ++-- include/functions.php | 11 +++++------ lang/chs/lang_functions.php | 4 +++- pic/sticky_1.png | Bin 0 -> 2581 bytes pic/sticky_2.png | Bin 0 -> 2606 bytes pic/sticky_3.png | Bin 0 -> 2662 bytes pickup.php | 2 +- styles/sprites.css | 18 ++++++++++++++++++ viewpeerlist.php | 2 +- 9 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 pic/sticky_1.png create mode 100644 pic/sticky_2.png create mode 100644 pic/sticky_3.png diff --git a/comment.php b/comment.php index 57cdc82..5ccb414 100644 --- a/comment.php +++ b/comment.php @@ -326,12 +326,12 @@ function check_comment_type($type) $sticky = 0 + $_GET['sticky']; int_check($sticky, true); - if ($isTop != $is_sticky){ + if ($isTop != $sticky){ $res = mysql_query("UPDATE comments SET is_sticky=" . $sticky . " WHERE id = " . $commentid) or sqlerr(__FILE__, __LINE__); $actSticky = $sticky == 0 ? "取消置顶" : "置顶"; - write_log(($isOwner ? "发布者 " : "管理员 ") ."$CURUSER[username] 编辑了评论 $commentid $actSticky"); + write_log(($isOwner ? "发布者 " : "管理员 ") ."$CURUSER[username] 编辑了种子 {$arr['name']} 评论 $commentid $actSticky"); } $returnto = $_GET ["returnto"] ? $_GET ["returnto"] : htmlspecialchars($_SERVER ["HTTP_REFERER"]); diff --git a/include/functions.php b/include/functions.php index d9b8c4a..345fb67 100755 --- a/include/functions.php +++ b/include/functions.php @@ -3397,9 +3397,9 @@ function commenttable($rows, $type, $parent_id, $review = false) $topActionBar = ''; if ($topAble){ if ($row['is_sticky'] == 0){ - $topActionBar = '" . $stickyicon . '  '; + $topActionBar = '" . $lang_functions['text_set_sticky'] . '  '; }else{ - $topActionBar = '" . $stickyicon . '  '; + $topActionBar = '" . $lang_functions['text_unset_sticky'] . '  '; } } @@ -3803,16 +3803,15 @@ function torrenttable($res, $variant = "torrent") { $dispname = mb_substr($dispname, 0, $max_length_of_torrent_name - 2, "UTF-8") . ".."; if ($row ['pos_state_until'] != "0000-00-00 00:00:00" && $CURUSER ['appendsticky'] == 'yes') { - $stickyicon = "\"Sticky\""; switch ($row ['pos_state']) { case 'sticky': - $stickyicon = $stickyicon . " "; + $stickyicon = "\"Sticky\""; break; case 'double_sticky': - $stickyicon = $stickyicon . $stickyicon . " "; + $stickyicon = "\"Sticky\""; break; case 'triple_sticky': - $stickyicon = $stickyicon . $stickyicon . $stickyicon . " "; + $stickyicon = "\"Sticky\""; break; default: $stickyicon = ""; diff --git a/lang/chs/lang_functions.php b/lang/chs/lang_functions.php index ff8a1a1..a2dbfce 100755 --- a/lang/chs/lang_functions.php +++ b/lang/chs/lang_functions.php @@ -308,5 +308,7 @@ 'text_tjuptrip' => "官方", 'text_keepseed' => "保种", 'text_pub4_notice' => "校园网环境下请及时关闭“离校模式”,避免校园网流量损失", - 'text_school' => "校" + 'text_school' => "校", + 'text_set_sticky' => "设为置顶", + 'text_unset_sticky' => "取消置顶" ); diff --git a/pic/sticky_1.png b/pic/sticky_1.png new file mode 100644 index 0000000000000000000000000000000000000000..6806e752c40f8f7f03db378ff6ea1f4fd1c67462 GIT binary patch literal 2581 zcmbVO4R8}>8crxJ2rX3Uc?CvXQYz50+3e=0*=+-~NwHB*E_3!p(jwb@isrp)!0--M9rF4iTA?VI6Y>MPl9dn#>*9PSRqxSbDuiQ9 zsz>!Ujm>Xn-CW5Efvs3kYNuCJ(j=prGaD%gQP6>xl>id*dVC@kGN~edDL9s=F%=Sl zNR=j4p&SrdWGh3=yuc!QwE?AZogT>})wn^cBgt6^p}~!q#)#os6gN;h4Mh-0?5Bd! z1jb2~Tjs@L!6%c-ElGX~!-Bz}I;d6if(ye*lEgFwMi3}Opkml3fe`8wvu=5?up%vR zeu?9Ki0lzK_<&?mL8j3yc>Qs=J~1W}6buUiKZdI{@|Ge%hK}R>0l^aq&d?a^VZE$R z5+N3kWBqPk;zc+A8?NKaLjpi)ZMJxfVYzs{@era^Tn)Do6J%JlXb<~Yteh43fIzdw z)sSYEyc<7d7FZzhf}Q6*w-Qx$i!x$1%ZVY88IN*4h7XD}6Kq%ukXVySUPm>0l+f4- zoWco8lb5S8QW{MZYU3Hs86FNwz#QX4ps;EfAc5P08JcqPf)~I&b6((LF~85HLgGqN zX5PaKFfe4NO`Nxy&1C}bFu@;*RIB77Tgc^^~wb>}EPn3XdSzPNRbSSIQJ5i@jr$%>u<))6R47y+tv=vZ8@rEx7D6%VpmAaJlJfhWF=3vvd$Lxb{7CQZ%zKDhqd8ZTv0$b>U)p94Tmmv61{vxRU zefD=&zfq^du^-Z^|0nyHIJ6u1Tr50Xu)$E3-^p&0S0)lz6T*1!0|R}WWIWqwps92^+CbRG7cA>cXE!`!oeoaL)6 zSRO4lHuBflEt_6Btjq9Do40vw`i-LWx{-G;W>N~D{-ZPfbbW>;3_#w}8<+ZL=YO>I zaP!MaPn_!MA82p-Q`0x%spBP8?|!`Vo$TywD7K)Wd2jnq9X*Gpob0-AwyB_PYQx@% z_1jEyo|xa*b$I{LC7rKN34ihAfv3M4weO{_m*36IGV_IXhu-dPBK!K=KR#7@*T9&R znsF0TU0E&no*2>f`NcPuVVnL%)8{8lYgk=V^!)lSE4lDL3qKjySG=j~?_JjW*4w4Q-Osgc?+pL&s%2#)H^z==gd#3jDvEvUMbN_Ye`*W{mXJ+18|G>DT@8kxKlS~l8m^^CAr!Iq1li#Q~x3|r(Zdvc__xdKc{E}U8 zW%c*{tp_Jfx_G>6|Ng(z|M+nWaZ|aqw5|Cs&sB{GbRKGLy@%WN^Vb(1yU*U9abr>6 z{8>}a?bxx$+F(6d20nA#-TT@ptIy>q+WB~G#lV^`29|evoQnVCB%M=j&06zFZf^3x z_VwPk#8>O4uTx~#j_+AK19RO!_gjC*%(T>wYsVBljnltf+K49S__*Z{SN~X}>`nI< z);%RAq1XhbxQ?q8Ym~Dq>aIT6JpZQ_t(#XIJ!5kPEU`!~Edb#(`Pt44nz4zk$ zxLISls}@Hx%3`Cy8clcQL@TmM>#|bh(J*Oi(RMXc3`mqzsCD(&es{oO=umog&bjw~ z_xqmreV^}n-}ipA(Oi_5l6ZfjL?THs<{L`EGgZ9eJU%;3blzS>iQA z((rnkL=rdbu#^ksrb2>ZT{4nps~DNjoH_dwa^e7v~KnjdjDz3w*62?&r zju9A6pc#u%HG!hzP!mf#tp4esI7-MBQ=p(~Xi^|=3Z^N-%5p9e?AhTWZ4BaZ+oVuL zNkY#$Sq=mS?Bvn&M!nw5u~vr@EbygyIgl||ufjAc6^zTUFkO?0FuHkxbW@Dcpp^oB zWDW;S$WeyUP*w^CXe*pSD;QXVF)A3dsuUVEs>Vrc#NNPCHDVQr_TvpfvlQ?#NsmSq zN?NUEU~7i83dU)L3Rctd44A?xMy*j>t0=4T2Ag8e0eX^jMtc=m(ZC}v*C>_BDm5%u z;8vKdQsCf5(J-mPFcilb%$gw=D}OSwh4Bf6q@UsViI&PCZ4)D>BTB$9rigU?RKW1O z=tLA2xrrqnEq# zF8U$9z4Gx#*Bd{MuY!IkJdEY#rPUsNzB9h92Uqrb78fM7u75Xq)8Od-flodeux$*S z3d+CIjEt-~d3Mez5B^v^7K_e}{p@gJ-Li_rt`}b(3ACNgw%|L8yUVq@69wG&h0k8R-d(3VyhoQ~eDGSA#s3Pv=i#F>cHGmjH@2qh z=~HQC4q45D=F#DQF8=Hto$tS@Vdc=dp*fpx!#c0qJFl;bDdNn>7wkPbcV@9|f8vUN ztX#XH{|FWvlB;)K?hDw`-OoCkddrI6Pbg}#IJy&`X!yEeEOh1K)#BFwoNKqwYuvi# z71>iQt!=yYN1psH{i7}Zt8;?#?~^sveRnL>&A8mL{kdj;`Gt;$vkG?X8?9bpeks18 z#2tLI_e@=5?!fsie|{`$8@n!VxUTQuzuTFyw>!p04{T2lmKQWR?P*$h)TG%iaRz(Dv>R z^3Kb$zNNvLQFA;A@|#_hS= o6O{aT2-~mI?YMJcsOjk$4>i7k`9D8aDgL7~<`x-Ra#pSTACxq{J^%m! literal 0 HcmV?d00001 diff --git a/pic/sticky_3.png b/pic/sticky_3.png new file mode 100644 index 0000000000000000000000000000000000000000..de75366bdd3b64776dbe00d3074c84e93aacfa3d GIT binary patch literal 2662 zcmbVO3se(l77l{3DA0C&6{X7%>w}X{=8+IGBT+E{0SS!(HE6A!%nUGvWMXEJ0BRAe zkEK4LP}xAWpl$6#TWyyuV5w4Zp>?q+U9H`tt)jMY(28BR3hqpZ0eWclY|fd?KmY&T zd%yp?_s&0Cj7bXu$4(h5kw^mL%vv-2ClvshmVIZoGK;NGe=U zNhH!PCdJH~4T(6(S``GvT4;sSY8TKFNz`1Yogg!59^eGwiOX})$$3dBWL_qTQL?#nfG8&}IIz+@0XVH$HV$`cWp2N?FczmF8Q_NSnOa%2 z7!WWUjDU`H&_IMj4U&i|0*J&Eh+3(_ux9}jMl=wtfecfja+C_zkq#jkhCwh2p(rRIKrYwD6Hd^^O?%)$PjjS$vGWXT z14NI6h0W%*GJ)y97OZx!TN~$*Ne~Qj5_Sktz~YwNK#KI@?AeYicW{b?=q%bw+jvgE zB3`ULgXLK+gZ&-X-sNEd1ZfQhZ;TPSSgqa=93Qh<*oH@t5z$;quAPQVG{3M0wUn_@Yz`Mb#D>-rJgt?9>mVEfqHqd| z;0TJtk#bmr!|(vqz*0I>ktA9?36?2<8?ZtgH2)L2A?}sDdLA&_bv*phihrK!i|hRBD(~!YcIxdp%2Li&Y@n4>SbDl7f#x zdTC0Uq$3FmB!v;ECRHkspe+cfPK$uC2oy$D7J;_A1n}n^jL?%r)=;k^D@yQ4qI9H% zh(JLKK{X&vsc4WOUzA84j=%l>GYPME)L^!-Bwa~sZDLtx?T*_f^N}6FeospG10AhqfL=ss z?_9iIbr<`2t8&r`&4t$8ckh37-^Is{L%*>u=*;0Sc`T(SVZCe3+r`cex|^H3Pe1$S6Jz*m^&fR# zVLI!hVvhCXm39S{L}yn71o+Q^m+VJZna32J(<33<54PyQSGLSCzBc1l!KdXdEwj#F z8Q0KU*n6!l>^$k0qj;*aF4bn-bbRBE3&->;|NZBK)5pJ>z?>|Vmvx_~f80GaF`(g{ zE2mxijFlIG-o zw{~7vmwxC|fi5ZF;U8(^mkE^zOpm`8w0;BI11S1pUF$a2-dVhP@mpPwpZhK~xoPc` zi!lwQhn?R^JBm*$mnUf6YhSqga&KR)Wb)P78^W~mMZtmoM+04HLXobAj*tKmERug5Y2-vYr zH7&9A=#0!N)0l(u`QXZB)%#tycm8nd#K~11B_H;bb-!^)9$Rou-&Yf{Y)kQyuSVtf zlBYJFoLm#uef6h`fB09Qmwxl}D0N4A%btE<>kBQP6+})x_R`sb4<+9zp zz5VQ^qKWVPsUMGPE~*S3*SKqHV|Dn#pbni++pbVa&w;as`jA!kGj=X4djol8yDD9- zDOf$ZsBmU#XmFf=QA}9dI1SfAU)nVHqq}$pYNSBqn{~P x%wn*%(c^ulzJ6n-uT$Ep+@lM)+&1w>Xl%pnfA;gnyW*E%d`y!5gZVEO{tr#4(TxBA literal 0 HcmV?d00001 diff --git a/pickup.php b/pickup.php index bea16fe..31d7916 100644 --- a/pickup.php +++ b/pickup.php @@ -201,7 +201,7 @@ function bark($msg) $returl = $_POST ["returnto"]; if ((0 + $_POST ["sel_posstate"]) > 1 && $row ["pos_state"] == 'normal') { - $pre_to_shoutbox ['text'] = "[b][color=red]" . $row ['name'] . "[/color][/b]被置顶啦:[url=details.php?id=" . mysql_real_escape_string($id) . "&hit=1]大家这里使劲戳[/url]"; + $pre_to_shoutbox ['text'] = "[b][color=red]" . $row ['name'] . "[/color][/b]被置顶啦:[url=details.php?id=" . mysql_real_escape_string($id) . "&hit=1]大家使劲戳戳戳[/url]"; $pre_to_shoutbox ['type'] = "sb"; $pre_to_shoutbox ['ip'] = "北洋媛隐身啦~啦啦啦~"; sql_query("INSERT INTO shoutbox (userid, date, text, type, ip) VALUES (0, " . sqlesc(time()) . ", " . sqlesc($pre_to_shoutbox ['text']) . ", " . sqlesc($pre_to_shoutbox ['type']) . ", '$pre_to_shoutbox[ip]' )") or sqlerr(__FILE__, __LINE__); diff --git a/styles/sprites.css b/styles/sprites.css index 57f8c19..4b3f107 100755 --- a/styles/sprites.css +++ b/styles/sprites.css @@ -753,4 +753,22 @@ img.tqq { display: inline-block; height: 14px; padding-right: 5px +} + +img.sticky_1 { + width: 14px; + height: 14px; + background: url(../pic/sticky_1.png); +} + +img.sticky_2 { + width: 14px; + height: 14px; + background: url(../pic/sticky_2.png); +} + +img.sticky_3 { + width: 14px; + height: 14px; + background: url(../pic/sticky_3.png); } \ No newline at end of file diff --git a/viewpeerlist.php b/viewpeerlist.php index 1089714..dd1fa0c 100644 --- a/viewpeerlist.php +++ b/viewpeerlist.php @@ -46,7 +46,7 @@ function dltable($name, $arr, $torrent) /* ($enablelocation_tweak == 'yes' || get_user_class() >= $userprofile_class ? "".$lang_viewpeerlist['col_location']."" : "".$lang_viewpeerlist['ip_type']."").*/ ($enablelocation_tweak == 'yes' || get_user_class() >= $userprofile_class ? "" . $lang_viewpeerlist['col_location'] . "" : "") . - "" . $lang_viewpeerlist['col_connectable'] . "". + "" . $lang_viewpeerlist['ip_type'] . "". "" . $lang_viewpeerlist['col_uploaded'] . "" .