From 595bd262f734c6e37b9255a78c7df6f4babf14e3 Mon Sep 17 00:00:00 2001 From: Grischa Brockhaus Date: Sat, 21 Jan 2012 16:10:06 +0100 Subject: [PATCH] commentSpice: * Reload rss if homepage url changes * Configure max entries loaded from rss * Beautifying inputs and descriptions --- .../UTF-8/lang_de.inc.php | 15 ++- .../frontend_commentspice.js | 11 ++- .../img/commentspice.png | Bin 0 -> 4401 bytes .../img/rss_icon.png | Bin 0 -> 1286 bytes .../img/twitter.png | Bin 1681 -> 0 bytes .../img/twitter_icon.png | Bin 0 -> 1254 bytes .../img/twitter_small.png | Bin 927 -> 0 bytes .../lang_de.inc.php | 15 ++- .../lang_en.inc.php | 2 +- .../serendipity_event_commentspice.php | 88 ++++++++++++++---- 10 files changed, 106 insertions(+), 25 deletions(-) create mode 100644 serendipity_event_commentspice/img/commentspice.png create mode 100644 serendipity_event_commentspice/img/rss_icon.png delete mode 100644 serendipity_event_commentspice/img/twitter.png create mode 100644 serendipity_event_commentspice/img/twitter_icon.png delete mode 100644 serendipity_event_commentspice/img/twitter_small.png diff --git a/serendipity_event_commentspice/UTF-8/lang_de.inc.php b/serendipity_event_commentspice/UTF-8/lang_de.inc.php index 969f2399..f1f801c0 100644 --- a/serendipity_event_commentspice/UTF-8/lang_de.inc.php +++ b/serendipity_event_commentspice/UTF-8/lang_de.inc.php @@ -1,10 +1,23 @@ Twitter Namen eingibst wird Deine Timeline in Deinem Kommentar verlinkt.'); +@define('PLUGIN_EVENT_COMMENTSPICE_PROMOTE_TWITTER_PLACEHOLDER', 'Dein Twittername'); @define('PLUGIN_EVENT_COMMENTSPICE_PROMOTE_ARTICLE_CHOOSE', '- Bewirb einen Deiner letzten Artikel -'); @define('PLUGIN_EVENT_COMMENTSPICE_PROMOTE_ARTICLE_RESCENT', '%s schrieb auch'); diff --git a/serendipity_event_commentspice/frontend_commentspice.js b/serendipity_event_commentspice/frontend_commentspice.js index 24cd0d50..efbf6c9f 100644 --- a/serendipity_event_commentspice/frontend_commentspice.js +++ b/serendipity_event_commentspice/frontend_commentspice.js @@ -1,11 +1,13 @@ var inputComentUrl = document.getElementById("serendipity_commentform_url"); var inputComentText = document.getElementById("serendipity_commentform_comment"); +var lastUrlChecked = null; function fetch_rss() { var url = inputComentUrl.value; if(!url.match(/^http/)) return; + if (url == lastUrlChecked) return; var divSelectRss = document.getElementById("serendipity_commentspice_rss"); - if (divSelectRss.style.display!='none') return; // allready done + //if (divSelectRss.style.display!='none') return; // allready done if (window.XMLHttpRequest) { // Mozilla, Safari, Opera, IE7 httpRequest = new XMLHttpRequest(); @@ -28,8 +30,10 @@ function fetch_rss_ready(httpRequest){ var jsonResponse = eval('(' + response + ')'); var divSelectRss = document.getElementById("serendipity_commentspice_rss"); var selectRss = document.getElementById("serendipity_commentform_rss"); - for (idx in jsonResponse) { - var article = jsonResponse[idx]; + var articles = jsonResponse.articles; + selectRss.options.length = 0; + for (idx in articles) { + var article = articles[idx]; var option = document.createElement('option'); option.text = article.title; option.value = article.url; @@ -41,6 +45,7 @@ function fetch_rss_ready(httpRequest){ } } divSelectRss.style.display=''; + lastUrlChecked = jsonResponse.url; } } diff --git a/serendipity_event_commentspice/img/commentspice.png b/serendipity_event_commentspice/img/commentspice.png new file mode 100644 index 0000000000000000000000000000000000000000..ff560d7c099a36dffe2e1d2342499e1dcee90522 GIT binary patch literal 4401 zcmV-15zg+3P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000J9Nkl}i^(DDtPYg2%yLEc^v=nz9(4$Wu zMmAub*+}){Fy*CRpNaWGYWd*J zL;B^D&DQ8ho*xtqx2Td1I-e$BQwaM1b$ufAn9b!mywYa&jknlyI$@l`Ibh zJ{?nF|3sAsCyIPA4Il_;M-Hsx-q=Df0aF3Lv@zpX6=9lO=0E~4Ig%h@Z_Wb>;7VY+ z5F~6$beJS+-s_Cp9~c;({67?;HSt(50cfHBq);@|`NzCM{DHzn4OnIqGE6USYz;%0 zEQ1$hQQK&J@UKMy3YgqS@zNP^PfPg8ZQc5-bfOL_v-rbzv;6N9+b6g13D0L<;W!E; zHv+(0129a;&&*iqesZ^9a_?j1=qqTcgZPlzSv)$~TQ=A#Y zR2(Ab(PRp{_$F>i(GFX^TRG~@a1SYq>R6E+EpJxsx)itu5OAC1s7eSL77T9jpE z23H)xwhgYCMMgXQ`;8v%;w7}5{niBRA|$85b-=BHYw;tL9VGk}18y0TBO4h=63~R6 zH8mv66JL0pAOzRTj7cs_PgCkgYz4$XQU|XLB0!32ljj&A(H>vIWbSHrBLGs+geA9X z@W&m*iUy!@1`g?`mC3%-#jFHNK0E80V0t9p&5QxxM7a=b1sS?B9S4gr1}w+i!rL90 z42mW%xI|HR86YWOhal=(x}9!&j@~l3b{1Z51k5CVBhT|Vo=uF?=|M+)tb{l z0L27i2a)BtTj0C?7*D!hmR{m#^*|HFo;iU#3r2wuDm%dUvA}OVpO;)hOLhIJV_+$M z@=jsbG`znIv8C2ij`&4JZ4Aa_YR5t_39Bc;FMu}(g&K7J#IfNTx4Vx(sRltVd-fe` zm#z;$L@1Qt;c0k$3hp#~K30Ar6=>HX-yd_mD$s_s3c(z>c?ep(_~Igue*Y9q%)sss z!`wtRBmCFWW6y5@K)#%LI$VNXRd^)er?-ysNUIBJ1fFD$)rR4`1t&1ogT3>7`oK9} z?(1C#zb{-HfaF2~UnnY+a^$D)lH$%i)7`J#H`SYKv@%*n;H2c+E=t2dUGj&P_v3FZ z*k_E~#akWJM7Oi^i)Co5IA97t|gYOYXa;VsC55e)C_Q@b8D4g@a|!)vJ~C z{I6CU$9rBR>Y?pRSM&d!0Q_}c2_l5lPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FTR01FTSts}j400007bV*G`2iyS_ z4h|4{CFltN00f3fL_t(I%Wafjh*WhH$3MT{{oT1Udv|7M*G>12%4+VgE|`B1*^;C% z`tug}5L94b5%wSy#P$@384;Ne6$MgKhGa_SLtv1-XqFJ0hRFVD+thV;U1xW8cXsaF zx%d8lzaB;xk`5dW=RABk=kPs8aGzOg5kk<{*Vnpr>(=#Q7;ay^dUa=|Qb`FRxaU$z z?$3=ecLe`qyLRn5+|$$ZiVz~>IF6K3;yBI{L`uoMn&UVKQOCq_JpLbGcX#*tO`A5I z$>nn0#u&=wMJm;Ru9Y2_D8!KxM+zJ%a2<)`NDz<+k90Oq9LG18fSsM4g`S?Cp}Va! zSDNA3$NSj4whdPYaD3l? zL`wNm7$xHAE{}Xtq9ZG4Zd*mTIM1TUu)KF0xySa9Ds0CYJ&&%;QB7bzf|(F5m75qT zOMnICy6z6GwOG-brFs4;%NwCRV<;Vaom3iHT^Mcaq2aZYboA_m{ex8BSV^f;WF~|= zRj9-kV+;T?pU-ENQg~sBjvTDaLf7&f+ul1z_x_(~dFEx-l?Q1%w1MgG4q}x@=ACQI zh$g10FuqtHTWgKh8Y!hjDMeZdR%h$Lwq_sEyb7~!2kG5M5QlDISFFc7{Wh}~PvK-A zz;1hiTMIA|KvfHpIK~)L2f9j;aUE9r(4K~ta1wQJ1Ie3hjGg@)o9{sM|H7>Bxc+57 zLcqEg4{*H*(*fL=4N0`d7?ViHaY%U{4W6Riht>vYav`%~EltmVNXO-)l+JyD@|!Ww z9cK8CznK~RlU#EPwa&HN38ADNk|e=e`>Rw+;dvfu*I}6lIR&l&`_^yp@NUL-9%Sm1 zJpgn(^(wbCT>kMi0HSpblU^s~pk}q!L{W5Hxvq^w_4{_5n&)}vl@Ox-F*G1S>$+g|rQ>9OKF(AE zw_}+6>V1jh($ literal 0 HcmV?d00001 diff --git a/serendipity_event_commentspice/img/twitter.png b/serendipity_event_commentspice/img/twitter.png deleted file mode 100644 index 6949dcf2c8beb942352b48dbd482737df6c3f368..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1681 zcmV;C25$L@P)A}hH==>YTPkpzJAeLzQy-sPt!uSpT>$1>F*;lf?}yX6>XXvdklNz0 zz?8<>wJ$Gzb#8Ta^?Pfrf3INqLhHf(D>Q%Lr9U2QQA118Qjn7IEciN#2qOKpM-Rc| zID6D$NSlkGz2Gmmj+W|@HrnmK4jw%CCYadL5#&B$@&h;SZ_(Kotkw`jarSG ziJ}<*YG|BmiW*8%okfRpjRgo;WCU0SV4&2%(%e|uNpm{>+*72o^Z;HpA=?Fj8W0+` zrVgb^Js}MMI?*JdSVEbEA`8hSD;56Quu@j&%@)C_RAs<=M+*c11fJ!4>70o%AauO& zHx?gcLQ)1LN-6IG6_xOaWdPX^U_DsVwH(6y+>wSRWeaz>Dgfsq3yyY;BWnlmeU|BR ztXTYJP{;se^s@vYjHA~VnsjV=fp&4D}KrhF|o^Vy2KICTTMWEV zs63zSS?ep9^ufcExv1dyyraZd_)y(w0LalClwWT3=^z{C!C-h?!H&A^KW zukiqp_Lv1gR(rUh4`rP`lqZ5$2J#7x0j*5>6x_u7M23a^5dbovkcY0a_WBE0zLCfE zntj06TZURa)Q!2l(vXAC;*nFs#)z{K#O{m!Ro+sfLk&eonl-w;?W(I!ag?i(Y+cLD6b-RhLA=Te*K z^kGd$v0z6NRhE5-W|FNEKn-E)}9UBVY+gPL$ zA>w>tu1P(v9wPubB4UqM9>b~g-5p1d&{lo)tfEJ#Z2usw*7Na3^yof-K%`zrxmIwa zG|Zx-2?UJBK+(Gf-h~}nA?}Gn@3x0gSRZw^ZE+)aG zc3qb?4B;bQin(pF5$?!9E-F2A_dneo=3Vhw`E%~36A_hj1+`%n6RxsR88Cn{5p#*x z>pXaj+~lo^it@z6L`Gb^&SP+h!9K$j02muuK_OFqgeYg~!ZJ67z0sgGX6g`}rqV#$ z0zfBMN&CISwDiph8Pb)eyfO281VQf{#%*_IowsNM7vy=q_37tdoH=#!!`1iaY00^f zLNFx=T#37nY3;MGzdZ|`ow5QZ++d3~A2+AdazGh?DI9?<*)|QEs|k5XQ)R%7G~Sit be*p#n6HV@m+Sq4T00000NkvXXu0mjf(*F*O diff --git a/serendipity_event_commentspice/img/twitter_icon.png b/serendipity_event_commentspice/img/twitter_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f6bd1c02d5f2c0e7833d45f9f5be55ba26f054a6 GIT binary patch literal 1254 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FTR01FTSts}j400007bV*G`2iyS_ z4h<~{VE5Yq00d@9L_t(I%Wag)Yg}a*#(&@CoS9@U$s|ptB{oE)X%(&iQUGrY*Gi z!pqC|E`GcpJkKL|szL||AvksF)UFdJP8`Ux?DXvH>`am*u@HhsEv4k?xA%Ta@IQ6# z+_^6n78X7bLX0S-q?8h+)MJR0l1DqG6haI!#+bDyfcy6CJ8NG zCd|yvkz0q<8X*-zDYViEr4Uk}on>saj4@{QF>q#PW`1E|Vd>%NwAyV>zxg(MUpPXJ zMvc}{l^U{ALylAt@hCDbfl}Q0@jQdS|HK-zs&C%B$^860Q55~Wva&*vXW`&WuZZVQ zzCpWGqkFG~sx?p|pp--@jSvdyCBk?Dj*V8A_R0#@TJ-$FD6p|1;-sBYNfFwyU#-I-#Jh-RR>70wAC=84d zw?z%rbD-g~w_fAqb2GgE!xgUTag?Yc-3TI&2+rb*0WR60x|8726aby3>7gi!$~MnL z@CR>$tR!ca9JOT1tu58XK31 zn|p~G)9A(&zB&m~1Mtqp>s)pd__T*lcMv9LR7=eEJxptzkPk4{5@|gIMp|RaBj~AT zh{h(6wFY9OM&>~XczJFYi`^!&7h@%a&L(DS4b$1eb+$>?|3O-dlG19W6mhA99T|nm z-4BIZL+hAdHxiESD)aG~L!7za!`R(;Gr{fkF+Mqe9lO1W?X?j74%S+tD7vDx9)2q? zl~H4p$heGD5y3mYUMV=1|HbJ;`#IjM07GLPZPxjG(4y1cU@B|T@Arb#S`iRl1w^dC+bJsWgD7R4QMst*w1@?AS3D z7Z)D_jlpLb_kOv6DGGcDc<*t}Ju$7dIOm8FJ)PFd1+}W1-N$Y+T)P^541&8Xw%60 Qj{pDw07*qoM6N<$f*r3=UjP6A literal 0 HcmV?d00001 diff --git a/serendipity_event_commentspice/img/twitter_small.png b/serendipity_event_commentspice/img/twitter_small.png deleted file mode 100644 index e58e1f0489466d30bf70655d197e8ede6d218ef5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 927 zcmV;Q17Q4#P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS$ z0UHAM*}xe900SRML_t(I%axSRYh6Vg#XsjebMJe}ON=!?1wpV~wV0jNjZ4vgL<+Ur z;zEiDO1g3rSN;d?+zCM!E*bN<#UteEG05@;ldh6pmAAIIHhwLr@$H^JI{b^?$XS$x< z>=r`v$=2QXwzs#x5n#h72lsal{FVLTi1}W@pbX5%z7{JC&S;CS68n@Af~$VUk^_CV|c>Ce2>LmWU&a$7m2#iBcjM)b2zH&rVapQt7DQ;>2mST84(YQ3In4p@GXUTw((Vot%N39}kW=tQt~+ z<)&46hM_a@f|DG{IY1IshLZ$B{B$A;zyv{1JG|KM@yjp~lX09hd%QCbD*~rP3?mY# z9mW~@=Da!pNo0p;@VsTd+N((zP0oz7Avxzf9DC$(705Dl3V%-E-Vv;ou=C)My-}hc z#5iT1){bNh3>LBz+zIPC@8M|`cw9v=qc13>mSuuoQSjHXy4DD-qzI!54knrXz7cg! zvO_GOa0ucQD99`X<1~vm*B5zhCE+-ZC~!Xiz2aHzv_2GFOP`U90#fXrxww13;oZxD zFaHtW9>FBXStT>@_6B_Mph0TSa<(YmwYtd=0>R!Gb{;m|cscU@v3OK>U=G&?u=_VC z1T6cxfSNHB!o2Mg1f^j234C{$cxP2Cbvq^aVIOu6MS*blmPE_TBao3h4pv($A+?8l z-DO`t{BH>MP#bHtrtvldtgYzj^%bEUTK2kNw0djk^%V$ZPg6j@{o&S)tvk23Z6n2* z0~dyrXIXmxqfc)FaP{i7vm4a4>_x{pJ)4`G{0k(?RGzDBKcfHu002ovPDHLkV1i4< BoMiw2 diff --git a/serendipity_event_commentspice/lang_de.inc.php b/serendipity_event_commentspice/lang_de.inc.php index 1394fd2b..65ce5568 100644 --- a/serendipity_event_commentspice/lang_de.inc.php +++ b/serendipity_event_commentspice/lang_de.inc.php @@ -1,10 +1,23 @@ Twitter Namen eingibst wird Deine Timeline in Deinem Kommentar verlinkt.'); +@define('PLUGIN_EVENT_COMMENTSPICE_PROMOTE_TWITTER_PLACEHOLDER', 'Dein Twittername'); @define('PLUGIN_EVENT_COMMENTSPICE_PROMOTE_ARTICLE_CHOOSE', '- Bewirb einen Deiner letzten Artikel -'); @define('PLUGIN_EVENT_COMMENTSPICE_PROMOTE_ARTICLE_RESCENT', '%s schrieb auch'); diff --git a/serendipity_event_commentspice/lang_en.inc.php b/serendipity_event_commentspice/lang_en.inc.php index 93308934..212ff803 100644 --- a/serendipity_event_commentspice/lang_en.inc.php +++ b/serendipity_event_commentspice/lang_en.inc.php @@ -1,7 +1,6 @@ twitter name, your timeline will get linked to your comment.'); +@define('PLUGIN_EVENT_COMMENTSPICE_PROMOTE_TWITTER_PLACEHOLDER', 'your twittername'); @define('PLUGIN_EVENT_COMMENTSPICE_PROMOTE_ARTICLE_CHOOSE', '- Promote one of your rescent articles -'); @define('PLUGIN_EVENT_COMMENTSPICE_PROMOTE_ARTICLE_RESCENT', '%s wrote about'); diff --git a/serendipity_event_commentspice/serendipity_event_commentspice.php b/serendipity_event_commentspice/serendipity_event_commentspice.php index 70e52f2c..3cf0242e 100644 --- a/serendipity_event_commentspice/serendipity_event_commentspice.php +++ b/serendipity_event_commentspice/serendipity_event_commentspice.php @@ -15,7 +15,7 @@ include dirname(__FILE__) . '/lang_en.inc.php'; require_once dirname(__FILE__) . '/DbSpice.class.php'; require_once dirname(__FILE__) . '/json/json.php4.include.php'; -@define('PLUGIN_EVENT_COMMENTSPICE_DEBUG', TRUE); +@define('PLUGIN_EVENT_COMMENTSPICE_DEBUG', FALSE); class serendipity_event_commentspice extends serendipity_event { @@ -33,9 +33,8 @@ class serendipity_event_commentspice extends serendipity_event 'smarty' => '2.6.7', 'php' => '4.1.0' )); - $propbag->add('version', '0.1'); + $propbag->add('version', '1.0'); $propbag->add('event_hooks', array( -// 'frontend_header' => true, 'frontend_footer' => true, 'frontend_comment' => true, 'frontend_display' => true, @@ -43,9 +42,10 @@ class serendipity_event_commentspice extends serendipity_event 'frontend_saveComment_finish' => true, 'backend_deletecomment' => true, 'external_plugin' => true, + 'css' => true, )); $propbag->add('groups', array('FRONTEND_VIEWS')); - $propbag->add('configuration', array('twitterinput','twitterinput_nofollow', 'announcerss', 'announcerss_nofollow','plugin_path')); + $propbag->add('configuration', array('twitterinput','twitterinput_nofollow', 'announcerss', 'announcerssmax','announcerss_nofollow','plugin_path')); } function generate_content(&$title) { @@ -88,7 +88,7 @@ class serendipity_event_commentspice extends serendipity_event $propbag->add('type', 'string'); $propbag->add('name', PLUGIN_EVENT_COMMENTSPICE_ANNOUNCE_RSS_MAXSELECT); $propbag->add('description', PLUGIN_EVENT_COMMENTSPICE_ANNOUNCE_RSS_MAXSELECT_DESC); - $propbag->add('default', false); + $propbag->add('default', 3); return true; case 'plugin_path': @@ -110,13 +110,17 @@ class serendipity_event_commentspice extends serendipity_event switch($event) { case 'external_plugin': switch($eventData) { - case 'spicetwitter.png': + case 'spiceicotwitter.png': header('Content-Type: image/png'); - echo file_get_contents(dirname(__FILE__). '/img/twitter.png'); + echo file_get_contents(dirname(__FILE__). '/img/twitter_icon.png'); break; - case 'spicetwittersmall.png': + case 'spiceicorss.png': header('Content-Type: image/png'); - echo file_get_contents(dirname(__FILE__). '/img/twitter_small.png'); + echo file_get_contents(dirname(__FILE__). '/img/rss_icon.png'); + break; + case 'commentspice.png': + header('Content-Type: image/png'); + echo file_get_contents(dirname(__FILE__). '/img/commentspice.png'); break; case 'commentspicefrss': if (!serendipity_db_bool($this->get_config('announcerss', false))) break; @@ -130,7 +134,6 @@ class serendipity_event_commentspice extends serendipity_event case 'frontend_saveComment_finish' : $this->commentSaved($eventData, $addData); break; - //case 'frontend_header': case 'frontend_footer': $this->printHeader(); break; @@ -143,6 +146,9 @@ class serendipity_event_commentspice extends serendipity_event case 'backend_deletecomment' : $this->commentDeleted($eventData, $addData); break; + case 'css': + $this->writeCss($eventData, $addData); + break; default: return false; break; @@ -157,6 +163,10 @@ class serendipity_event_commentspice extends serendipity_event } function cleanup() { DbSpice::install($this); + $announcerssmax = $this->get_config('announcerssmax',3); + if (!is_numeric($announcerssmax)) { + $this->set_config('announcerssmax',3); + } } function printHeader() { global $serendipity; @@ -278,7 +288,7 @@ class serendipity_event_commentspice extends serendipity_event $articles[] = $article; $itemCount = 0; - $maxItems = 3; + $maxItems = $announcerssmax = $this->get_config('announcerssmax',3); // Iterate the items while ($item = $rss->getNextItem()) { if ($itemCount>=$maxItems) break; @@ -290,8 +300,9 @@ class serendipity_event_commentspice extends serendipity_event $itemCount++; } if ($itemCount==0) return; - - echo json_encode($articles); + $result['articles'] = $articles; + $result['url'] = $comment_url; + echo json_encode($result); } function commentDeleted($eventData, $addData) { @@ -317,7 +328,7 @@ class serendipity_event_commentspice extends serendipity_event return true; } $twittername = $spice['twittername']; - $eventData['comment'] = 'get_config('twitterinput_nofollow', true)?' rel="nofollow"':'') . '>' . PLUGIN_EVENT_COMMENTSPICE_PROMOTE_TWITTER . ': ' . $twittername . '
' . $eventData['comment']; + $eventData['comment'] = 'get_config('twitterinput_nofollow', true)?' rel="nofollow"':'') . '>' . PLUGIN_EVENT_COMMENTSPICE_PROMOTE_TWITTER . ': ' . $twittername . '
' . $eventData['comment']; if ($spice['promo_name'] && $spice['promo_url']) { $eventData['comment'] .= "

