From 85b7ce76816f9c8b2c20cef42738581fb6301fe1 Mon Sep 17 00:00:00 2001 From: Exile Date: Tue, 19 Aug 2014 01:47:48 +0400 Subject: [PATCH] DC++ magnets + filelist fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Поиск в DC++ по имени файла и расширению. Исправление ошибки с переполнением int в списке файлов (отрицательные размеры). --- upload/ajax/view_torrent.php | 11 +++++++---- upload/images/dc_magnet.png | Bin 0 -> 2198 bytes upload/images/dc_magnet_ext.png | Bin 0 -> 1927 bytes upload/language/en/main.php | 2 ++ upload/language/ru/main.php | 2 ++ upload/language/ua/main.php | 2 ++ upload/templates/default/tpl_config.php | 2 ++ 7 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 upload/images/dc_magnet.png create mode 100644 upload/images/dc_magnet_ext.png diff --git a/upload/ajax/view_torrent.php b/upload/ajax/view_torrent.php index 5f9ed7227..7df15cf13 100644 --- a/upload/ajax/view_torrent.php +++ b/upload/ajax/view_torrent.php @@ -81,8 +81,6 @@ class torrent function build_filelist_array () { - global $lang; - $info = $this->tor_decoded['info']; if (isset($info['name.utf-8'])) @@ -149,7 +147,7 @@ class torrent { $this->multiple = false; $name = isset($info['name']) ? clean_tor_dirname($info['name']) : ''; - $length = isset($info['length']) ? (int) $info['length'] : 0; + $length = isset($info['length']) ? (float) $info['length'] : 0; $this->files_ary['/'][] = $this->build_file_item($name, $length); natsort($this->files_ary['/']); @@ -158,7 +156,12 @@ class torrent function build_file_item ($name, $length) { - return "$name $length"; + global $images, $lang; + + $magnet_name = ''; + $magnet_ext = ''; + + return "$name $length $magnet_name $magnet_ext"; } function build_filelist_html () diff --git a/upload/images/dc_magnet.png b/upload/images/dc_magnet.png new file mode 100644 index 0000000000000000000000000000000000000000..19a7cd5dcb7b0c625f433025948029cbeff9cad1 GIT binary patch literal 2198 zcmV;H2x<3;P)(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM zkN^M(97#k$RCwB?S9^?HRUQ7$pR~e&&`_;08juzsSp8(8wRBi0+0Y6xTcWa-{GYqrIKK9 z5u*eR!<+xqGfe=1)Yqs#08*_&eeWJ*uDS{*j~+vQtcamQhcR89Mkd_`j`Iu!V9lM! zd!TSL)yWEFVPO)+Y)=4@jLj&DrtC2~{QX-`JTIZPZG5t4m=JvAaZcdd?l@+v1lDOL zzc<;I>UA6kLI_Yw>)sH8IF1d^^D?AVx^k*8`So>cj{jui_MWHd#|8e{-N*WsskXGY zw=YknQZNhyQc3`TloF)j7Gn&SWx+H}R8y&ih0**IgWo#wFqHb)=IuS>7XqHK!CMB8 z4w!=N?CtGcp3P<vO#l=`-lbX@?5;}~%qgE0ov zG{G1HB?N|HAel@el}f>~ENGerP1C?R2c;C0QbbXN-rinp>EDiyqyy>uxTwE>$!D%y z_DsSw@AHFzwj9`Y|D>%8u_2X8WgBe*Ap{bMM6+#RSr%N^#pL89PMtc1iQHH?Fe!n_Z`>7WOzYc5RGk&3}O~utqOw)u?3d^oo zid7xAgZtr(nuy~Vwr%0lpSpa}Xuj~}(PH66P6+At9Bv7vplKSC$z&_1&2SfsMR@y9 zzZ<)1^jzI{p?T_7?u6|wr%4J8} z-(ZdnP6*1S63V4gi*PvS@H`KHdG@(omFcM;*@;A%5<;jXfNk5bEDK7hR+TcwAf<%o zc_Dy3T7&910U#wv6oDv(yY?hsyz~C# zhmZU~XxcO(1XN0yCydHeD%HvfV{8U5b5IUIr-VQdf;K`B_4UE)=l~5v0D!^S*w}dK zyU)F}Ywc@qzf*P`2MNQ3k`nt498hoV-TUK|_VnytJv4FD|5LM2yR^6(X76L-IvdL2??V$K|ty1S9< z?nY4tuAXp|QeW(t zJ-Zd&86PnQE1hJOsmjW&3kscEuAbO^>+uEEa#t5TDUo+w6oLS85JD-SR4zj)6*yL6 zr;_q%U5K2fX%ONAqols@C}!Wj(eH~2>?M5fD#Hy&##5pU^>&9 zY`v!TQq8L+i^bwqj^n_#Z9qz>2Kc2@pTG?xtDprnM6rY}1mC=IaeqSS8KIH z&Eix_!O(TMwtY@u^4|Q5XUGu>VBz4gK~u3`_AZ$3c6D{t+bfj#!du@!Qd6x{NeBT= z(_oqga`~~~g_mF5Fj^@7ic(r@MnD(h!qNu~Df{lm-i-mrit_G*Z|vK*55Di?n|p4- zEXPC;1gLqnmI|rMAP*hcS;92*RY4e9O}P|?5h_zt=QMggX}kZyuGhx1{Bz;^`7H+z z41u*}Ft@W4J>5NEl%ZO!!uNfIVF)Q>?0#!+@pP`R&Jd!=83Shw8fOric1}Ah)D3N3 zH>JR(!j8{gw{~Ljf(^^&&ri=v&w^AExzSOSO5;eFCMvZW_74pYR;#s5mFhIqg_Pd; zboH68D+2g}{jOA=cysT+4?J+uyuNFDdU`OgZyu7aiz6dPkS~>=Gz|R_!_bjVr$9cg zpg&uRDsayCC`wl!%Z>h`=KJgV`{uz90#t+Wh%WT|IP>GGS38UK{x9Gr2^d0**|t6C z$I&apBZnUf!!Ye8-Strv9Z#4B{+paVtDQbdKF&2Bf9i>)8skg-Fx;$~H;n(`^7Nkp Y0GQeFSr;$?+W-In07*qoM6N<$f|A-1e*gdg literal 0 HcmV?d00001 diff --git a/upload/images/dc_magnet_ext.png b/upload/images/dc_magnet_ext.png new file mode 100644 index 0000000000000000000000000000000000000000..ee6b2e467c7fce53275d633658fd5a7bcd1efbfe GIT binary patch literal 1927 zcmV;22YC32P)(_`g8%^e{{R4h=l}px2mk>USO5SzmjD14Z`WEM zkN^M&4M{{nRCwB?S6hf&SruLToO{oG)~#1Ml~+r;nxsjL5)A!7$9#-QU>rmT9ArM6 z_~8Sb2}TBF@PU5&KxIZ0CVmY5j8TG_3@9?12qQQ%m|!5JL%NfOPTOsDS68KP)vc=g zIL8nBUT;4p$>@dyb*td6z1LoQon3VL^l1QqQVL0uKq&>K6r_{@04ZhqTmev$QWgPt zN~snR%_^n3M1(YyQUHJ`ig5h+aU42y2=nvvSYBSn?c28z1OY0Q3N$<*q?E%%^rR5t zln~;OuIsh+@2xNlJA=Vsw%_mnQA+tL5zXckcvx%;tdw#YW6!y+`_*Ex_yNnZz&S_$ z#ZpQ$ilQC9?@zW`tpnj} zKYug`g0o7gzds0=<*KL{hViSRp`pX3X(CAyBuN4(C6XioV=SxCFbwFro&l$^bLUQs zjg384tybTZQhp_lX&b1H z;~1q<2`5jUM5R(e6h#;v9X&cVHFeRp?H9r@WNES*5xKgqpAtf3poU?S z0<_z0gkcyl#<=Hs%=0{O&Jo8kbX~{P)D+6)G6sV|W+e4`-7A$!KMccg{OZ-KF9Mk3 z$BrF4Dug&|nx;rAEffkH`bI=(x7%1)Sh&5mw)UM~ulIu>2rk~ge_tOA28V6i{?AAp zIDjKZj${s)Mv^3OT^Hly<3}2e#-|#M#+w=u?c>QbxKdam2;esBN&{X6#U+lTr2d3c_;A^DWCg@pw)o6X+~A^yo2V|Myu zY8ZL306@FlmPwNQlyiP7Zz$_M|5>Ng`Ao0Zd)KloFvieowa{v{GPX2LL%-k08*jYv zmrkeiqT@JiMnp_01So+PfSlwpX>MgnXp=| z7Q!%u5CWGkUtXD=o&A~+qDw^305ph5+P2N|vzreh(imd~V+;VmIfrSQ==b~RcDn!o zUDundtE*qSdGqEw2M-?n{=~#YDNXLijT`FPwQJuj7K{JLk|(0uN+~}-kNNT8oWrs# zu9W&*ew+%00>;M1;CWsqCSBJN1i>p8FJAn_xpU{<>h*e1O5w_tE3YO=^2@y2@rj9v zwIoSSS(dfmG|ep)6A^S>hwuAG<2b(07<(seO=_P>lAv0x!t*?=uCBuO{l&X?@BVgi zadBs}*|Zvs#dps{h-}f;+J&on%s5J zAxV;EyWM__hz!SZGG*rlm$$=OtybN!W5?4=OG{d((|MbSVgTrLI%qbVXfzsIjNN*vQBT_U_#a(=-tT0S1FX#sKFW*RNk+nVFgSJQ3YW_px+8+x9#F z7yt&ku3sXe#lc|ku|lC>mCI$6%VkI@(dl%+IY+zQ#@yW8H#AMVkZvxU=XUd-&IG(pGE89;0=f5xy3n9d7mSxRqnl>JW;p^!V@qXgp0{{a7>FX@$XV?G$ N002ovPDHLkV1iwXrVRi9 literal 0 HcmV?d00001 diff --git a/upload/language/en/main.php b/upload/language/en/main.php index 1da869c0e..e27e6fc1e 100644 --- a/upload/language/en/main.php +++ b/upload/language/en/main.php @@ -1114,6 +1114,8 @@ $lang['SEEDING'] = 'Seed'; $lang['LEECHING'] = 'Leech'; $lang['IS_REGISTERED'] = 'Registered'; $lang['MAGNET'] = 'Magnet'; +$lang['DC_MAGNET'] = 'Search in DC++ by filename'; +$lang['DC_MAGNET_EXT'] = 'Search in DC++ by extension'; //torrent status mod $lang['TOR_STATUS'] = 'Status'; diff --git a/upload/language/ru/main.php b/upload/language/ru/main.php index bf9257575..abfb9d0d6 100644 --- a/upload/language/ru/main.php +++ b/upload/language/ru/main.php @@ -1114,6 +1114,8 @@ $lang['SEEDING'] = 'Сидер'; $lang['LEECHING'] = 'Личер'; $lang['IS_REGISTERED'] = 'Зарегистрирован'; $lang['MAGNET'] = 'Magnet'; +$lang['DC_MAGNET'] = 'Поиск в DC++ по имени файла'; +$lang['DC_MAGNET_EXT'] = 'Поиск в DC++ по расширению'; //torrent status mod $lang['TOR_STATUS'] = 'Статус'; diff --git a/upload/language/ua/main.php b/upload/language/ua/main.php index 667264a1f..c458fd454 100644 --- a/upload/language/ua/main.php +++ b/upload/language/ua/main.php @@ -1114,6 +1114,8 @@ $lang['SEEDING'] = 'Сідер'; $lang['LEECHING'] = 'Лічер'; $lang['IS_REGISTERED'] = 'Зареєстрований'; $lang['MAGNET'] = 'Magnet'; +$lang['DC_MAGNET'] = 'Пошук в DC++ по імені файлу'; +$lang['DC_MAGNET_EXT'] = 'Пошук в DC++ по розширенню'; //torrent status mod $lang['TOR_STATUS'] = 'Статус'; diff --git a/upload/templates/default/tpl_config.php b/upload/templates/default/tpl_config.php index 31773f5bf..d7d976d60 100644 --- a/upload/templates/default/tpl_config.php +++ b/upload/templates/default/tpl_config.php @@ -62,6 +62,8 @@ $images['folder_dl_hot_new'] = $_main .'folder_dl_hot_new.gif'; $images['icon_clip'] = $_img .'icon_clip.gif'; $images['icon_dn'] = $_img .'icon_dn.gif'; $images['icon_magnet'] = $_img .'magnet.png'; +$images['icon_dc_magnet'] = $_img .'dc_magnet.png'; +$images['icon_dc_magnet_ext'] = $_img .'dc_magnet_ext.png'; // posting_icons $images['post_new'] = $_lang .'post.gif';