From cc1ec61b857cc793abab719c164496e8290291c1 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Wed, 9 Jul 2014 16:50:52 +0300 Subject: [PATCH 01/24] fix of issue #619 and other similar, error in JSLikeHTMLElement: node no longer exists. --- .../libraries/readability/Readability.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) mode change 100644 => 100755 inc/3rdparty/libraries/readability/Readability.php diff --git a/inc/3rdparty/libraries/readability/Readability.php b/inc/3rdparty/libraries/readability/Readability.php old mode 100644 new mode 100755 index d0f09d74c..9e77dc55d --- a/inc/3rdparty/libraries/readability/Readability.php +++ b/inc/3rdparty/libraries/readability/Readability.php @@ -679,6 +679,7 @@ class Readability } else { $topCandidate->innerHTML = $page->documentElement->innerHTML; $page->documentElement->innerHTML = ''; + $this->reinitBody(); $page->documentElement->appendChild($topCandidate); } } else { @@ -794,8 +795,7 @@ class Readability { // TODO: find out why element disappears sometimes, e.g. for this URL http://www.businessinsider.com/6-hedge-fund-etfs-for-average-investors-2011-7 // in the meantime, we check and create an empty element if it's not there. - if (!isset($this->body->childNodes)) $this->body = $this->dom->createElement('body'); - $this->body->innerHTML = $this->bodyCache; + $this->reinitBody(); if ($this->flagIsActive(self::FLAG_STRIP_UNLIKELYS)) { $this->removeFlag(self::FLAG_STRIP_UNLIKELYS); @@ -1134,5 +1134,18 @@ class Readability public function removeFlag($flag) { $this->flags = $this->flags & ~$flag; } + + /** + * Will recreate previously deleted body property + * + * @return void + */ + protected function reinitBody() { + if (!isset($this->body->childNodes)) { + $this->body = $this->dom->createElement('body'); + } + $this->body->innerHTML = $this->bodyCache; + } + } ?> \ No newline at end of file From c1aad6d5746ddb079e3b60d432212021c42c963b Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Wed, 9 Jul 2014 16:56:52 +0300 Subject: [PATCH 02/24] fix of issue #619 and other similar, error in JSLikeHTMLElement: node no longer exists. --- inc/3rdparty/libraries/readability/Readability.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/3rdparty/libraries/readability/Readability.php b/inc/3rdparty/libraries/readability/Readability.php index 9e77dc55d..4fa3ba63d 100755 --- a/inc/3rdparty/libraries/readability/Readability.php +++ b/inc/3rdparty/libraries/readability/Readability.php @@ -1142,9 +1142,9 @@ class Readability */ protected function reinitBody() { if (!isset($this->body->childNodes)) { - $this->body = $this->dom->createElement('body'); + $this->body = $this->dom->createElement('body'); + $this->body->innerHTML = $this->bodyCache; } - $this->body->innerHTML = $this->bodyCache; } } From d59536deea443f4bdac2c5cf1bfeea690810a817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Si=C3=B4n=20Le=20Roux?= Date: Thu, 10 Jul 2014 18:30:44 +0200 Subject: [PATCH 03/24] Add support for *.about.com Includes next_page_link for multi-page articles and strips pesky in-line 'next' links from the article body. Also includes an Xpath for author but I can't see where this is used in the wallabag UI. The 'tidy' option is turned off because it messed up bulleted lists. Tested with psychology.about.com and food.about.com. --- inc/3rdparty/site_config/standard/.about.com.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 inc/3rdparty/site_config/standard/.about.com.txt diff --git a/inc/3rdparty/site_config/standard/.about.com.txt b/inc/3rdparty/site_config/standard/.about.com.txt new file mode 100644 index 000000000..e1ebaee3f --- /dev/null +++ b/inc/3rdparty/site_config/standard/.about.com.txt @@ -0,0 +1,14 @@ +body: //div[@id='articlebody'] +title: //h1 +author: //p[@id='by']//a + +next_page_link: //span[@class='next']/a +# Not the same as below! + +prune: yes +tidy: no + +# Annoying 'next' links plainly inside the article body +strip: //*[text()[contains(.,'Next: ')]] + +test_url: http://psychology.about.com/od/theoriesofpersonality/ss/defensemech.htm From 5594d7d05469bcff2a046a99d49990bd63a6fd4f Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Mon, 21 Jul 2014 19:34:59 +0300 Subject: [PATCH 04/24] issue #750 - config for dn.pt site added --- inc/3rdparty/site_config/standard/dn.pt.txt | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 inc/3rdparty/site_config/standard/dn.pt.txt diff --git a/inc/3rdparty/site_config/standard/dn.pt.txt b/inc/3rdparty/site_config/standard/dn.pt.txt new file mode 100755 index 000000000..051b8cb98 --- /dev/null +++ b/inc/3rdparty/site_config/standard/dn.pt.txt @@ -0,0 +1,9 @@ +single_page_link: concat('http://www.dn.pt/Common/print.aspx?content_id=', //input[@type='hidden' and @name='link-comments']/@value) +# + +title: //h1 +author: //div[@class="Author"] + +strip: //div[@class="Patrocinio"] + +test_url: http://www.dn.pt/inicio/opiniao/interior.aspx?content_id=3972244&seccao=Alberto%20Gon%E7alves&tag=Opini%E3o%20-%20Em%20Foco&page=1 \ No newline at end of file From cec19bd866f32028b8a286f8504f601df9842834 Mon Sep 17 00:00:00 2001 From: skibbipl Date: Mon, 21 Jul 2014 20:58:58 +0200 Subject: [PATCH 05/24] Updated polish translation --- locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo | Bin 10557 -> 12632 bytes locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po | 579 ++++++++++++-------- 2 files changed, 352 insertions(+), 227 deletions(-) diff --git a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo index 3e8b132fa4544fe173fab16f8e3a2380204a4e23..297516c002b885a90f733cbe104910659d3fafa9 100755 GIT binary patch literal 12632 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 literal 10557 zcmaKx4U8m5b;k>A2m6R2n3(UxWrKZpa65Zv8*IksGxue4_MN@9_iQkbqo%uergvt# zhyJ*}8NR~Bhl3IzBp_sgA_XK85CRel5n@M3@oi8fLL7-eA|()sND+<#i4=lj5hcHW zb@$Bf`Rvx#{Q9H1>eYL%-mB{U{$&?_!fQ31@Lh5d=={b2cYUXco{qeUkZNd&!`d7TL9`6#A zUT%ZZ+uI>k%m7{hE2#0j8*YcEA%Erz{Ja?c8I*kAh8_4F_%e9GFV*e63abAdQ0?r2 zYX8RO{%uh0tiV+m!aeZo@NW2T@ORT19;Ki$;>b(|9Pj7(g z|6p@{6zcuALdnyISHh&Z{v9a!KM7^OuRx9Kn^1cFZ>WA=fY7qjOQ71ZQ2x0c{tDa$ zUkz`E7A8=B{ZY6Jei6#P{{SWDPasX3pF_R(LX2YJb#NzKg_7reQ2l)Zs=rS|jqeYd z>n}jb^<}8{z7FNzKZL6HW2kn12K_h?Li&0MM3v?$DE(Xy_546{|8}VN-wxGp1ZDSi z_&PX&JK(3G{B8qY1D}M_+l%P*9=H>}0=}o=Cm}9l{sb~~^A}L#`!1AR|I|GH5&SaO z{{v~#e4a+Hhu?sD@4ukpz{MDEJG>75DtsH%^BMf#=NR)5DEWUIA*7#=LB*3tq2&EO zlsp%`vbM+Na4*+8pxTR|o<9hsr;j)M43wU~0%hk%q4e|jQ2l%#%I`1cq3r!q$WY8{ zp!9kZl>QGvwSOO!9@e1bA4B=a2Oy?1ABSr1^Kd`>Q>gx*g3`}LIHBzKN~pN@YAAVb zhKOPgLR4W+z$JJJO0Lf}&mVz$?{A>&`6DQKUVsvg!pouL>Os0RC!ys2z2^RBq2&A; zR2=yh)ca3B`OEj9E|`g_3NPYdOf77xw~Nj zF@^agd@cMclpp;wlpH^U>hHN2Z4Z1YRKG{y&G5aDD&|qBasB{Gum1`q$A7{L;Zx21 z|AX?6ORlc{?FOiRZiSf8+zlo71WI33!w*A^^RrO>JPM_c$D#W9E>u51fEU4kf$HZ; zxC_4Qn%X{x8?Hh5!$a^G{0x*G{sT%+mtaKoe+|_5_Cn2%cfw0y3N^pp3;!B^w0ZuH z9rgSfLACcKhzRDJkfED@htlt5Ok(-_PWT*1TJqzzFrmn&@1f{;kRqGucwUY9?_SQ{ zK#_00lcHltp&Re_h~?+kY1kgm=R~qgK8;a_WNQ!URmUlcbn!vTwUj$3I%MB>QEsCg zrtGG)hjgXmtrYo<4%t_Sqr8WL>-%HWP#9AlpiFeZkx|}4i6|eUJVZG{k&nt=n-AIX z{gi{0C5r6b9`e~$$_FR`C8S(P=}>em*YLlu=l3|}?&cn*@yA8{%J+20M{o6KmN&aa*{Hjl$1*; zUCOrT3Oq?;YHKMMvijjcsdXbw2KE>iv`=0KVb$1WR=qM~cV%=PUx zAf4D^KntTd@il$7y{2kzdoD8vrV@$@{krN}9F0PAaNv@DREs&{v~>Mw%gu?)^D51@ z)+`3mm}=-@Xa`ZoX#`ya7`K~DBA3}J zOOyUB=5QDnws8I293GoUapP>LR!D!SHr8E{dM;m>2IV&REXRAk;qiH`*>R(yEawD9>_02KN zZ(WX-U1*NUqvB*OpNzp^^TQ#)X}LZU{-iRVs8zb2U$ER>?jS8 ze=50YGjIs&hMFvBW6D#xWjx07G0i|uDxq?7PlT5=evoV#%H}8S0I6P-Sz-q%?s;$F zrZ$iJ2`WdAt7vXje%lpLnxo_q-J`3@O>xiEdb=W&I;URR@8hX!tIadtmzccICN;|+A(n<_Yt z9ph}p$f8CEO{6K(VU%S3(3A$133mLU?p z6^$na9!3E2(ReM+m{h&F0gw#^MTrl)wIysF!{%yw7D2pqdA}71H{K*tJt7S_vn7_X zao9C(OS}*9wNW}5EB2p1=({@T8#L%G-Vk34+Iz&6`ojB$?)sCqN`2w$)K)ZM)GPbQ z5qj6eo_UIAD4?P`Vnv46b@?%(La>+Ph z%-&tP{(T=&Dwiu>xG=8E6qp4u4bn;(tp zyX}NC&D~m;3{8O^S7=?pj1=XGF+_^6OQsG9hPs1t=V5JY9q(Tu300Crr{cUgrx9jx zy%fP+mGdo;mlN`R-qhrQpXzfd=^-r(lVD#%hD883G85d@)FCl0uB^{?5#D@^B8qD? znN26m!yLyCh^N!Mh{n{ch#Cq7W|BoG%3P9V|aMdWVI5wb~E zh8*OzpQmYZrO5}*Wuw^OQVgujy*JVFRoqEg65&>UDWM-u2PBYoZA0%YM6{q&T2nkA zJ~Sr6OMP90981h+uNc*7b3j7tMQFggxy{QUi1K``B-hc}xs~d<7Cu9@X2LX;{Od&} z6UuUPiz2X$ih8fH>Y??LI_U9KH*+!r(ZetjYEHaTbe3`u8iE&w9cl;Q=3k9m@B_SEx&Z~E~`QGh?f=X zl*}8donCR#v4`rFNR-F85hG3)xnxijlkV~|Ue;+l?4((LdHcTed!Sb7ZADu}J(_It zT@{T;WWIH;t2*y$aw*-S+)be&SH(4!DkTnW$E-XsL>TAFH7v5)mp12U-SZoUz^}o> zdPdG2m5H;)Bua26|N7Ibq9Qsyr`{rJ(0JpTb+iiA43B*nZ4yw|tYqnW6ckHG!lnD_ zok-VKy=JMojYSqK>ZN0OKMt1;l>K~ZHSOAMD|f9f9Ymdq_)CYdK-XTod(ZVtyRTi^ zeS_U|L-)EHU$^_Z-Mgu{bPw}i3FEx=uD`CXchu#@(rV_CoS2ekUCSDG>Jn%7;$(4_ z&fYZ6I-`^E$xi9^ZEF|KORJF^BTjqG>9Hfn4lf3>r?Y$8!Ib4nLhI8BVip9r<;lp! z$xUqOT$V@0&Bs@7UAl2mPg0=yrNb=wm8iP*#$H@(d&|;F8nH`Rx+9uuLzEvS@OJHq zoBC0qR$HD((sZ(@eSpcuf@{#VoyEBNpKLR3)Jx5dJ7WUI zBy&|bbL$qZ*L&PqG7ScH*lcuJGngH$tKxiS$8mJ_A$B_PPi4z8A35^? zBS_TU`q_tP)1klKcu+HD<8<0Q4aoY%v@&-vO!ZonMv9t|8KW5vt)>b(=_P9RDswz9 zHy$(xXDrE-4zgl8EE!@o?T^l$37tg(={OGQqDpUJuM)a`TDd@S#peELKBAYX-u@1A zO+5cJbP2Ouv(_9Rl|6c%w(2YEYx-~QOzjT8u-$piUU+7Y%-25Vi4WG>j+tHY>z(bc z-SE!rJx|{S&zjB|ynKPhS2C?_|4ch!Ho;k%&(1zfgk*;tGYnMSZiO`{^8hmtA0fVL zmN!mfZuiz;o9fotADzdKnmzFYyeQStY96bbO}pa<92N>@cHIrJklbcAEl{DkpPE60 z_pn*c#x7WoZN&;W4%Xc$;eMD7>vaiFv{SC4#vi!YYWLQ*k3Uj%%z?}edAIg#O&ED3 zPud;y-2OARXk;4ZON^0ivx9zf?Q(=+udr%5OcOt@VK!yk+$?cN=@22~XqWAW(~ZaQ zOj;xB6`5B8-*>_pseR*g*-twtcM|7QG>h1cG)#!9U|!9dF=;~10vgHOj3lu2A+s?J z_{N1=`x~bj3+kcHj6phP$*j>nez+R(IYP6fYmVdv{jEoK7>|YofJvICJ>IpBP0CCX zX;>1ci-4PK)H*S#XvSPUd**z`TWqs^B*DM@278i*!3>r9O__X&<;T#67WLfB1-@~_ z5gp>TvXiR<*XXsJ2O>n@397 ziieIbGz3Zfm(?&%m^9wZBI{VX@fiL--*2`d`5Cw6O;}c_;xpX(*)zoBW_KPCy9i44 zCiGa!0Bwa{Di_XFy<*jfk2s=fWyzr2jYe*raD$EfSTThg#}Z2K&RQJ?ERQQpmbhWp z4x8XNm-tzB$cq-5&H8Hf_#^ASp~fg>od+g-E1eR>l})6bNlf~%-n|0FOMNeqF{d5d z2H$i0Kld|1!Plvg(hQ-v-k~##Yt?L$Vu#Iv9-o@QXTNy-YEns53PNfMhH6dHKDT0d#^ zDr4`Oc?6iBG~WQ4=;PW=y3bf_3`q0o#)H9(aVg|UAAiN!)U$nF6 zf>g^#fODQ!gxYD35oyi8OCg*X?C0{#FD0Zhzj|hoLI&iJ}je*_@ox672RZ7^C&erZ)2Pq|LjEN}6=@aaL30D%VZIlHM=&_?|G`^gW?X1@rF-T081n6#vBt zW_~SIXKX_GrcVo~HRqorT6*AtGn`Tk<@&U!2-XTU!`GkN!~GVEAOgoZwf*YznJW8bFT?gJ`83uUPd7fL6+%1Le1&HEZF;JC zjyS|AUqLUlZ7d!!bZ>73=ou-eHMKP(eVxacRIOe1>3lZ- zCQ)CV_p5|-;e%$oG}>YwzD~@SX!Vu?0VZh@Z#>2v@gFJ5k;`U$A7fZdh)r(?9eXE@ zS8l-e%6r2+ojvo{ipHyh`h_h{&0az~EdF!mTdn^sR42QN4B@2O_k@X W#0M%ws5f7m-qr1Si1g#>n*RrX^6XOp diff --git a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po index 0e7cbcf83..e39156e61 100755 --- a/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po +++ b/locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po @@ -1,183 +1,73 @@ msgid "" msgstr "" -"Project-Id-Version: wballabag\n" +"Project-Id-Version: wallabag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-07 17:38+0300\n" -"PO-Revision-Date: 2014-02-07 17:43+0300\n" -"Last-Translator: Maryana \n" +"POT-Creation-Date: 2014-02-25 15:17+0300\n" +"PO-Revision-Date: \n" +"Last-Translator: skibbipl \n" "Language-Team: \n" -"Language: \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" +"X-Generator: Poedit 1.6.6\n" "X-Poedit-Basepath: .\n" -"X-Poedit-Language: Polish\n" -"X-Poedit-Country: POLAND\n" -"X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" +"X-Poedit-SourceCharset: UTF-8\n" +"X-Poedit-SearchPath-0: /home/mariroz/_DEV/web/wallabag/wallabag-master-" +"testing\n" -msgid "poche, a read it later open source system" -msgstr "poche, serwis odrocznego czytania open source" +msgid "wallabag, a read it later open source system" +msgstr "wallabag, open source'owy system typu \"przeczytaj to później\"" msgid "login failed: user doesn't exist" -msgstr "logowanie nie udało się: użytkownik nie istnieje" - -msgid "Return home" -msgstr "Wrocic do głównej" - -msgid "Back to top" -msgstr "Wrócić na górę" - -msgid "original" -msgstr "oryginal" - -msgid "Mark as read" -msgstr "Zaznacz jako przeczytane" - -msgid "Toggle mark as read" -msgstr "Przełącz jako przeczytane" - -msgid "Favorite" -msgstr "Ulubiony" - -msgid "Toggle favorite" -msgstr "Zaznacz jako ulubione" - -msgid "Delete" -msgstr "Usuń" - -msgid "Tweet" -msgstr "Tweet" - -msgid "Email" -msgstr "Wyslij email" - -msgid "shaarli" -msgstr "shaarli" - -msgid "flattr" -msgstr "flattr" - -msgid "Does this article appear wrong?" -msgstr "Czy ten artykuł wygląda nieprawidłowo?" - -msgid "tags:" -msgstr "tegi:" - -msgid "Edit tags" -msgstr "Redagowac tegi" +msgstr "logowanie się nie powiodło: użytkownik nie istnieje" msgid "return home" -msgstr "wrócić do głównej" - -msgid "powered by" -msgstr "zasilany przez" - -msgid "debug mode is on so cache is off." -msgstr "tryb debugowania jest włączony, więc cash jest wyłączony." - -msgid "your poche version:" -msgstr "twoja wersja poche:" - -msgid "storage:" -msgstr "magazyn:" - -msgid "favoris" -msgstr "ulubione" - -msgid "archive" -msgstr "archiwum" - -msgid "unread" -msgstr "nieprzeczytane" - -msgid "by date asc" -msgstr "według daty rosnąco" - -msgid "by date" -msgstr "wg daty" - -msgid "by date desc" -msgstr "według daty spadająco" - -msgid "by title asc" -msgstr "według tytułu rosnąco" - -msgid "by title" -msgstr "wg tytułu" - -msgid "by title desc" -msgstr "według tytułu malejąco" - -msgid "No articles found." -msgstr "Nie znaleziono artykułów." - -msgid "toggle favorite" -msgstr "przełączyc ulubione" - -msgid "delete" -msgstr "usunąć" - -msgid "estimated reading time:" -msgstr "szacowany czas odczytu:" - -msgid "results" -msgstr "wyniki" - -msgid "home" -msgstr "główna" - -msgid "favorites" -msgstr "ulubione" - -msgid "tags" -msgstr "tagi" +msgstr "powrót do strony domowej" msgid "config" -msgstr "ustawienia" +msgstr "konfiguracja" -msgid "logout" -msgstr "wyloguj" +msgid "Saving articles" +msgstr "Zapisywanie artykułów" -msgid "Poching links" -msgstr "Zapisywanie linków" - -msgid "There are several ways to poche a link:" -msgstr "Istnieje kilka sposobów aby zapisać link:" +msgid "There are several ways to save an article:" +msgstr "Istnieje kilka sposobów aby zapisać artykuł:" msgid "read the documentation" -msgstr "zapoznać się z dokumentacją" +msgstr "przeczytaj dokumentację" msgid "download the extension" -msgstr "pobrać rozszerzenie" +msgstr "pobierz rozszerzenie" msgid "via F-Droid" msgstr "przez F-Droid" msgid " or " -msgstr "albo" +msgstr "albo " msgid "via Google Play" msgstr "przez Google Play" msgid "download the application" -msgstr "pobrać aplikację" +msgstr "pobierz aplikację" msgid "By filling this field" msgstr "Poprzez wypełnienie tego pola" -msgid "poche it!" -msgstr "zapisać!" +msgid "bag it!" +msgstr "zapisz!" msgid "Bookmarklet: drag & drop this link to your bookmarks bar" -msgstr "Bookmarklet: przeciągnij i upucs ten link na pasek zakladek" +msgstr "Skryptozakładka: przeciągnij i upuść ten link na twój pasek zakładek" -msgid "Updating poche" -msgstr "Aktualizacja poche" +msgid "Upgrading wallabag" +msgstr "Aktualizacja wallabag" msgid "Installed version" -msgstr "Zainstalowana wersja " +msgstr "Zainstalowana wersja" msgid "Latest stable version" msgstr "Najnowsza stabilna wersja" @@ -186,58 +76,64 @@ msgid "A more recent stable version is available." msgstr "Nowsza stabilna wersja jest dostępna." msgid "You are up to date." -msgstr "Masz wszystko najnowsze." +msgstr "Posiadasz najnowszą wersję." -msgid "latest dev version" -msgstr "najnowsza wersja dev" +msgid "Latest dev version" +msgstr "Najnowsza wersja developerska" -msgid "a more recent development version is available." -msgstr "Nowsza wersja rozwojowa jest dostępna." - -msgid "you are up to date." -msgstr "masz wszystko najnowsze." +msgid "A more recent development version is available." +msgstr "Nowsza developerska wersja jest dostępna." msgid "Feeds" -msgstr "Kanały (feeds)" +msgstr "Kanały" -msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." -msgstr "Twój znak kanału jest pusty i musi najpierw zostac wygenerowany. Kliknij tu dla jego generacji." +msgid "" +"Your feed token is currently empty and must first be generated to enable " +"feeds. Click here to generate it." +msgstr "" +"Twój token kanału jest aktualnie pusty i musi zostać wygenerowany, aby " +"włączyć kanały. Kliknij tutaj, aby go " +"wygenerować." msgid "Unread feed" -msgstr "Kanał nieprzeczytanego" +msgstr "Nieprzeczytane kanały" msgid "Favorites feed" -msgstr "Kanał ulubionego" +msgstr "Ulubione kanały" msgid "Archive feed" -msgstr "Kanał archiwum" +msgstr "Kanały archiwum" msgid "Your token:" -msgstr "Twój znak (token): " +msgstr "Twój token:" msgid "Your user id:" -msgstr "Twój id użytkownika (user id):" +msgstr "Twój id użytkownika:" -msgid "You can regenerate your token: generate!." -msgstr "Mozna zgenerowac nowy znak: kliknij zgenerowac!." +msgid "" +"You can regenerate your token: generate!" +"." +msgstr "" +"Możesz wygenewrować ponownie swój token: generuj!." msgid "Change your theme" -msgstr "Zmienic motyw" +msgstr "Zmień swój motyw" msgid "Theme:" msgstr "Motyw:" msgid "Update" -msgstr "Aktualizacja" +msgstr "Aktualizuj" msgid "Change your language" -msgstr "Zmienić język" +msgstr "Zmień język" msgid "Language:" msgstr "Język:" msgid "Change your password" -msgstr "Zmień hasło" +msgstr "Zmień swoje hasło" msgid "New password:" msgstr "Nowe hasło:" @@ -246,164 +142,373 @@ msgid "Password" msgstr "Hasło" msgid "Repeat your new password:" -msgstr "Powtórz hasło jeszcze raz:" +msgstr "Powtórz twoje nowe hasło:" msgid "Import" msgstr "Import" -msgid "Please execute the import script locally as it can take a very long time." -msgstr "Proszę wykonać skrypt import lokalnie, gdyż moze to trwać bardzo długo." +msgid "" +"Please execute the import script locally as it can take a very long time." +msgstr "" +"Proszę wykonaj skrypt importu lokalnie, ponieważ może to trwać bardzo długo." -msgid "More info in the official docs:" -msgstr "Więcej informacji w oficjalnej dokumentacji:" +msgid "More info in the official documentation:" +msgstr "Więcej informacji znajdziesz w oficjalnej dokumentacji:" msgid "Import from Pocket" -msgstr "Іmport z Pocket'a" +msgstr "Importuj z Pocket" #, php-format msgid "(you must have a %s file on your server)" -msgstr "(musisz mieć plik %s na serwerze)" +msgstr "(musisz mieć plik %s na swoim serwerze)" msgid "Import from Readability" -msgstr "Import z Readability" +msgstr "Importuj z Readability" msgid "Import from Instapaper" -msgstr "Import z Instapaper" +msgstr "Importuj z Instapaper" -msgid "Import from poche" -msgstr "Import z poche" +msgid "Import from wallabag" +msgstr "Importuj z wallabag" -msgid "Export your poche data" -msgstr "Eksportowac dane poche" +msgid "Export your wallabag data" +msgstr "Wyeksportuj swoje dane wallabag" msgid "Click here" msgstr "Kliknij tu" msgid "to download your database." -msgstr "aby pobrac bazę danych." +msgstr "aby pobrać twoją bazę danych." -msgid "to export your poche data." -msgstr "aby eksportować dane poche." +msgid "to export your wallabag data." +msgstr "aby wyeksportować dane wallabag." -msgid "Tag" -msgstr "Teg" +msgid "Cache" +msgstr "Cache" -msgid "No link available here!" -msgstr "Brak dostępnych linków!" - -msgid "toggle mark as read" -msgstr "przełączyć znak jako przeczytane" +msgid "to delete cache." +msgstr "aby wyczyścić cache." msgid "You can enter multiple tags, separated by commas." -msgstr "Mozna wprowadzić wiele tagów rozdzielajac je przecinkami." +msgstr "Możesz wprowadzić wiele tagów, oddzielonych przecinkami." msgid "return to article" -msgstr "wrócić do artykułu" +msgstr "powrót do artykułu" msgid "plop" msgstr "plop" -msgid "You can check your configuration here." -msgstr "Można sprawdzić swoją konfigurację tu." +msgid "" +"You can check your configuration " +"here." +msgstr "" +"Możesz sprawdzić swoją " +"konfigurację tutaj." + +msgid "favoris" +msgstr "favoris" + +msgid "archive" +msgstr "archiwum" + +msgid "unread" +msgstr "nieprzeczytane" + +msgid "by date asc" +msgstr "po dacie rosnąco" + +msgid "by date" +msgstr "po dacie" + +msgid "by date desc" +msgstr "po dacie malejąco" + +msgid "by title asc" +msgstr "po tytule rosnąco" + +msgid "by title" +msgstr "po tytule" + +msgid "by title desc" +msgstr "po tytule malejąco" + +msgid "Tag" +msgstr "Otaguj" + +msgid "No articles found." +msgstr "Nie znaleziono artykułów." + +msgid "Toggle mark as read" +msgstr "Przełącz jako przeczytane" + +msgid "toggle favorite" +msgstr "przełącz ulubione" + +msgid "delete" +msgstr "usuń" + +msgid "original" +msgstr "oryginał" + +msgid "estimated reading time:" +msgstr "szacowany czas czytania:" + +msgid "mark all the entries as read" +msgstr "zaznacz wszystkie wpisy jako przeczytane" + +msgid "results" +msgstr "rezultaty" msgid "installation" msgstr "instalacja" msgid "install your wallabag" -msgstr "zainstalować wallabag" +msgstr "zainstauj wallabag" -msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." -msgstr "wallabag nie jest jeszcze zainstalowany. Proszę wypełnić poniższy formularz, aby go zainstalowac. Nie wahaj się zapoznac się z dokumentacja na stronie wallabag." +msgid "" +"wallabag is still not installed. Please fill the below form to install it. " +"Don't hesitate to read the documentation " +"on wallabag website." +msgstr "" +"wallabag wciąż nie jest zainstalowany. Proszę wypełnij poniższy formularz " +"aby go zainstalować. Nie wahaj się przeczytać dokumentacji na stronie wallabag." msgid "Login" msgstr "Login" msgid "Repeat your password" -msgstr "Powtórz hasło" +msgstr "Powtórz swoje hasło" msgid "Install" -msgstr "Instalowac" +msgstr "Zainstauj" msgid "login to your wallabag" -msgstr "zalogować się do swojego wallabag" +msgstr "zaloguj się do twojego wallabag" msgid "Login to wallabag" -msgstr "Zalogować się do wallabag" +msgstr "Logowanie do wallabag" msgid "you are in demo mode, some features may be disabled." -msgstr "jesteś w trybie demo, niektóre funkcje mogą być niedostępne." +msgstr "jesteś w trybie demo, niektóre funkcjonalności mogą być wyłączone." msgid "Username" -msgstr "Imię użytkownika" +msgstr "Nazwa użytkownika" msgid "Stay signed in" msgstr "Pozostań zalogowany" msgid "(Do not check on public computers)" -msgstr "(Nie sprawdzaj na publicznych komputerach" +msgstr "(Nie zaznaczaj na komputerach z publicznym dostępem)" + +msgid "Sign in" +msgstr "Zaloguj się" + +msgid "favorites" +msgstr "ulubione" + +msgid "estimated reading time :" +msgstr "szacowany czas czytania :" + +msgid "Mark all the entries as read" +msgstr "Zaznacz wszystkie wpisy jako przeczytane" + +msgid "Return home" +msgstr "Powrót na stronę domową" + +msgid "Back to top" +msgstr "Powrót na górę" + +msgid "Mark as read" +msgstr "Oznacz jako przeczytane" + +msgid "Favorite" +msgstr "Ulubione" + +msgid "Toggle favorite" +msgstr "Przełącz ulubione" + +msgid "Delete" +msgstr "Usuń" + +msgid "Tweet" +msgstr "Tweet" + +msgid "Email" +msgstr "Email" + +msgid "shaarli" +msgstr "shaarli" + +msgid "flattr" +msgstr "flattr" + +msgid "Does this article appear wrong?" +msgstr "Czy ten artykuł jest wyświetlany niepoprawnie?" + +msgid "tags:" +msgstr "tagi:" + +msgid "Edit tags" +msgstr "Edytuj tagi" + +msgid "save link!" +msgstr "zapisz link!" + +msgid "home" +msgstr "strona domowa" + +msgid "tags" +msgstr "tagi" + +msgid "logout" +msgstr "wyloguj" + +msgid "powered by" +msgstr "w oparciu o" + +msgid "debug mode is on so cache is off." +msgstr "tryb debug jest włączony zatem cache jest wyłączony." + +msgid "your wallabag version:" +msgstr "wersja twojego wallabag:" + +msgid "storage:" +msgstr "storage:" + +msgid "save a link" +msgstr "zapisz link" + +msgid "back to home" +msgstr "powrót do strony domowej" + +msgid "toggle mark as read" +msgstr "przełącz jako przeczytane" + +msgid "tweet" +msgstr "tweet" + +msgid "email" +msgstr "email" + +msgid "this article appears wrong?" +msgstr "ten artykuł wygląda niepoprawnie?" + +msgid "No link available here!" +msgstr "No link available here!" + +#, fuzzy +msgid "Poching a link" +msgstr "Poching a link" + +msgid "by filling this field" +msgstr "przez wypełnienie tego pola" + +msgid "bookmarklet: drag & drop this link to your bookmarks bar" +msgstr "skryptozakładka: przeciągnij i upuść ten link na twój pasek zakładek" + +msgid "your version" +msgstr "twoja wersja" + +msgid "latest stable version" +msgstr "najnowsza stabilna wersja" + +msgid "a more recent stable version is available." +msgstr "nowsza wersja stabilna jest dostępna." + +msgid "you are up to date." +msgstr "posiadasz najnowszą wersję." + +msgid "latest dev version" +msgstr "najnowsza wersja developerska" + +msgid "a more recent development version is available." +msgstr "nowsza wersja developerska jest dostępna." + +msgid "Please execute the import script locally, it can take a very long time." +msgstr "" +"Please execute the import script locally, it can take a very long time." + +msgid "More infos in the official doc:" +msgstr "More infos in the official doc:" + +msgid "import from Pocket" +msgstr "import from Pocket" + +msgid "import from Readability" +msgstr "import from Readability" + +msgid "import from Instapaper" +msgstr "import from Instapaper" + +msgid "Tags" +msgstr "Tagi" msgid "Untitled" -msgstr "Bez nazwy" +msgstr "Untitled" msgid "the link has been added successfully" -msgstr "link pozostał pomyślnie dodany" +msgstr "link został dodany pomyślnie" msgid "error during insertion : the link wasn't added" -msgstr "błąd podczas wprowadzania: link nie zostal dodany" +msgstr "błąd podczas dodawania : link nie został dodany" msgid "the link has been deleted successfully" -msgstr "link zostal pomyślnie usunięty" +msgstr "link został usunięty pomyślnie" msgid "the link wasn't deleted" msgstr "link nie został usunięty" +msgid "Article not found!" +msgstr "Artykuł nie znaleziony!" + msgid "previous" -msgstr "poprzednia" +msgstr "poprzedni" msgid "next" -msgstr "następna" +msgstr "następny" msgid "in demo mode, you can't update your password" -msgstr "w trybie demo, nie można zmieniać hasła" +msgstr "w trybie demo nie możesz zaktualizować swojego hasła" msgid "your password has been updated" -msgstr "twoje hasło zmienione" +msgstr "twoje hasło zostało zaktualizowane" -msgid "the two fields have to be filled & the password must be the same in the two fields" -msgstr "oba pola muszą być wypełnione i hasła muszę być takie same w obu polach" +msgid "" +"the two fields have to be filled & the password must be the same in the two " +"fields" +msgstr "" +"oba pola muszą być wypełnione oraz hasło musi być takie same w obu polach" msgid "still using the \"" -msgstr "nadal w użyciu \"" +msgstr "wciąż używam \"" msgid "that theme does not seem to be installed" -msgstr "wydaje się że motyw nie był zainstalowany" +msgstr "ten motyw nie wygląda na zainstalowany" msgid "you have changed your theme preferences" -msgstr "ustawienia motywu zostałe zmienione" +msgstr "zmieniłeś swoje preferencje motywu" msgid "that language does not seem to be installed" -msgstr "wydaje się że język nie był zainstalowany" +msgstr "ten język nie wygląda na zainstalowany" msgid "you have changed your language preferences" -msgstr "ustawienia języka zostałe zmienione" +msgstr "zmieniłeś swoje preferencje językowe" msgid "login failed: you have to fill all fields" -msgstr "logowanie nie powiodlo się: musisz wypełnić wszystkie pola" +msgstr "logowanie się nie powiodło: musisz wypełnić wszystkie pola" -msgid "welcome to your poche" -msgstr "witamy w poche" +msgid "welcome to your wallabag" +msgstr "witaj w twoim wallabag" msgid "login failed: bad login or password" -msgstr "logowanie nie powiodlo się: zly login lub hasło" - -msgid "see you soon!" -msgstr "do zobaczenia wkrótce!" +msgstr "logowanie się nie powiodło: nieprawidłowy login lub hasło" msgid "import from instapaper completed" -msgstr "import з instapaper'a zakończony" +msgstr "import z instapaper zakończony" msgid "import from pocket completed" -msgstr "import z pocket'a zakończony" +msgstr "import z pocket zakończony" msgid "import from Readability completed. " msgstr "import z Readability zakończony. " @@ -415,14 +520,34 @@ msgid "Unknown import provider." msgstr "Nieznany dostawca importu." msgid "Incomplete inc/poche/define.inc.php file, please define \"" -msgstr "Niekompletny plik inc/poche/define.inc.php, proszę definiować \"" +msgstr "Niekompletny plik inc/poche/define.inc.php, proszę zdefiniuj \"" msgid "Could not find required \"" -msgstr "Nie znaleziono potrzebnego \"" +msgstr "Nie znaleziono wymaganego \"" msgid "Uh, there is a problem while generating feeds." -msgstr "Uh, jest problem podczas generowania kanałów (feeds)." +msgstr "Ah, wystąpił problem podczas generowania kanałów." + +msgid "Cache deleted." +msgstr "Cache usunięty." msgid "Oops, it seems you don't have PHP 5." -msgstr "Oops, wygląda ze u was niema PHP 5." +msgstr "Oops, wygląda na to że nie masz PHP 5." +#~ msgid "poche it!" +#~ msgstr "poche it!" + +#~ msgid "Updating poche" +#~ msgstr "Updating poche" + +#~ msgid "create an issue" +#~ msgstr "create an issue" + +#~ msgid "or" +#~ msgstr "or" + +#~ msgid "contact us by mail" +#~ msgstr "contact us by mail" + +#~ msgid "your poche version:" +#~ msgstr "your poche version:" From 9c67b1b829290e5e78cb7da90acf285d6cd5c48f Mon Sep 17 00:00:00 2001 From: Marc Wilhelm Date: Tue, 22 Jul 2014 11:52:18 +0200 Subject: [PATCH 06/24] Split up check_setup.php into two files. The new file check_essentials.php takes care of stuff like the PHP version and is executed before the config files are included which are needed by check_setup. This patch addresses issue #773 --- check_essentials.php | 14 ++++++++++++++ check_setup.php | 15 +-------------- index.php | 3 ++- 3 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 check_essentials.php diff --git a/check_essentials.php b/check_essentials.php new file mode 100644 index 000000000..a47cd5a8d --- /dev/null +++ b/check_essentials.php @@ -0,0 +1,14 @@ + "short_open_tag = On"'); + } +} \ No newline at end of file diff --git a/check_setup.php b/check_setup.php index 2b84a7440..7e378b153 100644 --- a/check_setup.php +++ b/check_setup.php @@ -1,25 +1,12 @@ "short_open_tag = On"'); - } -} - // Check if /cache is writeable if (! is_writable('cache')) { die('The directory "cache" must be writeable by your web server user'); } // Check if /db is writeable -if (! is_writable('db')) { +if (! is_writable('db') && STORAGE === 'sqlite') { die('The directory "db" must be writeable by your web server user'); } diff --git a/index.php b/index.php index 481841ece..cce10b502 100755 --- a/index.php +++ b/index.php @@ -9,8 +9,9 @@ */ define ('POCHE', '1.7.1'); -require 'check_setup.php'; +require 'check_essentials.php'; require_once 'inc/poche/global.inc.php'; +require 'check_setup.php'; # Set error reporting level if (defined('ERROR_REPORTING')) { From b738bea9ca03c7c05e8c159b9c2f48fb40e58ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 22 Jul 2014 16:37:13 +0200 Subject: [PATCH 07/24] Fix #776 --- themes/baggy/config.twig | 2 +- themes/default/config.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 46735f074..e45c3218f 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -111,7 +111,7 @@
- +
diff --git a/themes/default/config.twig b/themes/default/config.twig index 160f6046a..8f047ae6a 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -110,7 +110,7 @@
- +
From 9cf6bac1a502d1418834f4f7619d40eb65378c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 22 Jul 2014 18:01:27 +0200 Subject: [PATCH 08/24] fix to display the login successful message with the translation --- inc/poche/Poche.class.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 09a9f5ff8..2b0c3bf8d 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -877,6 +877,14 @@ class Poche $longlastingsession = isset($_POST['longlastingsession']); $passwordTest = ($isauthenticated) ? $user['password'] : Tools::encodeString($password . $login); Session::login($user['username'], $user['password'], $login, $passwordTest, $longlastingsession, array('poche_user' => new User($user))); + + # reload l10n + $language = $user['config']['language']; + @putenv('LC_ALL=' . $language); + setlocale(LC_ALL, $language); + bindtextdomain($language, LOCALE); + textdomain($language); + $this->messages->add('s', _('welcome to your wallabag')); Tools::logm('login successful'); Tools::redirect($referer); From 3e87066506bbbc5e0819c4f8bc7ec5b763b76303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 22 Jul 2014 18:12:03 +0200 Subject: [PATCH 09/24] fix display of 'Done' message when we add a link from 'save a link' item --- themes/baggy/_pocheit-form.twig | 2 +- themes/baggy/css/main.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig index 505ec368e..57a928c0b 100755 --- a/themes/baggy/_pocheit-form.twig +++ b/themes/baggy/_pocheit-form.twig @@ -4,7 +4,7 @@ {% trans "Save a link" %} + -
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 6d320cd2d..711c152be 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -630,7 +630,7 @@ a.add-to-wallabag-link-after:after { #add-link-result { font-weight: bold; - margin-top: 10px; + font-size: 0.9em; } /* ========================================================================== From cca9284b6a8111f5dd07bca3f8d4f266ceee3c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 22 Jul 2014 18:14:41 +0200 Subject: [PATCH 10/24] change default pagination, set it to 12, to have a nice baggy display --- inc/poche/config.inc.default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 95f727c68..d01580970 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -59,7 +59,7 @@ @define ('LOCALE', ROOT . '/locale'); @define ('CACHE', ROOT . '/cache'); -@define ('PAGINATION', '10'); +@define ('PAGINATION', '12'); //limit for download of articles during import @define ('IMPORT_LIMIT', 5); From 9f8541ef2a9dc670ca75fb452c0930e1afa4a8f6 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 22 Jul 2014 20:17:15 +0300 Subject: [PATCH 11/24] highlight.js library added to highlight programming code examples in article view --- themes/baggy/css/main.css | 8 + themes/baggy/view.twig | 1 + themes/default/_highlight.twig | 4 + themes/default/css/style.css | 6 + themes/default/highlightjs/highlight.pack.js | 1 + themes/default/highlightjs/styles/default.css | 152 ++++++++++++++++++ themes/default/highlightjs/styles/github.css | 127 +++++++++++++++ .../default/highlightjs/styles/googlecode.css | 148 +++++++++++++++++ themes/default/view.twig | 1 + 9 files changed, 448 insertions(+) create mode 100755 themes/default/_highlight.twig create mode 100644 themes/default/highlightjs/highlight.pack.js create mode 100644 themes/default/highlightjs/styles/default.css create mode 100644 themes/default/highlightjs/styles/github.css create mode 100644 themes/default/highlightjs/styles/googlecode.css diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 6d320cd2d..f82387449 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -923,6 +923,13 @@ blockquote { text-decoration: underline; } +pre code { + font-family: "Courier New", Courier, monospace; + border: 1px solid #ccc; + font-size: 0.96em; +} + + /* ========================================================================== 6 = Media Queries ========================================================================== */ @@ -1055,3 +1062,4 @@ blockquote { left: 0; } } + diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index af97407d0..703ce5be1 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -4,6 +4,7 @@ {% endblock %} {% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} {% block content %} + {% include '_highlight.twig' %}
  • {% trans "Back to top" %}
    • diff --git a/themes/default/_highlight.twig b/themes/default/_highlight.twig new file mode 100755 index 000000000..cdb7c6bf3 --- /dev/null +++ b/themes/default/_highlight.twig @@ -0,0 +1,4 @@ + {# include excelent highlight.js library for code highligting, see http://highlightjs.org/ #} + + + diff --git a/themes/default/css/style.css b/themes/default/css/style.css index e58ef81a1..e254d481b 100755 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css @@ -429,4 +429,10 @@ a.add-to-wallabag-link-after:after { text-indent: 0; color: black; width: 50px; +} + +pre code { + font-family: "Courier New", Courier, monospace; + border: 1px solid #ddd; + font-size: 0.96em; } \ No newline at end of file diff --git a/themes/default/highlightjs/highlight.pack.js b/themes/default/highlightjs/highlight.pack.js new file mode 100644 index 000000000..10a21c34b --- /dev/null +++ b/themes/default/highlightjs/highlight.pack.js @@ -0,0 +1 @@ +var hljs=new function(){function j(v){return v.replace(/&/gm,"&").replace(//gm,">")}function t(v){return v.nodeName.toLowerCase()}function h(w,x){var v=w&&w.exec(x);return v&&v.index==0}function r(w){var v=(w.className+" "+(w.parentNode?w.parentNode.className:"")).split(/\s+/);v=v.map(function(x){return x.replace(/^lang(uage)?-/,"")});return v.filter(function(x){return i(x)||x=="no-highlight"})[0]}function o(x,y){var v={};for(var w in x){v[w]=x[w]}if(y){for(var w in y){v[w]=y[w]}}return v}function u(x){var v=[];(function w(y,z){for(var A=y.firstChild;A;A=A.nextSibling){if(A.nodeType==3){z+=A.nodeValue.length}else{if(t(A)=="br"){z+=1}else{if(A.nodeType==1){v.push({event:"start",offset:z,node:A});z=w(A,z);v.push({event:"stop",offset:z,node:A})}}}}return z})(x,0);return v}function q(w,y,C){var x=0;var F="";var z=[];function B(){if(!w.length||!y.length){return w.length?w:y}if(w[0].offset!=y[0].offset){return(w[0].offset"}function E(G){F+=""}function v(G){(G.event=="start"?A:E)(G.node)}while(w.length||y.length){var D=B();F+=j(C.substr(x,D[0].offset-x));x=D[0].offset;if(D==w){z.reverse().forEach(E);do{v(D.splice(0,1)[0]);D=B()}while(D==w&&D.length&&D[0].offset==x);z.reverse().forEach(A)}else{if(D[0].event=="start"){z.push(D[0].node)}else{z.pop()}v(D.splice(0,1)[0])}}return F+j(C.substr(x))}function m(y){function v(z){return(z&&z.source)||z}function w(A,z){return RegExp(v(A),"m"+(y.cI?"i":"")+(z?"g":""))}function x(D,C){if(D.compiled){return}D.compiled=true;D.k=D.k||D.bK;if(D.k){var z={};var E=function(G,F){if(y.cI){F=F.toLowerCase()}F.split(" ").forEach(function(H){var I=H.split("|");z[I[0]]=[G,I[1]?Number(I[1]):1]})};if(typeof D.k=="string"){E("keyword",D.k)}else{Object.keys(D.k).forEach(function(F){E(F,D.k[F])})}D.k=z}D.lR=w(D.l||/\b[A-Za-z0-9_]+\b/,true);if(C){if(D.bK){D.b="\\b("+D.bK.split(" ").join("|")+")\\b"}if(!D.b){D.b=/\B|\b/}D.bR=w(D.b);if(!D.e&&!D.eW){D.e=/\B|\b/}if(D.e){D.eR=w(D.e)}D.tE=v(D.e)||"";if(D.eW&&C.tE){D.tE+=(D.e?"|":"")+C.tE}}if(D.i){D.iR=w(D.i)}if(D.r===undefined){D.r=1}if(!D.c){D.c=[]}var B=[];D.c.forEach(function(F){if(F.v){F.v.forEach(function(G){B.push(o(F,G))})}else{B.push(F=="self"?D:F)}});D.c=B;D.c.forEach(function(F){x(F,D)});if(D.starts){x(D.starts,C)}var A=D.c.map(function(F){return F.bK?"\\.?("+F.b+")\\.?":F.b}).concat([D.tE,D.i]).map(v).filter(Boolean);D.t=A.length?w(A.join("|"),true):{exec:function(F){return null}};D.continuation={}}x(y)}function c(S,L,J,R){function v(U,V){for(var T=0;T";U+=Z+'">';return U+X+Y}function N(){if(!I.k){return j(C)}var T="";var W=0;I.lR.lastIndex=0;var U=I.lR.exec(C);while(U){T+=j(C.substr(W,U.index-W));var V=E(I,U);if(V){H+=V[1];T+=w(V[0],j(U[0]))}else{T+=j(U[0])}W=I.lR.lastIndex;U=I.lR.exec(C)}return T+j(C.substr(W))}function F(){if(I.sL&&!f[I.sL]){return j(C)}var T=I.sL?c(I.sL,C,true,I.continuation.top):e(C);if(I.r>0){H+=T.r}if(I.subLanguageMode=="continuous"){I.continuation.top=T.top}return w(T.language,T.value,false,true)}function Q(){return I.sL!==undefined?F():N()}function P(V,U){var T=V.cN?w(V.cN,"",true):"";if(V.rB){D+=T;C=""}else{if(V.eB){D+=j(U)+T;C=""}else{D+=T;C=U}}I=Object.create(V,{parent:{value:I}})}function G(T,X){C+=T;if(X===undefined){D+=Q();return 0}var V=v(X,I);if(V){D+=Q();P(V,X);return V.rB?0:X.length}var W=z(I,X);if(W){var U=I;if(!(U.rE||U.eE)){C+=X}D+=Q();do{if(I.cN){D+=""}H+=I.r;I=I.parent}while(I!=W.parent);if(U.eE){D+=j(X)}C="";if(W.starts){P(W.starts,"")}return U.rE?0:X.length}if(A(X,I)){throw new Error('Illegal lexeme "'+X+'" for mode "'+(I.cN||"")+'"')}C+=X;return X.length||1}var M=i(S);if(!M){throw new Error('Unknown language: "'+S+'"')}m(M);var I=R||M;var D="";for(var K=I;K!=M;K=K.parent){if(K.cN){D+=w(K.cN,D,true)}}var C="";var H=0;try{var B,y,x=0;while(true){I.t.lastIndex=x;B=I.t.exec(L);if(!B){break}y=G(L.substr(x,B.index-x),B[0]);x=B.index+y}G(L.substr(x));for(var K=I;K.parent;K=K.parent){if(K.cN){D+=""}}return{r:H,value:D,language:S,top:I}}catch(O){if(O.message.indexOf("Illegal")!=-1){return{r:0,value:j(L)}}else{throw O}}}function e(y,x){x=x||b.languages||Object.keys(f);var v={r:0,value:j(y)};var w=v;x.forEach(function(z){if(!i(z)){return}var A=c(z,y,false);A.language=z;if(A.r>w.r){w=A}if(A.r>v.r){w=v;v=A}});if(w.language){v.second_best=w}return v}function g(v){if(b.tabReplace){v=v.replace(/^((<[^>]+>|\t)+)/gm,function(w,z,y,x){return z.replace(/\t/g,b.tabReplace)})}if(b.useBR){v=v.replace(/\n/g,"
    ")}return v}function p(z){var y=b.useBR?z.innerHTML.replace(/\n/g,"").replace(/
    |
    ]*>/g,"\n").replace(/<[^>]*>/g,""):z.textContent;var A=r(z);if(A=="no-highlight"){return}var v=A?c(A,y,true):e(y);var w=u(z);if(w.length){var x=document.createElementNS("http://www.w3.org/1999/xhtml","pre");x.innerHTML=v.value;v.value=q(w,u(x),y)}v.value=g(v.value);z.innerHTML=v.value;z.className+=" hljs "+(!A&&v.language||"");z.result={language:v.language,re:v.r};if(v.second_best){z.second_best={language:v.second_best.language,re:v.second_best.r}}}var b={classPrefix:"hljs-",tabReplace:null,useBR:false,languages:undefined};function s(v){b=o(b,v)}function l(){if(l.called){return}l.called=true;var v=document.querySelectorAll("pre code");Array.prototype.forEach.call(v,p)}function a(){addEventListener("DOMContentLoaded",l,false);addEventListener("load",l,false)}var f={};var n={};function d(v,x){var w=f[v]=x(this);if(w.aliases){w.aliases.forEach(function(y){n[y]=v})}}function k(){return Object.keys(f)}function i(v){return f[v]||f[n[v]]}this.highlight=c;this.highlightAuto=e;this.fixMarkup=g;this.highlightBlock=p;this.configure=s;this.initHighlighting=l;this.initHighlightingOnLoad=a;this.registerLanguage=d;this.listLanguages=k;this.getLanguage=i;this.inherit=o;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE]};this.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE]};this.PWM={b:/\b(a|an|the|are|I|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such)\b/};this.CLCM={cN:"comment",b:"//",e:"$",c:[this.PWM]};this.CBCM={cN:"comment",b:"/\\*",e:"\\*/",c:[this.PWM]};this.HCM={cN:"comment",b:"#",e:"$",c:[this.PWM]};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.CSSNM={cN:"number",b:this.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0};this.RM={cN:"regexp",b:/\//,e:/\/[gim]*/,i:/\n/,c:[this.BE,{b:/\[/,e:/\]/,r:0,c:[this.BE]}]};this.TM={cN:"title",b:this.IR,r:0};this.UTM={cN:"title",b:this.UIR,r:0}}();hljs.registerLanguage("bash",function(b){var a={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)\}/}]};var d={cN:"string",b:/"/,e:/"/,c:[b.BE,a,{cN:"variable",b:/\$\(/,e:/\)/,c:[b.BE]}]};var c={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\.]+/,k:{keyword:"if then else elif fi for break continue while in do done exit return set declare case esac export exec",literal:"true false",built_in:"printf echo read cd pwd pushd popd dirs let eval unset typeset readonly getopts source shopt caller type hash bind help sudo",operator:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"shebang",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:true,c:[b.inherit(b.TM,{b:/\w[\w\d_]*/})],r:0},b.HCM,b.NM,d,c,a]}});hljs.registerLanguage("cs",function(b){var a="abstract as base bool break byte case catch char checked const continue decimal default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long new null object operator out override params private protected public readonly ref return sbyte sealed short sizeof stackalloc static string struct switch this throw true try typeof uint ulong unchecked unsafe ushort using virtual volatile void while async await ascending descending from get group into join let orderby partial select set value var where yield";return{aliases:["csharp"],k:a,i:/::/,c:[{cN:"comment",b:"///",e:"$",rB:true,c:[{cN:"xmlDocTag",v:[{b:"///",r:0},{b:""},{b:""}]}]},b.CLCM,b.CBCM,{cN:"preprocessor",b:"#",e:"$",k:"if else elif endif define undef warning error line region endregion pragma checksum"},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},b.ASM,b.QSM,b.CNM,{bK:"protected public private internal",e:/[{;=]/,k:a,c:[{bK:"class namespace interface",starts:{c:[b.TM]}},{b:b.IR+"\\s*\\(",rB:true,c:[b.TM]}]}]}});hljs.registerLanguage("ruby",function(f){var j="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?";var i="and false then defined module in return redo if BEGIN retry end for true self when next until do begin unless END rescue nil else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor";var b={cN:"yardoctag",b:"@[A-Za-z]+"};var c={cN:"value",b:"#<",e:">"};var k={cN:"comment",v:[{b:"#",e:"$",c:[b]},{b:"^\\=begin",e:"^\\=end",c:[b],r:10},{b:"^__END__",e:"\\n$"}]};var d={cN:"subst",b:"#\\{",e:"}",k:i};var e={cN:"string",c:[f.BE,d],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:"%[qw]?\\(",e:"\\)"},{b:"%[qw]?\\[",e:"\\]"},{b:"%[qw]?{",e:"}"},{b:"%[qw]?<",e:">"},{b:"%[qw]?/",e:"/"},{b:"%[qw]?%",e:"%"},{b:"%[qw]?-",e:"-"},{b:"%[qw]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/}]};var a={cN:"params",b:"\\(",e:"\\)",k:i};var h=[e,c,k,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[f.inherit(f.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{cN:"inheritance",b:"<\\s*",c:[{cN:"parent",b:"("+f.IR+"::)?"+f.IR}]},k]},{cN:"function",bK:"def",e:" |$|;",r:0,c:[f.inherit(f.TM,{b:j}),a,k]},{cN:"constant",b:"(::)?(\\b[A-Z]\\w*(::)?)+",r:0},{cN:"symbol",b:":",c:[e,{b:j}],r:0},{cN:"symbol",b:f.UIR+"(\\!|\\?)?:",r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{cN:"variable",b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{b:"("+f.RSR+")\\s*",c:[c,k,{cN:"regexp",c:[f.BE,d],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}],r:0}];d.c=h;a.c=h;var g=[{r:1,cN:"output",b:"^\\s*=> ",e:"$",rB:true,c:[{cN:"status",b:"^\\s*=>"},{b:" ",e:"$",c:h}]},{r:1,cN:"input",b:"^[^ ][^=>]*>+ ",e:"$",rB:true,c:[{cN:"prompt",b:"^[^ ][^=>]*>+"},{b:" ",e:"$",c:h}]}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:i,c:g.concat(h)}});hljs.registerLanguage("diff",function(a){return{aliases:["patch"],c:[{cN:"chunk",r:10,v:[{b:/^\@\@ +\-\d+,\d+ +\+\d+,\d+ +\@\@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"header",v:[{b:/Index: /,e:/$/},{b:/=====/,e:/=====$/},{b:/^\-\-\-/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+\+\+/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"change",b:"^\\!",e:"$"}]}});hljs.registerLanguage("javascript",function(a){return{aliases:["js"],k:{keyword:"in if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const class",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document"},c:[{cN:"pi",b:/^\s*('|")use strict('|")/,r:10},a.ASM,a.QSM,a.CLCM,a.CBCM,a.CNM,{b:"("+a.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[a.CLCM,a.CBCM,a.RM,{b:/;/,r:0,sL:"xml"}],r:0},{cN:"function",bK:"function",e:/\{/,eE:true,c:[a.inherit(a.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,c:[a.CLCM,a.CBCM],i:/["'\(]/}],i:/\[|%/},{b:/\$[(.]/},{b:"\\."+a.IR,r:0}]}});hljs.registerLanguage("xml",function(a){var c="[A-Za-z0-9\\._:-]+";var d={b:/<\?(php)?(?!\w)/,e:/\?>/,sL:"php",subLanguageMode:"continuous"};var b={eW:true,i:/]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xsl","plist"],cI:true,c:[{cN:"doctype",b:"",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"|$)",e:">",k:{title:"style"},c:[b],starts:{e:"",rE:true,sL:"css"}},{cN:"tag",b:"|$)",e:">",k:{title:"script"},c:[b],starts:{e:"<\/script>",rE:true,sL:"javascript"}},{b:"<%",e:"%>",sL:"vbscript"},d,{cN:"pi",b:/<\?\w+/,e:/\?>/,r:10},{cN:"tag",b:"",c:[{cN:"title",b:"[^ /><]+",r:0},b]}]}});hljs.registerLanguage("markdown",function(a){return{aliases:["md","mkdown","mkd"],c:[{cN:"header",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"blockquote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"`.+?`"},{b:"^( {4}|\t)",e:"$",r:0}]},{cN:"horizontal_rule",b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].+?[\\)\\]]",rB:true,c:[{cN:"link_label",b:"\\[",e:"\\]",eB:true,rE:true,r:0},{cN:"link_url",b:"\\]\\(",e:"\\)",eB:true,eE:true},{cN:"link_reference",b:"\\]\\[",e:"\\]",eB:true,eE:true}],r:10},{b:"^\\[.+\\]:",e:"$",rB:true,c:[{cN:"link_reference",b:"\\[",e:"\\]",eB:true,eE:true},{cN:"link_url",b:"\\s",e:"$"}]}]}});hljs.registerLanguage("css",function(a){var b="[a-zA-Z-][a-zA-Z0-9_-]*";var c={cN:"function",b:b+"\\(",rB:true,eE:true,e:"\\("};return{cI:true,i:"[=/|']",c:[a.CBCM,{cN:"id",b:"\\#[A-Za-z0-9_-]+"},{cN:"class",b:"\\.[A-Za-z0-9_-]+",r:0},{cN:"attr_selector",b:"\\[",e:"\\]",i:"$"},{cN:"pseudo",b:":(:)?[a-zA-Z0-9\\_\\-\\+\\(\\)\\\"\\']+"},{cN:"at_rule",b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{cN:"at_rule",b:"@",e:"[{;]",c:[{cN:"keyword",b:/\S+/},{b:/\s/,eW:true,eE:true,r:0,c:[c,a.ASM,a.QSM,a.CSSNM]}]},{cN:"tag",b:b,r:0},{cN:"rules",b:"{",e:"}",i:"[^\\s]",r:0,c:[a.CBCM,{cN:"rule",b:"[^\\s]",rB:true,e:";",eW:true,c:[{cN:"attribute",b:"[A-Z\\_\\.\\-]+",e:":",eE:true,i:"[^\\s]",starts:{cN:"value",eW:true,eE:true,c:[c,a.CSSNM,a.QSM,a.ASM,a.CBCM,{cN:"hexcolor",b:"#[0-9A-Fa-f]+"},{cN:"important",b:"!important"}]}}]}]}]}});hljs.registerLanguage("http",function(a){return{i:"\\S",c:[{cN:"status",b:"^HTTP/[0-9\\.]+",e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{cN:"request",b:"^[A-Z]+ (.*?) HTTP/[0-9\\.]+$",rB:true,e:"$",c:[{cN:"string",b:" ",e:" ",eB:true,eE:true}]},{cN:"attribute",b:"^\\w",e:": ",eE:true,i:"\\n|\\s|=",starts:{cN:"string",e:"$"}},{b:"\\n\\n",starts:{sL:"",eW:true}}]}});hljs.registerLanguage("java",function(b){var a="false synchronized int abstract float private char boolean static null if const for true while long throw strictfp finally protected import native final return void enum else break transient new catch instanceof byte super volatile case assert short package default double public try this switch continue throws";return{aliases:["jsp"],k:a,i:/<\//,c:[{cN:"javadoc",b:"/\\*\\*",e:"\\*/",c:[{cN:"javadoctag",b:"(^|\\s)@[A-Za-z]+"}],r:10},b.CLCM,b.CBCM,b.ASM,b.QSM,{bK:"protected public private",e:/[{;=]/,k:a,c:[{cN:"class",bK:"class interface",eW:true,eE:true,i:/[:"\[\]]/,c:[{bK:"extends implements",r:10},b.UTM]},{b:b.UIR+"\\s*\\(",rB:true,c:[b.UTM]}]},b.CNM,{cN:"annotation",b:"@[A-Za-z]+"}]}});hljs.registerLanguage("php",function(b){var e={cN:"variable",b:"(\\$|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"};var a={cN:"preprocessor",b:/<\?(php)?|\?>/};var c={cN:"string",c:[b.BE,a],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},b.inherit(b.ASM,{i:null}),b.inherit(b.QSM,{i:null})]};var d={v:[b.BNM,b.CNM]};return{aliases:["php3","php4","php5","php6"],cI:true,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",c:[b.CLCM,b.HCM,{cN:"comment",b:"/\\*",e:"\\*/",c:[{cN:"phpdoc",b:"\\s@[A-Za-z]+"},a]},{cN:"comment",b:"__halt_compiler.+?;",eW:true,k:"__halt_compiler",l:b.UIR},{cN:"string",b:"<<<['\"]?\\w+['\"]?$",e:"^\\w+;",c:[b.BE]},a,e,{cN:"function",bK:"function",e:/[;{]/,eE:true,i:"\\$|\\[|%",c:[b.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",e,b.CBCM,c,d]}]},{cN:"class",bK:"class interface",e:"{",eE:true,i:/[:\(\$"]/,c:[{bK:"extends implements",r:10},b.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[b.UTM]},{bK:"use",e:";",c:[b.UTM]},{b:"=>"},c,d]}});hljs.registerLanguage("python",function(a){var f={cN:"prompt",b:/^(>>>|\.\.\.) /};var b={cN:"string",c:[a.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[f],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[f],r:10},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},a.ASM,a.QSM]};var d={cN:"number",r:0,v:[{b:a.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:a.CNR+"[lLjJ]?"}]};var e={cN:"params",b:/\(/,e:/\)/,c:["self",f,d,b]};var c={e:/:/,i:/[${=;\n]/,c:[a.UTM,e]};return{aliases:["py","gyp"],k:{keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},i:/(<\/|->|\?)/,c:[f,d,b,a.HCM,a.inherit(c,{cN:"function",bK:"def",r:10}),a.inherit(c,{cN:"class",bK:"class"}),{cN:"decorator",b:/@/,e:/$/},{b:/\b(print|exec)\(/}]}});hljs.registerLanguage("sql",function(a){var b={cN:"comment",b:"--",e:"$"};return{cI:true,i:/[<>]/,c:[{cN:"operator",bK:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate savepoint release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup",e:/;/,eW:true,k:{keyword:"abs absolute acos action add adddate addtime aes_decrypt aes_encrypt after aggregate all allocate alter analyze and any are as asc ascii asin assertion at atan atan2 atn2 authorization authors avg backup before begin benchmark between bin binlog bit_and bit_count bit_length bit_or bit_xor both by cache call cascade cascaded case cast catalog ceil ceiling chain change changed char_length character_length charindex charset check checksum checksum_agg choose close coalesce coercibility collate collation collationproperty column columns columns_updated commit compress concat concat_ws concurrent connect connection connection_id consistent constraint constraints continue contributors conv convert convert_tz corresponding cos cot count count_big crc32 create cross cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime data database databases datalength date_add date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts datetimeoffsetfromparts day dayname dayofmonth dayofweek dayofyear deallocate declare decode default deferrable deferred degrees delayed delete des_decrypt des_encrypt des_key_file desc describe descriptor diagnostics difference disconnect distinct distinctrow div do domain double drop dumpfile each else elt enclosed encode encrypt end end-exec engine engines eomonth errors escape escaped event eventdata events except exception exec execute exists exp explain export_set extended external extract fast fetch field fields find_in_set first first_value floor flush for force foreign format found found_rows from from_base64 from_days from_unixtime full function get get_format get_lock getdate getutcdate global go goto grant grants greatest group group_concat grouping grouping_id gtid_subset gtid_subtract handler having help hex high_priority hosts hour ident_current ident_incr ident_seed identified identity if ifnull ignore iif ilike immediate in index indicator inet6_aton inet6_ntoa inet_aton inet_ntoa infile initially inner innodb input insert install instr intersect into is is_free_lock is_ipv4 is_ipv4_compat is_ipv4_mapped is_not is_not_null is_used_lock isdate isnull isolation join key kill language last last_day last_insert_id last_value lcase lead leading least leaves left len lenght level like limit lines ln load load_file local localtime localtimestamp locate lock log log10 log2 logfile logs low_priority lower lpad ltrim make_set makedate maketime master master_pos_wait match matched max md5 medium merge microsecond mid min minute mod mode module month monthname mutex name_const names national natural nchar next no no_write_to_binlog not now nullif nvarchar oct octet_length of old_password on only open optimize option optionally or ord order outer outfile output pad parse partial partition password patindex percent_rank percentile_cont percentile_disc period_add period_diff pi plugin position pow power pragma precision prepare preserve primary prior privileges procedure procedure_analyze processlist profile profiles public publishingservername purge quarter query quick quote quotename radians rand read references regexp relative relaylog release release_lock rename repair repeat replace replicate reset restore restrict return returns reverse revoke right rlike rollback rollup round row row_count rows rpad rtrim savepoint schema scroll sec_to_time second section select serializable server session session_user set sha sha1 sha2 share show sign sin size slave sleep smalldatetimefromparts snapshot some soname soundex sounds_like space sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_no_cache sql_small_result sql_variant_property sqlstate sqrt square start starting status std stddev stddev_pop stddev_samp stdev stdevp stop str str_to_date straight_join strcmp string stuff subdate substr substring subtime subtring_index sum switchoffset sysdate sysdatetime sysdatetimeoffset system_user sysutcdatetime table tables tablespace tan temporary terminated tertiary_weights then time time_format time_to_sec timediff timefromparts timestamp timestampadd timestampdiff timezone_hour timezone_minute to to_base64 to_days to_seconds todatetimeoffset trailing transaction translation trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse ucase uncompress uncompressed_length unhex unicode uninstall union unique unix_timestamp unknown unlock update upgrade upped upper usage use user user_resources using utc_date utc_time utc_timestamp uuid uuid_short validate_password_strength value values var var_pop var_samp variables variance varp version view warnings week weekday weekofyear weight_string when whenever where with work write xml xor year yearweek zon",literal:"true false null",built_in:"array bigint binary bit blob boolean char character date dec decimal float int integer interval number numeric real serial smallint varchar varying int8 serial8 text"},c:[{cN:"string",b:"'",e:"'",c:[a.BE,{b:"''"}]},{cN:"string",b:'"',e:'"',c:[a.BE,{b:'""'}]},{cN:"string",b:"`",e:"`",c:[a.BE]},a.CNM,a.CBCM,b]},a.CBCM,b]}});hljs.registerLanguage("ini",function(a){return{cI:true,i:/\S/,c:[{cN:"comment",b:";",e:"$"},{cN:"title",b:"^\\[",e:"\\]"},{cN:"setting",b:"^[a-z0-9\\[\\]_-]+[ \\t]*=[ \\t]*",e:"$",c:[{cN:"value",eW:true,k:"on off true false yes no",c:[a.QSM,a.NM],r:0}]}]}});hljs.registerLanguage("perl",function(c){var d="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when";var f={cN:"subst",b:"[$@]\\{",e:"\\}",k:d};var g={b:"->{",e:"}"};var a={cN:"variable",v:[{b:/\$\d/},{b:/[\$\%\@](\^\w\b|#\w+(\:\:\w+)*|{\w+}|\w+(\:\:\w*)*)/},{b:/[\$\%\@][^\s\w{]/,r:0}]};var e={cN:"comment",b:"^(__END__|__DATA__)",e:"\\n$",r:5};var h=[c.BE,f,a];var b=[a,c.HCM,e,{cN:"comment",b:"^\\=\\w",e:"\\=cut",eW:true},g,{cN:"string",c:h,v:[{b:"q[qwxr]?\\s*\\(",e:"\\)",r:5},{b:"q[qwxr]?\\s*\\[",e:"\\]",r:5},{b:"q[qwxr]?\\s*\\{",e:"\\}",r:5},{b:"q[qwxr]?\\s*\\|",e:"\\|",r:5},{b:"q[qwxr]?\\s*\\<",e:"\\>",r:5},{b:"qw\\s+q",e:"q",r:5},{b:"'",e:"'",c:[c.BE]},{b:'"',e:'"'},{b:"`",e:"`",c:[c.BE]},{b:"{\\w+}",c:[],r:0},{b:"-?\\w+\\s*\\=\\>",c:[],r:0}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\/\\/|"+c.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",r:0,c:[c.HCM,e,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",r:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[c.BE],r:0}]},{cN:"sub",bK:"sub",e:"(\\s*\\(.*?\\))?[;{]",r:5},{cN:"operator",b:"-\\w\\b",r:0}];f.c=b;g.c=b;return{aliases:["pl"],k:d,c:b}});hljs.registerLanguage("objectivec",function(a){var d={keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"NSString NSDictionary CGRect CGPoint UIButton UILabel UITextView UIWebView MKMapView NSView NSViewController NSWindow NSWindowController NSSet NSUUID NSIndexSet UISegmentedControl NSObject UITableViewDelegate UITableViewDataSource NSThread UIActivityIndicator UITabbar UIToolBar UIBarButtonItem UIImageView NSAutoreleasePool UITableView BOOL NSInteger CGFloat NSException NSLog NSMutableString NSMutableArray NSMutableDictionary NSURL NSIndexPath CGSize UITableViewCell UIView UIViewController UINavigationBar UINavigationController UITabBarController UIPopoverController UIPopoverControllerDelegate UIImage NSNumber UISearchBar NSFetchedResultsController NSFetchedResultsChangeType UIScrollView UIScrollViewDelegate UIEdgeInsets UIColor UIFont UIApplication NSNotFound NSNotificationCenter NSNotification UILocalNotification NSBundle NSFileManager NSTimeInterval NSDate NSCalendar NSUserDefaults UIWindow NSRange NSArray NSError NSURLRequest NSURLConnection UIInterfaceOrientation MPMoviePlayerController dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"};var c=/[a-zA-Z@][a-zA-Z0-9_]*/;var b="@interface @class @protocol @implementation";return{aliases:["m","mm","objc","obj-c"],k:d,l:c,i:""}]}]},{cN:"class",b:"("+b.split(" ").join("|")+")\\b",e:"({|$)",eE:true,k:b,l:c,c:[a.UTM]},{cN:"variable",b:"\\."+a.UIR,r:0}]}});hljs.registerLanguage("coffeescript",function(c){var b={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super then unless until loop of by when and or is isnt not",literal:"true false null undefined yes no on off",reserved:"case default function var void with const let enum export import native __hasProp __extends __slice __bind __indexOf",built_in:"npm require console print module global window document"};var a="[A-Za-z$_][0-9A-Za-z$_]*";var f=c.inherit(c.TM,{b:a});var e={cN:"subst",b:/#\{/,e:/}/,k:b};var d=[c.BNM,c.inherit(c.CNM,{starts:{e:"(\\s*/)?",r:0}}),{cN:"string",v:[{b:/'''/,e:/'''/,c:[c.BE]},{b:/'/,e:/'/,c:[c.BE]},{b:/"""/,e:/"""/,c:[c.BE,e]},{b:/"/,e:/"/,c:[c.BE,e]}]},{cN:"regexp",v:[{b:"///",e:"///",c:[e,c.HCM]},{b:"//[gim]*",r:0},{b:"/\\S(\\\\.|[^\\n])*?/[gim]*(?=\\s|\\W|$)"}]},{cN:"property",b:"@"+a},{b:"`",e:"`",eB:true,eE:true,sL:"javascript"}];e.c=d;return{aliases:["coffee","cson","iced"],k:b,c:d.concat([{cN:"comment",b:"###",e:"###"},c.HCM,{cN:"function",b:"("+a+"\\s*=\\s*)?(\\(.*\\))?\\s*\\B[-=]>",e:"[-=]>",rB:true,c:[f,{cN:"params",b:"\\(",rB:true,c:[{b:/\(/,e:/\)/,k:b,c:["self"].concat(d)}]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:true,i:/[:="\[\]]/,c:[f]},f]},{cN:"attribute",b:a+":",e:":",rB:true,eE:true,r:0}])}});hljs.registerLanguage("nginx",function(c){var b={cN:"variable",v:[{b:/\$\d+/},{b:/\$\{/,e:/}/},{b:"[\\$\\@]"+c.UIR}]};var a={eW:true,l:"[a-z/_]+",k:{built_in:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},r:0,i:"=>",c:[c.HCM,{cN:"string",c:[c.BE,b],v:[{b:/"/,e:/"/},{b:/'/,e:/'/}]},{cN:"url",b:"([a-z]+):/",e:"\\s",eW:true,eE:true},{cN:"regexp",c:[c.BE,b],v:[{b:"\\s\\^",e:"\\s|{|;",rE:true},{b:"~\\*?\\s+",e:"\\s|{|;",rE:true},{b:"\\*(\\.[a-z\\-]+)+"},{b:"([a-z\\-]+\\.)+\\*"}]},{cN:"number",b:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{cN:"number",b:"\\b\\d+[kKmMgGdshdwy]*\\b",r:0},b]};return{aliases:["nginxconf"],c:[c.HCM,{b:c.UIR+"\\s",e:";|{",rB:true,c:[{cN:"title",b:c.UIR,starts:a}],r:0}],i:"[^\\s\\}]"}});hljs.registerLanguage("json",function(a){var e={literal:"true false null"};var d=[a.QSM,a.CNM];var c={cN:"value",e:",",eW:true,eE:true,c:d,k:e};var b={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:true,eE:true,c:[a.BE],i:"\\n",starts:c}],i:"\\S"};var f={b:"\\[",e:"\\]",c:[a.inherit(c,{cN:null})],i:"\\S"};d.splice(d.length,0,b,f);return{c:d,k:e,i:"\\S"}});hljs.registerLanguage("apache",function(a){var b={cN:"number",b:"[\\$%]\\d+"};return{aliases:["apacheconf"],cI:true,c:[a.HCM,{cN:"tag",b:""},{cN:"keyword",b:/\w+/,r:0,k:{common:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{e:/$/,r:0,k:{literal:"on off all"},c:[{cN:"sqbracket",b:"\\s\\[",e:"\\]$"},{cN:"cbracket",b:"[\\$%]\\{",e:"\\}",c:["self",b]},b,a.QSM]}}],i:/\S/}});hljs.registerLanguage("cpp",function(a){var b={keyword:"false int float while private char catch export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const struct for static_cast|10 union namespace unsigned long throw volatile static protected bool template mutable if public friend do return goto auto void enum else break new extern using true class asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue wchar_t inline delete alignof char16_t char32_t constexpr decltype noexcept nullptr static_assert thread_local restrict _Bool complex _Complex _Imaginary",built_in:"std string cin cout cerr clog stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf"};return{aliases:["c","h","c++","h++"],k:b,i:""]',k:"include",i:"\\n"},a.CLCM]},{cN:"stl_container",b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:b,c:["self"]},{b:a.IR+"::"}]}});hljs.registerLanguage("makefile",function(a){var b={cN:"variable",b:/\$\(/,e:/\)/,c:[a.BE]};return{aliases:["mk","mak"],c:[a.HCM,{b:/^\w+\s*\W*=/,rB:true,r:0,starts:{cN:"constant",e:/\s*\W*=/,eE:true,starts:{e:/$/,r:0,c:[b]}}},{cN:"title",b:/^[\w]+:\s*$/},{cN:"phony",b:/^\.PHONY:/,e:/$/,k:".PHONY",l:/[\.\w]+/},{b:/^\t+/,e:/$/,c:[a.QSM,b]}]}}); \ No newline at end of file diff --git a/themes/default/highlightjs/styles/default.css b/themes/default/highlightjs/styles/default.css new file mode 100644 index 000000000..e5bd2801d --- /dev/null +++ b/themes/default/highlightjs/styles/default.css @@ -0,0 +1,152 @@ +/* + +Original style from softwaremaniacs.org (c) Ivan Sagalaev + +*/ + +.hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + background: #f0f0f0; +} + +.hljs, +.hljs-subst, +.hljs-tag .hljs-title, +.lisp .hljs-title, +.clojure .hljs-built_in, +.nginx .hljs-title { + color: black; +} + +.hljs-string, +.hljs-title, +.hljs-constant, +.hljs-parent, +.hljs-tag .hljs-value, +.hljs-rules .hljs-value, +.hljs-preprocessor, +.hljs-pragma, +.haml .hljs-symbol, +.ruby .hljs-symbol, +.ruby .hljs-symbol .hljs-string, +.hljs-template_tag, +.django .hljs-variable, +.smalltalk .hljs-class, +.hljs-addition, +.hljs-flow, +.hljs-stream, +.bash .hljs-variable, +.apache .hljs-tag, +.apache .hljs-cbracket, +.tex .hljs-command, +.tex .hljs-special, +.erlang_repl .hljs-function_or_atom, +.asciidoc .hljs-header, +.markdown .hljs-header, +.coffeescript .hljs-attribute { + color: #800; +} + +.smartquote, +.hljs-comment, +.hljs-annotation, +.hljs-template_comment, +.diff .hljs-header, +.hljs-chunk, +.asciidoc .hljs-blockquote, +.markdown .hljs-blockquote { + color: #888; +} + +.hljs-number, +.hljs-date, +.hljs-regexp, +.hljs-literal, +.hljs-hexcolor, +.smalltalk .hljs-symbol, +.smalltalk .hljs-char, +.go .hljs-constant, +.hljs-change, +.lasso .hljs-variable, +.makefile .hljs-variable, +.asciidoc .hljs-bullet, +.markdown .hljs-bullet, +.asciidoc .hljs-link_url, +.markdown .hljs-link_url { + color: #080; +} + +.hljs-label, +.hljs-javadoc, +.ruby .hljs-string, +.hljs-decorator, +.hljs-filter .hljs-argument, +.hljs-localvars, +.hljs-array, +.hljs-attr_selector, +.hljs-important, +.hljs-pseudo, +.hljs-pi, +.haml .hljs-bullet, +.hljs-doctype, +.hljs-deletion, +.hljs-envvar, +.hljs-shebang, +.apache .hljs-sqbracket, +.nginx .hljs-built_in, +.tex .hljs-formula, +.erlang_repl .hljs-reserved, +.hljs-prompt, +.asciidoc .hljs-link_label, +.markdown .hljs-link_label, +.vhdl .hljs-attribute, +.clojure .hljs-attribute, +.asciidoc .hljs-attribute, +.lasso .hljs-attribute, +.coffeescript .hljs-property, +.hljs-phony { + color: #88f; +} + +.hljs-keyword, +.hljs-id, +.hljs-title, +.hljs-built_in, +.css .hljs-tag, +.hljs-javadoctag, +.hljs-phpdoc, +.hljs-yardoctag, +.smalltalk .hljs-class, +.hljs-winutils, +.bash .hljs-variable, +.apache .hljs-tag, +.go .hljs-typename, +.tex .hljs-command, +.asciidoc .hljs-strong, +.markdown .hljs-strong, +.hljs-request, +.hljs-status { + font-weight: bold; +} + +.asciidoc .hljs-emphasis, +.markdown .hljs-emphasis { + font-style: italic; +} + +.nginx .hljs-built_in { + font-weight: normal; +} + +.coffeescript .javascript, +.javascript .xml, +.lasso .markup, +.tex .hljs-formula, +.xml .javascript, +.xml .vbscript, +.xml .css, +.xml .hljs-cdata { + opacity: 0.5; +} diff --git a/themes/default/highlightjs/styles/github.css b/themes/default/highlightjs/styles/github.css new file mode 100644 index 000000000..47fc26517 --- /dev/null +++ b/themes/default/highlightjs/styles/github.css @@ -0,0 +1,127 @@ +/* + +github.com style (c) Vasily Polovnyov + +*/ + +.hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + color: #333; + background: #f8f8f8; +} + +.hljs-comment, +.hljs-template_comment, +.diff .hljs-header, +.hljs-javadoc { + color: #998; + font-style: italic; +} + +.hljs-keyword, +.css .rule .hljs-keyword, +.hljs-winutils, +.javascript .hljs-title, +.nginx .hljs-title, +.hljs-subst, +.hljs-request, +.hljs-status { + color: #333; + font-weight: bold; +} + +.hljs-number, +.hljs-hexcolor, +.ruby .hljs-constant { + color: #099; +} + +.hljs-string, +.hljs-tag .hljs-value, +.hljs-phpdoc, +.tex .hljs-formula { + color: #d14; +} + +.hljs-title, +.hljs-id, +.coffeescript .hljs-params, +.scss .hljs-preprocessor { + color: #900; + font-weight: bold; +} + +.javascript .hljs-title, +.lisp .hljs-title, +.clojure .hljs-title, +.hljs-subst { + font-weight: normal; +} + +.hljs-class .hljs-title, +.haskell .hljs-type, +.vhdl .hljs-literal, +.tex .hljs-command { + color: #458; + font-weight: bold; +} + +.hljs-tag, +.hljs-tag .hljs-title, +.hljs-rules .hljs-property, +.django .hljs-tag .hljs-keyword { + color: #000080; + font-weight: normal; +} + +.hljs-attribute, +.hljs-variable, +.lisp .hljs-body { + color: #008080; +} + +.hljs-regexp { + color: #009926; +} + +.hljs-symbol, +.ruby .hljs-symbol .hljs-string, +.lisp .hljs-keyword, +.tex .hljs-special, +.hljs-prompt { + color: #990073; +} + +.hljs-built_in, +.lisp .hljs-title, +.clojure .hljs-built_in { + color: #0086b3; +} + +.hljs-preprocessor, +.hljs-pragma, +.hljs-pi, +.hljs-doctype, +.hljs-shebang, +.hljs-cdata { + color: #999; + font-weight: bold; +} + +.hljs-deletion { + background: #fdd; +} + +.hljs-addition { + background: #dfd; +} + +.diff .hljs-change { + background: #0086b3; +} + +.hljs-chunk { + color: #aaa; +} diff --git a/themes/default/highlightjs/styles/googlecode.css b/themes/default/highlightjs/styles/googlecode.css new file mode 100644 index 000000000..fd237367d --- /dev/null +++ b/themes/default/highlightjs/styles/googlecode.css @@ -0,0 +1,148 @@ +/* + +Google Code style (c) Aahan Krish + +*/ + +.hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + background: white; + color: black; +} + +.hljs-comment, +.hljs-template_comment, +.hljs-javadoc { + color: #800; +} + +.hljs-keyword, +.method, +.hljs-list .hljs-title, +.clojure .hljs-built_in, +.nginx .hljs-title, +.hljs-tag .hljs-title, +.setting .hljs-value, +.hljs-winutils, +.tex .hljs-command, +.http .hljs-title, +.hljs-request, +.hljs-status { + color: #008; +} + +.hljs-envvar, +.tex .hljs-special { + color: #660; +} + +.hljs-string, +.hljs-tag .hljs-value, +.hljs-cdata, +.hljs-filter .hljs-argument, +.hljs-attr_selector, +.apache .hljs-cbracket, +.hljs-date, +.hljs-regexp, +.coffeescript .hljs-attribute { + color: #080; +} + +.hljs-sub .hljs-identifier, +.hljs-pi, +.hljs-tag, +.hljs-tag .hljs-keyword, +.hljs-decorator, +.ini .hljs-title, +.hljs-shebang, +.hljs-prompt, +.hljs-hexcolor, +.hljs-rules .hljs-value, +.hljs-literal, +.hljs-symbol, +.ruby .hljs-symbol .hljs-string, +.hljs-number, +.css .hljs-function, +.clojure .hljs-attribute { + color: #066; +} + +.hljs-class .hljs-title, +.haskell .hljs-type, +.smalltalk .hljs-class, +.hljs-javadoctag, +.hljs-yardoctag, +.hljs-phpdoc, +.hljs-typename, +.hljs-tag .hljs-attribute, +.hljs-doctype, +.hljs-class .hljs-id, +.hljs-built_in, +.setting, +.hljs-params, +.hljs-variable, +.clojure .hljs-title { + color: #606; +} + +.css .hljs-tag, +.hljs-rules .hljs-property, +.hljs-pseudo, +.hljs-subst { + color: #000; +} + +.css .hljs-class, +.css .hljs-id { + color: #9b703f; +} + +.hljs-value .hljs-important { + color: #ff7700; + font-weight: bold; +} + +.hljs-rules .hljs-keyword { + color: #c5af75; +} + +.hljs-annotation, +.apache .hljs-sqbracket, +.nginx .hljs-built_in { + color: #9b859d; +} + +.hljs-preprocessor, +.hljs-preprocessor *, +.hljs-pragma { + color: #444; +} + +.tex .hljs-formula { + background-color: #eee; + font-style: italic; +} + +.diff .hljs-header, +.hljs-chunk { + color: #808080; + font-weight: bold; +} + +.diff .hljs-change { + background-color: #bccff9; +} + +.hljs-addition { + background-color: #baeeba; +} + +.hljs-deletion { + background-color: #ffc8bd; +} + +.hljs-comment .hljs-yardoctag { + font-weight: bold; +} diff --git a/themes/default/view.twig b/themes/default/view.twig index b7d48c002..88d140796 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -1,6 +1,7 @@ {% extends "layout.twig" %} {% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %} {% block content %} + {% include '_highlight.twig' %} {% include '_pocheit-form.twig' %}
      From 0ce85e0a7fa873c69f1ec159bc188c6a58a2ad21 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Wed, 23 Jul 2014 14:27:57 +0300 Subject: [PATCH 12/24] config for habrahabr.ru to grep articles with comments --- .../site_config/standard/habrahabr.ru.txt | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 inc/3rdparty/site_config/standard/habrahabr.ru.txt diff --git a/inc/3rdparty/site_config/standard/habrahabr.ru.txt b/inc/3rdparty/site_config/standard/habrahabr.ru.txt new file mode 100755 index 000000000..675383595 --- /dev/null +++ b/inc/3rdparty/site_config/standard/habrahabr.ru.txt @@ -0,0 +1,21 @@ +title: //span[@class="post_title"] +author: //div[@class="author"] +date: //div[@class="published + +body: //div[@class='content html_format'] | //div[@id='comments'] + +strip: //a[@class="link_to_comment"] +strip: //div[@class="show_tree"] +strip: //a[@class="to_parent"] + + +replace_string(class="reply_comments"): style="padding-left: 20px" +replace_string(class="voting "): style="float: right" +replace_string(src="//habrastorage.org/getpro/habr/avatars/): style="width:24px; height:24px;" class="123" src="//habrastorage.org/getpro/habr/avatars/ +replace_string(class="info "): style="padding-top:5px;font-size:0.85em;line-height:24px;" + + +prune: no +tidy: no + +test_url: http://habrahabr.ru/post/229883/ \ No newline at end of file From 7dd8b5026d0ae52fc5be001ee224aac72f3e7b25 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 24 Jul 2014 16:48:41 +0300 Subject: [PATCH 13/24] security issue --- inc/poche/Poche.class.php | 4 +- inc/poche/Routing.class.php | 83 +++++++++++++++++++------------------ 2 files changed, 45 insertions(+), 42 deletions(-) mode change 100644 => 100755 inc/poche/Routing.class.php diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index a49413f23..098dd7c19 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -750,8 +750,8 @@ class Poche die(sprintf(_('User with this id (%d) does not exist.'), $user_id)); } - if (!in_array($type, $allowed_types) || $token != $config['token']) { - die(_('Uh, there is a problem while generating feeds.')); + if (!in_array($type, $allowed_types) || !isset($config['token']) || $token != $config['token']) { + die(_('Uh, there is a problem while generating feed. Wrong token used?')); } $feed = new FeedWriter(RSS2); diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php old mode 100644 new mode 100755 index eb4c4d900..653fa9003 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php @@ -97,50 +97,53 @@ class Routing private function _launchAction() { - if (isset($_GET['login'])) { - // hello you - $this->wallabag->login($this->referer); - } elseif (isset($_GET['logout'])) { - // see you soon ! - $this->wallabag->logout(); - } elseif (isset($_GET['config'])) { - // update password - $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']); - } elseif (isset($_GET['newuser'])) { - $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']); - } elseif (isset($_GET['deluser'])) { - $this->wallabag->deleteUser($_POST['password4deletinguser']); - } elseif (isset($_GET['epub'])) { - $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['id'], $_GET['value']); - $epub->run(); - } elseif (isset($_GET['import'])) { - $import = $this->wallabag->import(); - $tplVars = array_merge($this->vars, $import); - } elseif (isset($_GET['download'])) { - Tools::downloadDb(); - } elseif (isset($_GET['empty-cache'])) { - Tools::emptyCache(); - } elseif (isset($_GET['export'])) { - $this->wallabag->export(); - } elseif (isset($_GET['updatetheme'])) { - $this->wallabag->tpl->updateTheme($_POST['theme']); - } elseif (isset($_GET['updatelanguage'])) { - $this->wallabag->language->updateLanguage($_POST['language']); - } elseif (isset($_GET['uploadfile'])) { - $this->wallabag->uploadFile(); - } elseif (isset($_GET['feed'])) { - if (isset($_GET['action']) && $_GET['action'] == 'generate') { + if (isset($_GET['login'])) { + // hello to you + $this->wallabag->login($this->referer); + } elseif (isset($_GET['feed']) && isset($_GET['user_id'])) { + $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0); + $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type']); + } + + //allowed ONLY to logged in user + if ( \Session::isLogged() === true ) + { + if (isset($_GET['logout'])) { + // see you soon ! + $this->wallabag->logout(); + } elseif (isset($_GET['config'])) { + // update password + $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']); + } elseif (isset($_GET['newuser'])) { + $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']); + } elseif (isset($_GET['deluser'])) { + $this->wallabag->deleteUser($_POST['password4deletinguser']); + } elseif (isset($_GET['epub'])) { + $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['id'], $_GET['value']); + $epub->run(); + } elseif (isset($_GET['import'])) { + $import = $this->wallabag->import(); + $tplVars = array_merge($this->vars, $import); + } elseif (isset($_GET['download'])) { + Tools::downloadDb(); + } elseif (isset($_GET['empty-cache'])) { + Tools::emptyCache(); + } elseif (isset($_GET['export'])) { + $this->wallabag->export(); + } elseif (isset($_GET['updatetheme'])) { + $this->wallabag->tpl->updateTheme($_POST['theme']); + } elseif (isset($_GET['updatelanguage'])) { + $this->wallabag->language->updateLanguage($_POST['language']); + } elseif (isset($_GET['uploadfile'])) { + $this->wallabag->uploadFile(); + } elseif (isset($_GET['feed']) && isset($_GET['action']) && $_GET['action'] == 'generate') { $this->wallabag->updateToken(); } - else { - $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0); - $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type']); + elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) { + $plainUrl = new Url(base64_encode($_GET['plainurl'])); + $this->wallabag->action('add', $plainUrl); } } - elseif (isset($_GET['plainurl']) && !empty($_GET['plainurl'])) { - $plainUrl = new Url(base64_encode($_GET['plainurl'])); - $this->wallabag->action('add', $plainUrl); - } } public function _render($file, $vars) From 830612f555d8bc72669fe9bc0686680001af0e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 25 Jul 2014 07:26:56 +0200 Subject: [PATCH 14/24] typo --- inc/poche/Routing.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index 653fa9003..004bd45a9 100755 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php @@ -97,16 +97,16 @@ class Routing private function _launchAction() { - if (isset($_GET['login'])) { - // hello to you - $this->wallabag->login($this->referer); + if (isset($_GET['login'])) { + // hello to you + $this->wallabag->login($this->referer); } elseif (isset($_GET['feed']) && isset($_GET['user_id'])) { $tag_id = (isset($_GET['tag_id']) ? intval($_GET['tag_id']) : 0); $this->wallabag->generateFeeds($_GET['token'], filter_var($_GET['user_id'],FILTER_SANITIZE_NUMBER_INT), $tag_id, $_GET['type']); } //allowed ONLY to logged in user - if ( \Session::isLogged() === true ) + if (\Session::isLogged() === true) { if (isset($_GET['logout'])) { // see you soon ! From 2f3c05651e6013a28188d0e7fbf075011ed63e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 25 Jul 2014 07:50:15 +0200 Subject: [PATCH 15/24] guidelines for wallabag --- GUIDELINES.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 GUIDELINES.md diff --git a/GUIDELINES.md b/GUIDELINES.md new file mode 100644 index 000000000..51e0de936 --- /dev/null +++ b/GUIDELINES.md @@ -0,0 +1,53 @@ +# Guidelines for wallabag + +If you want to contribute to wallabag, you have some rules to respect. These rules were defined by [PHP Framework Interop Group](http://www.php-fig.org). + +## Basic Coding Standard (PSR-1) + +This section of the standard comprises what should be considered the standard coding elements that are required to ensure a high level of technical interoperability between shared PHP code. + +* Files MUST use only ` Date: Fri, 25 Jul 2014 07:50:56 +0200 Subject: [PATCH 16/24] thank you @mariroz & @tcitworld :) --- CREDITS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CREDITS.md b/CREDITS.md index 7ec3cbb7a..f1e9d7af4 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -11,4 +11,6 @@ wallabag is based on : wallabag is mainly developed by Nicolas Lœuillet under the MIT License +Thank you so much to @tcitworld and @mariroz. + Contributors : https://github.com/wallabag/wallabag/graphs/contributors \ No newline at end of file From 70549136ba0ba5692448a079b6911cf8bb52cbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 25 Jul 2014 07:52:00 +0200 Subject: [PATCH 17/24] link to guidelines in contributing file --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9ccb0b149..58bc71345 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,3 +26,5 @@ Note : If you have large portions of text, use [Github's Gist service](https://g ## You want to fix a bug or to add a feature Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**. + +[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md). \ No newline at end of file From dc764892213e8d1cb458621910aa8d0ce0a3eb7e Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Fri, 15 Aug 2014 19:22:55 +0300 Subject: [PATCH 18/24] minimum of control on server side added --- inc/poche/Poche.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 09a9f5ff8..bcf2ddeb6 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -906,7 +906,7 @@ class Poche */ public function import() { - if ( isset($_FILES['file']) ) { + if ( isset($_FILES['file']) && $_FILES['file']['tmp_name'] ) { Tools::logm('Import stated: parsing file'); // assume, that file is in json format @@ -976,6 +976,9 @@ class Poche } Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).'); } + else { + $this->messages->add('s', _('Did you forget to select a file?')); + } //file parsing finished here //now download article contents if any From 211068ce504c48ee95e742a12ec04f16f3988c6c Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 21 Aug 2014 17:17:36 +0300 Subject: [PATCH 19/24] vendor dir is not accessible before install, sqlite db dir write check moved into db class --- check_setup.php | 5 ----- inc/poche/Database.class.php | 4 ++++ index.php | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) mode change 100644 => 100755 check_setup.php diff --git a/check_setup.php b/check_setup.php old mode 100644 new mode 100755 index 7e378b153..cf02c34ba --- a/check_setup.php +++ b/check_setup.php @@ -5,11 +5,6 @@ if (! is_writable('cache')) { die('The directory "cache" must be writeable by your web server user'); } -// Check if /db is writeable -if (! is_writable('db') && STORAGE === 'sqlite') { - die('The directory "db" must be writeable by your web server user'); -} - // install folder still present, need to install wallabag if (is_dir('install')) { require('install/index.php'); diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index 2c80b64b5..dfd7ae349 100755 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -23,6 +23,10 @@ class Database { { switch (STORAGE) { case 'sqlite': + // Check if /db is writeable + if ( !is_writable(STORAGE_SQLITE) || !is_writable(dirname(STORAGE_SQLITE))) { + die('An error occured: "db" directory must be writeable for your web server user!'); + } $db_path = 'sqlite:' . STORAGE_SQLITE; $this->handle = new PDO($db_path); break; diff --git a/index.php b/index.php index f191d7e71..39990d55a 100755 --- a/index.php +++ b/index.php @@ -10,8 +10,8 @@ define ('POCHE', '1.8.0'); require 'check_essentials.php'; -require_once 'inc/poche/global.inc.php'; require 'check_setup.php'; +require_once 'inc/poche/global.inc.php'; // Start session Session::$sessionName = 'wallabag'; From ecb8c1389c353fa1dead7e70b35d6140257c8830 Mon Sep 17 00:00:00 2001 From: zinnober Date: Sat, 23 Aug 2014 16:47:29 +0200 Subject: [PATCH 20/24] Complete rework of faz.net-template adding multipage support and major article cleanup --- .../site_config/custom/blogs.faz.net.txt | 45 +++++++ inc/3rdparty/site_config/standard/faz.net.txt | 113 ++++++++++++++---- 2 files changed, 134 insertions(+), 24 deletions(-) create mode 100644 inc/3rdparty/site_config/custom/blogs.faz.net.txt mode change 100755 => 100644 inc/3rdparty/site_config/standard/faz.net.txt diff --git a/inc/3rdparty/site_config/custom/blogs.faz.net.txt b/inc/3rdparty/site_config/custom/blogs.faz.net.txt new file mode 100644 index 000000000..4f2626f1d --- /dev/null +++ b/inc/3rdparty/site_config/custom/blogs.faz.net.txt @@ -0,0 +1,45 @@ +# Author: zinnober + +tidy: no +prune: no + +# Set author +author: //a[@rel='author'] + +# Set date +date: //span[@class='Datum'] + +# Content is here +body: //div[@class='Artikel'] + +# Tidy up before article +strip: //div[@id='FAZHeaderNeu'] +strip: //h2[@itemprop='headline'] +strip: //span[@class='Datum'] +strip: //span[@class='Autor'] +strip_id_or_class: ArticlePagerTop +strip: //div[@class='FAZArtikelEinleitung']/h2 + +# General cleanup +strip: //div[@class='clear'] +strip: //span[@class='Bildnachweis'] +strip: //iframe +strip_id_or_class: Community +strip: ' · ' + +# Remove tracking and ads +strip_image_src: /l.gif? +strip: //img[@width='1'] +strip_id_or_class: invisible +strip_id_or_class: Anzeige +strip_id_or_class: billboard + +# Remove clutter after article +strip_id_or_class: Tagline +strip_id_or_class: ArtikelAbbinder +strip_id_or_class: FAZArtikelKommentare +strip_id_or_class: ArtikelKommentieren +strip_id_or_class: FAZContentRight + +# Try it yourself +test_url: http://blogs.faz.net/wost/2014/08/17/viel-fuck-und-wenig-guter-sex-1239/ diff --git a/inc/3rdparty/site_config/standard/faz.net.txt b/inc/3rdparty/site_config/standard/faz.net.txt old mode 100755 new mode 100644 index d087d2aa2..47048a1b2 --- a/inc/3rdparty/site_config/standard/faz.net.txt +++ b/inc/3rdparty/site_config/standard/faz.net.txt @@ -1,36 +1,101 @@ +# Author: zinnober +# Complete rewrite of the faz.net template as the standard one is broken +# I tried to consider as many page variants as possible, which was some serious work + +tidy: no +prune: no + # Title title: //p[@class='Content HeadlineShort'] -# Authors -# some are known and have a link, others don't -author: substring-after(//span[@class='Autor'], 'Von') +# Set author +author: substring-after(//span[@class='Autor'], 'von ') +author: //span[@class='caps last']/span[@class='caps last'] +author: //a[@rel='author'] -# Date +# Set date date: //span[@class='Datum'] +date: //span[@class='Datum'],/span -# Body +# Fetch full multipage articles +next_page_link: //a[@title='Nächste Seite'] + +# Content is here body: //div[@class='Artikel'] -# Removements before body text -strip: //div[@class='Breadcrumbs'] -strip: //div[@class='QuickSearchBox'] -strip: //div[@class='FAZArtikelEinleitung'] -strip: //div[@class='FAZArtikelReiter'] +# Tidy up before article +strip: //div[@id='FAZHeaderNeu'] +strip: //h2[@itemprop='headline'] +strip: //span[@class='Datum'] +strip: //span[@class='Autor'] +strip_id_or_class: ArticlePagerTop + +# General cleanup strip: //div[@class='clear'] +strip: //a[@title='Zur Homepage FAZ.NET'] +strip: //iframe +replace_string( · ): -# General removements -strip: //span[@class='Bildnachweis'] -strip: //img[@class='MediaIcon'] -strip: //div[@class='ArtikelMediaLink'] -dissolve: //a[img] +# Remove tracking and ads +strip_image_src: /l.gif? +strip: //div[contains(@style, 'background-image')] +strip: //img[@width='1'] +strip_id_or_class: invisible +strip_id_or_class: Anzeige +strip_id_or_class: billboard -# Removements after body text -strip: //div[@class='ArtikelAbbinder'] -strip: //div[@class='ArtikelKommentieren Artikelfuss GETS;tk;boxen.top-lesermeinungen;tp;content'] -strip: //div[@class='FAZArtikelKommentare FAZArtikelContent'] -strip: //div[@class='FAZArtikelFunktionen'] -strip: //div[@id='FAZContentRight'] +# Remove various text boxes and social media foo +strip_id_or_class: WeitereBeitraege +strip_id_or_class: WBListe +strip_id_or_class: AutorenModul +strip_id_or_class: Community +strip_id_or_class: SocialMediaStatus +strip_id_or_class: RelatedLinkBox +strip_id_or_class: MultimediaNavigation +strip_id_or_class: IndexTitel + +# Fix picture caps and pictures (use better resolution and remove clutter) +strip_id_or_class: LightBoxOverlay +strip_id_or_class: exitLarge +strip_id_or_class: PagerBox +strip_id_or_class: Bildnachweis +strip_id_or_class: Bildueberschrift +strip_id_or_class: Bildbeschreibung +strip_id_or_class: ArtikelBild610 +strip_id_or_class: MediaLink +strip_id_or_class: FotoBoxInnerLeft +strip_id_or_class: BilderRelatedLinks + +# Remove clutter after article +strip_id_or_class: ArticlePagerBottom +strip_id_or_class: backToHome +strip_id_or_class: ArtikelAbbinder +strip_id_or_class: lesermeinungscontainer +strip_id_or_class: ThemenLinks +strip_id_or_class: rechtehinweis +strip_id_or_class: FAZArtikelMap +strip_id_or_class: FAZArtikelKommentare +strip_id_or_class: ArtikelKommentieren +strip_id_or_class: FAZArtikelFunktionen +strip_id_or_class: mailLB +strip_id_or_class: FAZContentRight +strip_id_or_class: stageModule +strip_id_or_class: ContentFooter +strip_id_or_class: ServicesFooter +strip_id_or_class: FAZFooter + +# Clean up stuff present just in some articles +strip_id_or_class: Teaser620 +strip_id_or_class: TeaserMultimedia +strip_id_or_class: VideoBox + +# Remove as soon as Wallabag maight be able to embed flash video +strip_id_or_class: mmoObjectAsTeaserInArticle +strip_id_or_class: additionalStylesAudioVideo +strip_id_or_class: hideMMElements + +# Try it yourself +test_url: http://www.faz.net/aktuell/feuilleton/zum-tod-von-margaret-thatcher-die-reizfigur-12141919.html#Drucken +test_url: http://www.faz.net/aktuell/politik/inland/allensbach-analyse-im-namen-des-volkes-13106492.html +test_url: http://www.faz.net/aktuell/feuilleton/kino/video-filmkritiken/video-filmkritik-when-animals-dream-zerrissene-jugend-13105772.html -# Fix picture captions -wrap_in(small): //span[@class='Bildunterschrift']/text() -test_url: http://www.faz.net/aktuell/feuilleton/zum-tod-von-margaret-thatcher-die-reizfigur-12141919.html#Drucken \ No newline at end of file From 8763e4efde17f133d0bda504640acada108e7870 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 26 Aug 2014 12:43:56 +0200 Subject: [PATCH 21/24] Fix downloading SQLite database from all users --- inc/poche/Routing.class.php | 2 -- inc/poche/Tools.class.php | 20 +++++++++++--------- themes/baggy/config.twig | 2 -- themes/default/config.twig | 1 - 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index 004bd45a9..0b3730580 100755 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php @@ -124,8 +124,6 @@ class Routing } elseif (isset($_GET['import'])) { $import = $this->wallabag->import(); $tplVars = array_merge($this->vars, $import); - } elseif (isset($_GET['download'])) { - Tools::downloadDb(); } elseif (isset($_GET['empty-cache'])) { Tools::emptyCache(); } elseif (isset($_GET['export'])) { diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 63137d765..c2c1bdab1 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -296,18 +296,20 @@ final class Tools /** * Download the sqlite database + * Function not longer used for security reasons */ - public static function downloadDb() - { - header('Content-Disposition: attachment; filename="poche.sqlite.gz"'); - self::_status(200); - header('Content-Transfer-Encoding: binary'); - header('Content-Type: application/octet-stream'); - echo gzencode(file_get_contents(STORAGE_SQLITE)); + // public static function downloadDb() + // { + // header('Content-Disposition: attachment; filename="poche.sqlite.gz"'); + // self::_status(200); - exit; - } + // header('Content-Transfer-Encoding: binary'); + // header('Content-Type: application/octet-stream'); + // echo gzencode(file_get_contents(STORAGE_SQLITE)); + + // exit; + // } /** * Get the content for a given URL (by a call to FullTextFeed) diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index e45c3218f..7bd229cbe 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -121,8 +121,6 @@

      {% trans "You can click here to fetch content for articles with no content." %}

      {% trans "Export your wallabag data" %}

      - {% if constant('STORAGE') == 'sqlite' %} -

      {% trans "Click here" %} {% trans "to download your database." %}

      {% endif %}

      {% trans "Click here" %} {% trans "to export your wallabag data." %}

      {% trans "Fancy an E-Book ?" %}

      diff --git a/themes/default/config.twig b/themes/default/config.twig index 8f047ae6a..5656fadd7 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -121,7 +121,6 @@

      {% trans "Export your wallabag data" %}

      {% if constant('STORAGE') == 'sqlite' %} -

      {% trans "Click here" %} {% trans "to download your database." %}

      {% endif %}

      {% trans "Click here" %} {% trans "to export your wallabag data." %}

      {% trans "Cache" %}

      From d5c481c2f40f1d05750a7020df1f129439627247 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 28 Aug 2014 21:01:43 +0200 Subject: [PATCH 22/24] remove old function --- inc/poche/Tools.class.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index c2c1bdab1..55fedac8d 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -294,23 +294,6 @@ final class Tools } } - /** - * Download the sqlite database - * Function not longer used for security reasons - */ - - // public static function downloadDb() - // { - // header('Content-Disposition: attachment; filename="poche.sqlite.gz"'); - // self::_status(200); - - // header('Content-Transfer-Encoding: binary'); - // header('Content-Type: application/octet-stream'); - // echo gzencode(file_get_contents(STORAGE_SQLITE)); - - // exit; - // } - /** * Get the content for a given URL (by a call to FullTextFeed) * From 5af2555f59f13e06cf0ae65e5c0265d1d10bead8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20K=C3=B6nig?= Date: Thu, 11 Sep 2014 13:17:19 +0200 Subject: [PATCH 23/24] Implemented additional check for using the 'X-Forwarded-Port' header. --- inc/poche/Tools.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 55fedac8d..93ec3fc6a 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -54,6 +54,10 @@ final class Tools || ($https && $_SERVER["SERVER_PORT"] == '443') || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection ? '' : ':' . $_SERVER["SERVER_PORT"]); + + if (isset($_SERVER["HTTP_X_FORWARDED_PORT"])) { + $serverport = ':' . $_SERVER["HTTP_X_FORWARDED_PORT"]; + } $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); From aa1083bdac8c20285f9ee6822768cc75145c06d4 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 16 Sep 2014 20:27:03 +0200 Subject: [PATCH 24/24] fix pictures display when DOWNLOAD_PICTURES is enabled --- inc/poche/pochePictures.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/poche/pochePictures.php b/inc/poche/pochePictures.php index 7a914f90f..52394c703 100644 --- a/inc/poche/pochePictures.php +++ b/inc/poche/pochePictures.php @@ -33,7 +33,7 @@ final class Picture } if (self::_downloadPictures($absolute_path, $fullpath) === true) { - $content = str_replace($matches[$i][2], $fullpath, $content); + $content = str_replace($matches[$i][2], Tools::getPocheUrl() . $fullpath, $content); } $processing_pictures[] = $absolute_path;