" . sprintf(PLUGIN_EVENT_COMMENTSPICE_PROMOTE_ARTICLE_RESCENT, $eventData['author']) . ": get_config('announcerss_nofollow', false)?' rel="nofollow"':'') . ">{$spice['promo_name']}

"; } @@ -326,31 +337,70 @@ class serendipity_event_commentspice extends serendipity_event function printCommentEditExtras(&$eventData, &$addData) { global $serendipity; - $tag_comment_spice = '
(' . PLUGIN_EVENT_COMMENTSPICE_EXPERIMENTAL . ')'; if (serendipity_db_bool($this->get_config('twitterinput', true))) { if (isset($serendipity['COOKIE']['twitter'])) $twittername = $serendipity['COOKIE']['twitter']; else $twittername = ''; echo '
'; - echo ''; + echo ''; echo '
'; } if (serendipity_db_bool($this->get_config('announcerss', false))) { echo ''; } if (serendipity_db_bool($this->get_config('twitterinput', true))) { echo '
'; - echo PLUGIN_EVENT_COMMENTSPICE_PROMOTE_TWITTER_FOOTER . $tag_comment_spice; + echo ''; + echo PLUGIN_EVENT_COMMENTSPICE_PROMOTE_TWITTER_FOOTER; echo '
'; } if (serendipity_db_bool($this->get_config('announcerss', false))) { echo '
'; - echo PLUGIN_EVENT_COMMENTSPICE_PROMOTE_ARTICLE_FOOTER .$tag_comment_spice; + echo ''; + echo PLUGIN_EVENT_COMMENTSPICE_PROMOTE_ARTICLE_FOOTER; echo '
'; } } + function writeCss(&$eventData, &$addData) { + global $serendipity; + if (!(strpos($eventData, '.commentspice_ico'))) { +?> +.commentspice_ico { + float:right; + margin-right:0px; + margin-left:10px; +} + +.commentspice_twitter_input { + background: url('index.php?/plugin/spiceicotwitter.png') left no-repeat; + padding-left: 1.5em; + max-width: 18.5em; + margin-bottom: 1em; +} + +.commentspice_rss_input { + max-width: 22em; + min-width: 13.5em; + width: 100%; + background: url('index.php?/plugin/spiceicorss.png') no-repeat left #444444; + overflow: hidden; + border: 0.1em solid #000000; + border-radius: 3px 3px 3px 3px; + color: #FFFFFF; + padding-left: 1.5em; + margin-bottom: 1em; +} +get_config('installation_secret'); if (empty($installation_secret)) {