From a111c66e94214491bfff573f5b0d372f5829d6d4 Mon Sep 17 00:00:00 2001 From: "glix08@gmail.com" Date: Mon, 3 Feb 2014 21:54:36 +0000 Subject: [PATCH] r581 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Фикс прав на удаление постов аяксом (спасибо Phoenix); фикс ошибок из-за пустых системных заголовков; пара мелочей, вроде нового логотипа. Движок переводится в стадию RC - начинается подготовка к релизу, в частности отлов всех багов, которые на данный момент в статусе критичных + исправление мелких недочетов. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@581 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/ajax/posts.php | 14 ++-- upload/ajax/view_torrent.php | 4 +- upload/common.php | 7 +- upload/config.php | 7 +- upload/images/logo/logo_me.png | Bin 0 -> 25699 bytes upload/includes/init_bb.php | 1 - upload/language/lang_english/lang_main.php | 4 +- upload/language/lang_russian/lang_main.php | 8 ++- upload/privmsg.php | 2 +- upload/templates/admin/index.tpl | 8 +-- upload/templates/default/page_header.tpl | 79 ++++++++++----------- 11 files changed, 74 insertions(+), 60 deletions(-) create mode 100644 upload/images/logo/logo_me.png diff --git a/upload/ajax/posts.php b/upload/ajax/posts.php index 339b0e484..64e5b2863 100644 --- a/upload/ajax/posts.php +++ b/upload/ajax/posts.php @@ -50,7 +50,7 @@ if (!defined('WORD_LIST_OBTAINED')) switch($this->request['type']) { case 'delete'; - if ($post['post_id'] != $post['topic_first_post_id'] && ($is_auth['auth_mod'] || ($userdata['user_id'] == $post['poster_id'] && $is_auth['auth_delete'] && $post['topic_last_post_id'] == $post['post_id'] && $post['post_time'] + 3600*3 > TIMENOW))) + if ($post['post_id'] != $post['topic_first_post_id'] && $is_auth['auth_delete'] && ($is_auth['auth_mod'] || ($userdata['user_id'] == $post['poster_id'] && $post['topic_last_post_id'] == $post['post_id'] && $post['post_time'] + 3600*3 > TIMENOW))) { if (empty($this->request['confirmed'])) { @@ -62,14 +62,14 @@ switch($this->request['type']) } else { - $this->ajax_die(sprintf($lang['DELETE_OWN_POSTS'], strip_tags($is_auth['auth_delete_type']))); + $this->ajax_die(sprintf($lang['SORRY_AUTH_DELETE'], strip_tags($is_auth['auth_delete_type']))); } break; case 'reply'; - if(bf($userdata['user_opt'], 'user_opt', 'allow_post')) + if (bf($userdata['user_opt'], 'user_opt', 'allow_post')) { - $this->ajax_die($lang['RULES_REPLY_CANNOT']); + $this->ajax_die(strip_tags($lang['RULES_REPLY_CANNOT'])); } elseif(!$is_auth['auth_reply']) { @@ -113,6 +113,10 @@ switch($this->request['type']) case 'edit': case 'editor': + if (bf($userdata['user_opt'], 'user_opt', 'allow_post_edit')) + { + $this->ajax_die($lang['POST_EDIT_CANNOT']); + } if ($post['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod']) { $this->ajax_die($lang['EDIT_OWN_POSTS']); @@ -224,7 +228,7 @@ switch($this->request['type']) if (bf($userdata['user_opt'], 'user_opt', 'allow_post')) { - $this->ajax_die($lang['RULES_REPLY_CANNOT']); + $this->ajax_die(strip_tags($lang['RULES_REPLY_CANNOT'])); } elseif (!$is_auth['auth_reply']) { diff --git a/upload/ajax/view_torrent.php b/upload/ajax/view_torrent.php index 426445279..0b192847b 100644 --- a/upload/ajax/view_torrent.php +++ b/upload/ajax/view_torrent.php @@ -104,7 +104,7 @@ class torrent } array_deep($f['path'], 'clean_tor_dirname'); - $length = isset($f['length']) ? $f['length'] : 0; + $length = isset($f['length']) ? (int) $f['length'] : 0; $subdir_count = count($f['path']) - 1; if ($subdir_count > 0) @@ -145,7 +145,7 @@ class torrent { $this->multiple = false; $name = isset($info['name']) ? clean_tor_dirname($info['name']) : ''; - $length = isset($info['length']) ? $info['length'] : 0; + $length = isset($info['length']) ? (int) $info['length'] : 0; $this->files_ary['/'][] = $this->build_file_item($name, $length); natsort($this->files_ary['/']); diff --git a/upload/common.php b/upload/common.php index 846880951..d52cea0ad 100644 --- a/upload/common.php +++ b/upload/common.php @@ -1,10 +1,15 @@ WMU3Bldny^-MV?(XjH&h-D@ci((#zIoHD zR(Exsvv(cYwe?q_3UU(22zUqp003D^QcMv5fS?1P8-0QWfAc{gcY=R#9lxtND%lu2 zy6D>j0m4Q$20#)iD}587B2eGR&29+D2LM2km?^6{s>#am7}{7d=>OA)!PUwZObuou z=xVEPXaRI2F#wvFS@V-#v~-Y?m>Kbt{$iJ9lC>2Dnwm+v+XI!{<&+KGEeyGhNCgE* z_*{9w46J~T`XsJamevkDuKc9`;>!a*|K~CzDapUOI9l+N{(DervI-=kHugXgb_OPT zLnaO;5)NhtW>z*%PEI-!7A9sUMkW?UW)^y8P99bk9wsJ||N4-E?`Cgg%%dnK{$KY3 z|Kle$b#%1lVPtf1aba*_Ww5a~VPxj!=KhBV3kyBC2fc%vwWGc(y|n|`e>jK%9SrTw zY#q&PtV#aisBd87c4wCI4T1F_jv!Wj2)ESY=Ml5KnEKqdqeQX8I%2UD_b5>d!W9fjlHssjpctiJjz^nYEFPi^IQq%gXXdSvxrDTN?tU#P~_U^bBTZMm*f##aKky*jd?` zn8cZxzcX`-urqxZ5#wNI=V1NLBF6O}S}_|#Co7<}<9}$4{x>b#|493fAXwRg?<@wi zH**FWiQC&)k^F1IJZAs%SeXAue*Z;l^goY<<$t7Q1P_MspKbmBZ1aCEfo12P)BhG) z@Spz{d!RK~*6qPUjrf;C2LRApk`fbEc3nQzhEK=noAX&?^&mclL_D?EC4KPc)bZ^{ zhgNPyl|&McFd^lBMT?LKPZiChm=f!PQvL>+``aJVpM=KWeq*HVw0r%4U~S`NL3wQc z{(ck%bp3Xl_G4M!q`9o@xb1o2qs?6fxL7ZHg&_|VRb+P^N z$4myG2azm-&FqV7bj@3a+Zj7p$kvlP@44sh-}?}^0PszLK{B#G-1OhBW-S6Zog2s~e}QI1y<}S=tCT(Rwj{2#Jo_NB}KBRsFYL ziuB`oANor^W8}YvKmgKUBll96rJu^4J0cqX5eG@!195`517P*H`tH_(EfWZ2tbisd!EXUsH{aD z1y?Q8IPomqbY)$1&@BknbTG&XS4esp)V1wYEhr&Iv~RAoC0m$Sdmd50YbLH{OR}`) zUmruf+0h5=DQ68d!+!o|r!KbT6VieH5GW%my>2*kfewRCWDebXS-bA1Mb6MpAkqAvX-LpNRpy>1|tD34B0fy@^nuxkiw+!+uJ#Mfu4A=n7& z8u2&O@xz)rPbKkE(vZL(hGL^(jHyho#nOY3cx`k(TmJcSf3|}bRdnG+Lqp>)71%^| zXEuUp*f`c~?Gtr!@AFB`0cDr90&irDr{6@$+aE$46EfX*trG<4{K?fH&DHU8x})}X zgBn_+B}J-&;bA7Rlw=N??#Gs=_+G(ek932A8~?fx`pVnWa!q6EzzpiA^2Nk#v39g# zeSW6+wWzR*>h_6jr&oYQf4g-!a}R`qQECtFO)c~}{&0F+VV0h<_@_D~ms$mY`Xs5K zZtw=h3g~frLruAlFS5J@VKQ~t7eKwW!y@8c#bBnhtYDkGZ?im-@|c+y(oe59D(665 zftTQKZ`4isrT{}Izd`LA4gE#Q8}Hhjf!m3RMs&K9CbX)q-fBfaKXsqI-s<8noyGH3 zPe|6*g~d~8(o;V~nUuTJf$g;`hR|Nv1rm7}YzhPj^3~*N^P{r20RufQtSjm zEaqhl<6$1uoxrlzS&@@x!Xy0;7LnRuDS)V(TN{NF8~<%*?j2oy^WE)x*armccLfaT zNXfhF>l{-!RHE>Q?vIe6Ph))4=p(c7zaZetY?UaB(?Qoi>f^puK_fRBK+tx~3id@C z{W5jUqRXPbnHU@zdV2f)g{;zTCxX*-r#~X2vh{j+2uUMNT3Y%buRJ{@i@2dZ#QyjD z%a;kXcMDlg7JkDgo+Q5YYEL^>cTpwBV>H>a_rgmPe=M$2iMFy!Sa!{1%f)!pIVGSh zJ^j-|oN~=}&!z1aT}h5tK#EAOsd{~1Al+dR4s`$BM|zjt4}JYDpMh|qGpm(CSrng) z$~8sus@sdl7s-d-RQZb6b;=KGC+G{tS??3u{E0V{;rI()Nw;r@RGU}B7a4kJj{aCC zUq@MCqm|In(7e0DO&wkPah!MAf?@dZKicIKPcuKtoqiikB(3dxUWp4K;OW`|I_{OjXM{&nx$WVd@d1Y)12(+lD-a3|Cr* z?(y|o-|HJ3{bk!AaTW%G_nEJ~m|NA!LjWw2tLaF+RbExce(KBP1G$7k)cR|+Y}>=9 z;fylBvj?)1l{iy2_hi{))LT2rSsAh-H567g{9tVMJ-%QOqICxm z*=OtlbU*zdG)b+_8mgF}G(9{&HJYd{IBZ%<7I`XK#;U{&&Me-;mDh_a1R*0hLPlO^ z#@9-(4~utS`lZZ{52f%8nNHC)H|RRWK-Eflg}pK9yS=oUp7A89~Rp0mo4zYn(odY7IK`g z^|cjyVoR|ZPx|`h&2h!5A=HFIJ~RC)spA#cU1v4}`{dcafZMp97%u%Zh?Xq7_PA&m zbw|WyOENb<|3?_Rq`f`!yzN0}+oXRymHk8sw!)10d8$3c_ilx=c91Eg){RpfkT9N` zE`)i;8}y@|4Y7v=>v^05&r|gdBFy}avh{wK)tompBET9@7FLS{m~*-*Lpg;%aoM* zMuZgfp*@&|Kt*xAQFc{we$dfSvT^18W@Ga1rw5v^&>DXbqe)6c;SosNrGyCc2KXlQ z3i<3v5PQwW#7%}w)-X!H;tP?&L9ikKT(duikMgv;E#4@xWlA0&X(U2xB zyuDBy#2hle7U~mxfeDTVD+YtMwxpdnwtX1eC!x2NlnYFyBXZ$yNRoPLfC@E)JZ6C@ z4BC#@YlDG{$_qPc?54-c)phJ~`Slks6ZLM!-fPae%>r1KzSv9ndyJ)nFV~BZAls_< z)2Tw%3BEWT?rx@KWLEj7>vIjDkGts?*7g+(z5ZuNVgmNj6jC=AY&g zIxa7k<;qo4MU`A?R^tw8xb)VNDku^SDXRtS=@F=)7~j_K*!8h=HX~pzO6n^2USuFi zv~(z}S9!{+ObrLTb~PFimCVh}6hxGXZ#q94P zJprb(qfc-+w~?5|x3g8cg6@}HaG@#lvabg$k9CWyD=`TPcege^FDo88UUzd86LeaQ z(Si&1X)dl5$L%7X${JpsJh?Bp&m>fq? zo}jCbq{qw)tk9S5UXfesAy4a~1w=mWd1&OOgNmdW6*#dTh_$sAdTW9Uwe&aH9g&;_x3L zW@ct{3l{UrnI88`B~}^@axefE?FL9cA4?A=&UlHzBtFQ@`yR&oNC4g%4qSy)(F zT?J=?WvqRX;xYF{qc^rtp=p$2iE3f307#g+`GM(hSwr+UHfV$dQD4FzP-70ysRCL zFtn5pRg%c@_g)O&hI5359Avs5Q>O}eJ=bn{-i+z)S^}RZb40V6_YyVxJ0D<{w%h47 z>nCM7*Xk--TVIF9(l|R9;m~|o&#aoYB)1 z`hcS0Q;^JJc$;1Oh6KOr?KB)Oq+=aI(XCT!9ATR&F1?x~ctBSu2?Vii{QPS_%pwU* zKH}>mE$ea8E$e4iZFHnat_Vf#%_Z4hdLEEp7nyK^@^7(<5dH2{zh4MzGpN>l360x=)Kxh{Fp z@$sJUdLU@zb?kDwc!h1OX7zG=&2$X zu_wQIG0&i0vn#i>nK*7EXllUAfQ z*c#?s*^OMz z%EJGm4{M28J2^p1OPf@w*5V7cR#wdvH zPM6SY%%+3YKHR%tuy^g(7!55p>07JH%gg;g-fy1{vIOJ0q>)BLP>F+Q-UEdLU^5=i z8aBN5kxV8#cX?xSSY`6b9hY)^RA)f2EALS7^;`YL1m5(I`7|g&I0;Nod|yEb8+o-< z$c>h78;M3*_5C$6`ZTbLnm>i#`(jJjQN+&@PIDqw>Y*^O3*C{pd}p%1JyR8=7q5O6 z9tuYp37#K=qdc3<3(d*LJxF&LKU>}Wb^SYerR*1@0m)|+dCGesef6&r4iY&}HwPc- zn5JLS{>-Qk2_%Y$7hUl}6F9#{;xKO~(pENZ|AdBs^ki&*G%%klO*mw7S+yHrhk=2q zb-z8dBTV~a$k2R9`h{*VBW;{(C)^fJ7?;TVamzxD+F93S%_&Zkr0V4H;vtDayIH7S z zJemg1Ki{1Y)6&tcGWtoc(c#R1H{}BZRb)p+4RAgE9V*(7$O-&BqG*kekM6mr`5mYv zUO5wj(t#o^WQ-*tA(uSXNlULyzI(M>U2w#&m<{Z9EgTT^d;?Z;mdB{Of*U{wki4_= zeJ}Cbp@iYAfp>C6GBfn!+g+7UP^3>KD>=OCpR;^VY?gSQwdrQ0H;<^h3#bRKazP!| z1ft|CJ;OwDKZ#U5j7?bnR>9t4N1ymO;UHltC=e6Zkselik*{Wbc$FvfXTU3xO%Giz z6DIPotZY8vNjq?i)n%%P^<4UJ&N))iI^$0nF7c59oZhT`+B}D$hX=Vr0V=V8CnW6< zdyVzGHOS^ub^J2W%#;w}o8+aOgaJ?{6>i$sAV8 z7f&f&9`~ni*5HWrgpg!=Xk>&pWsE?dA}3Fzkgq1Jbt(oNovgf@2)?MloUgTTKFi8$ z3FwR4h2*G%O^3%xMMJawlMXPEUlhMMb}_y=6~g8f?0_OdFb$$QnPHrC-90}|_{f=3 z77YbIc)nf@>|}XAn+;xkVV?RIZIZtb1JG7*hb4uNVfg?c=Zh5UnAT+-cC`59{HsziAIDpzzUGj=VPg zg41p2oCCnizex3KWxosb3QUo!{Mnd-rye|4BG{wa?_ zz-3E-7muHm>>pOvq=Is&yxIk$RS{rKMga*huHBln)RG}Qq?Ky&OL97MV8CH!jM-QRETKf6k_jMAe@AOBp4 zX;fsx>VGiBP3(U7^~$D|H^0Dr8tV`X*aH~ zE#}y-HJzl8mG~8_ex6GRFj|4?4QXPRgtW=4rx0z@)cM_fNo z%VVTBaG-4|BxzaMTJkiZO#j8zlxlMhlW2J4R(I08caw{-`A10(4(+eXZ$wW5n{qtW z zOlQb7m z^l~xZADa+r$bc|qy0>x=K*j0>z;ued;8J?|G-Q(8CR4YPFGE3W zl)EE%490H&Rn^I}%unz1Nw}S`AcIr`{+`Zzwlx8&R*5-&pV1LKj+&Fe?QTSb^Wvvs zed8Hb){yK_3KbCb;6zml=wvOVFxc3NimfvUL)nG^6NW(4GW=S-pjN?W!1G zQaF-axU9oT$J8%S#?6wtzZEbM* znAj1}bh;O5MAd2UAVe%HqOC7r1y+J|wIzFedZUK-e0c9@fy@{f7z8Tq!(z(MMFLlC zwWq~#&uhSET_iQj!aK{A`U+EBZ4Otg4Z9WPWA|;(s9HW2UFH+dr@f>P)Z{rAx*mRn zIt|IB4&%w^A1n=eJ0MsScgI(Q=Q)e8l6GgV?}%%TtPglkmE9W^`m9&D%{Gh5{BW?P z)s(jc_6`k1ZiWr#YEqbcP8L+!1bED?Uq&Eh8CD}28LB;s89YB>blZzMG@VjlDKVw+ z?n7ITrd2f`(_EFWK&tMBOriWiLI1K3y&m=ROCIDX&cWgD4(2$hwD(|qYnkMD zh!gDbPJwu(6exEh>-W!n1S@rBWQVNc(j03F`>4VbPn;)eHwOFFhhSxnzf`5$aniV& z>$SEFeK+7>3iU{kovpxAhn^NM%L6wIic@DP+yUnjCxBo0I)@_{(WT+aC4njzfuX-$ zXlA}ppbVp=9F9UfWz&&~hYPh;ZdE0MxLxrGR`q^Ot&aZ7>;>vqJe1vb0Ts8)9!CX9I$hx&-FDGiUa{2p z^f@CkIQu_MrDAonuEJN-PAv3QPc4J7Ih~3_#)KeLE$>sRCU;}P=Ez(GQ&+~AB3f=< zw0Sr>HiFhr5-W4(PK+IZ3crR0nL(Cg6c_5|FF~I-Rai$>pp+8N-P z!xgq#aus*Lp8MBCI`<7djM{OgDbTq8+b|M0NruzBdbiDQxdS$rN%*O+j}1A5yv~+m zd*=bdaD?dN4ueQFyiq?Wp6GmWeY zF17xT?eEVgNxRApJTC4prZ?O6(1LHbGby87%zJ#vW70Xv?r8w!P2cZu9$@8w%WB^jix*Hl-{#nVvEy~0I`wN)05Se$DTYPGblDRbB0UB1slQbu%ErUaedhC z`++PN(zV|&pWO6*JFjVjsh7(e7lXZ>4q63XZgv%^s;Imr@h)WmsH{2dP(2gPjTOm9 z$J?%lX_K!CKH0h0IGA{-$mIr-Evx~ghdBfA>RII4cVnf+Ypo&5VRJIp98uljg8Q8M zo`nQeNgCTEyeK!wJZpaGxb2N$YuR>9?tB$B4xT(R`>JC7MZ3}&+Cc)Y{Fh+!TV{&% z2lxHj@Jg{;B6(-2uOC8t)za-HX1Acz$;I-439!D!qZ6KNAk%ADR^6$cbXoC|SvCb- zBX*wr0fVRMyPUMPVxi*bw8q{J9ajN0}-VFG~y$`eudI6~Nc6 z;|EiufaLW}g_TSJ`cs0BkJt05UP2L z$cea8SvtL@cAlt{`uh?WV1?P*7ltj^1ze{U-e3irFO#aqZG@Mys`gYi?^o9^GDmD4 zdK~s9qkF<82mwm`F7pBD3kz`+vhHy{BVFYQ?>YctoKL7S6Sd*G3o;lco2J3$4h=N{ zC0j1mNm+K;M+S1f#i+bC9!8=3!`?p=rvzqXY z`j&&+977wTMH3_MA{2g8r7ll*m!S$}?G?4J&cu(g!FwO^8U+VG-R9mWi;XMbQxeon z)ViIxv<5d#!dq(1-Ef=Ak(JAkXLZEnAUJj`A8LFV43!w5kWoMU-U;IW=I28bLW_81 z;y+&emdy`dBcZpFlA@2ovSA5W9&^0^H3|*uayTi>h2s=Lu7>qW$!E?Sk&l`V`STs# zgfM5-rsIu6$d)1Czy|o)pp7HUz-)v%l7n$IeY8+Tmtp5K71nXpfuD1?i_AwC-}|_e zw@L5sFQP5ZXYSk!Z*<1U-LD!Q-fhYC&J@0YWR$|$E}cf!bCW_A*=jiLOgU$mTD)3` z@?FLnf5XpZ@pmC~^sr@|9(Tv=@P#=J8JY7rR*5(I?eBDBwe_z$BeEfNE(=2(Gz*Cd z#o2~cNSWb_`;$-rbk;xk@e{Bw>iSH9WOxGjl<30V$$h)R$Y+m{r=yvY7j}?XtohdE z0isb!NGHd~I&n3U=3lkzhk!R-R4AD>ukZY@ievqZrb=(ryR~unZ-dyQeI|iNpIYqf zSE`|&)AxJVGKfr7vS5CQ2*AD z005X%aW6Z*zdi-6;uHlZyev-KkVi~?Y zM-tu`=X}SRr;~(VC6SYQ*`uxl-TmR*YsxNBKLIPyakkl0S@Rp?hU13qV1Z54d7bsm z!K~mDqK38y%FQ}UXij#W?oFMz&S>IvRj+gTmhh(XY9*SLZoU^+WVg=7n z>3%E$38l!j!5Rovd-Z9vqM)_)wjgR{4GkV?+7Q9z(x<#3>2v(ZPlKw{5;KQx;iGUU z1SEx*A+$6!DAh}s7-?N=QxKc^eWNjuCU*n^`l@;go#QyRv8I5k^pyjqn)QELGHW32}O>pO>vBT!3n+c$LSemyw z&Q|Jk=Tj=om@4v}*F}yq8&hO@GBb?o2tAhJ;s)w0X51{TtvN80D)Us*vOckvi0hEj zFZP<&d5DQ>RPS%FpxT9*m(HIdA_;+Qmw=Br$49FZ*Y zIl?OFzPb4>g461dwr)P)Oyl?A%E(y|%48`uE$vIVM65KEqJg=Z{Aa%O0lHRUBsCmk zdAI`CAQW(ozTWvS@vl%JHmQ7{n4-2ZHag>f0ru7BQ1IlE?XAj3^^ey&ghMQ zy)>~pcKYt5i@UJ?%soeffq9v)!9@^I}#p*qXz3x8$IEZd@awHA@E|(a3`}Yrp=>HmAEh{&)MIg{{rXucK9(_&woQ@I;U6@D%1p>Jrq!0 zjGm_=1maraa%Za+_)81}Vk#{nlT_}X4fN^#?a#MZPL%*@b`OoVWOpgDvHaIUu*Vc~ ze?Qzl7*(i0vZR6wNkz_te-jimZA(dKRH&NIO_o}d2mUuo2rm-m+o z;y_$BCb&TCY=&pAL%vTp06ox>FS{2Lq1uLtfCO>~?QdV9C1X=4&8O(qMCBaxo_Hz- zhV}0;sJ}q|u}gWC?nI@mEfA{T2>Fc>m=Or0AtmAb{M#0b1)r)Xo_W2hf($VUIlB)yZX1R_b1{H~gz-mW zcx>1ElSnTI_j0Rae~#e9ABsXyPOmv(a-8g@cle^7=qSo2WlB%pgWx~0t`sXF_A=tRqQE%rV;GV?( z9896tmO&x?XadkvHbN*HorZJGVYkQP9F`Tcr+KP>#*#tj43co;Zjost`m;Cm5bTBW zd(c>^NCaWgyb=lgsL^{dU^b$nXui39^CTXEmMH2yj3}``x7FP8N#V3vr?nSzwuUaY zk)~UgIctP?;@v2tU^H?&lk~+bIY$7k=2nm$DbRIAfrW!G{Q@SS+l(&;4K@6?@N%Et zoj{_fS@!0Fn(6EV7o@cnQr&=h@U8ZteXZ|b`w^RDZJ3_b;>@w`NscX^Q#PPtJ~MTX zTUGmw|FT!t_l#g?V51T4rrp(c3*dW$8eIZYY#?KZhRd}OBeC(7~Y^$vs;lU zd+ghP(cf))oaTY$;D#X+pYOww0dJ|N7?E*~;nZ(C6B%XJ3Gb6TUHX@_ zwF|>{Z)khsH=VRqbK$5YWkytus!Sj$NP*LCxbGT|a23GvN!h5Ao05^Sst26){XU9X z4-;x@)YL9O7g6#a^xHMWH@&M2AUY~UB;cuLm7$-PKJ1gX5#=L#<=RUZrSgxGRd8-M zL6w2)b0#CFA~R0>octK&^BU0pxE)5WRb)1j#Q1AJyuFUJHQ;2)B#S?OXj`OW#wycC?;${pJ+apO||Ty@N}(?BNvBSbM673ZdFpW97*2sPpAPHtLpW z00kv_Ykh}KR2T7Z<0piwKxhB_{@p2s-mIE)y<9FHGqw3>IhztQ+83=BHvy*$XO;w& zDr~wDHl~$>wxt7F7Z|#}KdU&ZtYN0#`B0$4n4tc~q&UzJBJ$Z?GeV6T0UHck);@Uz zhRt2kjix1QYjIkhG z%gNgL4qcB|sh5UgQW^|hREnCOdOORx$acEONWadJYF;Pw-iG<5Av-%7a?%IQYd5Yx zGJh{hhTGSf{fw{@`H7+3J4;F#q7+yx5BKJ`>!>4iqK*!|(lo%@p$U>N`F*|tzSq)% zu8-GF@y|T157`36~TRKok7okiik$3VpI#Z8%V53ow*Gc-&e|1nP;O1Yzq4SB9m9sRl#N+%XqPO|clNFTXe!xScZ&4Lp+ zIw^+|{t}pgs`HMY7B8~#c?Ihk$?7lp`NF01PCe#qtpsQ310iI~HXrned$dGJvG1O8 zEDnJ75{$@V7#|(wvjyitwdm69I4II%J6`t~kNn_>8Z+=)=Kf&PW|9nOh>%alfy)4e zx3{-tVDQo^`u;a#_zcK^Yg?k^iWGU|5&cxm8dcO6H3-@tI{y01X>{9DZVXVjhtiB~ zbwi2Y%rOC;M1x_NZIVz{d$I~1zl*Y*m(3asbYEM}o6GnUy*gKeYYa6qMnX0>gXH2S zBlNiggrlm@w|L4f(jNjazcT#U;0MHM)re9Y)^?$R&}?nkI?YSo+DO|ZAQC;JJ~q1o z`oP+j_!vq^`p90UHn1q;axrxe|AGi&a$9iVIMUgUt5$_^Tmq9MNWNxIj@8+;2llDs zGeqs0ykF!t=As5DUhdQh7G~7Es|E?7x?J$xa4}GKy~Y(RZz`MV=%8GxKRi68SQdZ5 zHJmnH@8_AUKMJrWP-K%gRX%UD{4b}q3l8l?)gY|%)g}jVDJgh^IvHb?U)7heERx#( zJ&a#`U^Lg@b3ZespULE*ULJC4=B-8?e<`D$NmnE`)3N73uu>c#V@1iri4cXHZC`Qs ze+s7$%kp`Dx_Nr=)7s!hnjCSh>)Q`B4e+bb_}lC&dsdyK?X1q@tkdVO`IkJ3$28!`zuC@<*VLD&&}OF-2^5lZZ)k8)x?uh`Tp4q44>uxy2!)f zSNIQ#@zz)y?%TQ-VmrJkpfoc=YfbR$m1EDHbkoDoL3hmjm6;D2GwdhbHxzN z`G?TUSN+?59jV1Vv}*BB3bQLPf5Q4Y(j_E@6zSGN_WF~*o~YrfhC5-?rNL!;fn$0e zh_3*-ICLMu`$a=F50|-o`Q z1PK9xj^ZZ!t1XS|afV<@(Kmd8gBHh2i0nTX>~FP%&z}P;CGRsZ zBm|u@TZnnB6Y@v6m8LC1b^BhZ23~>9P+1bpgMlVyyKcsnshFW!b!wo5nhX07$opo0 zj108VsQGS-neDB&`8@q~6_I%AdT#{IU!M>)P5};zGfu(56fUwB=?rVSqj)HMuMqKO zL$_z{a2$vxbS2xhtc@&?lC z{jvwOt1=M-8(WalOD}?hQj~k``uDa+=(1T92jdcj`9na0$HVy>ucvEifS3jP-e=Wu zT~F*1*~$LcFM$)mj=}6)d$_cEgu-imy@)Qy4+4*y0k)Io`7S3d-!^StgM-d2<%lfh z;54Q~z*`*B{-Ha_l-0NYQEMZw(4a~KoCP>+4t@#cYz>Ncx{tNHv2F{xLbf4}cvp;RJ!Dj%IY6G1S z=htFUj_K3a`}_?t8!$$K9>7R0&P7dgi~NUUUza+ir|Nn685hh6Cq5v~{Xl&_12MZ^ z3ETOs4TQ)JN`jBde4!JzdBRlYbX@bzT-}6@Ls$Z`8Y4XeSRLwisdGYv4%I)x#A>YTU z%q(MC*%Dz$s&+Y=vSgRkxzaHpss^Sh9>u<~dkPWzyk1H3I-fqaSVoZ~(HGATe?Pu$ zr2K)TUhcF&s1ofZ3k2@batY(M!1rnhJ~E*a@+hllYHIp>I&H+>#Jb~g!A>gDvTAMQ z&B=eyAhy9R{hX0Fy_a{R-&8;=r_1ZnZvusQkLkl#U^w3Nq(c@o9m}JX%V}Xy)mmoU z!tb!4qKQCNca&wDDtPrnUIsmYI%DLQKuMfEf!RT(3fpF2Onm0FxEK3XD=S4+jIbpH zyre9_>Yrw52yqn*D`y$HltpmqoKgLAK>!?Tdu$hl;q~s&_**d+-)4!2LiM$L}N5v7n^bXmttVnZrk0JYwYAsEEdNx*$DtbBbm~#DyUQifdhd9W(x*CAv@oDooNoac?Y9fs zi;GRkUA8+S@z{^s1>dit3?K`d_~$+k^jeYb{=ueI-70S}Al$8yc=}Rk`?h-T9rsRI za54Ykhtx)2JVFnrCiyF)$$2a-3kBz=PVI?JhDH=l+U5{JmmVgo!}HwO%1C|_4s4@@ z&Z&SFv(W>Ufz;BEO747QhtJbKtKEo zPccu#uW*@vfagry+)ujl;G#)Yme>7~oq6GIB=7m>ENe3`8pR-pS71rTS4bC({1Wvw z{i}@EfO+2iYEQ$LDAk!$cD>gu6PiOrpOS<=NKcgVF>1vUv9ilqT@TOGK?8*?{db7Q zoXbe)FSjb{qhqK4YbMwt+v=#rbP`rlLFzTl6E*`fKD*aB)8FbR7y^{`ZIBl(s_yRY zENq(g64Qc_a9JREZMR*^!Jwtad1N;SH@)p&R~B#Xlyi5VUu3R45{~fsh8c=DsE`gX ze)1F>t=l0(;8iXMW}e;Ro2pawJD*hjckPV<>jFE&?tbC=Dw?nz!uYy{`ul33R=2QRp^ z_u12KmJvS#ojD4co0}CzXs2z9ubcgEQfO9{h7Ty>L|la%BNxoJ+%8gu&oc_eknmpusgmUC%oDd6cHUhDn}g&(@}bn{`H z#0s?}?+|ZWvU$EjGpqmX&G3$>#G&P9C>}reaIBoQ5Lrn-(H|{I>%awq&ew%lZEON)@f=* z7nI<%e@<08MYWkAy*FhyAc>jZv=Fpk=YOU%UxfMcKsfJvEcphvm4RLS6_QIDfjtcG zVm+H6gUT}~-ALiZ^hh8`@}i4(`tkVNO~c<5v4o_8h#zBnK}yxUExRfVBiPb9G1m{n z(o~eXpYTTGFIY;hBC*_`q>J?_AxEyP=jKCKzpU6vO#Gw}WVf_X{5nD$4yenueD$Qo z#g1nfQ7W6$9U3?j!GHc=A2ZOC~Fwl(dC@Lu?8MPfPd%VSC4uIBWvW_2#I znV7jLdQT+HB_7BM%rFPG(bV0Ce$z~d;%Q-0+D{;dGo8sG>Q6)$jv?Q2K{nwtsH@9>|bzPsmh>bm(j@vyCYBNEEH4N`$sTfVU>vA zeUqz7RWt;}DlR5wDnAnpjXCc7! z1FTO}a^I5ZHJv|O#$^c>54}G=f&dJKF-%`|PgFeY zdwy*7sa9JuK6oAGgv@@j`<9`oRZdXRl;aUj$Xox`Xt%@i`DsKCV9Sl+$CC!GXGm_* zdVzsERvWH65#!)}VbBAtRg77yGqhtf9;DpOWWCp=2GQSh9YjX^;-iqQn?VV{&i1 zt7VecFu*S860~*#CxGgOp5S*aXm_d3R9zn9TRB&4Md#cOGANU|ItJ)yXnqL4VKZnY zKbPsgmF7X0i#Pv<;!?|6zB^g4=>%7-m-oR)J&q+U;WZSA=?!rF1??og>oV)m@(mS- zsq>~23N>42aTw<;6WRsQ$2mp7%l%yN<7q-;NG;Mi@$<_WB^aeDSlR;iO#2u-1)qlG zL1QkYsL?}Uc)B;%$)BOkzeB)ij2XxBnUqy5?ItfCZ7{;G!Zn+@X)K_rsj2c#3|g?k zi{+t=&HAO@rv1rSV*ZFf*>bZi5s!EXXtxeHkN;p4L<0OX2BR?+eNKr{b=k8j})y3LoVtFVjDC?gV4JimXkZ0=CAWakVvs1oe zeLq7=({NBKgvi3fTP#M^@Wx*msk2%O;@P_of!DB6ipEWf>DW#?5V%NiacW9Os1kn^ zc6V>yyY;JPYUNu_mOxPD`{CL}B*%MJxBjr<<5T7^&OIO}ElsH;T7y zKXpvwT-MzvV+?cyvjM9!r7C6Te9aG=a#@2vj&{bCik=*_Op-t=6b$7kTsNbv{G&Yf znQr?js$jr@0i=^H{z#DqVpW$%Y11i3)O~IQ==J-2*Xeu({=JutTxR?6vAI5Eu8i7h zS^7R0tsZRY#5y~_o-yWh^0FHzUwGZAT)ffEv^d7W9ZCqtRkDx{1Q_hL#v9shQLvrza&R zCgBJ$u+=06u}*A=LKD`4vU26?_y?G0mOjHIql+;j`Ho;IfPuzjL3Y0Evdi)wdE}7< zZsaO8r5?kavrdf#a6S9%v)EIsE$8Lkuwla%E=#$C4u?*@^m^eFsnP49K#+wCMfJr% zp#`|eylUO@!icBMhQuHxv{ud-=8T``EjVJI*p~#G84IM%I^Sc z8JN(8F>I!a_{))9&pZ&*}ZT}$Tm{CD8dPxx+uXaaEyQjlQke^8+6u>nIn#g zuXnLzu-c+E*ReMbpg1VES^-pZ^>peqfbrgY@5S1~1ZKQF7c5wi#w-|CgipCf&<=7U z&(_Pw%v$&qJao zx-YxlSJsEKPBqC)3EIN!OOehv1xhtxYzlAZ&{)y&O;%XO%=1ThhNaCtGnvMFO6 zl#O7?Q68txSo#RT4F~YS<&P1t0B$CORSugJty!=^7IKx_G6J_n*3P&aJ-CmlH&{jj zGm~yii?=h7IuD&hNA)Sd((54uP))vqF|s0&m+Z7bXI`iye+G_#VVMlPc|0oT@P&QA ztYd8xBrF*3+qZAh?|%2YJT{-p;9rtuuT`NRdK>bekWaMP*02>L+tKf=J9GkV<8-#O zNtAj0_17mdlZ{#4&@He=&QItyn0;V-LklP%Cn)~}IYj;)WZ zkt0WTX7=deGFL^}5TJ?tbQ$XJ18_b6{PPA6$nE&Ef(M>LDXXCDleXR`Wjq$l?mCU- zem8){xhL}L`fw3?CVDfIGm-{YRg?s+;*xEYm|DkxlIlC;J75I@RyLb*SspVnnain{ zs@~z`jap#NgEG?FQ(pTMC^5mHdS5km9_8wK0*0Nio15j39Mvo|fLupqIVi0m6(tZO zldzcqWL$pvO>fghlmA7^4)&d+*thWQ_ z>C;(}QX0Gq$}T%A#o)lVWnMLUUYcS#n=N9&ER>{?q{u zu5?FRAL#s^fzagV>a^cb_Ij!8VZf4~XoFyLGi+cWoL`MHnH;~VcGTIem(AOZi!Z(y z%*u8?gZjw>Lz=V?1034Ylz=64(G9R9b2sD!&aur(vFsGX($}*}okV#W=@o-j%76g_ zI!LgpcGGE1&s=|VTL+2#uwZVtZQB;FwKV-wBqHc+PYgN|u&fyL_$UDjCY)jP=6~cd zelt}!s%m_D?Rv9}vSH|1$zrefKrmq73{^%I09CzX6J$HqIf2l6BR^$lwio7LP5t4J zDN3G13VMo|9~5~FuO*d0bWTZ)osA;|7$ac8XOhY`dg})scmT&T)u}yy8a0+Ywg{*A zA}H{)&ptD7A4XcfY#g72_o{OaogEar0TdJzco`5g8L)~qmIEOpZmix3SW*el(P9Zf zuq8_gNYkJRV98D!jInbho_+S&t?s`2ZUCU=JWNCFLV7dZioB-;-j%T5I{ zpCC*w-Q3sO6m1j^-+`>Nv$L~!kOWxOMAB&hGM4M0eqVq6wSkkN0bpmGaRv<>IMD9b zub+^e+Gs#e+%{%$adEZMJ;+Csp{;|eEFakacgC>V@msoZQL?!?SkPu|AXvqWXA1?{ z4D}{@2wnvYD26%~%-N@mBb&hV`|BtptsUjG=|ms`b`ZHVgQk(VD`?f0S)r8% zVI`r^A)Ji>3k@tgdZ2lXH0%^k+%b)=UAxvgH}ON=ptvO^CG_uq{~HHO*7LvXHgDcs z!$P$3^70b-N}W1&YRaTZlT5HFxBbU4x?OeERmQSq%Tngfots=*S{gp49*mCbQzz@< z23WB&#i)6~-xy1q;9`?4W8%b#m=%Q+zsUxP7-6ya_obI!LI?@kq?Q4w9;N_;l=uDj z-%n$PmNa_w=!C1UzFM3h1cs(|I^g>aJi|Z{cG@xk`a;%V!+C%@!)lJDXkgulfvB}@ zl3j)qW+j>F)vLwT`Z5w`C-nK}pA!!-^&2*9sOG_@PBH8yOO~Xdvoi=($iY+TVk2g! zc2Q^{zyhEvz-j~rE({VAMJeOPjZ3`Xf(znxk)VEgT$9SEH&VVmlF4;NID;APv|J^Dcvkv93mY14J$(AM_t zx=_8pNFE%CGjzOVw&5?~zkB}Sgy^i;-QcOG zo~qxub7wUxdn2>|@ZrPteAO_hnaoI2nW3ajm@vU}-g)OCG(v=8?b)-(kmil8fo)jX zbva;E;osoowxjLqj=BM`LVoXHBfvr)l5yKwJ#mI)y^@atEHFpz%*I=9y%of|()y4s z72X1v0lH3SYSJVW8!|c>7G{g&mPJ82#som%d_)^5fYkv@0Wx%-2j65KC@co1I&~JI zN~j-}^gR0Lqo^O2CDq7vx3+2vX3N4qymjl=1ZK~0mn2<#?X^bd&Ygu`^MGrxZeVgF zsIfXr`q6?;hK0Q3V0zTMH8=rF9O1*QkZq9J)(~Exq?!aX!#2H1lwfCw)1ILR$~VIR z#+M}+7o7j1fHtDwEerwTLI@K2cWBgXh;$FziL&TEe+^}3bfUJcI}iq|n))($H4Iaj znMnscrcq;P8%#)((62hC8^dbGBs8So#Dm$Z%*@Ps&}O}nacBg0NP6(W2LlThEU08g z;B&FR#lM-Ei9pBao_h|XJcJweYw5N>Q*7h>^UwFZ`R1D*7I;9JaZp6nQ5_&d5@hTc zN8#r3YR-9L2P3k-{WKUmBfrX?Y7%)^PY9qSvEgnAO;Qf(q;oypA71KQW6M5 z`rul~B(yCoXGmj4o{5P!7O&4XlWo(+zUsiTRI=DI^a+p(Vvoqs#0P)c6bxMqR7|cz zqZ)%7E^Pd63!pLxyd)TqW~A;yHn8zm4fX8OM@)bF0>wE)MSMwBkV%HIq#!HK&;HXkZp zeDTH9o;`ae0tj_;3IK*hrdU|}#v5(_G+IA)T>8#pQg%GoTwcxju=siS zbWR! zelQ7SZtdH*ua?dH0Oyy?z$FgeIC$`2tq$f2xG^K>?2~8%uw=AVivX4-JW`BD6l7Xp z!Em!1&M36ynK-uer-ue<+pxu96iUeW+incd;`z`4vK7ICLh&G$mD!ovwaMd0 zYN@K`aA+#q!=|4np^QaQ-}nUT5MV*UabE<6)$FJy<7sRboL}u|sgwYR65yz$l`B_b zled_i4=^j4mDSFeF~b0x(mNjpGWZVI3^5qc5Kt)Q@D<3YEo7m5dM7%P(HVJxHORe( zn&c%JR>YK(lVc1RFu-ctwyodI5v}5Xu=h7JCSt%hr%s)kv|_~ybK}O1Sl}9o@?)t- zErXU1TM9#Y;RDo7E6ET{r_)`Up>}f)TiH$s;%vgOl*y=BpgRnjc1hWv62Yj!=K$JLb+BAb% zl%Hi3QP<(G`s9;Of**ePp($s|1CDSa1>B~SVadVLYRRyMTIKu1Z!EeXGaCjZUzk0G z&L~u7T*&-u0H=n_wi{m!lZH)o8F`{&9ozS(^z;m>uHC^`iIJR`VOT-S$1*54jHdR# zR1zT+rw>bxK1Oq$Q+80B8AAZfL02~Xd-3AM#AaT-+IK6~#5CGsQ^?0Ag$Mho#|A0}6%C3x~2Y<5VY;Q_iSIOm@HYVTrtyQakhFD{5Zc7KkxIl(G$m70Jns z?O))4#w_XMk3Vj(5_haxp+ah-9b?f&NF;|otsnHZI)1)vJ?ZuLWgJsSgP)B zz>juC2UBuU`l=k|V79UBW+E9@(CG_PfC4`x9ot@5YA{j&+XS$bzN4O46_A&ghc&gf z8nm1V`VOXr$rJco&ph)?^R?GrOI*5iDF)IYoBFQhW%)&1z^&RrnygJ`30bFF60j__ zLt!0@EfI>7n3ze(zus5MCR?rWO$BWw*ajSGi0^k+1)-sK_$Sw3HU58kY7Vt;+mqi@ zLX}m;B22=hdS+MN+C(wk-xM&E0-|x$wya0Wu#lKtSr8h0Dthb|8^zYvv4$AOB87LdfUS@E%Qf#ScL4BlGejG48zQ4J+sYZSd34TrT%FfP)Ng6dT zv@5efOFNje(QK45KTvisFkBd|5w?LT@L98Fd7$*4efC+9%?Im9J0zUcE@2I#GsM8K z#BK^Gw+>j^fg!eY(1WSw#;`QTMzJs~up3o&=f;Bo2i7SgBO{~H3DRmbz$XTWSb$N@ zHaY=Iv1fdTi4FZeeLs4Azjbxe4t%%pE8+m)lTJFx!-J18Z{EBB_X**Lj8%S+kMfb~ zGL)b#$N_YvMF5L2Q3#u>R1a&=>t)OeW-@^IDJ40bT4ngC)_0iUtd#15wXDoOe!>!X z1miJ$HlYq-`jnsqIepy4$brYkr3O2-j zV3CNwy8G_C5yJyB!(6mz5q3j!<{QwB!b&9NQXrj5$(Xmi^I04x<} zqy`mbM#W-=>VqeA5&7th2JM3NbdNszC>W4ee+K1ZCT_vc#B3fR0`{Igd#p$^p-w%~ z_DNS|uw@vIC6_dX^+^SY!juPqVpBc+JWmx2df8={Va+LFF*nQ4Ub%9m1&iSbfLp{# z>N3=3Uu`$Gca#iE?&WP;aGH6%o@ClnSVo&SeN9=cs9ieuv@%E7iBb-M4R_ zV5d-cHcPN}(0u#tw=qR-GjPSiAkbbyo{B->0#IVIA_jSivg3JGc74Xt$(WQ5MUhcV zCZWH6vbEOB8s zUZn%-T>z?O%a)0AG;!<~0!Ec@Q#s=i0s$tD-ByPV9f}j5jD-sqVq(Q|#wbRydPFVk?jmmpPaTV- z*iL9CSz8AgF&gS4J;DbdG87W(5SjY>k2#SaR&gMFw0tU4#LygX;#|tmK zV4rr{X*7EDXvE|QkW%1)_d}^+VgMX3xZnbSn=xn39Am+P1=t(P#{JR2Rsn`?TA`!4 zEgf;w2{bC6S7p~t6K5W3&`{v49bM&m#$YoYRm9#o8J650rxDZ8pF=z06M)9724G^m z`|i8+>8GF4iWMttxALm`DVC;N6q04z>Nf?FDj1ecb$j;g*>v^QSBqd!$O^il#~xzm zPYh5viXLX-si&T5%$PC5+^}JTy?XU(yP0-qbljIp075X$7Mmqh=ClVJ^BV~kmb>lQ zw}EzAgXy5RCv7V`7_2)`>nrjn2T$s3dCq8G?HSN9$haLyMeUpz!y}@?8;}R(E7k&Vzmu)s3`E4`m?ze zENZ$|_Zy*@FnuEVu%vm{+_6x$a;PiN!gF8`5H60XhtPKH*l|P+3zh+J05ifaiVCRk ziH-rE7W@Oc{{f1o?o)MvGQm8>HY?aBCR%4#KrK6qtva5b7nlls718pN4pJ}%(r1_e z8fXuEH)YBc8*B?lxr1%NCkM8Ld(@~8&__F>9mbCz59d6h{Ec_sc?So5*m8#fSHN-l zXcS<9ZNj%0rQK~6wXT~?nn~Y;wVf~?T99Q|coyzQ-ywF*V z`WsiTUcKm^d+xy?CH!HCm(mx4%Sop2dz4-&i$b-V8qCoS$}Ir-gY8Y9KHY}?VKBkz zH`rMOvVzRi1O@)ag=Y|+1D#>B6@j)`?P1H{+9vf>`sX~$QS~VRGXozTjhn@dVWH)% zK+qpN#0t2#+@fuD{ix7Bg?|o^Co$*^dRiGDAFK&}yk}o<$fj?N0d0%T{$1L7PVJgw zwr$hLC{H;+6{&?(UUiUJ7knMnY~BSmp_$>?#@4O6QM=YB(#ISh2s7*lK4(`F%5bl#$(A|YgS26Q?l zTy)rB!-k19gP3i>Z%zTp1)xnDA0yYGL4y!3A$(z~OiHNoJ5gYiQTJz{c89 zlo9%Zd$_G^)z6*IegGI47A9xVC!NvvM-ezG>92v2uOhIeV2ioi-~FErw3adSQfls-G@ep&L??>_sljrwL8Vk$*82V>H}0-d4S3* z_cHq`V^&qi74cEMuZr5YIg#42d0AAljq2*FD8a0yQcpTncw19VYF~p|C3wiU+2B(0 zPy!m+09arh02>xcL`N(}F6)yw;VJQN zzx`I2c|(Q_F&GSOn27)s<%?6%@=#KM3WJ-7L4%W7g0=V!?FayIJH`sYjCR84jD(J& z1_9L;08_{bX1sHNQl<`mzx?vcMTbOt0Jx&DaFiPz8M242;BV*(-iJ-_09wcwZ5b)_ z1@8n%stpCzAOHY^F2EeqeOr(R+7ImkQ%q-+_%2#`Q7*8d?c28t1`NH?bsBQQcbF8x zY2rpbuy} zEULz0c_+I*V!%rDgnS!GJj#^^gVvgTHMG??g6gsNp6v^*e-57)z)Eb^a4+<*(OPYl z8-uL3edpR#P!(8za2j>+d~Ocy+R-?v*B~RWOTJNBQ%oh5yQrkRfXd2uv$9uEZq7i; z&d8&cYo~^0WcVFr)Q+lcHUm==nJ(~q>oeGv5gUIsT26vxFX&tlx*nmd({1HXK?lXi z3t@td;MgVAhyWG{XVa!lV&u>!afD()nOMPXj2>uUD1#1I5CRlR-!n+fv_N=Z7b;KO z4}qf$%u0lkV#LP#oy$;klLEh?V=;AyDJ7oQ0TAU@odETXmX|VRkQcyLDJ7Ipbs&HU zloNoBI^dlOB=IZ&>8h))Qb#t4GT@!7R;{uz7(gMR_^2NMQa5+do?J#74B}@$`ICq;^wLXh$O8AM)fX%~q2~Y-{$2Rf z07A-Xugp)hKUnPO(W3=Z!{DnXT)>?5_H;5$-UBJO!gY~p3+R~ z%gS@9h`JeKk3DkR^G$BPXPS&Qer8-H{716&2~Fb99@hM||Ddzh|H~NJZ=i8nzaJS1 zX(t*T+nhqR^+i-uS3=pDY(g-Al~?S;=2e^FmFRVWazW4lLMX5*hca{UoB}O1 z%PB)PT=RnIh`eBuAursE4uOt^I-^aXhyWJV5!L$u!aNGYX)Ef8x}a^)b^t)s51kP0 z18~DVstuI64KoAp1$cn%fT;rfH2+JZy~XfebqbcsERbfQg!6)FwR|%~+#60B^OI8ZH15@LO$y@sdb)MFoPj$#cU$onx1AA?8wwN}p zZ9h7m;whfu>Hkk^?88b6BN5g~1B~_^yHVfXr_#RNt7wnallFK9P@S2Mb^al+!bq2s zYf}w_S4Am_!wiq{;MaJHr+E5)rp9xxty`(fpsY;hvdK6A$+3B;lVKSeV5xrtxIFT2 z1}?Lj!LQCF%V#`LbOZf8^#glr=9MD2vD#@{$ZhUg*2}3`T$#j5~6TnFO zw?E|a5_|g<(!0iu_Pd9(X>ee*{Y1MpR2fLN4;VceraU2kS$IhgKjROOnbnre+Df*K z{fv8lgN|VVWjw`GJpG^mOM(p8RceM{I8?`=Rl_D?z$d~UFgYlGR{#aym0(r!S>f06 zXrQM4tzH&jrc_Gb)b+M6+V=|K$ckY!+fFhM8#P9{28{CVV1P0@@j4hg?eV`>3L<;;2sDh^KgprymYrHK2q7uCNb_ zKaHSuM+{OvRs8~(QOGWDA}lUMw0i%&n6YoujTYP$|%!Z4oV tDW3j+CF5AnNsFg=il=xwUg>`Y7y#&h8b}r0$eREF002ovPDHLkV1oK_x5)qi literal 0 HcmV?d00001 diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php index bcf98fc6f..feff1c228 100644 --- a/upload/includes/init_bb.php +++ b/upload/includes/init_bb.php @@ -177,7 +177,6 @@ define('TOPIC_WATCH_UN_NOTIFIED', 0); define('POST_NORMAL', 0); define('POST_STICKY', 1); define('POST_ANNOUNCE', 2); -define('POST_GLOBAL_ANNOUNCE', 3); // Search types define('SEARCH_TYPE_POST', 0); diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 8cf151026..0c25d53f0 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -3192,4 +3192,6 @@ $lang['SEARCH_NO_RESULTS'] = 'No users match your selected criteria. Please try $lang['ACCOUNT_STATUS'] = 'Account Status'; $lang['SORT_OPTIONS'] = 'Sort options:'; $lang['LAST_VISIT'] = 'Last Visit'; -$lang['DAY'] = 'Day'; \ No newline at end of file +$lang['DAY'] = 'Day'; + +$lang['POST_EDIT_CANNOT'] = 'Sorry, but you cannot edit posts'; \ No newline at end of file diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 02ab28a86..87c970077 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1827,8 +1827,8 @@ $lang['USER_LEVELS_UPDATED'] = 'Уровни и права пользовате // Synchronize $lang['SYNCHRONIZE'] = 'Синхронизировать'; $lang['TOPICS_DATA_SYNCHRONIZED'] = 'Темы синхронизированы'; -$lang['USER_POSTS_COUNT'] = 'Количество сообщений пользователей.'; -$lang['USER POSTS COUNT SYNCHRONIZED'] = 'Количество сообщений пользователей синхронизированы.'; +$lang['USER_POSTS_COUNT'] = 'Количество сообщений пользователей'; +$lang['USER POSTS COUNT SYNCHRONIZED'] = 'Количество сообщений пользователей синхронизированы'; // Online Userlist $lang['SHOW_ONLINE_USERLIST'] = 'Показать список пользователей онлайн'; @@ -3218,4 +3218,6 @@ $lang['SEARCH_NO_RESULTS'] = 'Нет пользователей, отвечаю $lang['ACCOUNT_STATUS'] = 'Статус учётной записи'; $lang['SORT_OPTIONS'] = 'Поля сортировки:'; $lang['LAST_VISIT'] = 'Последнее посещение'; -$lang['DAY'] = 'День'; \ No newline at end of file +$lang['DAY'] = 'День'; + +$lang['POST_EDIT_CANNOT'] = 'Извините, вы не можете редактировать сообщения'; \ No newline at end of file diff --git a/upload/privmsg.php b/upload/privmsg.php index 29d8fb58e..0f3987871 100644 --- a/upload/privmsg.php +++ b/upload/privmsg.php @@ -1117,7 +1117,7 @@ else if ( $submit || $refresh || $mode != '' ) 'NAME_FROM' => $userdata['username'], 'MSG_SUBJECT' => html_entity_decode($privmsg_subject), 'SITENAME' => $bb_cfg['sitename'], - 'U_INBOX' => make_url(PM_URL ."?folder=inbox$pm&mode=read&p=". $privmsg_sent_id), + 'U_INBOX' => make_url(PM_URL . "?folder=inbox&mode=read&p=". $privmsg_sent_id), )); $emailer->send(); diff --git a/upload/templates/admin/index.tpl b/upload/templates/admin/index.tpl index 4c830b95f..0d17296d6 100644 --- a/upload/templates/admin/index.tpl +++ b/upload/templates/admin/index.tpl @@ -84,21 +84,21 @@ ajax.callback.manage_user = function(data) { {L_DATASTORE}{L_ALL_CACHE},  - {L_TEMPLATES}  + {L_TEMPLATES} {L_UPDATE}: - {L_USER_LEVELS},  - {L_INDEXER} + {L_USER_LEVELS} + {L_INDEXER} {L_SYNCHRONIZE}: {L_TOPICS},  - {L_USER_POSTS_COUNT}  + {L_USER_POSTS_COUNT} diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl index a4636b8b2..34ae8f740 100644 --- a/upload/templates/default/page_header.tpl +++ b/upload/templates/default/page_header.tpl @@ -126,13 +126,12 @@ function initSpoilers(context) } function initExternalLinks(context) { - var context = context || 'body'; - if (ExternalLinks_InNewWindow) { - $("a.postLink:not([href*='"+ window.location.hostname +"/'])", context).attr({ target: '_blank' }); - //$("a.postLink:not([@href*='"+ window.location.hostname +"/'])", context).replaceWith('{L_LINKS_ARE_FORBIDDEN}'); - } + var context = context || 'body'; + if (ExternalLinks_InNewWindow) { + $("a.postLink:not([href*='"+ window.location.hostname +"/'])", context).attr({ target: '_blank' }); + } } -function fixPostImage ($img) +function fixPostImage($img) { var banned_image_hosts = /imagebanana|hidebehind/i; // imageshack var src = $img[0].src; @@ -171,7 +170,7 @@ function initMedia(context) } } $(document).ready(function(){ - $('div.post_wrap, div.signature').each(function(){ initPostBBCode( $(this) ) }); + $('div.post_wrap, div.signature').each(function(){ initPostBBCode( $(this) ) }); }); @@ -185,32 +184,32 @@ var LOGGED_IN = {LOGGED_IN}; var InfoWinParams = 'HEIGHT=510,resizable=yes,WIDTH=780'; var user = { - opt_js: {USER_OPTIONS_JS}, + opt_js: {USER_OPTIONS_JS}, - set: function(opt, val, days, reload) { - this.opt_js[opt] = val; - setCookie('opt_js', $.toJSON(this.opt_js), days); - if (reload) { - window.location.reload(); - } - } + set: function(opt, val, days, reload) { + this.opt_js[opt] = val; + setCookie('opt_js', $.toJSON(this.opt_js), days); + if (reload) { + window.location.reload(); + } + } } $(document).ready(function(){ - $("div.jumpbox").html('\ - \ - \ - \ - \ - '); - $('#jumpbox-container').one('click', function(){ - $('#jumpbox-title').html('   {L_LOADING} ...  '); - var jumpbox_src = '{AJAX_HTML_DIR}' + ({LOGGED_IN} ? 'jumpbox_user.html' : 'jumpbox_guest.html'); - $(this).load(jumpbox_src); - $('#jumpbox-submit').click(function(){ window.location.href='{FORUM_URL}'+$('#jumpbox').val(); }); - }); + $("div.jumpbox").html('\ + \ + \ + \ + \ + '); + $('#jumpbox-container').one('click', function(){ + $('#jumpbox-title').html('   {L_LOADING} ...  '); + var jumpbox_src = '{AJAX_HTML_DIR}' + ({LOGGED_IN} ? 'jumpbox_user.html' : 'jumpbox_guest.html'); + $(this).load(jumpbox_src); + $('#jumpbox-submit').click(function(){ window.location.href='{FORUM_URL}'+$('#jumpbox').val(); }); + }); }); @@ -218,17 +217,17 @@ var ajax = new Ajax('{SITE_URL}{$bb_cfg['ajax_url']}', 'POST', 'json'); function getElText (e) { - var t = ''; - if (e.textContent !== undefined) { t = e.textContent; } else if (e.innerText !== undefined) { t = e.innerText; } else { t = jQuery(e).text(); } - return t; + var t = ''; + if (e.textContent !== undefined) { t = e.textContent; } else if (e.innerText !== undefined) { t = e.innerText; } else { t = jQuery(e).text(); } + return t; } function escHTML (txt) { return txt.replace(/ -$(document).ready(function(){ - $('.tablesorter').tablesorter(); // {debug: true} +$(document).ready(function() { + $('.tablesorter').tablesorter(); }); @@ -284,13 +283,13 @@ input[type="checkbox"] { margin-bottom: -1px; } var dev = true; function OpenInEditor ($file, $line) { - $editor_path = '{EDITOR_PATH}'; - $editor_args = '{EDITOR_ARGS}'; + $editor_path = '{EDITOR_PATH}'; + $editor_args = '{EDITOR_ARGS}'; - $url = BB_ROOT +'develop/open_editor.php'; - $url += '?prog='+ $editor_path +'&args='+ $editor_args.sprintf($file, $line); + $url = BB_ROOT +'develop/open_editor.php'; + $url += '?prog='+ $editor_path +'&args='+ $editor_args.sprintf($file, $line); - window.open($url,'','height=1,width=1,left=1,top=1,resizable=yes,scrollbars=no,toolbar=no'); + window.open($url,'','height=1,width=1,left=1,top=1,resizable=yes,scrollbars=no,toolbar=no'); } @@ -431,7 +430,7 @@ if (top != self) {