From c116fe970b13c6f4c297a7ae9b019d950c06f355 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Mon, 12 Feb 2024 21:06:37 +0700 Subject: [PATCH] Added ability to view `post_text` of topic (#1401) * Added ability to view `post_text` of topic * Updated * Update viewtopic.tpl * Update view_post.php * Update view_post.php * Update view_post.php * Update view_post.php * Updated * Update viewtopic.tpl * Create _source.gif * Create icon_code.gif * Update tpl_config.php * Updated * Updated * Updated * Updated * Update config.php * Update icon_code.gif * Updated * Delete icon_code.gif * Update CHANGELOG.md --- CHANGELOG.md | 1 + library/ajax/view_post.php | 13 +++++++-- library/config.php | 1 + library/language/source/main.php | 1 + .../default/images/lang/source/icon_code.gif | Bin 0 -> 1310 bytes .../lang/source/icons_sources/icon_large.gif | Bin 0 -> 2335 bytes .../lang/source/icons_sources/icon_medium.gif | Bin 0 -> 1953 bytes .../lang/source/icons_sources/icon_small.gif | Bin 0 -> 1718 bytes styles/templates/default/tpl_config.php | 2 ++ styles/templates/default/viewtopic.tpl | 27 ++++++++++++++++++ 10 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 styles/templates/default/images/lang/source/icon_code.gif create mode 100644 styles/templates/default/images/lang/source/icons_sources/icon_large.gif create mode 100644 styles/templates/default/images/lang/source/icons_sources/icon_medium.gif create mode 100644 styles/templates/default/images/lang/source/icons_sources/icon_small.gif diff --git a/CHANGELOG.md b/CHANGELOG.md index 995490288..12678a086 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Merged pull requests:** - Release 2.4.2 🐯 ([belomaxorka](https://github.com/belomaxorka)) +- Added ability to view post_text of topic [\#1401](https://github.com/torrentpier/torrentpier/pull/1401) ([belomaxorka](https://github.com/belomaxorka)) - Added support for rutracker font BBCode tag [\#1397](https://github.com/torrentpier/torrentpier/pull/1397) ([belomaxorka](https://github.com/belomaxorka)) - Added mod "Reason to move topic" [\#1388](https://github.com/torrentpier/torrentpier/pull/1388) ([belomaxorka](https://github.com/belomaxorka)) - Created template file for AJAX quick actions [\#1381](https://github.com/torrentpier/torrentpier/pull/1381) ([belomaxorka](https://github.com/belomaxorka)) diff --git a/library/ajax/view_post.php b/library/ajax/view_post.php index 06d0bcf12..62aa54e32 100644 --- a/library/ajax/view_post.php +++ b/library/ajax/view_post.php @@ -11,19 +11,22 @@ if (!defined('IN_AJAX')) { die(basename(__FILE__)); } -global $user, $lang; +global $user, $lang, $bb_cfg; $post_id = isset($this->request['post_id']) ? (int)$this->request['post_id'] : null; $topic_id = isset($this->request['topic_id']) ? (int)$this->request['topic_id'] : null; +$return_text = $bb_cfg['show_post_bbcode_button'] && isset($this->request['return_text']) && (bool)$this->request['return_text']; if (is_null($post_id)) { $post_id = DB()->fetch_row("SELECT topic_first_post_id FROM " . BB_TOPICS . " WHERE topic_id = $topic_id", 'topic_first_post_id'); } +$post_text_sql = $return_text ? "pt.post_text," : "IF(h.post_html IS NULL, pt.post_text, NULL) AS post_text,"; + $sql = " SELECT p.*, - h.post_html, IF(h.post_html IS NULL, pt.post_text, NULL) AS post_text, + h.post_html, $post_text_sql f.auth_read FROM " . BB_POSTS . " p INNER JOIN " . BB_POSTS_TEXT . " pt ON(pt.post_id = p.post_id) @@ -52,4 +55,8 @@ if ($post_data['auth_read'] == AUTH_REG) { $this->response['post_id'] = $post_id; $this->response['topic_id'] = $topic_id; -$this->response['post_html'] = get_parsed_post($post_data); +if ($return_text) { + $this->response['post_text'] = $post_data['post_text']; +} else { + $this->response['post_html'] = get_parsed_post($post_data); +} diff --git a/library/config.php b/library/config.php index 722b4b022..96ea1deaf 100644 --- a/library/config.php +++ b/library/config.php @@ -474,6 +474,7 @@ $bb_cfg['sf_on_first_page_only'] = true; // Show subforums only on the first pag $bb_cfg['allowed_topics_per_page'] = [50, 100, 150, 200, 250, 300]; // Allowed number of topics per page // Topics +$bb_cfg['show_post_bbcode_button'] = true; // Show "Code" button in topic to display BBCode of topic $bb_cfg['show_quick_reply'] = true; // Show quick reply forim $bb_cfg['show_rank_text'] = false; // Show user rank name in topics $bb_cfg['show_rank_image'] = true; // Show user rank image in topics diff --git a/library/language/source/main.php b/library/language/source/main.php index 0ca5f8167..fbad3926d 100644 --- a/library/language/source/main.php +++ b/library/language/source/main.php @@ -1363,6 +1363,7 @@ $lang['READ_PROFILE_TXTB'] = '[Profile]'; $lang['SEND_EMAIL_TXTB'] = '[E-mail]'; $lang['VISIT_WEBSITE_TXTB'] = '[www]'; $lang['EDIT_DELETE_POST_TXTB'] = '[Edit]'; +$lang['CODE_TOPIC_TXTB'] = '[Code]'; $lang['SEARCH_USER_POSTS_TXTB'] = '[Search]'; $lang['VIEW_IP_TXTB'] = '[ip]'; $lang['DELETE_POST_TXTB'] = '[x]'; diff --git a/styles/templates/default/images/lang/source/icon_code.gif b/styles/templates/default/images/lang/source/icon_code.gif new file mode 100644 index 0000000000000000000000000000000000000000..5afd6e2c7010c131047b37584eb931e4a9a46326 GIT binary patch literal 1310 zcmeH`{ZEqz5XT?1U<*Z{)ro)s91ucuvW+pTXdo29uDZ_QG8`tbi8^#)ZcJGmqZL?D zW-JX0wgcN@smy_CyD@|~Xo0@SYe8l0^E`d%WAPc!T1(%a8WOXv?2p(_yB{vO`&{lW z_sta_KD3unxd)&DFMxFm27`p3@Ogb6w+COrv1b^9pngB$_4?dykIS`+VSn1~%QhQ| zAWJZ8g&-INA>G3T`!WW>$b+%z`y)n;-ZW)08>S!YCKp7CA<54Vy6=rDRAc=E+9A#4 znTA`nS9`u}k=F};;&=47{;0a%rIsr-3iVjufcCz2Mx&oKLrd?RYh#~lJ91uF_EpD6 zmqg{4L?`RSryIIHIJ=5e(2}5_qB-b31z>Cdxyn$2D|PK%T?MQ^c; z`~>0k`CO~34ySVk$Dd)?Q@h=UqE-ZfU>JlT3kaGmmZ|A!>k{Hxbvc|48)~zF7J~5m zd|r>o?Q}W_zu)Kedfe_nAV7pbC=9VsCWPH?m&@f06*(L@j$;^Rx7!f}fkVwf&|olV zwc3yh|Elr7`%f>B8jLzxRQi5l0jKDV*RnT;g@&iDk-`C>5!ki9$oiWAoldky3aq>9AT}!Z?+Ih+Z{ZPhez!GWiXD zOtY1dTeCCYhFzPJHt z`vZm1>2H;q%cg#Neqt*NRv*vr06GWgo)zoV3xjaW_G6iqZ9PhKysRm+V7iXCJufPw znsNJ%y6V7|_Btgy?dq*GM!QMF5jC#tU}f_a=-L;FyH9x8u)6BTbLetT<~$b)e4m)W z$-E#-Y;KEZ1>85|@($I2mm}HBI5(nzT&{cmC(XrOBP1V^42!Q79C7!PL64R{k?>Wmz9|4Y&S(Oj$^uuNfm6> zX;A|=Oxsn5Q6f6yI5`n1+=#5R($bc&78$oh&`Y9m;`CC%hAdwE$E2O);)JTZxPl%{ Iiv{-o1MN8sN&o-= literal 0 HcmV?d00001 diff --git a/styles/templates/default/images/lang/source/icons_sources/icon_large.gif b/styles/templates/default/images/lang/source/icons_sources/icon_large.gif new file mode 100644 index 0000000000000000000000000000000000000000..e3d072db648f30cd5e140320539cc8899ed5a07c GIT binary patch literal 2335 zcmb_e3vdi)96v?8+Ytu!+$>5a_V#hRd$-HcxVy-Sgo#X@N62RPySuI2?b+S9OE40| zb5IfO6rC|uj8GkK8p?PTEj8_s(U1`{nT}F1S|UaDySv=ck(PFPGrRlke!u_Y_y7OC z@4ICavc`1j*t?^_VCdpZw`apA2d~8T3GiO0%?`jvhd}yd&0y%%Eqt{ytl!wnU`SXl z=eTrN<~Uwdd`3Z1@_{kr3!@E&5u-u@L7WM6Bp-NWzZGq$I));$WJM=2nM7v52E1~5 zu?i*@XXS{+Geu59M~y^Agm~z{2Xp}m`3n3RAF`qmzdRg=KjSD8f#@@>Xlghh;>w(W z*c25YoRP#tf*=ty9MLRg;kaQ4MNlT3U~!7UD1s+Qo?(#Y9}2^%lAF)Ar!@zIZ&uW+ z>j56egTbINXfi6Q2PZj>!wCwfC=4Pnt;nwnA`};93Uw2R=7; z%!ZMhIlP9kV>a;XadTMve>RTAk;FJIP^cC}$|Q+6C;&d_PlKGuIH7=7(G|_B{Eh4Q zbfggB0I*v8cvXg~5en>zSQvKcv|CX)W0YixCkfb8+h`kYGjR@*BrP0EI@naxXh)jO zo|a~b`Dn?O;LNPuVuAK7GH7$Ryb>DM9T8G_VUg zu%b|}G)7PuN#&3n&scbhN+HZV5lxKGR3zD5^b#~IZ4*zJ{{n@pMG|!3m0(Ha-HPfH zpl)QJ-~o8R??I7xTX>sNpr|k~%+3^6e6&G!pvtp>l%^^^BqCW}ZlPqaZdKG)`Y&z9 zSB3MxqTKpnp<2Z}bDk)h3kNRIgy zy@KBZ;BJYdVVdDx<=>NeJ;6q^Y>~{1n)?69;9)k=CgD*rJ?~#+?uGpna*uq1n{;>> zKOW#q{D1*|SSJ-8ALpA0!eDq~xYM4R<0`BFDAQl_Zs)R5=hK!CyXn&w>EQT|X`6aB zRu1v5nh;!LoN|h|vGj{hZ!!b7wB3oWDy=A~dwYRt?&|sF;}RQkzszVI>ePg%8xPiC z$NL}piuh1lTJm`Cy>5qU3)o>jR&)}Jt!qwIFKJgZ$~x~>$%Y5TD?d(>uY8xA-hWP` ztLomqnGU<#=5(ke|`UA%Dh9zPTe?B-#TG@U*n)hdazwyM#-+*ix+NN(os4g z?M`~u_i$-xS=U4`fc598%eP)@Ysu@q>zfp;G5dPWjW_#rKS2_wnS>pemxGND4CsbQ ziOxZ-TpQm~PuC4KjJs02eK>Qmw*S5)OX;?}uG4bowJ)F7Fu&?&diTyTdMJl|J19W&G4RY zx;%K{w8sa2IdJD$(%RZahTnTC<#Gp)Wk%Z#^%Y~s+^RwMcIn|vy?=PM`bqBeE&aAW zK{sEx#I5MQ`Xp^^Gc~VdPSUN~AxE0B3~K{@Mpt+KR4W8!dEPsfth>~dTs{9DS^nb^ zrt+uTXQ!mD6Myfra$MilUn50xM}A+p;_57=U1Pd)&<`7?%h=~+ztX3+`{E{7(Zj6% z^%pYIj!bED?%~aob;lDQ?SFirswp%l!}DIko+(H27AF__E?3u_>Dm^IXOAZDDNm`J z+i;F7Kf3cB^V#*D`KICDesHi<^)CG*G`G#AL|3cF4OQ3YJnh)@q|cd0M``Q+h1KD| OFiuC7eb?x`1%CqD#xsTh literal 0 HcmV?d00001 diff --git a/styles/templates/default/images/lang/source/icons_sources/icon_medium.gif b/styles/templates/default/images/lang/source/icons_sources/icon_medium.gif new file mode 100644 index 0000000000000000000000000000000000000000..fed70f75eb949c20646ed41a7d42036e30a43300 GIT binary patch literal 1953 zcmbVNdu-Hn9PdEKKrwTofPaiyKp^a{uY0v}%)9oE8*)V`9ii}El`8A=fpjT0`Ma@r_@B}mrkM6(YD)#*}{t>J@NWpL%inoLt;aXgt! z+LN?h)f;h=VHljCaEh`)gw1GGOd(}cjL|s;9vGr7Yo@F!sKqEWsLiGqgQjMDNNC}3 zo>(!mk%BS9Q-X$*b^=c%EXUGl!>j>U%;*hfIg9VhqNZuRE;L}AE@)k=|ETtV6@mO zU4~U7#CcV0wkRujF9uKSk}R<#0h7x4IR{5G0g@y=jEfAoe6&9hLO^jK#^&AmeYY?s(M6KZ2_gdxtCAdT?GNg(iu)QUyf2bq3jYa~L^i7G2?17)oDdoTt|^Te znokVNsc}_@ilKG1Rr8q?@j#bbfE3i#1ez{dR_-Tg6yxxD_yFT);Fl&zzt0!s0|d_m znV{262e7QH^nVhK=Zy);1`K#>_Da`++1XiKhWzkOu!3k^PcLQ&&}K`iwb`G+*O%pt ze6k5Z%4;)rO&T&VLyekAK?lA@Sjm4c2+Co1UtJLyA+bqN8UgH=IA*ztTa6{-7oLg# z6_?XzS2dv=9CkKqn(wJ_k?+btfz&$ext&|fzeSLOXDfJLB((V8DzaubQ5-nN&Z>Fl zj-|z&``a;ho4>5yT~_enJEN+$ zFMPh}LR}H@6nB5w=R0~=e}ATU!Jr?p2c~!ZG7`TvFk=%txci7}Gqs?rt#sU%Ya6=G z4XZ>hy7ooiJ~L=?RnhCyC#*QXPZ`EDe$>a+He z?n9TK+xYU5sXIOBEB8$ADlc60QvKN zIZ&?F4qwrEniC#D)FZa}CECEBA9c6KE^d1K&%z)vDskz(i4N;0S`nz^-}TR2@E6<+ BoN537 literal 0 HcmV?d00001 diff --git a/styles/templates/default/images/lang/source/icons_sources/icon_small.gif b/styles/templates/default/images/lang/source/icons_sources/icon_small.gif new file mode 100644 index 0000000000000000000000000000000000000000..85b723015d8aaf2344a311fed1c7dab3dfd4152b GIT binary patch literal 1718 zcmbVNTZr6L7>7yEYrm8joovbu-wa^CZ)8eLyqJ{?U$)%_fP^JgM7Wf&J~+CoHn90y~p41j8?p zhCRL%kg26=&0K1ls>O~zi1v3hAaF^9QO9+>Q0o-f96NLgOU^HPqJ1WgdNTn;5a7Pbql1#MCvOE!b60^5ip zU*q|9yPaugGc>64qN=LAAn}sK0fGy=UW7ZG7w#S~=p-})+mCGOp_mcR)5WO3g4DhT z*H3A^Fv$~SjPGEd7c)ZaX#g~g|AxA5iVmYma!v2L#9^)L6Mm9}bTKdqz;_R}3Zrrh zBqnAz5nOH&FG|BLGmZ5Z1E-fJ%jAheT!4k(N=$Y74I0s~K{rT3`Z!I6uayFVBO25w zbp~ag7_gwyR1VG9o<-YX>?T1I9Y>_VLcL{9kT_AQLA_;3%gOf(iY5qss6j1zp}Q_r z*0TA(L803$9O2D?4MVGVVT3)CRP+K1qB6E^X_h6+N=^_sQIS+m73D0aDp`S3ayhI> z1m~r!+0zB_IyD#L+zsL_h!=`#er!a^W=nZR6wA8bPK^4cO5lK}Bv5yBfykgk- ze;k&nEzrQl&xB2cI*Zb>XeH{<01^k;&Bh%M?qa3f3yS|P3u#hf9Z5)td9m@Ofc9!Ifg7zd0y?3C^Y+$cWU|RBQY?F`2O5YdX&;K>c zy=T{rpaC4_TD(jrDqN&9nRq}Qz{H*T;_0I>t>3BW#oC@jZ@+fnju+4l{mgw&etu__Jf}t8R{&*i-Wo0yO=AE^YS-`R+yom+;3|P`|}g0 zSF1lh`@^N3`@TAQ9({0Ob(%SM%h~svZyq*RFYh{8Io;jSdhz@#Ys#4$SJ3h1@w0zi z-A<1c@BQV`3tPVX_1s&(zdEus{oJL!PWWDHZKpK5>s0fpKQB+y*FQe6_Wklz5`S4L M<*NSSLkFM#3$U3irT_o{ literal 0 HcmV?d00001 diff --git a/styles/templates/default/tpl_config.php b/styles/templates/default/tpl_config.php index 2ed84aaa7..372ef8816 100644 --- a/styles/templates/default/tpl_config.php +++ b/styles/templates/default/tpl_config.php @@ -17,6 +17,7 @@ $_main = BB_ROOT . 'styles/' . basename(TEMPLATES_DIR) . '/' . $template_name . $_lang = $_main . 'lang/' . basename($bb_cfg['default_lang']) . '/'; // post_buttons +$images['icon_code'] = $_lang . 'icon_code.gif'; $images['icon_quote'] = $_lang . 'icon_quote.gif'; $images['icon_edit'] = $_lang . 'icon_edit.gif'; $images['icon_search'] = $_lang . 'icon_search.gif'; @@ -129,6 +130,7 @@ $template->assign_vars([ if (!empty($page_cfg['load_tpl_vars']) and $vars = array_flip($page_cfg['load_tpl_vars'])) { if (isset($vars['post_buttons'])) { $template->assign_vars([ + 'CODE_IMG' => $bb_cfg['text_buttons'] ? $lang['CODE_TOPIC_TXTB'] : '' . $lang['CODE_TOPIC_TXTB'] . '', 'QUOTE_IMG' => $bb_cfg['text_buttons'] ? $lang['REPLY_WITH_QUOTE_TXTB'] : '' . $lang['REPLY_WITH_QUOTE_TXTB'] . '', 'EDIT_POST_IMG' => $bb_cfg['text_buttons'] ? $lang['EDIT_DELETE_POST_TXTB'] : '' . $lang['EDIT_DELETE_POST_TXTB'] . '', 'DELETE_POST_IMG' => $bb_cfg['text_buttons'] ? $lang['DELETE_POST_TXTB'] : '' . $lang['DELETE_POST_TXTB'] . '', diff --git a/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl index 2b7fccc2c..c9ac0dfac 100644 --- a/styles/templates/default/viewtopic.tpl +++ b/styles/templates/default/viewtopic.tpl @@ -11,6 +11,32 @@ $(document).ready(function(){ $('div.sp-head').click(); }); + + + + @@ -398,6 +424,7 @@ function build_poll_add_form (src_el) {QUOTE_IMG}{POST_BTN_SPACER} {EDIT_POST_IMG}{POST_BTN_SPACER} {DELETE_POST_IMG}{POST_BTN_SPACER} + {CODE_IMG} {IP_POST_IMG}{POST_BTN_SPACER} {MC_IMG}{POST_BTN_SPACER}