From 76e487cd7e6a3594faf1749ff4f9b936ff75d868 Mon Sep 17 00:00:00 2001 From: Dmitry Sandalov Date: Sat, 28 Dec 2013 11:47:10 +0400 Subject: [PATCH 01/15] docs link, typos --- locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo | Bin 4826 -> 4823 bytes locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po | 10 +++++----- locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo | Bin 4779 -> 4776 bytes locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po | 8 ++++---- locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo | Bin 4487 -> 4481 bytes locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po | 16 ++++++++-------- locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo | Bin 4198 -> 4195 bytes locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po | 10 +++++----- locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo | Bin 5635 -> 5632 bytes locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po | 10 +++++----- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 4813 -> 4810 bytes locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 10 +++++----- locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo | Bin 4900 -> 4897 bytes locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po | 10 +++++----- locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo | Bin 5806 -> 5803 bytes locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po | 10 +++++----- themes/README.md | 2 +- 17 files changed, 43 insertions(+), 43 deletions(-) diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo index bdf19250c1ce050c5a82af809b1cb1d2719aac75..0e8f88bfc8615424c2c3b8730eb08c61b0126aaf 100644 GIT binary patch delta 68 zcmcbmdR=ux6x-xzHu=rfY)Q;QDf!8InRz7{sRjAT8L4{7`MHzdbFSPxlj{^47P-x( Hf~kxEd_Eb) delta 80 zcmcbvdP{Xf6dPml7RY@CU diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po index a99d39032..8209a9cdd 100644 --- a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po +++ b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po @@ -73,7 +73,7 @@ msgstr "Importovat" msgid "Please execute the import script locally, it can take a very long time." msgstr "Spusťte importní skript lokálně, může to dlouho trvat." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Více informací v oficiální dokumentaci:" msgid "import from Pocket" @@ -85,13 +85,13 @@ msgstr "importovat z Readability" msgid "import from Instapaper" msgstr "importovat z Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Export dat" msgid "Click here" msgstr "Klikněte zde" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "pro export vašich dat." msgid "back to home" @@ -105,11 +105,11 @@ msgstr "instalovat" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche ještě není nainstalováno. Pro instalaci vyplňte níže uvedený formulář. " -"Nezapomeňte si přečíst dokumentaci " +"Nezapomeňte si přečíst dokumentaci " "na stránkách programu." msgid "Login" diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo index cf8ae292b35603638072e1c447844b3f97a85f84..253d8c7e44c7a2fb982058be3c0db9dfdc642d25 100644 GIT binary patch delta 74 zcmZ3jx|KZ6dPmlread the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "Poche ist noch nicht installiert. Bitte fülle die Felder unten aus, um die " diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo index f387889df55a870bb94e0d9d2769ce4109cd0130..974ca4f363f5a6cef731463028752fd92c14999a 100644 GIT binary patch delta 80 zcmZoyZdBfo#Wp#cO@4DXTRO8)N`A6lW?o4~YC(Q-Myg(Ne(q!kft8!ras6NezLmVVs RfofKB{a_?T!{pUma{(4pBJBVG diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po index 8e56560de..b78759f53 100644 --- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po +++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po @@ -68,8 +68,8 @@ 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 "More info in the official doc:" +msgstr "More info in the official doc:" msgid "import from Pocket" msgstr "import from Pocket" @@ -80,14 +80,14 @@ msgstr "import from Readability" msgid "import from Instapaper" msgstr "import from Instapaper" -msgid "Export your poche datas" -msgstr "Export your poche datas" +msgid "Export your poche data" +msgstr "Export your poche data" msgid "Click here" msgstr "Click here" -msgid "to export your poche datas." -msgstr "to export your poche datas." +msgid "to export your poche data." +msgstr "to export your poche data." msgid "back to home" msgstr "back to home" @@ -100,11 +100,11 @@ msgstr "install your poche" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgid "Login" diff --git a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo index 0122cebcd3a0c67a4192bd5122caf02429ee2779..2097823970de4e3e791c4ee77bf4601cfc8a2ae4 100644 GIT binary patch delta 95 zcmaE+@K|BPBvyF_&)kCiq7nwryyB9?oE!$9{PfH`2H*UmRE5mEwEV@JS($}W@{{#4 i^GY&O3-XgQQuUJab0;6=Xx!}1`Ir@p+-4hoEk*#0z#@SF delta 99 zcmaE?@JwODBv!>@2G87r{Gt*D&%EN2#GD)kpZxU9JO mGExijlQUBFlJj%*Q}UB1ALeLeEZ*$G`Ir@p>}E@TEk*z&J|oot diff --git a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po index 833d18039..afe0595de 100644 --- a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po +++ b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po @@ -68,7 +68,7 @@ msgid "Please execute the import script locally, it can take a very long time." msgstr "" "Por favor, ejecute la importación en local, esto puede demorar un tiempo." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Más información en la documentación oficial :" msgid "import from Pocket" @@ -80,13 +80,13 @@ msgstr "importación desde Readability" msgid "import from Instapaper" msgstr "importación desde Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Exportar sus datos de poche" msgid "Click here" msgstr "Haga clic aquí" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "para exportar sus datos de poche." msgid "back to home" @@ -100,11 +100,11 @@ msgstr "instala tu Poche" msgid "" "Poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "Poche todavia no està instalado. Por favor, completa los campos siguientes " -"para instalarlo. No dudes de leer la " +"para instalarlo. No dudes de leer la " "documentación en el sitio de Poche." msgid "Login" diff --git a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo index 001782086e82ef5e71710e6e39239b20642c50a2..a7bb6f646c7f629ac9cc6d96b9634445dd633005 100644 GIT binary patch delta 68 zcmZqHY0%k_#Wp#cO@4DXTRO8)N`A6lW?o4~YC(Q-Myg(Ne(q!zu9chDaXse1BDZ<5 HZ~_wmM+z9s delta 74 zcmZqBY1Y}0#l~1XIg3r6v3PSQTRO8)W?o4~YC(Q-Myg(Ney)B>e)41{u9ZO9)m)D` Mu*hy+Ae_Ji0JvWo9{>OV diff --git a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po index 4bc118fd2..74a763c62 100644 --- a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po +++ b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po @@ -67,7 +67,7 @@ msgstr "درون‌ریزی" msgid "Please execute the import script locally, it can take a very long time." msgstr "لطفاً برنامهٔ درون‌ریزی را به‌طور محلی اجرا کنید، شاید خیلی طول بکشد." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "اطلاعات بیشتر در راهنمای رسمی:" msgid "import from Pocket" @@ -79,13 +79,13 @@ msgstr "درون‌ریزی از Readability" msgid "import from Instapaper" msgstr "درون‌ریزی از Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "داده‌های poche خود را برون‌بری کنید" msgid "Click here" msgstr "اینجا را کلیک کنید" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "برای برون‌بری داده‌های poche شما" msgid "back to home" @@ -99,11 +99,11 @@ msgstr "poche خود را نصب کنید" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche هنوز نصب نیست. برای نصب لطفاً فرم زیر را پر کنید. خواندن راهنما در وبگاه poche را از یاد نبرید." +"href='http://doc.inthepoche.com'>راهنما در وبگاه poche را از یاد نبرید." msgid "Login" msgstr "ورود" diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo index e3baaaa106b1d4fb619fb71aa530325e87dd765b..99e7142c07eac84139bc19d8aa4cf4b5e3015fa6 100644 GIT binary patch delta 68 zcmX@BdP;Re7Te@(Hu=rnZ0XEGDf!8InRz7{sRjAT8L4{7`MHx>xK?gn$JNM&MQ*dB HU=JezUdread the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche n'est pas encore installé. Merci de remplir le formulaire suivant pour " -"l'installer. N'hésitez pas à lire la " +"l'installer. N'hésitez pas à lire la " "documentation sur le site de poche." msgid "Login" diff --git a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo index e4d4fb3dab38c58c9d100a97bbc39d2942a7bae4..d6ef989003bea1bc4c32af2f384827ab7bc7e617 100644 GIT binary patch delta 68 zcmZ3Ywoq+D7Te@(Hu=rnZ0XEGDf!8InRz7{sRjAT8L4{7`MHx>xK?gn$8~}Yi`?c8 H!8wcoQcW2H delta 74 zcmZ3ewnS}178_&n!6Rd5a?0L11RRsaA1 diff --git a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po index f4e69c075..429d5d558 100644 --- a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po +++ b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po @@ -75,7 +75,7 @@ msgstr "" "Si prega di eseguire lo script di importazione a livello locale, può " "richiedere un tempo molto lungo." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Maggiori info nella documentazione ufficiale" msgid "import from Pocket" @@ -87,13 +87,13 @@ msgstr "Importa da Readability" msgid "import from Instapaper" msgstr "Importa da Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Esporta i tuoi dati di poche" msgid "Click here" msgstr "Fai clic qui" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "per esportare i tuoi dati di poche." msgid "back to home" @@ -107,11 +107,11 @@ msgstr "installa il tuo poche" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche non è ancora installato. Si prega di riempire il modulo sottostante " -"per completare l'installazione. Leggere " +"per completare l'installazione. Leggere " "la documentazione sul sito di poche." msgid "Login" diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo index eea7ff0bece78ce6049e3d48c2ea487db1284d95..970898dbae27618b55488ab0895c438445c37184 100644 GIT binary patch delta 68 zcmZ3dyIOZc7Te@(Hu=rnZ0XEGDf!8InRz7{sRjAT8L4{7`MHx>xK?gn$5q0KMQ*c+ HNEH(RQC=8g delta 74 zcmZ3jyH0mQ78_&nread the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche всё ещё не установлен. Надо заполнить форму ниже, чтобы установить " -"его. Неплохо также прочесть документацию " +"его. Неплохо также прочесть документацию " "на сайте poche." msgid "Login" diff --git a/themes/README.md b/themes/README.md index 9e5d65605..b5d925b46 100644 --- a/themes/README.md +++ b/themes/README.md @@ -24,7 +24,7 @@ That's all ! ## create a theme -Just have a look to this short documentation : http://inthepoche.com/doc/doku.php?id=designers:creating_theme +Just have a look to this short documentation : http://doc.inthepoche.com/doku.php?id=designers:creating_theme ## send a theme From b1bfd4cb0c06bb7fd730d634a57325dc34cfb407 Mon Sep 17 00:00:00 2001 From: William Theaker Date: Thu, 2 Jan 2014 21:04:56 -0500 Subject: [PATCH 02/15] Updated tag edit page --- themes/default/edit-tags.twig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig index 7116bba9f..53852d392 100644 --- a/themes/default/edit-tags.twig +++ b/themes/default/edit-tags.twig @@ -11,10 +11,10 @@ no tags {% for tag in tags %}
  • {{ tag.value }} ✘
    • {% endfor %}
    - -

    {% trans "you can type several tags, separated by comma" %}

    + +

    {% trans "You can enter multiple tags, separated by commas." %}

    - +
    -{% trans "back to the article" %} -{% endblock %} \ No newline at end of file +{% trans "return to article" %} +{% endblock %} From aeea7c6af02d02cfed077eeab1b7fe34a4d4c5db Mon Sep 17 00:00:00 2001 From: William Theaker Date: Thu, 2 Jan 2014 21:15:41 -0500 Subject: [PATCH 03/15] Updated config page --- themes/default/config.twig | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/themes/default/config.twig b/themes/default/config.twig index c01556ba8..10df726e0 100644 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -6,11 +6,11 @@ {% endblock %} {% block content %}

    {% trans "Poching links" %}

    -

    {% trans "There are several ways to poche a link::" %} (?)

    +

    {% trans "There are several ways to poche a link:" %} (?)

    • Firefox: {% trans "download the extension" %}
    • Chrome: {% trans "download the extension" %}
      • -
    • Android: {% trans "via f-droid" %} {% trans " or " %} {% trans "via Google Play" %}
      • +
    • Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
    • Windows Phone: {% trans "download the application" %}
    • @@ -31,12 +31,12 @@

      {% trans "Feeds" %}

      {% if token == '' %} -

      {% trans "The token is empty, you have to generate it to use feeds. Click here to generate it." %}

      +

      {% trans "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." %}

      {% else %}

      {% trans "You can regenerate your token: generate!." %}

      {% endif %} @@ -101,12 +101,12 @@ {% endif %}

      {% trans "Import" %}

      -

      {% trans "Please execute the import script locally, it can take a very long time." %}

      -

      {% trans "More info in the official docs:" %} inthepoche.com

      +

      {% trans "Please execute the import script locally as it can take a very long time." %}

      +

      {% trans "More info in the official docs:" %} inthepoche.com

      {% trans "Export your poche data" %}

      From 9de34d4e8430b8b2d994aa9b681ec9f11dabf0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 3 Jan 2014 10:06:26 +0100 Subject: [PATCH 04/15] [fix] error in query to get entries and tags --- inc/poche/Database.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index afe02a41e..d8b638598 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -337,7 +337,7 @@ class Database { public function retrieveEntriesByTag($tag_id) { $sql = - "SELECT * FROM entries + "SELECT entries.* FROM entries LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id WHERE tags_entries.tag_id = ?"; $query = $this->executeQuery($sql, array($tag_id)); @@ -348,7 +348,7 @@ class Database { public function retrieveTagsByEntry($entry_id) { $sql = - "SELECT * FROM tags + "SELECT tags.* FROM tags LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id WHERE tags_entries.entry_id = ?"; $query = $this->executeQuery($sql, array($entry_id)); From 0b57c6825aa0bf88d10a2c420875f6cf9afe17c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 3 Jan 2014 10:15:05 +0100 Subject: [PATCH 05/15] [fix] bugs #374 and #376 - encoding in rss --- inc/poche/Poche.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 4f70afb75..d3eb71d2f 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -951,7 +951,7 @@ class Poche if (count($entries) > 0) { foreach ($entries as $entry) { $newItem = $feed->createNewItem(); - $newItem->setTitle(htmlentities($entry['title'])); + $newItem->setTitle($entry['title']); $newItem->setLink(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']); $newItem->setDate(time()); $newItem->setDescription($entry['content']); From 4a84d94e91b2868145e222d235c1209ac9fe7f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 3 Jan 2014 10:21:18 +0100 Subject: [PATCH 06/15] [add] config file for interviewmagazine.com --- inc/3rdparty/site_config/custom/interviewmagazine.com.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 inc/3rdparty/site_config/custom/interviewmagazine.com.txt diff --git a/inc/3rdparty/site_config/custom/interviewmagazine.com.txt b/inc/3rdparty/site_config/custom/interviewmagazine.com.txt new file mode 100644 index 000000000..a9d4f8ca5 --- /dev/null +++ b/inc/3rdparty/site_config/custom/interviewmagazine.com.txt @@ -0,0 +1,4 @@ +title: //title +body: //div[contains(@class, 'block')] + +test_url: http://www.interviewmagazine.com/film/spike-jonze \ No newline at end of file From cb4fba5a333ac18b40665502e3de74249106cad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 3 Jan 2014 10:22:12 +0100 Subject: [PATCH 07/15] [del] remove inthepoche.com config file, website has changed --- inc/3rdparty/site_config/custom/inthepoche.com.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 inc/3rdparty/site_config/custom/inthepoche.com.txt diff --git a/inc/3rdparty/site_config/custom/inthepoche.com.txt b/inc/3rdparty/site_config/custom/inthepoche.com.txt deleted file mode 100644 index ede74b976..000000000 --- a/inc/3rdparty/site_config/custom/inthepoche.com.txt +++ /dev/null @@ -1,7 +0,0 @@ -title: //title -body: //div[@class='post-content'] - -prune: no -tidy: no - -test_url: http://www.inthepoche.com/?post/poche-hosting \ No newline at end of file From 4d058d48243e48876599dc006bb49ce28ef7db25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 3 Jan 2014 10:33:01 +0100 Subject: [PATCH 08/15] [fix] code display when printing a page was buggy --- themes/default/css/print.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/themes/default/css/print.css b/themes/default/css/print.css index 99c00bdfe..625478e19 100644 --- a/themes/default/css/print.css +++ b/themes/default/css/print.css @@ -33,6 +33,10 @@ article { border: none !important; } +pre code { + line-height: 1.6em; +} + /* Add URL after links */ .vieworiginal a:after { content: " (" attr(href) ")"; From b5c1ed12273d72888b443e801123252d92f8c8ec Mon Sep 17 00:00:00 2001 From: FireFox Date: Fri, 3 Jan 2014 11:17:15 +0100 Subject: [PATCH 09/15] Change Permissions in pochePictures.php Stored Pictures are not accessible (on my server), when permission is set to 0705, but instead, when using 0755 (or for example to 0715) all is working as expected. So maybe it would be good, considering in changing the permission of created directories in the assets directory --- inc/poche/pochePictures.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/poche/pochePictures.php b/inc/poche/pochePictures.php index 4e4a0b085..b0cfb9df8 100644 --- a/inc/poche/pochePictures.php +++ b/inc/poche/pochePictures.php @@ -84,12 +84,12 @@ function create_assets_directory($id) { $assets_path = ABS_PATH; if(!is_dir($assets_path)) { - mkdir($assets_path, 0705); + mkdir($assets_path, 0715); } $article_directory = $assets_path . $id; if(!is_dir($article_directory)) { - mkdir($article_directory, 0705); + mkdir($article_directory, 0715); } return $article_directory; @@ -107,4 +107,4 @@ function remove_directory($directory) } return rmdir($directory); } -} \ No newline at end of file +} From 9bc32632af80130ca6aff968b800ceb43aa86576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 3 Jan 2014 15:18:13 +0100 Subject: [PATCH 10/15] [fix] #375 Readability.com changed its export format --- inc/poche/Poche.class.php | 53 +++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index d3eb71d2f..e9ff7b46c 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -806,34 +806,37 @@ class Poche $url = NULL; $favorite = FALSE; $archive = FALSE; - foreach ($value as $attr => $attr_value) { - if ($attr == 'article__url') { - $url = new Url(base64_encode($attr_value)); - } - $sequence = ''; - if (STORAGE == 'postgres') { - $sequence = 'entries_id_seq'; - } - if ($attr_value == 'true') { - if ($attr == 'favorite') { - $favorite = TRUE; + foreach ($value as $item) { + foreach ($item as $attr => $value) { + if ($attr == 'article__url') { + $url = new Url(base64_encode($value)); } - if ($attr == 'archive') { - $archive = TRUE; + $sequence = ''; + if (STORAGE == 'postgres') { + $sequence = 'entries_id_seq'; + } + if ($value == 'true') { + if ($attr == 'favorite') { + $favorite = TRUE; + } + if ($attr == 'archive') { + $archive = TRUE; + } } } - } - # we can add the url - if (!is_null($url) && $url->isCorrect()) { - $this->action('add', $url, 0, TRUE); - $count++; - if ($favorite) { - $last_id = $this->store->getLastId($sequence); - $this->action('toggle_fav', $url, $last_id, TRUE); - } - if ($archive) { - $last_id = $this->store->getLastId($sequence); - $this->action('toggle_archive', $url, $last_id, TRUE); + + # we can add the url + if (!is_null($url) && $url->isCorrect()) { + $this->action('add', $url, 0, TRUE); + $count++; + if ($favorite) { + $last_id = $this->store->getLastId($sequence); + $this->action('toggle_fav', $url, $last_id, TRUE); + } + if ($archive) { + $last_id = $this->store->getLastId($sequence); + $this->action('toggle_archive', $url, $last_id, TRUE); + } } } } From 607e12b4f2ad9881ac8dd3195fc44c36375583f5 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 4 Jan 2014 21:50:08 +0100 Subject: [PATCH 11/15] Fixes bug 359 --- inc/3rdparty/FlattrItem.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/3rdparty/FlattrItem.class.php index 0d3e69d0d..711b4ee07 100644 --- a/inc/3rdparty/FlattrItem.class.php +++ b/inc/3rdparty/FlattrItem.class.php @@ -14,12 +14,12 @@ class FlattrItem { $flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache"); if($flattrResponse != FALSE) { $result = json_decode($flattrResponse); - if (isset($result->message)){ + if (isset($result->message)){ if ($result->message == "flattrable") { $this->status = FLATTRABLE; } } - elseif ($result->link) { + elseif (is_object($result) && $result->link) { $this->status = FLATTRED; $this->flattrItemURL = $result->link; $this->numflattrs = $result->flattrs; From a562e3905ac67983b85853e5ace813b2de0e3807 Mon Sep 17 00:00:00 2001 From: adev Date: Sun, 5 Jan 2014 15:03:05 +0100 Subject: [PATCH 12/15] Create sqlite table tags_entries only if not already exists --- inc/poche/Database.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index d8b638598..04731821f 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -81,7 +81,7 @@ class Database { if (STORAGE == 'sqlite') { $sql = ' - CREATE TABLE tags_entries ( + CREATE TABLE IF NOT EXISTS tags_entries ( id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, entry_id INTEGER, tag_id INTEGER, From fcb5fd27e2fe7de36a9e2dffc818686a08ecc4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 6 Jan 2014 08:32:28 +0100 Subject: [PATCH 13/15] [change] update poche version in compatibility test file --- poche_compatibility_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poche_compatibility_test.php b/poche_compatibility_test.php index eed3c3913..42faaa2ce 100644 --- a/poche_compatibility_test.php +++ b/poche_compatibility_test.php @@ -1,5 +1,5 @@ =')); $pcre_ok = extension_loaded('pcre'); From d866e8be91de61a9b7dc40ae68c2390e0e05201d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 7 Jan 2014 13:13:24 +0100 Subject: [PATCH 14/15] [change] poche logo is now at SVG format, see #373 --- themes/default/_top.twig | 2 +- .../apple-touch-icon-144x144-precomposed.png | Bin 7349 -> 2361 bytes .../apple-touch-icon-72x72-precomposed.png | Bin 6168 -> 1375 bytes themes/default/img/apple-touch-icon.png | Bin 5803 -> 1174 bytes themes/default/img/logo.png | Bin 1350 -> 0 bytes themes/default/img/logo.svg | 8 ++++++++ 6 files changed, 9 insertions(+), 1 deletion(-) delete mode 100644 themes/default/img/logo.png create mode 100644 themes/default/img/logo.svg diff --git a/themes/default/_top.twig b/themes/default/_top.twig index b5f650287..083be1527 100644 --- a/themes/default/_top.twig +++ b/themes/default/_top.twig @@ -1,6 +1,6 @@

      - {% if view == 'home' %}{% block logo %}logo poche{% endblock %} + {% if view == 'home' %}{% block logo %}logo poche{% endblock %} {% else %}{{ block('logo') }} {% endif %}

      diff --git a/themes/default/img/apple-touch-icon-144x144-precomposed.png b/themes/default/img/apple-touch-icon-144x144-precomposed.png index 557b479ce45e19e9513bf125c325a081aa4a368c..9e951230a68d07a1abaf352ca6e6a0c108f8b324 100644 GIT binary patch literal 2361 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 diff --git a/themes/default/img/apple-touch-icon-72x72-precomposed.png b/themes/default/img/apple-touch-icon-72x72-precomposed.png index e167d3a41c6577ba6ae753e917b4a2c66b3448ff..263419b18ea4ab0ddeae900b545fba5296bd7551 100644 GIT binary patch delta 1356 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 i%y?Cu;m{j3!4OAGn5^Egb}C=Ojqx2g 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 + + + + + + + From e1cf0fda27df031e478e55d6df08823d42fe2220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 7 Jan 2014 13:15:43 +0100 Subject: [PATCH 15/15] [add] user_agent in file_get_contents --- inc/poche/Poche.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index e9ff7b46c..76a73be2b 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -333,7 +333,9 @@ class Poche switch ($action) { case 'add': - $json = file_get_contents(Tools::getPocheUrl() . '/inc/3rdparty/makefulltextfeed.php?url='.urlencode($url->getUrl()).'&max=5&links=preserve&exc=&format=json&submit=Create+Feed'); + $options = array('http' => array('user_agent' => 'poche')); + $context = stream_context_create($options); + $json = file_get_contents(Tools::getPocheUrl() . '/inc/3rdparty/makefulltextfeed.php?url='.urlencode($url->getUrl()).'&max=5&links=preserve&exc=&format=json&submit=Create+Feed', false, $context); $content = json_decode($json, true); $title = $content['rss']['channel']['item']['title']; $body = $content['rss']['channel']['item']['description'];