From f701a87ab9c96fb61d531e43d8a085a8a4f9ffb8 Mon Sep 17 00:00:00 2001 From: Garvin Hicking Date: Fri, 23 Sep 2016 10:46:54 +0200 Subject: [PATCH] upstream patch by ian --- serendipity_event_faq/ChangeLog | 46 + serendipity_event_faq/UTF-8/lang_bg.inc.php | 87 +- serendipity_event_faq/UTF-8/lang_cs.inc.php | 93 +- serendipity_event_faq/UTF-8/lang_cz.inc.php | 93 +- serendipity_event_faq/UTF-8/lang_de.inc.php | 81 +- serendipity_event_faq/UTF-8/lang_ja.inc.php | 86 +- .../alternatives/plugin_faq_categories.tpl | 9 +- .../alternatives/plugin_faq_category_faq.tpl | 15 +- .../alternatives/plugin_faq_category_faqs.tpl | 11 +- serendipity_event_faq/documentation_cs.html | 8 +- serendipity_event_faq/documentation_cz.html | 8 +- serendipity_event_faq/lang_bg.inc.php | 87 +- serendipity_event_faq/lang_cs.inc.php | 89 +- serendipity_event_faq/lang_cz.inc.php | 89 +- serendipity_event_faq/lang_de.inc.php | 81 +- serendipity_event_faq/lang_en.inc.php | 80 +- serendipity_event_faq/lang_ja.inc.php | 86 +- .../plugin_faq_categories.tpl | 28 +- .../plugin_faq_category_faq.tpl | 56 +- .../plugin_faq_category_faqs.tpl | 59 +- .../plugin_faq_searchresults.tpl | 24 +- .../serendipity_event_faq.php | 1325 +++++++---------- .../serendipity_plugin_faq.php | 34 +- serendipity_event_faq/style_faq_backend.css | 135 +- serendipity_event_faq/style_faq_frontend.css | 90 +- 25 files changed, 1398 insertions(+), 1402 deletions(-) diff --git a/serendipity_event_faq/ChangeLog b/serendipity_event_faq/ChangeLog index e053c848..c2ad3029 100644 --- a/serendipity_event_faq/ChangeLog +++ b/serendipity_event_faq/ChangeLog @@ -1,3 +1,49 @@ +1.23: +----- + + * Fix pagination to not show other category entries + +1.22: +----- + + * Fix bug with hidden config items default fallback even more, + since the category id 'cid' was not cached properly and so + every new Q/A wasn't set right by faqorder. + * Fixes some more 2.0 issues with CSS and or missing CSS classes. + * Convert frontend templates p tag usage to div + * Allow custom CSS file copies in themes - by copy to the themes + root, or included to the style or user.css files as before. + +1.21: +----- + + * Fix some more markup and stylings + * Touched templates in the 'alternatives' directory for Smarty3, + but not for the other new changes to the default used template files. + Make your own in comparisson. Recommended default copies for custom + themes are found in the root of this plugin. + * Remove bash file + * Added S9y 1.7 plain editor js file forgotten in v.1.20 + * Changed to Serendipity CONST Smarty wrapper usage + +1.20: +----- + + * Set some more plugin consistencies + * Fix bug with hidden config items default fallback + * Refactor inspectConfig item preparation + * Serendipity 2.0+ ready markup changes + +1.13: +----- + + * Set plugin consistencies + * Use load language API - extends required Serendipity version to v.1.6 + * Removed old Smarty2 security settings - extends required Serendipity version to v.1.7 + * Use native API method parseTemplate() + * Convert plugin template for Smarty3 usage + * Append, not prepend CSS data into eventData stream + latest: Smarty3 forward compatibility 1.4 diff --git a/serendipity_event_faq/UTF-8/lang_bg.inc.php b/serendipity_event_faq/UTF-8/lang_bg.inc.php index 6957bf3d..21786101 100644 --- a/serendipity_event_faq/UTF-8/lang_bg.inc.php +++ b/serendipity_event_faq/UTF-8/lang_bg.inc.php @@ -1,50 +1,51 @@ - - * EN-Revision: Revision of lang_en.inc.php - * Translated on 2007/11/30 - * @author Vladimir Ajgl - * @revisionDate 2009/02/15 - * @author Vladimír Ajgl - * @revisionDate 2009/02/23 + * @author Vladimír Ajgl + * EN-Revision: Revision of lang_en.inc.php + * Translated on 2007/11/30 + * @author Vladimir Ajgl + * @revisionDate 2009/02/15 + * @author Vladimír Ajgl + * @revisionDate 2009/02/23 */ -@define('FAQS', 'FAQ - Často kladené otázky'); -@define('FAQ_NEW_ENTRY', 'Nová otázka'); -@define('FAQ_NAME', 'FAQ - Často kladené otázky'); -@define('FAQ_NAME_DESC', 'Správa FAQ - často kladených otázek'); -@define('FAQ_QUESTIONS', 'Otázky'); -@define('FAQ_QUESTION', 'Otázka'); -@define('FAQ_QUESTION_DESC', 'Zadej znění otázky'); -@define('FAQ_ANSWER', 'Odpověď'); -@define('FAQ_ANSWER_DESC', 'Zadej znění odpovědi'); -@define('FAQ_CATEGORY', 'Kategorie'); -@define('FAQ_CATEGORIES', 'Přehled kategorií'); -@define('FAQ_CATEGORY_DESC', 'Vyber kategorii'); -@define('FAQ_PID', 'Rodič'); -@define('FAQ_PID_PID', 'Vyber rodičovskou (nadřazenou) stránku'); -@define('FAQ_DESCRIPTION', 'Popis'); -@define('FAQ_DESCRIPTION_DESC', 'Zadej popis kategorie'); -@define('FAQ_PARENT', 'Nemá rodiče'); -@define('FAQ_NEWCATEGORY', 'Nová kategorie'); -@define('FAQ_DAYSUPDATE', 'Dní pro označení jako aktualizovaná'); -@define('FAQ_DAYSUPDATE_DESC', 'Kolik dní bude otázka označená jako aktualizovaná?'); -@define('FAQ_DAYSNEW', 'Dní pro označení jako nová'); -@define('FAQ_DAYSNEW_DESC', 'Kolik dní bude otázka označená jako nová?'); -@define('FAQ_NEW', 'Nová'); -@define('FAQ_UPDATE', 'Aktualizovaná'); -@define('FAQ_FAQURL', 'URL stránky FAQ'); -@define('FAQ_FAQURL_DESC', 'Adresa, pod kterou je možno zobrazit pluginu často kladených otázek'); -@define('FAQ_REALYDELETECATEGORY', 'Opravdu chcete smazat tuto kategorii?'); -@define('FAQ_NEWFAQ', 'Nová otázka'); -@define('FAQ_MARKUP', 'Značkování FAQ'); -@define('FAQ_MARKUP_DESC', 'Používat značkovací pluginy v často kladených otázkách?'); +@define('FAQS', 'FAQ - Často kladené otázky'); +@define('FAQ_NEW_ENTRY', 'Nová otázka'); +@define('FAQ_NAME', 'FAQ - Často kladené otázky'); +@define('FAQ_NAME_DESC', 'Správa FAQ - často kladených otázek'); +@define('FAQ_QUESTIONS', 'Otázky'); +@define('FAQ_QUESTION', 'Otázka'); +@define('FAQ_QUESTION_DESC', 'Zadej znění otázky'); +@define('FAQ_ANSWER', 'Odpověď'); +@define('FAQ_ANSWER_DESC', 'Zadej znění odpovědi'); +@define('FAQ_CATEGORY', 'Kategorie'); +@define('FAQ_CATEGORIES', 'Přehled kategorií'); +@define('FAQ_CATEGORY_DESC', 'Vyber kategorii'); +@define('FAQ_PID', 'Rodič'); +@define('FAQ_PID_PID', 'Vyber rodičovskou (nadřazenou) stránku'); +@define('FAQ_DESCRIPTION', 'Popis'); +@define('FAQ_DESCRIPTION_DESC', 'Zadej popis kategorie'); +@define('FAQ_PARENT', 'Nemá rodiče'); +@define('FAQ_NEWCATEGORY', 'Nová kategorie'); +@define('FAQ_DAYSUPDATE', 'Dní pro označení jako aktualizovaná'); +@define('FAQ_DAYSUPDATE_DESC', 'Kolik dní bude otázka označená jako aktualizovaná?'); +@define('FAQ_DAYSNEW', 'Dní pro označení jako nová'); +@define('FAQ_DAYSNEW_DESC', 'Kolik dní bude otázka označená jako nová?'); +@define('FAQ_NEW', 'Nová'); +@define('FAQ_UPDATE', 'Aktualizovaná'); +@define('FAQ_FAQURL', 'URL stránky FAQ'); +@define('FAQ_FAQURL_DESC', 'Adresa, pod kterou je možno zobrazit pluginu často kladených otázek'); +@define('FAQ_REALYDELETECATEGORY', 'Opravdu chcete smazat tuto kategorii?'); +@define('FAQ_NEWFAQ', 'Nová otázka'); +@define('FAQ_MARKUP', 'Značkování FAQ'); +@define('FAQ_MARKUP_DESC', 'Používat značkovací pluginy v často kladených otázkách?'); -@define('FAQ_PLUGIN_NAME', 'FAQ - výběr kategorií'); -@define('FAQ_PLUGIN_NAME_DESC', 'Vyberte kategorie FAQ, které chcete mít zobrazené v postranním sloupci na Vašem blogu.'); -@define('FAQ_PLUGIN_TITLE', 'Nadpis'); -@define('FAQ_PLUGIN_TITLE_DESC', 'Nadpis pro blok pluginy v postranním sloupci'); -@define('FAQ_PLUGIN_CATEGORY', 'Výběr kategorií'); -@define('FAQ_PLUGIN_CATEGORY_DESC', 'Které kategorie mají být zobrazeny?'); +@define('FAQ_PLUGIN_NAME', 'FAQ - výběr kategorií'); +@define('FAQ_PLUGIN_NAME_DESC', 'Vyberte kategorie FAQ, které chcete mít zobrazené v postranním sloupci na Vašem blogu.'); +@define('FAQ_PLUGIN_TITLE', 'Nadpis'); +@define('FAQ_PLUGIN_TITLE_DESC', 'Nadpis pro blok pluginy v postranním sloupci'); +@define('FAQ_PLUGIN_CATEGORY', 'Výběr kategorií'); +@define('FAQ_PLUGIN_CATEGORY_DESC', 'Které kategorie mají být zobrazeny?'); -@define('FAQ_PREVOUS', 'Předchozí otázka:'); -@define('FAQ_NEXT', 'Následující otázka:'); +@define('FAQ_PREVOUS', 'Předchozí otázka:'); +@define('FAQ_NEXT', 'Následující otázka:'); + +@define('FAQ_SEARCHRESULTS', 'Nalezeno %d častých dotazů:'); -@define('FAQ_SEARCHRESULTS', 'Nalezeno %d častých dotazů:'); diff --git a/serendipity_event_faq/UTF-8/lang_cz.inc.php b/serendipity_event_faq/UTF-8/lang_cz.inc.php index 425fa589..32510518 100644 --- a/serendipity_event_faq/UTF-8/lang_cz.inc.php +++ b/serendipity_event_faq/UTF-8/lang_cz.inc.php @@ -1,53 +1,54 @@ - * EN-Revision: Revision of lang_en.inc.php - * Translated on 2007/11/30 - * @author Vladimir Ajgl - * @revisionDate 2009/02/15 - * @author Vladimír Ajgl - * @revisionDate 2009/02/23 + * @author Vladimír Ajgl + * EN-Revision: Revision of lang_en.inc.php + * Translated on 2007/11/30 + * @author Vladimir Ajgl + * @revisionDate 2009/02/15 + * @author Vladimír Ajgl + * @revisionDate 2009/02/23 */ -@define('FAQS', 'FAQ - Často kladené otázky'); -@define('FAQ_NEW_ENTRY', 'Nová otázka'); -@define('FAQ_NAME', 'FAQ - Často kladené otázky'); -@define('FAQ_NAME_DESC', 'Správa FAQ - často kladených otázek'); -@define('FAQ_QUESTIONS', 'Otázky'); -@define('FAQ_QUESTION', 'Otázka'); -@define('FAQ_QUESTION_DESC', 'Zadej znění otázky'); -@define('FAQ_ANSWER', 'Odpověď'); -@define('FAQ_ANSWER_DESC', 'Zadej znění odpovědi'); -@define('FAQ_CATEGORY', 'Kategorie'); -@define('FAQ_CATEGORIES', 'Přehled kategorií'); -@define('FAQ_CATEGORY_DESC', 'Vyber kategorii'); -@define('FAQ_PID', 'Rodič'); -@define('FAQ_PID_PID', 'Vyber rodičovskou (nadřazenou) stránku'); -@define('FAQ_DESCRIPTION', 'Popis'); -@define('FAQ_DESCRIPTION_DESC', 'Zadej popis kategorie'); -@define('FAQ_PARENT', 'Nemá rodiče'); -@define('FAQ_NEWCATEGORY', 'Nová kategorie'); -@define('FAQ_DAYSUPDATE', 'Dní pro označení jako aktualizovaná'); -@define('FAQ_DAYSUPDATE_DESC', 'Kolik dní bude otázka označená jako aktualizovaná?'); -@define('FAQ_DAYSNEW', 'Dní pro označení jako nová'); -@define('FAQ_DAYSNEW_DESC', 'Kolik dní bude otázka označená jako nová?'); -@define('FAQ_NEW', 'Nová'); -@define('FAQ_UPDATE', 'Aktualizovaná'); -@define('FAQ_FAQURL', 'URL stránky FAQ'); -@define('FAQ_FAQURL_DESC', 'Adresa, pod kterou je možno zobrazit pluginu často kladených otázek'); -@define('FAQ_REALYDELETECATEGORY', 'Opravdu chcete smazat tuto kategorii?'); -@define('FAQ_NEWFAQ', 'Nová otázka'); -@define('FAQ_MARKUP', 'Značkování FAQ'); -@define('FAQ_MARKUP_DESC', 'Používat značkovací pluginy v často kladených otázkách?'); +@define('FAQS', 'FAQ - Často kladené otázky'); +@define('FAQ_NEW_ENTRY', 'Nová otázka'); +@define('FAQ_NAME', 'FAQ - Často kladené otázky'); +@define('FAQ_NAME_DESC', 'Správa FAQ - často kladených otázek'); +@define('FAQ_QUESTIONS', 'Otázky'); +@define('FAQ_QUESTION', 'Otázka'); +@define('FAQ_QUESTION_DESC', 'Zadej znění otázky'); +@define('FAQ_ANSWER', 'Odpověď'); +@define('FAQ_ANSWER_DESC', 'Zadej znění odpovědi'); +@define('FAQ_CATEGORY', 'Kategorie'); +@define('FAQ_CATEGORIES', 'Přehled kategorií'); +@define('FAQ_CATEGORY_DESC', 'Vyber kategorii'); +@define('FAQ_PID', 'Rodič'); +@define('FAQ_PID_PID', 'Vyber rodičovskou (nadřazenou) stránku'); +@define('FAQ_DESCRIPTION', 'Popis'); +@define('FAQ_DESCRIPTION_DESC', 'Zadej popis kategorie'); +@define('FAQ_PARENT', 'Nemá rodiče'); +@define('FAQ_NEWCATEGORY', 'Nová kategorie'); +@define('FAQ_DAYSUPDATE', 'Dní pro označení jako aktualizovaná'); +@define('FAQ_DAYSUPDATE_DESC', 'Kolik dní bude otázka označená jako aktualizovaná?'); +@define('FAQ_DAYSNEW', 'Dní pro označení jako nová'); +@define('FAQ_DAYSNEW_DESC', 'Kolik dní bude otázka označená jako nová?'); +@define('FAQ_NEW', 'Nová'); +@define('FAQ_UPDATE', 'Aktualizovaná'); +@define('FAQ_FAQURL', 'URL stránky FAQ'); +@define('FAQ_FAQURL_DESC', 'Adresa, pod kterou je možno zobrazit pluginu často kladených otázek'); +@define('FAQ_REALYDELETECATEGORY', 'Opravdu chcete smazat tuto kategorii?'); +@define('FAQ_NEWFAQ', 'Nová otázka'); +@define('FAQ_MARKUP', 'Značkování FAQ'); +@define('FAQ_MARKUP_DESC', 'Používat značkovací pluginy v často kladených otázkách?'); -@define('FAQ_PLUGIN_NAME', 'FAQ - výběr kategorií'); -@define('FAQ_PLUGIN_NAME_DESC', 'Vyberte kategorie FAQ, které chcete mít zobrazené v postranním sloupci na Vašem blogu.'); -@define('FAQ_PLUGIN_TITLE', 'Nadpis'); -@define('FAQ_PLUGIN_TITLE_DESC', 'Nadpis pro blok pluginy v postranním sloupci'); -@define('FAQ_PLUGIN_CATEGORY', 'Výběr kategorií'); -@define('FAQ_PLUGIN_CATEGORY_DESC', 'Které kategorie mají být zobrazeny?'); +@define('FAQ_PLUGIN_NAME', 'FAQ - výběr kategorií'); +@define('FAQ_PLUGIN_NAME_DESC', 'Vyberte kategorie FAQ, které chcete mít zobrazené v postranním sloupci na Vašem blogu.'); +@define('FAQ_PLUGIN_TITLE', 'Nadpis'); +@define('FAQ_PLUGIN_TITLE_DESC', 'Nadpis pro blok pluginy v postranním sloupci'); +@define('FAQ_PLUGIN_CATEGORY', 'Výběr kategorií'); +@define('FAQ_PLUGIN_CATEGORY_DESC', 'Které kategorie mají být zobrazeny?'); -@define('FAQ_PREVOUS', 'Předchozí otázka:'); -@define('FAQ_NEXT', 'Následující otázka:'); +@define('FAQ_PREVOUS', 'Předchozí otázka:'); +@define('FAQ_NEXT', 'Následující otázka:'); + +@define('FAQ_SEARCHRESULTS', 'Nalezeno %d častých dotazů:'); -@define('FAQ_SEARCHRESULTS', 'Nalezeno %d častých dotazů:'); diff --git a/serendipity_event_faq/UTF-8/lang_de.inc.php b/serendipity_event_faq/UTF-8/lang_de.inc.php index c12b5b24..22cfa81d 100644 --- a/serendipity_event_faq/UTF-8/lang_de.inc.php +++ b/serendipity_event_faq/UTF-8/lang_de.inc.php @@ -1,50 +1,51 @@ - - * @translated 2009/08/20 + * @version 1.0 + * @author Konrad Bauckmeier + * @translated 2009/08/20 */ -@define('FAQS', 'Fragenkatalog'); -@define('FAQ_NEW_ENTRY', 'Neuer Eintrag'); -@define('FAQ_NAME', 'FAQs'); -@define('FAQ_NAME_DESC', 'Liste von Fragen und Antworten werden übersichtlich aufbereitet dargestellt.'); -@define('FAQ_QUESTIONS', 'Fragen'); -@define('FAQ_QUESTION', 'Frage'); -@define('FAQ_QUESTION_DESC', 'Geben Sie hier die Frage ein.'); -@define('FAQ_ANSWER', 'Antwort'); -@define('FAQ_ANSWER_DESC', 'Geben Sie hier die Antwort ein.'); -@define('FAQ_CATEGORY', 'Kategorie'); -@define('FAQ_CATEGORIES', 'Kategorien'); -@define('FAQ_CATEGORY_DESC', 'Wählen Sie hier die Kategorie aus.'); -@define('FAQ_PID', 'Elternseite'); -@define('FAQ_PID_PID', 'Welches ist die übergeordnete Seite.'); -@define('FAQ_DESCRIPTION', 'Beschreibung'); -@define('FAQ_DESCRIPTION_DESC', 'Geben Sie hier eine kurze Beschreibung ein.'); -@define('FAQ_PARENT', 'Ist Elternkategorie'); -@define('FAQ_NEWCATEGORY', 'Neue Kategorie'); -@define('FAQ_DAYSUPDATE', 'Tage der Aktualisierung'); -@define('FAQ_DAYSUPDATE_DESC', 'Wieviele Tage soll ein Eintrag als aktualisiert gekennzeichnet werden?'); -@define('FAQ_DAYSNEW', 'Tage als neuer Artikel'); -@define('FAQ_DAYSNEW_DESC', 'Wieviele Tage soll ein Eintrag als neu gekennzeichnet werden?'); -@define('FAQ_NEW', 'Neu'); -@define('FAQ_UPDATE', 'Aktualisiert'); -@define('FAQ_FAQURL', 'URL zum FAQ-Plugin'); -@define('FAQ_FAQURL_DESC', 'Der Teil hinter '.$serendipity['permalinkPluginPath'].'.'); +@define('FAQS', 'Fragenkatalog'); +@define('FAQ_NEW_ENTRY', 'Neuer Eintrag'); +@define('FAQ_NAME', 'FAQs'); +@define('FAQ_NAME_DESC', 'Liste von Fragen und Antworten werden übersichtlich aufbereitet dargestellt.'); +@define('FAQ_QUESTIONS', 'Fragen'); +@define('FAQ_QUESTION', 'Frage'); +@define('FAQ_QUESTION_DESC', 'Geben Sie hier die Frage ein.'); +@define('FAQ_ANSWER', 'Antwort'); +@define('FAQ_ANSWER_DESC', 'Geben Sie hier die Antwort ein.'); +@define('FAQ_CATEGORY', 'Kategorie'); +@define('FAQ_CATEGORIES', 'Kategorien'); +@define('FAQ_CATEGORY_DESC', 'Wählen Sie hier die Kategorie aus.'); +@define('FAQ_PID', 'Elternseite'); +@define('FAQ_PID_PID', 'Welches ist die übergeordnete Seite.'); +@define('FAQ_DESCRIPTION', 'Beschreibung'); +@define('FAQ_DESCRIPTION_DESC', 'Geben Sie hier eine kurze Beschreibung ein.'); +@define('FAQ_PARENT', 'Ist Elternkategorie'); +@define('FAQ_NEWCATEGORY', 'Neue Kategorie'); +@define('FAQ_DAYSUPDATE', 'Tage der Aktualisierung'); +@define('FAQ_DAYSUPDATE_DESC', 'Wieviele Tage soll ein Eintrag als aktualisiert gekennzeichnet werden?'); +@define('FAQ_DAYSNEW', 'Tage als neuer Artikel'); +@define('FAQ_DAYSNEW_DESC', 'Wieviele Tage soll ein Eintrag als neu gekennzeichnet werden?'); +@define('FAQ_NEW', 'Neu'); +@define('FAQ_UPDATE', 'Aktualisiert'); +@define('FAQ_FAQURL', 'URL zum FAQ-Plugin'); +@define('FAQ_FAQURL_DESC', 'Der Teil hinter '.$serendipity['permalinkPluginPath'].'.'); -@define('FAQ_PLUGIN_NAME', 'FAQ Kategorie-Plugin'); -@define('FAQ_PLUGIN_NAME_DESC', 'Zeigt einzelne Kategorien in der Seitenleiste an.'); -@define('FAQ_PLUGIN_TITLE', 'Überschrift'); -@define('FAQ_PLUGIN_TITLE_DESC', 'Kurze Überschrift für das Plugin.'); -@define('FAQ_PLUGIN_CATEGORY', 'Kategorie'); +@define('FAQ_PLUGIN_NAME', 'FAQ Kategorie-Plugin'); +@define('FAQ_PLUGIN_NAME_DESC', 'Zeigt einzelne Kategorien in der Seitenleiste an.'); +@define('FAQ_PLUGIN_TITLE', 'Überschrift'); +@define('FAQ_PLUGIN_TITLE_DESC', 'Kurze Überschrift für das Plugin.'); +@define('FAQ_PLUGIN_CATEGORY', 'Kategorie'); @define('FAQ_PLUGIN_CATEGORY_DESC', 'Welche Kategorien sollen angezeigt werden?'); @define('FAQ_PREVOUS', 'Vorherige Frage:'); @define('FAQ_NEXT', 'Nächste Frage:'); -@define('FAQ_SEARCHRESULTS', '%d FAQs gefunden:'); +@define('FAQ_SEARCHRESULTS', '%d FAQs gefunden:'); // Next lines were translated on 2009/08/20 -@define('FAQ_REALYDELETECATEGORY', 'Möchten Sie diese Kategorie wirklich löschen?'); -@define('FAQ_NEWFAQ', 'Neue FAQ'); -@define('FAQ_MARKUP', 'Textformatierung für FAQ Artikel anwenden'); -@define('FAQ_MARKUP_DESC', 'Wenn aktiviert, werden die Textformatierungen auch auf FAQ Artikel angewandt. '); \ No newline at end of file +@define('FAQ_REALYDELETECATEGORY', 'Möchten Sie diese Kategorie wirklich löschen?'); +@define('FAQ_NEWFAQ', 'Neue FAQ'); +@define('FAQ_MARKUP', 'Textformatierung für FAQ Artikel anwenden'); +@define('FAQ_MARKUP_DESC', 'Wenn aktiviert, werden die Textformatierungen auch auf FAQ Artikel angewandt. '); + diff --git a/serendipity_event_faq/UTF-8/lang_ja.inc.php b/serendipity_event_faq/UTF-8/lang_ja.inc.php index 441c97e2..5b6969fd 100644 --- a/serendipity_event_faq/UTF-8/lang_ja.inc.php +++ b/serendipity_event_faq/UTF-8/lang_ja.inc.php @@ -1,53 +1,51 @@ - - * EN-Revision: 1.9 + * @version + * @author Translator Name + * EN-Revision: 1.9 */ -@define('FAQS', 'FAQs'); -@define('FAQ_NEW_ENTRY', '新規 FAQ'); -@define('FAQ_NAME', 'よくある質問と回答(Frequently Asked Questions)'); -@define('FAQ_NAME_DESC', 'よくある質問と回答(Frequently Asked Question)の編集です。'); -@define('FAQ_QUESTIONS', 'Questions'); -@define('FAQ_QUESTION', '質問'); -@define('FAQ_QUESTION_DESC', '質問を入力してください。'); -@define('FAQ_ANSWER', '回答'); -@define('FAQ_ANSWER_DESC', '回答を入力してください。'); -@define('FAQ_CATEGORY', 'カテゴリ'); -@define('FAQ_CATEGORIES', 'Categories'); -@define('FAQ_CATEGORY_DESC', 'カテゴリを選択してください。'); -@define('FAQ_PID', '親'); -@define('FAQ_PID_PID', '親ページを選択してください。'); -@define('FAQ_DESCRIPTION', '説明'); -@define('FAQ_DESCRIPTION_DESC', 'このカテゴリの説明を入力してください。'); -@define('FAQ_PARENT', 'Is parent.'); -@define('FAQ_NEWCATEGORY', '新規カテゴリを作成します。'); -@define('FAQ_DAYSUPDATE', '更新の日数'); -@define('FAQ_DAYSUPDATE_DESC', '何日までの FAQ を更新としますか?'); -@define('FAQ_DAYSNEW', '新規の日数'); -@define('FAQ_DAYSNEW_DESC', '何日までの FAQ を新規としますか?'); -@define('FAQ_NEW', '新規'); -@define('FAQ_UPDATE', '更新する'); -@define('FAQ_FAQURL', 'FAQ プラグインへの URL'); -@define('FAQ_FAQURL_DESC', ''); -@define('FAQ_REALYDELETECATEGORY', '本当にこのカテゴリを削除したいですか?'); -@define('FAQ_NEWFAQ', '新規 FAQ'); -@define('FAQ_MARKUP', 'FAQ 記事をマークアップ'); -@define('FAQ_MARKUP_DESC', 'FAQ 形式から s9y へのマークアッププラグインを私用します。'); +@define('FAQS', 'FAQs'); +@define('FAQ_NEW_ENTRY', '新規 FAQ'); +@define('FAQ_NAME', 'よくある質問と回答(Frequently Asked Questions)'); +@define('FAQ_NAME_DESC', 'よくある質問と回答(Frequently Asked Question)の編集です。'); +@define('FAQ_QUESTIONS', 'Questions'); +@define('FAQ_QUESTION', '質問'); +@define('FAQ_QUESTION_DESC', '質問を入力してください。'); +@define('FAQ_ANSWER', '回答'); +@define('FAQ_ANSWER_DESC', '回答を入力してください。'); +@define('FAQ_CATEGORY', 'カテゴリ'); +@define('FAQ_CATEGORIES', 'Categories'); +@define('FAQ_CATEGORY_DESC', 'カテゴリを選択してください。'); +@define('FAQ_PID', '親'); +@define('FAQ_PID_PID', '親ページを選択してください。'); +@define('FAQ_DESCRIPTION', '説明'); +@define('FAQ_DESCRIPTION_DESC', 'このカテゴリの説明を入力してください。'); +@define('FAQ_PARENT', 'Is parent.'); +@define('FAQ_NEWCATEGORY', '新規カテゴリを作成します。'); +@define('FAQ_DAYSUPDATE', '更新の日数'); +@define('FAQ_DAYSUPDATE_DESC', '何日までの FAQ を更新としますか?'); +@define('FAQ_DAYSNEW', '新規の日数'); +@define('FAQ_DAYSNEW_DESC', '何日までの FAQ を新規としますか?'); +@define('FAQ_NEW', '新規'); +@define('FAQ_UPDATE', '更新する'); +@define('FAQ_FAQURL', 'FAQ プラグインへの URL'); +@define('FAQ_FAQURL_DESC', ''); +@define('FAQ_REALYDELETECATEGORY', '本当にこのカテゴリを削除したいですか?'); +@define('FAQ_NEWFAQ', '新規 FAQ'); +@define('FAQ_MARKUP', 'FAQ 記事をマークアップ'); +@define('FAQ_MARKUP_DESC', 'FAQ 形式から s9y へのマークアッププラグインを私用します。'); -@define('FAQ_PLUGIN_NAME', 'FAQs カテゴリ選択'); -@define('FAQ_PLUGIN_NAME_DESC', 'ブログに表示するカテゴリを選びます。'); -@define('FAQ_PLUGIN_TITLE', 'ヘッドライン'); -@define('FAQ_PLUGIN_TITLE_DESC', 'プラグインの短いヘッドラインです。'); -@define('FAQ_PLUGIN_CATEGORY', 'カテゴリを選択する'); +@define('FAQ_PLUGIN_NAME', 'FAQs カテゴリ選択'); +@define('FAQ_PLUGIN_NAME_DESC', 'ブログに表示するカテゴリを選びます。'); +@define('FAQ_PLUGIN_TITLE', 'ヘッドライン'); +@define('FAQ_PLUGIN_TITLE_DESC', 'プラグインの短いヘッドラインです。'); +@define('FAQ_PLUGIN_CATEGORY', 'カテゴリを選択する'); @define('FAQ_PLUGIN_CATEGORY_DESC', 'どのカテゴリを表示しますか?'); -@define('FAQ_PREVOUS', '前の質問:'); -@define('FAQ_NEXT', '次の質問:'); +@define('FAQ_PREVOUS', '前の質問:'); +@define('FAQ_NEXT', '次の質問:'); -@define('FAQ_SEARCHRESULTS', '%d 個の FAQ が見つかりました:'); +@define('FAQ_SEARCHRESULTS', '%d 個の FAQ が見つかりました:'); - -?> \ No newline at end of file diff --git a/serendipity_event_faq/alternatives/plugin_faq_categories.tpl b/serendipity_event_faq/alternatives/plugin_faq_categories.tpl index 747e3a0c..b591f49e 100644 --- a/serendipity_event_faq/alternatives/plugin_faq_categories.tpl +++ b/serendipity_event_faq/alternatives/plugin_faq_categories.tpl @@ -1,18 +1,19 @@ +
-

{$smarty.const.FAQ_NAME}

-

{$smarty.const.FAQ_CATEGORIES}

+

{$CONST.FAQ_NAME}

+

{$CONST.FAQ_CATEGORIES}

-

{$smarty.const.ADMIN_FRONTPAGE} > {$smarty.const.FAQ_CATEGORIES}

+

{$CONST.ADMIN_FRONTPAGE} > {$CONST.FAQ_CATEGORIES}

{if is_array($faq_plugin.categories)}
    - {foreach from=$faq_plugin.categories item=cat} + {foreach $faq_plugin.categories AS $cat} {if $cat.depth == 0}
  • {$cat.category}
    • {/if} diff --git a/serendipity_event_faq/alternatives/plugin_faq_category_faq.tpl b/serendipity_event_faq/alternatives/plugin_faq_category_faq.tpl index 80ba9fb8..31028b92 100644 --- a/serendipity_event_faq/alternatives/plugin_faq_category_faq.tpl +++ b/serendipity_event_faq/alternatives/plugin_faq_category_faq.tpl @@ -1,14 +1,15 @@ +
    -

    {$smarty.const.FAQ_NAME}

    +

    {$CONST.FAQ_NAME}

    {$faq_plugin.this_faq.category}

    -

    {$smarty.const.ADMIN_FRONTPAGE} > {$smarty.const.FAQ_CATEGORIES} - {foreach from=$cat_tree item=cat}> +

    {$CONST.ADMIN_FRONTPAGE} > {$CONST.FAQ_CATEGORIES} + {foreach $cat_tree AS $cat}> {if $cat.id != $faq_plugin.catid} {/if} @@ -21,10 +22,10 @@

    -

    {$smarty.const.FAQ_QUESTION}: {$faq_plugin.this_faq.question}


    -

    {$smarty.const.FAQ_ANSWER}: {$faq_plugin.this_faq.answer}


    -

    {$smarty.const.FAQ_PREVOUS} {$faq_plugin.prev_faq.question|truncate:30:'...'}

    -

    {$smarty.const.FAQ_NEXT} {$faq_plugin.next_faq.question|truncate:30:'...'}

    +

    {$CONST.FAQ_QUESTION}: {$faq_plugin.this_faq.question}


    +

    {$CONST.FAQ_ANSWER}: {$faq_plugin.this_faq.answer}


    +

    {$CONST.FAQ_PREVOUS} {$faq_plugin.prev_faq.question|truncate:30:'...'}

    +

    {$CONST.FAQ_NEXT} {$faq_plugin.next_faq.question|truncate:30:'...'}

    diff --git a/serendipity_event_faq/alternatives/plugin_faq_category_faqs.tpl b/serendipity_event_faq/alternatives/plugin_faq_category_faqs.tpl index dc807ec6..865b47e7 100644 --- a/serendipity_event_faq/alternatives/plugin_faq_category_faqs.tpl +++ b/serendipity_event_faq/alternatives/plugin_faq_category_faqs.tpl @@ -1,15 +1,16 @@ +
    -

    {$smarty.const.FAQ_NAME}

    +

    {$CONST.FAQ_NAME}

    {$faq_plugin.category}

    -

    {$smarty.const.ADMIN_FRONTPAGE} > {$smarty.const.FAQ_CATEGORIES} - {foreach from=$cat_tree item=cat} > +

    {$CONST.ADMIN_FRONTPAGE} > {$CONST.FAQ_CATEGORIES} + {foreach $cat_tree AS $cat} > {if $cat.id != $faq_plugin.catid} {/if} @@ -26,7 +27,7 @@ {if is_array($faq_plugin.subcategories)}

    @@ -34,7 +35,7 @@ {if is_array($faq_plugin.faqs)}
      - {foreach from=$faq_plugin.faqs item=faq} + {foreach $faq_plugin.faqs AS $faq}
    • {$faq.question} {$faq.status}
      • {/foreach}
    diff --git a/serendipity_event_faq/documentation_cs.html b/serendipity_event_faq/documentation_cs.html index 554ccb55..767c777b 100644 --- a/serendipity_event_faq/documentation_cs.html +++ b/serendipity_event_faq/documentation_cs.html @@ -1,12 +1,12 @@ - - + + - Dokumentace: FAQ - asto kladen otzky + Dokumentace: FAQ - asto kladen otzky

    Dokumentace k pluginu 'FAQ - asto kladen otzky'
    (serendipity_event_faq)

    -

    Dokumentaci k tomuto pluginu peloil do etiny Vladimr Ajgl (vlada [zavinac] ajgl [tecka] cz) dne 20.9.2011. Od t doby mohl bt plugin pozmnn nebo mohly bt rozen jeho funkce. Zkontrolujte pro jistotu i aktuln anglick "ChangeLog". +

    Dokumentaci k tomuto pluginu peloil do etiny Vladimr Ajgl (vlada [zavinac] ajgl [tecka] cz) dne 20.9.2011. Od t doby mohl bt plugin pozmnn nebo mohly bt rozen jeho funkce. Zkontrolujte pro jistotu i aktuln anglick "ChangeLog".

    Popis pluginu

    diff --git a/serendipity_event_faq/documentation_cz.html b/serendipity_event_faq/documentation_cz.html index aadf6f01..6bdda646 100644 --- a/serendipity_event_faq/documentation_cz.html +++ b/serendipity_event_faq/documentation_cz.html @@ -1,12 +1,12 @@ - - + + - Dokumentace: FAQ - asto kladen otzky + Dokumentace: FAQ - asto kladen otzky

    Dokumentace k pluginu 'FAQ - asto kladen otzky'
    (serendipity_event_faq)

    -

    Dokumentaci k tomuto pluginu peloil do etiny Vladimr Ajgl (vlada [zavinac] ajgl [tecka] cz) dne 20.9.2011. Od t doby mohl bt plugin pozmnn nebo mohly bt rozen jeho funkce. Zkontrolujte pro jistotu i aktuln anglick "ChangeLog". +

    Dokumentaci k tomuto pluginu peloil do etiny Vladimr Ajgl (vlada [zavinac] ajgl [tecka] cz) dne 20.9.2011. Od t doby mohl bt plugin pozmnn nebo mohly bt rozen jeho funkce. Zkontrolujte pro jistotu i aktuln anglick "ChangeLog".

    Popis pluginu

    diff --git a/serendipity_event_faq/lang_bg.inc.php b/serendipity_event_faq/lang_bg.inc.php index 673bc808..b4356611 100644 --- a/serendipity_event_faq/lang_bg.inc.php +++ b/serendipity_event_faq/lang_bg.inc.php @@ -1,50 +1,51 @@ - - * EN-Revision: Revision of lang_en.inc.php - * Translated on 2007/11/30 - * @author Vladimir Ajgl - * @revisionDate 2009/02/15 + * @author Vladimr Ajgl + * EN-Revision: Revision of lang_en.inc.php + * Translated on 2007/11/30 + * @author Vladimir Ajgl + * @revisionDate 2009/02/15 */ -@define('FAQS', 'FAQ - asto kladen otzky'); -@define('FAQ_NEW_ENTRY', 'Nov otzka'); -@define('FAQ_NAME', 'FAQ - asto kladen otzky'); -@define('FAQ_NAME_DESC', 'Sprva FAQ - asto kladench otzek'); -@define('FAQ_QUESTIONS', 'Otzky'); -@define('FAQ_QUESTION', 'Otzka'); -@define('FAQ_QUESTION_DESC', 'Zadej znn otzky'); -@define('FAQ_ANSWER', 'Odpov'); -@define('FAQ_ANSWER_DESC', 'Zadej znn odpovdi'); -@define('FAQ_CATEGORY', 'Kategorie'); -@define('FAQ_CATEGORIES', 'Pehled kategori'); -@define('FAQ_CATEGORY_DESC', 'Vyber kategorii'); -@define('FAQ_PID', 'Rodi'); -@define('FAQ_PID_PID', 'Vyber rodiovskou (nadazenou) strnku'); -@define('FAQ_DESCRIPTION', 'Popis'); -@define('FAQ_DESCRIPTION_DESC', 'Zadej popis kategorie'); -@define('FAQ_PARENT', 'Nem rodie'); -@define('FAQ_NEWCATEGORY', 'Nov kategorie'); -@define('FAQ_DAYSUPDATE', 'Dn pro oznaen jako aktualizovan'); -@define('FAQ_DAYSUPDATE_DESC', 'Kolik dn bude otzka oznaen jako aktualizovan?'); -@define('FAQ_DAYSNEW', 'Dn pro oznaen jako nov'); -@define('FAQ_DAYSNEW_DESC', 'Kolik dn bude otzka oznaen jako nov?'); -@define('FAQ_NEW', 'Nov'); -@define('FAQ_UPDATE', 'Aktualizovan'); -@define('FAQ_FAQURL', 'URL strnky FAQ'); -@define('FAQ_FAQURL_DESC', 'Adresa, pod kterou je mono zobrazit pluginu asto kladench otzek'); -@define('FAQ_REALYDELETECATEGORY', 'Opravdu chcete smazat tuto kategorii?'); -@define('FAQ_NEWFAQ', 'Nov otzka'); -@define('FAQ_MARKUP', 'Znakovn FAQ'); -@define('FAQ_MARKUP_DESC', 'Pouvat znakovac pluginy v asto kladench otzkch?'); +@define('FAQS', 'FAQ - asto kladen otzky'); +@define('FAQ_NEW_ENTRY', 'Nov otzka'); +@define('FAQ_NAME', 'FAQ - asto kladen otzky'); +@define('FAQ_NAME_DESC', 'Sprva FAQ - asto kladench otzek'); +@define('FAQ_QUESTIONS', 'Otzky'); +@define('FAQ_QUESTION', 'Otzka'); +@define('FAQ_QUESTION_DESC', 'Zadej znn otzky'); +@define('FAQ_ANSWER', 'Odpov'); +@define('FAQ_ANSWER_DESC', 'Zadej znn odpovdi'); +@define('FAQ_CATEGORY', 'Kategorie'); +@define('FAQ_CATEGORIES', 'Pehled kategori'); +@define('FAQ_CATEGORY_DESC', 'Vyber kategorii'); +@define('FAQ_PID', 'Rodi'); +@define('FAQ_PID_PID', 'Vyber rodiovskou (nadazenou) strnku'); +@define('FAQ_DESCRIPTION', 'Popis'); +@define('FAQ_DESCRIPTION_DESC', 'Zadej popis kategorie'); +@define('FAQ_PARENT', 'Nem rodie'); +@define('FAQ_NEWCATEGORY', 'Nov kategorie'); +@define('FAQ_DAYSUPDATE', 'Dn pro oznaen jako aktualizovan'); +@define('FAQ_DAYSUPDATE_DESC', 'Kolik dn bude otzka oznaen jako aktualizovan?'); +@define('FAQ_DAYSNEW', 'Dn pro oznaen jako nov'); +@define('FAQ_DAYSNEW_DESC', 'Kolik dn bude otzka oznaen jako nov?'); +@define('FAQ_NEW', 'Nov'); +@define('FAQ_UPDATE', 'Aktualizovan'); +@define('FAQ_FAQURL', 'URL strnky FAQ'); +@define('FAQ_FAQURL_DESC', 'Adresa, pod kterou je mono zobrazit pluginu asto kladench otzek'); +@define('FAQ_REALYDELETECATEGORY', 'Opravdu chcete smazat tuto kategorii?'); +@define('FAQ_NEWFAQ', 'Nov otzka'); +@define('FAQ_MARKUP', 'Znakovn FAQ'); +@define('FAQ_MARKUP_DESC', 'Pouvat znakovac pluginy v asto kladench otzkch?'); -@define('FAQ_PLUGIN_NAME', 'FAQ - vbr kategori'); -@define('FAQ_PLUGIN_NAME_DESC', 'Vyberte kategorie FAQ, kter chcete mt zobrazen v postrannm sloupci na Vaem blogu.'); -@define('FAQ_PLUGIN_TITLE', 'Nadpis'); -@define('FAQ_PLUGIN_TITLE_DESC', 'Nadpis pro blok pluginy v postrannm sloupci'); -@define('FAQ_PLUGIN_CATEGORY', 'Vbr kategori'); -@define('FAQ_PLUGIN_CATEGORY_DESC', 'Kter kategorie maj bt zobrazeny?'); +@define('FAQ_PLUGIN_NAME', 'FAQ - vbr kategori'); +@define('FAQ_PLUGIN_NAME_DESC', 'Vyberte kategorie FAQ, kter chcete mt zobrazen v postrannm sloupci na Vaem blogu.'); +@define('FAQ_PLUGIN_TITLE', 'Nadpis'); +@define('FAQ_PLUGIN_TITLE_DESC', 'Nadpis pro blok pluginy v postrannm sloupci'); +@define('FAQ_PLUGIN_CATEGORY', 'Vbr kategori'); +@define('FAQ_PLUGIN_CATEGORY_DESC', 'Kter kategorie maj bt zobrazeny?'); -@define('FAQ_PREVOUS', 'Pedchoz otzka:'); -@define('FAQ_NEXT', 'Nsledujc otzka:'); +@define('FAQ_PREVOUS', 'Pedchoz otzka:'); +@define('FAQ_NEXT', 'Nsledujc otzka:'); + +@define('FAQ_SEARCHRESULTS', 'Nalezeno %d astch dotaz:'); -@define('FAQ_SEARCHRESULTS', 'Nalezeno %d astch dotaz:'); diff --git a/serendipity_event_faq/lang_cz.inc.php b/serendipity_event_faq/lang_cz.inc.php index 1e362f28..7c3a2f78 100644 --- a/serendipity_event_faq/lang_cz.inc.php +++ b/serendipity_event_faq/lang_cz.inc.php @@ -1,51 +1,52 @@ - * EN-Revision: Revision of lang_en.inc.php - * Translated on 2007/11/30 - * @author Vladimir Ajgl - * @revisionDate 2009/02/15 + * @author Vladimr Ajgl + * EN-Revision: Revision of lang_en.inc.php + * Translated on 2007/11/30 + * @author Vladimir Ajgl + * @revisionDate 2009/02/15 */ -@define('FAQS', 'FAQ - asto kladen otzky'); -@define('FAQ_NEW_ENTRY', 'Nov otzka'); -@define('FAQ_NAME', 'FAQ - asto kladen otzky'); -@define('FAQ_NAME_DESC', 'Sprva FAQ - asto kladench otzek'); -@define('FAQ_QUESTIONS', 'Otzky'); -@define('FAQ_QUESTION', 'Otzka'); -@define('FAQ_QUESTION_DESC', 'Zadej znn otzky'); -@define('FAQ_ANSWER', 'Odpov'); -@define('FAQ_ANSWER_DESC', 'Zadej znn odpovdi'); -@define('FAQ_CATEGORY', 'Kategorie'); -@define('FAQ_CATEGORIES', 'Pehled kategori'); -@define('FAQ_CATEGORY_DESC', 'Vyber kategorii'); -@define('FAQ_PID', 'Rodi'); -@define('FAQ_PID_PID', 'Vyber rodiovskou (nadazenou) strnku'); -@define('FAQ_DESCRIPTION', 'Popis'); -@define('FAQ_DESCRIPTION_DESC', 'Zadej popis kategorie'); -@define('FAQ_PARENT', 'Nem rodie'); -@define('FAQ_NEWCATEGORY', 'Nov kategorie'); -@define('FAQ_DAYSUPDATE', 'Dn pro oznaen jako aktualizovan'); -@define('FAQ_DAYSUPDATE_DESC', 'Kolik dn bude otzka oznaen jako aktualizovan?'); -@define('FAQ_DAYSNEW', 'Dn pro oznaen jako nov'); -@define('FAQ_DAYSNEW_DESC', 'Kolik dn bude otzka oznaen jako nov?'); -@define('FAQ_NEW', 'Nov'); -@define('FAQ_UPDATE', 'Aktualizovan'); -@define('FAQ_FAQURL', 'URL strnky FAQ'); -@define('FAQ_FAQURL_DESC', 'Adresa, pod kterou je mono zobrazit pluginu asto kladench otzek'); -@define('FAQ_REALYDELETECATEGORY', 'Opravdu chcete smazat tuto kategorii?'); -@define('FAQ_NEWFAQ', 'Nov otzka'); -@define('FAQ_MARKUP', 'Znakovn FAQ'); -@define('FAQ_MARKUP_DESC', 'Pouvat znakovac pluginy v asto kladench otzkch?'); +@define('FAQS', 'FAQ - asto kladen otzky'); +@define('FAQ_NEW_ENTRY', 'Nov otzka'); +@define('FAQ_NAME', 'FAQ - asto kladen otzky'); +@define('FAQ_NAME_DESC', 'Sprva FAQ - asto kladench otzek'); +@define('FAQ_QUESTIONS', 'Otzky'); +@define('FAQ_QUESTION', 'Otzka'); +@define('FAQ_QUESTION_DESC', 'Zadej znn otzky'); +@define('FAQ_ANSWER', 'Odpov'); +@define('FAQ_ANSWER_DESC', 'Zadej znn odpovdi'); +@define('FAQ_CATEGORY', 'Kategorie'); +@define('FAQ_CATEGORIES', 'Pehled kategori'); +@define('FAQ_CATEGORY_DESC', 'Vyber kategorii'); +@define('FAQ_PID', 'Rodi'); +@define('FAQ_PID_PID', 'Vyber rodiovskou (nadazenou) strnku'); +@define('FAQ_DESCRIPTION', 'Popis'); +@define('FAQ_DESCRIPTION_DESC', 'Zadej popis kategorie'); +@define('FAQ_PARENT', 'Nem rodie'); +@define('FAQ_NEWCATEGORY', 'Nov kategorie'); +@define('FAQ_DAYSUPDATE', 'Dn pro oznaen jako aktualizovan'); +@define('FAQ_DAYSUPDATE_DESC', 'Kolik dn bude otzka oznaen jako aktualizovan?'); +@define('FAQ_DAYSNEW', 'Dn pro oznaen jako nov'); +@define('FAQ_DAYSNEW_DESC', 'Kolik dn bude otzka oznaen jako nov?'); +@define('FAQ_NEW', 'Nov'); +@define('FAQ_UPDATE', 'Aktualizovan'); +@define('FAQ_FAQURL', 'URL strnky FAQ'); +@define('FAQ_FAQURL_DESC', 'Adresa, pod kterou je mono zobrazit pluginu asto kladench otzek'); +@define('FAQ_REALYDELETECATEGORY', 'Opravdu chcete smazat tuto kategorii?'); +@define('FAQ_NEWFAQ', 'Nov otzka'); +@define('FAQ_MARKUP', 'Znakovn FAQ'); +@define('FAQ_MARKUP_DESC', 'Pouvat znakovac pluginy v asto kladench otzkch?'); -@define('FAQ_PLUGIN_NAME', 'FAQ - vbr kategori'); -@define('FAQ_PLUGIN_NAME_DESC', 'Vyberte kategorie FAQ, kter chcete mt zobrazen v postrannm sloupci na Vaem blogu.'); -@define('FAQ_PLUGIN_TITLE', 'Nadpis'); -@define('FAQ_PLUGIN_TITLE_DESC', 'Nadpis pro blok pluginy v postrannm sloupci'); -@define('FAQ_PLUGIN_CATEGORY', 'Vbr kategori'); -@define('FAQ_PLUGIN_CATEGORY_DESC', 'Kter kategorie maj bt zobrazeny?'); +@define('FAQ_PLUGIN_NAME', 'FAQ - vbr kategori'); +@define('FAQ_PLUGIN_NAME_DESC', 'Vyberte kategorie FAQ, kter chcete mt zobrazen v postrannm sloupci na Vaem blogu.'); +@define('FAQ_PLUGIN_TITLE', 'Nadpis'); +@define('FAQ_PLUGIN_TITLE_DESC', 'Nadpis pro blok pluginy v postrannm sloupci'); +@define('FAQ_PLUGIN_CATEGORY', 'Vbr kategori'); +@define('FAQ_PLUGIN_CATEGORY_DESC', 'Kter kategorie maj bt zobrazeny?'); -@define('FAQ_PREVOUS', 'Pedchoz otzka:'); -@define('FAQ_NEXT', 'Nsledujc otzka:'); +@define('FAQ_PREVOUS', 'Pedchoz otzka:'); +@define('FAQ_NEXT', 'Nsledujc otzka:'); + +@define('FAQ_SEARCHRESULTS', 'Nalezeno %d astch dotaz:'); -@define('FAQ_SEARCHRESULTS', 'Nalezeno %d astch dotaz:'); diff --git a/serendipity_event_faq/lang_de.inc.php b/serendipity_event_faq/lang_de.inc.php index cba729bc..7b1ec660 100644 --- a/serendipity_event_faq/lang_de.inc.php +++ b/serendipity_event_faq/lang_de.inc.php @@ -1,50 +1,51 @@ - - * @translated 2009/08/20 + * @version 1.0 + * @author Konrad Bauckmeier + * @translated 2009/08/20 */ -@define('FAQS', 'Fragenkatalog'); -@define('FAQ_NEW_ENTRY', 'Neuer Eintrag'); -@define('FAQ_NAME', 'FAQs'); -@define('FAQ_NAME_DESC', 'Liste von Fragen und Antworten werden bersichtlich aufbereitet dargestellt.'); -@define('FAQ_QUESTIONS', 'Fragen'); -@define('FAQ_QUESTION', 'Frage'); -@define('FAQ_QUESTION_DESC', 'Geben Sie hier die Frage ein.'); -@define('FAQ_ANSWER', 'Antwort'); -@define('FAQ_ANSWER_DESC', 'Geben Sie hier die Antwort ein.'); -@define('FAQ_CATEGORY', 'Kategorie'); -@define('FAQ_CATEGORIES', 'Kategorien'); -@define('FAQ_CATEGORY_DESC', 'Whlen Sie hier die Kategorie aus.'); -@define('FAQ_PID', 'Elternseite'); -@define('FAQ_PID_PID', 'Welches ist die bergeordnete Seite.'); -@define('FAQ_DESCRIPTION', 'Beschreibung'); -@define('FAQ_DESCRIPTION_DESC', 'Geben Sie hier eine kurze Beschreibung ein.'); -@define('FAQ_PARENT', 'Ist Elternkategorie'); -@define('FAQ_NEWCATEGORY', 'Neue Kategorie'); -@define('FAQ_DAYSUPDATE', 'Tage der Aktualisierung'); -@define('FAQ_DAYSUPDATE_DESC', 'Wieviele Tage soll ein Eintrag als aktualisiert gekennzeichnet werden?'); -@define('FAQ_DAYSNEW', 'Tage als neuer Artikel'); -@define('FAQ_DAYSNEW_DESC', 'Wieviele Tage soll ein Eintrag als neu gekennzeichnet werden?'); -@define('FAQ_NEW', 'Neu'); -@define('FAQ_UPDATE', 'Aktualisiert'); -@define('FAQ_FAQURL', 'URL zum FAQ-Plugin'); -@define('FAQ_FAQURL_DESC', 'Der Teil hinter '.$serendipity['permalinkPluginPath'].'.'); +@define('FAQS', 'Fragenkatalog'); +@define('FAQ_NEW_ENTRY', 'Neuer Eintrag'); +@define('FAQ_NAME', 'FAQs'); +@define('FAQ_NAME_DESC', 'Liste von Fragen und Antworten werden bersichtlich aufbereitet dargestellt.'); +@define('FAQ_QUESTIONS', 'Fragen'); +@define('FAQ_QUESTION', 'Frage'); +@define('FAQ_QUESTION_DESC', 'Geben Sie hier die Frage ein.'); +@define('FAQ_ANSWER', 'Antwort'); +@define('FAQ_ANSWER_DESC', 'Geben Sie hier die Antwort ein.'); +@define('FAQ_CATEGORY', 'Kategorie'); +@define('FAQ_CATEGORIES', 'Kategorien'); +@define('FAQ_CATEGORY_DESC', 'Whlen Sie hier die Kategorie aus.'); +@define('FAQ_PID', 'Elternseite'); +@define('FAQ_PID_PID', 'Welches ist die bergeordnete Seite.'); +@define('FAQ_DESCRIPTION', 'Beschreibung'); +@define('FAQ_DESCRIPTION_DESC', 'Geben Sie hier eine kurze Beschreibung ein.'); +@define('FAQ_PARENT', 'Ist Elternkategorie'); +@define('FAQ_NEWCATEGORY', 'Neue Kategorie'); +@define('FAQ_DAYSUPDATE', 'Tage der Aktualisierung'); +@define('FAQ_DAYSUPDATE_DESC', 'Wieviele Tage soll ein Eintrag als aktualisiert gekennzeichnet werden?'); +@define('FAQ_DAYSNEW', 'Tage als neuer Artikel'); +@define('FAQ_DAYSNEW_DESC', 'Wieviele Tage soll ein Eintrag als neu gekennzeichnet werden?'); +@define('FAQ_NEW', 'Neu'); +@define('FAQ_UPDATE', 'Aktualisiert'); +@define('FAQ_FAQURL', 'URL zum FAQ-Plugin'); +@define('FAQ_FAQURL_DESC', 'Der Teil hinter '.$serendipity['permalinkPluginPath'].'.'); -@define('FAQ_PLUGIN_NAME', 'FAQ Kategorie-Plugin'); -@define('FAQ_PLUGIN_NAME_DESC', 'Zeigt einzelne Kategorien in der Seitenleiste an.'); -@define('FAQ_PLUGIN_TITLE', 'berschrift'); -@define('FAQ_PLUGIN_TITLE_DESC', 'Kurze berschrift fr das Plugin.'); -@define('FAQ_PLUGIN_CATEGORY', 'Kategorie'); +@define('FAQ_PLUGIN_NAME', 'FAQ Kategorie-Plugin'); +@define('FAQ_PLUGIN_NAME_DESC', 'Zeigt einzelne Kategorien in der Seitenleiste an.'); +@define('FAQ_PLUGIN_TITLE', 'berschrift'); +@define('FAQ_PLUGIN_TITLE_DESC', 'Kurze berschrift fr das Plugin.'); +@define('FAQ_PLUGIN_CATEGORY', 'Kategorie'); @define('FAQ_PLUGIN_CATEGORY_DESC', 'Welche Kategorien sollen angezeigt werden?'); @define('FAQ_PREVOUS', 'Vorherige Frage:'); @define('FAQ_NEXT', 'Nchste Frage:'); -@define('FAQ_SEARCHRESULTS', '%d FAQs gefunden:'); +@define('FAQ_SEARCHRESULTS', '%d FAQs gefunden:'); // Next lines were translated on 2009/08/20 -@define('FAQ_REALYDELETECATEGORY', 'Mchten Sie diese Kategorie wirklich lschen?'); -@define('FAQ_NEWFAQ', 'Neue FAQ'); -@define('FAQ_MARKUP', 'Textformatierung fr FAQ Artikel anwenden'); -@define('FAQ_MARKUP_DESC', 'Wenn aktiviert, werden die Textformatierungen auch auf FAQ Artikel angewandt. '); \ No newline at end of file +@define('FAQ_REALYDELETECATEGORY', 'Mchten Sie diese Kategorie wirklich lschen?'); +@define('FAQ_NEWFAQ', 'Neue FAQ'); +@define('FAQ_MARKUP', 'Textformatierung fr FAQ Artikel anwenden'); +@define('FAQ_MARKUP_DESC', 'Wenn aktiviert, werden die Textformatierungen auch auf FAQ Artikel angewandt. '); + diff --git a/serendipity_event_faq/lang_en.inc.php b/serendipity_event_faq/lang_en.inc.php index c9e53bdc..8ba65db7 100644 --- a/serendipity_event_faq/lang_en.inc.php +++ b/serendipity_event_faq/lang_en.inc.php @@ -1,44 +1,48 @@ - * EN-Revision: 1.9 + * @version + * @author Translator Name + * EN-Revision: 1.9 */ -@define('FAQS', 'FAQs'); -@define('FAQ_NEW_ENTRY', '新規 FAQ'); -@define('FAQ_NAME', 'よくある質問と回答(Frequently Asked Questions)'); -@define('FAQ_NAME_DESC', 'よくある質問と回答(Frequently Asked Question)の編集です。'); -@define('FAQ_QUESTIONS', 'Questions'); -@define('FAQ_QUESTION', '質問'); -@define('FAQ_QUESTION_DESC', '質問を入力してください。'); -@define('FAQ_ANSWER', '回答'); -@define('FAQ_ANSWER_DESC', '回答を入力してください。'); -@define('FAQ_CATEGORY', 'カテゴリ'); -@define('FAQ_CATEGORIES', 'Categories'); -@define('FAQ_CATEGORY_DESC', 'カテゴリを選択してください。'); -@define('FAQ_PID', '親'); -@define('FAQ_PID_PID', '親ページを選択してください。'); -@define('FAQ_DESCRIPTION', '説明'); -@define('FAQ_DESCRIPTION_DESC', 'このカテゴリの説明を入力してください。'); -@define('FAQ_PARENT', 'Is parent.'); -@define('FAQ_NEWCATEGORY', '新規カテゴリを作成します。'); -@define('FAQ_DAYSUPDATE', '更新の日数'); -@define('FAQ_DAYSUPDATE_DESC', '何日までの FAQ を更新としますか?'); -@define('FAQ_DAYSNEW', '新規の日数'); -@define('FAQ_DAYSNEW_DESC', '何日までの FAQ を新規としますか?'); -@define('FAQ_NEW', '新規'); -@define('FAQ_UPDATE', '更新する'); -@define('FAQ_FAQURL', 'FAQ プラグインへの URL'); -@define('FAQ_FAQURL_DESC', ''); -@define('FAQ_REALYDELETECATEGORY', '本当にこのカテゴリを削除したいですか?'); -@define('FAQ_NEWFAQ', '新規 FAQ'); -@define('FAQ_MARKUP', 'FAQ 記事をマークアップ'); -@define('FAQ_MARKUP_DESC', 'FAQ 形式から s9y へのマークアッププラグインを私用します。'); +@define('FAQS', 'FAQs'); +@define('FAQ_NEW_ENTRY', '新規 FAQ'); +@define('FAQ_NAME', 'よくある質問と回答(Frequently Asked Questions)'); +@define('FAQ_NAME_DESC', 'よくある質問と回答(Frequently Asked Question)の編集です。'); +@define('FAQ_QUESTIONS', 'Questions'); +@define('FAQ_QUESTION', '質問'); +@define('FAQ_QUESTION_DESC', '質問を入力してください。'); +@define('FAQ_ANSWER', '回答'); +@define('FAQ_ANSWER_DESC', '回答を入力してください。'); +@define('FAQ_CATEGORY', 'カテゴリ'); +@define('FAQ_CATEGORIES', 'Categories'); +@define('FAQ_CATEGORY_DESC', 'カテゴリを選択してください。'); +@define('FAQ_PID', '親'); +@define('FAQ_PID_PID', '親ページを選択してください。'); +@define('FAQ_DESCRIPTION', '説明'); +@define('FAQ_DESCRIPTION_DESC', 'このカテゴリの説明を入力してください。'); +@define('FAQ_PARENT', 'Is parent.'); +@define('FAQ_NEWCATEGORY', '新規カテゴリを作成します。'); +@define('FAQ_DAYSUPDATE', '更新の日数'); +@define('FAQ_DAYSUPDATE_DESC', '何日までの FAQ を更新としますか?'); +@define('FAQ_DAYSNEW', '新規の日数'); +@define('FAQ_DAYSNEW_DESC', '何日までの FAQ を新規としますか?'); +@define('FAQ_NEW', '新規'); +@define('FAQ_UPDATE', '更新する'); +@define('FAQ_FAQURL', 'FAQ プラグインへの URL'); +@define('FAQ_FAQURL_DESC', ''); +@define('FAQ_REALYDELETECATEGORY', '本当にこのカテゴリを削除したいですか?'); +@define('FAQ_NEWFAQ', '新規 FAQ'); +@define('FAQ_MARKUP', 'FAQ 記事をマークアップ'); +@define('FAQ_MARKUP_DESC', 'FAQ 形式から s9y へのマークアッププラグインを私用します。'); -@define('FAQ_PLUGIN_NAME', 'FAQs カテゴリ選択'); -@define('FAQ_PLUGIN_NAME_DESC', 'ブログに表示するカテゴリを選びます。'); -@define('FAQ_PLUGIN_TITLE', 'ヘッドライン'); -@define('FAQ_PLUGIN_TITLE_DESC', 'プラグインの短いヘッドラインです。'); -@define('FAQ_PLUGIN_CATEGORY', 'カテゴリを選択する'); +@define('FAQ_PLUGIN_NAME', 'FAQs カテゴリ選択'); +@define('FAQ_PLUGIN_NAME_DESC', 'ブログに表示するカテゴリを選びます。'); +@define('FAQ_PLUGIN_TITLE', 'ヘッドライン'); +@define('FAQ_PLUGIN_TITLE_DESC', 'プラグインの短いヘッドラインです。'); +@define('FAQ_PLUGIN_CATEGORY', 'カテゴリを選択する'); @define('FAQ_PLUGIN_CATEGORY_DESC', 'どのカテゴリを表示しますか?'); -@define('FAQ_PREVOUS', '前の質問:'); -@define('FAQ_NEXT', '次の質問:'); +@define('FAQ_PREVOUS', '前の質問:'); +@define('FAQ_NEXT', '次の質問:'); -@define('FAQ_SEARCHRESULTS', '%d 個の FAQ が見つかりました:'); +@define('FAQ_SEARCHRESULTS', '%d 個の FAQ が見つかりました:'); - -?> \ No newline at end of file diff --git a/serendipity_event_faq/plugin_faq_categories.tpl b/serendipity_event_faq/plugin_faq_categories.tpl index 182e75af..5da328ba 100644 --- a/serendipity_event_faq/plugin_faq_categories.tpl +++ b/serendipity_event_faq/plugin_faq_categories.tpl @@ -1,21 +1,23 @@ -
    -

    {$smarty.const.ADMIN_FRONTPAGE} > {$smarty.const.FAQ_CATEGORIES}

    -
    -
    -

    {$smarty.const.FAQ_CATEGORIES}

    -
    +
    +
    +
    {$CONST.ADMIN_FRONTPAGE} > {$CONST.FAQ_CATEGORIES}
    +
    +
    +

    {$CONST.FAQ_CATEGORIES}

    +
    {if is_array($faq_plugin.categories)} -
      -{foreach from=$faq_plugin.categories item=cat} -{if $cat.depth == 0} -
    • {$cat.category}
      • -{/if} -{/foreach} -
    +
      + {foreach $faq_plugin.categories AS $cat} + {if $cat.depth == 0} +
    • {$cat.category}
      • + {/if} + {/foreach} +
    {/if} +
    diff --git a/serendipity_event_faq/plugin_faq_category_faq.tpl b/serendipity_event_faq/plugin_faq_category_faq.tpl index 96a27830..b20452bb 100644 --- a/serendipity_event_faq/plugin_faq_category_faq.tpl +++ b/serendipity_event_faq/plugin_faq_category_faq.tpl @@ -1,28 +1,42 @@ -
    -

    {$smarty.const.ADMIN_FRONTPAGE} > {$smarty.const.FAQ_CATEGORIES} +

    +
    +
    {$CONST.ADMIN_FRONTPAGE} > {$CONST.FAQ_CATEGORIES} -{foreach from=$cat_tree item=cat} -> {if $cat.id != $faq_plugin.catid} - -{/if} -{$cat.category} -{if $cat.id != $faq_plugin.catid} - -{/if} -{/foreach} -

    + {foreach $cat_tree AS $cat} + > {if $cat.id != $faq_plugin.catid}{/if}{$cat.category}{if $cat.id != $faq_plugin.catid}{/if} + {/foreach} +
    +
    + +

    {$faq_plugin.this_faq.category}

    + +
    + {$CONST.FAQ_QUESTION}: + {$faq_plugin.this_faq.question} +
    + +
    + {$CONST.FAQ_ANSWER}: + {$faq_plugin.this_faq.answer} +
    + +
    -

    {$faq_plugin.this_faq.category}

    - -

    {$smarty.const.FAQ_QUESTION}: {$faq_plugin.this_faq.question}

    -

    {$smarty.const.FAQ_ANSWER}: {$faq_plugin.this_faq.answer}

    - - -

    {$smarty.const.FAQ_PREVOUS} {$faq_plugin.prev_faq.question|truncate:30:'...'}

    -

    {$smarty.const.FAQ_NEXT} {$faq_plugin.next_faq.question|truncate:30:'...'}

    - diff --git a/serendipity_event_faq/plugin_faq_category_faqs.tpl b/serendipity_event_faq/plugin_faq_category_faqs.tpl index e3a9d6a0..2f329b36 100644 --- a/serendipity_event_faq/plugin_faq_category_faqs.tpl +++ b/serendipity_event_faq/plugin_faq_category_faqs.tpl @@ -1,38 +1,35 @@ -
    -

    {$smarty.const.ADMIN_FRONTPAGE} > {$smarty.const.FAQ_CATEGORIES} +

    +
    +
    + {$CONST.ADMIN_FRONTPAGE} > {$CONST.FAQ_CATEGORIES} -{foreach from=$cat_tree item=cat} -> {if $cat.id != $faq_plugin.catid} - -{/if} -{$cat.category} -{if $cat.id != $faq_plugin.catid} - -{/if} -{/foreach} -

    + {foreach $cat_tree AS $cat} + > {if $cat.id != $faq_plugin.catid}{/if}{$cat.category}{if $cat.id != $faq_plugin.catid}{/if} + {/foreach} +
    +
    + +

    {$faq_plugin.category}

    + {if $faq_plugin.introduction}
    {$faq_plugin.introduction}
    {/if} + + {if is_array($faq_plugin.subcategories)} + + {/if} + + {if is_array($faq_plugin.faqs)} +
      + {foreach $faq_plugin.faqs AS $faq} +
    • {$faq.question} {$faq.status}
      • + {/foreach} +
    + {/if}
    -

    {$faq_plugin.category}

    -{if $faq_plugin.introduction}

    {$faq_plugin.introduction}

    {/if} - -{if is_array($faq_plugin.subcategories)} - -{/if} - -{if is_array($faq_plugin.faqs)} -
      -{foreach from=$faq_plugin.faqs item=faq} -
    • {$faq.question} {$faq.status}
      • -{/foreach} -
    -{/if} - diff --git a/serendipity_event_faq/plugin_faq_searchresults.tpl b/serendipity_event_faq/plugin_faq_searchresults.tpl index e9635cd4..2bfce006 100644 --- a/serendipity_event_faq/plugin_faq_searchresults.tpl +++ b/serendipity_event_faq/plugin_faq_searchresults.tpl @@ -1,10 +1,18 @@ -
    -

    {$smarty.const.FAQ_SEARCHRESULTS|sprintf:$faq_searchresults}

    - + + +
    +
    +
    {$CONST.FAQ_SEARCHRESULTS|sprintf:$faq_searchresults}
    + {if !empty($faq_results)} + + {/if} +
    + + diff --git a/serendipity_event_faq/serendipity_event_faq.php b/serendipity_event_faq/serendipity_event_faq.php index badca799..c89bcc36 100644 --- a/serendipity_event_faq/serendipity_event_faq.php +++ b/serendipity_event_faq/serendipity_event_faq.php @@ -1,17 +1,10 @@ -add('name', FAQ_NAME); $propbag->add('description', FAQ_NAME_DESC); - $propbag->add('author', 'Falk Doering'); - $propbag->add('version', '1.12.1'); + $propbag->add('author', 'Falk Doering, Ian'); + $propbag->add('version', '1.23'); $propbag->add('copyright', 'LGPL'); $propbag->add('stackable', false); $propbag->add('requirements', array( - 'serendipity' => '0.9', - 'smarty' => '2.6.7', - 'php' => '4.1.0' + 'serendipity' => '1.7', + 'smarty' => '3.1.0', + 'php' => '5.2.0' )); $propbag->add('groups', array('FRONTEND_FEATURES')); $propbag->add('configuration_faq', $this->config_faq); @@ -103,12 +91,13 @@ class serendipity_event_faq extends serendipity_event $propbag->add('event_hooks', array( 'backend_sidebar_entries_event_display_faq' => true, 'backend_sidebar_entries' => true, + 'backend_sidebar_admin_appearance' => true, + 'entries_footer' => true, 'external_plugin' => true, 'entry_display' => true, 'genpage' => true, 'css_backend' => true, - 'css' => true, - 'entries_footer' => true + 'css' => true )); return true; @@ -158,7 +147,7 @@ class serendipity_event_faq extends serendipity_event $propbag->add('type', 'boolean'); $propbag->add('name', FAQ_MARKUP); $propbag->add('description', FAQ_MARKUP_DESC); - $propbag->add('default', true); + $propbag->add('default', 'true'); break; default: @@ -265,7 +254,7 @@ class serendipity_event_faq extends serendipity_event case 'language': $propbag->add('type', 'hidden'); - $propbag->add('value', $serendipity['GET']['cat_lang']); + $propbag->add('value', $serendipity['GET']['cat_lang']); break; default: @@ -274,11 +263,62 @@ class serendipity_event_faq extends serendipity_event return true; } + function generate_content(&$title) + { + $title = FAQ_NAME; + } + + function install() + { + $this->setupDB(); + } + + function setupDB() + { + global $serendipity; + + $db = $this->get_config('db_built', 0); + switch ($db) { + case 0: + $q = "CREATE TABLE {$serendipity['dbPrefix']}faqs ( + id {AUTOINCREMENT} {PRIMARY}, + cid int(11) default 0, + faqorder int(11) default 0, + question text, + answer text + ) {UTF_8}"; + serendipity_db_schema_import($q); + $q = "CREATE TABLE {$serendipity['dbPrefix']}faq_categorys ( + id {AUTOINCREMENT} {PRIMARY}, + parent_id int(11) not null default 0, + catorder int(11) default 0, + category varchar(255) not null, + introduction text + ) {UTF_8}"; + serendipity_db_schema_import($q); + case 1: + $q = "ALTER TABLE {$serendipity['dbPrefix']}faqs ADD COLUMN changedate int(11) default 0"; + serendipity_db_schema_import($q); + $q = "ALTER TABLE {$serendipity['dbPrefix']}faqs ADD COLUMN changetype varchar(10)"; + serendipity_db_schema_import($q); + case 2: + $q = "CREATE {FULLTEXT_MYSQL} INDEX faqentry_idx ON {$serendipity['dbPrefix']}faqs (question, answer)"; + serendipity_db_schema_import($q); + case 3: + $q = "ALTER TABLE {$serendipity['dbPrefix']}faq_categorys ADD COLUMN language varchar(2)"; + serendipity_db_schema_import($q); + serendipity_db_update('faq_categorys', array(), array('language' => $serendipity['language'])); + $this->set_config('db_built', 4); + break; + } + + } + /** * * Get categories data * - * Select all categories stroed in the faq categories table. + * Select all categories stored in the faq categories table. * If the parameter is true only parent categories will be * returned. * @@ -286,7 +326,6 @@ class serendipity_event_faq extends serendipity_event * @param boolean * @return array */ - function getCategories($lang) { global $serendipity; @@ -295,7 +334,7 @@ class serendipity_event_faq extends serendipity_event $cats = $this->fetchCategories($lang); if (is_array($cats)) { $cats = serendipity_walkRecursive($cats); - foreach ($cats as $cat) { + foreach ($cats AS $cat) { if (($this->category['id'] != $cat['id']) && ($this->category['id'] != $cat['parent_id'])) { $c[$cat['id']] = $cat['category']; } @@ -309,54 +348,12 @@ class serendipity_event_faq extends serendipity_event global $serendipity; $q = "SELECT id, parent_id, category, catorder, language - FROM ".$serendipity['dbPrefix']."faq_categorys + FROM {$serendipity['dbPrefix']}faq_categorys WHERE language = '$lang' ORDER BY catorder"; return serendipity_db_query($q, false, 'assoc'); } - - function setupDB() - { - global $serendipity; - - $db = $this->get_config('db_built', 0); - switch ($db) { - case 0: - $q = 'CREATE TABLE '.$serendipity['dbPrefix'].'faqs ( - id {AUTOINCREMENT} {PRIMARY}, - cid int(11) default 0, - faqorder int(11) default 0, - question text, - answer text - ) {UTF_8}'; - serendipity_db_schema_import($q); - $q = "CREATE TABLE ".$serendipity['dbPrefix']."faq_categorys ( - id {AUTOINCREMENT} {PRIMARY}, - parent_id int(11) not null default 0, - catorder int(11) default 0, - category varchar(255) not null, - introduction text - ) {UTF_8}"; - serendipity_db_schema_import($q); - case 1: - $q = 'ALTER TABLE '.$serendipity['dbPrefix'].'faqs ADD COLUMN changedate int(11) default 0'; - serendipity_db_schema_import($q); - $q = 'ALTER TABLE '.$serendipity['dbPrefix'].'faqs ADD COLUMN changetype varchar(10)'; - serendipity_db_schema_import($q); - case 2: - $q = 'CREATE {FULLTEXT_MYSQL} INDEX faqentry_idx on '.$serendipity['dbPrefix'].'faqs (question, answer)'; - serendipity_db_schema_import($q); - case 3: - $q = 'ALTER TABLE '.$serendipity['dbPrefix'].'faq_categorys ADD COLUMN language varchar(2)'; - serendipity_db_schema_import($q); - serendipity_db_update('faq_categorys', array(), array('language' => $serendipity['language'])); - $this->set_config('db_built', 4); - break; - } - - } - function &getFaq($key, $default = null) { return (isset($this->faq[$key]) ? $this->faq[$key] : $default); @@ -384,9 +381,13 @@ class serendipity_event_faq extends serendipity_event if (!is_numeric($this->faq['id'])) { $this->faq['changedate'] = time(); $this->faq['changetype'] = 'new'; - $q = 'SELECT COUNT(id) AS counter - FROM '.$serendipity['dbPrefix'].'faqs - WHERE cid = '.$this->faq['cid']; + if (!is_numeric($this->faq['cid'])) { + trigger_error("The {$this->faq['cid']} (cid) parameter must contain a valid 'category id' key", E_USER_ERROR); + return; + } + $q = "SELECT COUNT(id) AS counter + FROM {$serendipity['dbPrefix']}faqs + WHERE cid = ".$this->faq['cid']; $res = serendipity_db_query($q, true, 'assoc'); $this->faq['faqorder'] = ($res['counter'] + 1); $this->postgreFaqPrepare(); @@ -404,17 +405,18 @@ class serendipity_event_faq extends serendipity_event { global $serendipity; - $q = 'SELECT cid, faqorder - FROM '.$serendipity['dbPrefix'].'faqs - WHERE id = '.$id; + $q = "SELECT cid, faqorder + FROM {$serendipity['dbPrefix']}faqs + WHERE id = $id"; $res = serendipity_db_query($q, true, 'assoc'); - $q = 'DELETE FROM '.$serendipity['dbPrefix'].'faqs - WHERE id = '.$id; + + $q = "DELETE FROM {$serendipity['dbPrefix']}faqs + WHERE id = $id"; if (serendipity_db_query($q)) { - $q = 'UPDATE '.$serendipity['dbPrefix'].'faqs + $q = "UPDATE {$serendipity['dbPrefix']}faqs SET faqorder = faqorder - 1 - WHERE cid = '.$res['cid'].' - AND faqorder > '.$res['faqorder']; + WHERE cid = {$res['cid']} + AND faqorder > {$res['faqorder']}"; return serendipity_db_query($q); } return false; @@ -424,9 +426,9 @@ class serendipity_event_faq extends serendipity_event { global $serendipity; - $q = 'SELECT * - FROM '.$serendipity['dbPrefix'].'faqs - WHERE id = '.$id; + $q = "SELECT * + FROM {$serendipity['dbPrefix']}faqs + WHERE id = $id"; $faq = serendipity_db_query($q, true, 'assoc'); if (is_array($faq)) { $this->faq =& $faq; @@ -439,10 +441,10 @@ class serendipity_event_faq extends serendipity_event { global $serendipity; - $q = 'SELECT id, question - FROM '.$serendipity['dbPrefix'].'faqs - WHERE cid = '.$cid.' - ORDER BY faqorder'; + $q = "SELECT id, question + FROM {$serendipity['dbPrefix']}faqs + WHERE cid = $cid + ORDER BY faqorder"; return serendipity_db_query($q, false, 'assoc'); } @@ -450,9 +452,9 @@ class serendipity_event_faq extends serendipity_event { global $serendipity; - $q = 'SELECT * - FROM '.$serendipity['dbPrefix'].'faq_categorys - WHERE id = '.$id; + $q = "SELECT * + FROM {$serendipity['dbPrefix']}faq_categorys + WHERE id = $id"; $cat = serendipity_db_query($q, true, 'assoc'); if (is_array($cat)) { $this->category = &$cat; @@ -469,7 +471,6 @@ class serendipity_event_faq extends serendipity_event if (empty($this->category['catorder'])) { $this->category['catorder'] = '1'; } - } function &updateCategory() @@ -477,10 +478,11 @@ class serendipity_event_faq extends serendipity_event global $serendipity; if (!is_numeric($this->category['id'])) { - $q = 'SELECT COUNT(id) AS counter - FROM '.$serendipity['dbPrefix'].'faq_categorys - WHERE parent_id = '.$this->category['parent_id']; + $q = "SELECT COUNT(id) AS counter + FROM {$serendipity['dbPrefix']}faq_categorys + WHERE parent_id = ".$this->category['parent_id']; $res = serendipity_db_query($q, true, 'assoc'); + $this->category['catorder'] = ($res['counter'] + 1); $this->postgreCategoryPrepare(); $result = serendipity_db_insert('faq_categorys', $this->category); @@ -495,21 +497,22 @@ class serendipity_event_faq extends serendipity_event { global $serendipity; - $q = 'SELECT catorder, parent_id - FROM '.$serendipity['dbPrefix'].'faq_categorys - WHERE id = '.$id; + $q = "SELECT catorder, parent_id + FROM {$serendipity['dbPrefix']}faq_categorys + WHERE id = $id"; $res = serendipity_db_query($q, true, 'assoc'); - $q = 'DELETE FROM '.$serendipity['dbPrefix'].'faq_categorys - WHERE id = '.$id; + + $q = "DELETE FROM {$serendipity['dbPrefix']}faq_categorys + WHERE id = $id"; if (serendipity_db_query($q)) { - $q = 'UPDATE '.$serendipity['dbPrefix'].'faq_categorys + $q = "UPDATE {$serendipity['dbPrefix']}faq_categorys SET catorder = catorder - 1 - WHERE parent_id = '.$res['parent_id'].' - AND catorder > '.$res['catorder']; + WHERE parent_id = {$res['parent_id']} + AND catorder > {$res['catorder']}"; serendipity_db_query($q); - $q = 'UPDATE '.$serendipity['dbPrefix'].'faq_categorys + $q = "UPDATE {$serendipity['dbPrefix']}faq_categorys SET parent_id = 0 - WHERE parent_id = '.$id; + WHERE parent_id = $id"; serendipity_db_query($q); return true; } @@ -527,9 +530,9 @@ class serendipity_event_faq extends serendipity_event { global $serendipity; - $q = 'SELECT COUNT(id) AS counter - FROM '.$serendipity['dbPrefix'].'faqs - WHERE cid = '.$cid; + $q = "SELECT COUNT(id) AS counter + FROM {$serendipity['dbPrefix']}faqs + WHERE cid = $cid"; $res = serendipity_db_query($q, true, 'assoc'); return $res['counter']; } @@ -558,9 +561,9 @@ class serendipity_event_faq extends serendipity_event { global $serendipity; - $q = 'SELECT catorder, parent_id - FROM '.$serendipity['dbPrefix'].'faq_categorys - WHERE id = '.$id; + $q = "SELECT catorder, parent_id + FROM {$serendipity['dbPrefix']}faq_categorys + WHERE id = $id"; $old = serendipity_db_query($q, true, 'assoc'); switch ($moveto) { @@ -568,10 +571,12 @@ class serendipity_event_faq extends serendipity_event serendipity_db_update('faq_categorys', array('parent_id' => $old['parent_id'], 'catorder' => ($old['catorder'] - 1)), array('catorder' => $old['catorder'])); serendipity_db_update('faq_categorys', array('id' => $id), array('catorder' => ($old['catorder'] - 1))); break; + case D_FAQ_MOVEDOWN: serendipity_db_update('faq_categorys', array('parent_id' => $old['parent_id'], 'catorder' => ($old['catorder'] + 1)), array('catorder' => $old['catorder'])); serendipity_db_update('faq_categorys', array('id' => $id), array('catorder' => ($old['catorder'] + 1))); break; + default: return false; } @@ -583,10 +588,10 @@ class serendipity_event_faq extends serendipity_event { global $serendipity; - $q = 'SELECT faqorder - FROM '.$serendipity['dbPrefix'].'faqs - WHERE id = '.$id.' - AND cid = '.$cid; + $q = "SELECT faqorder + FROM {$serendipity['dbPrefix']}faqs + WHERE id = $id + AND cid = $cid"; $old = serendipity_db_query($q, true, 'assoc'); switch ($moveto) { case D_FAQ_MOVEUP: @@ -610,12 +615,21 @@ class serendipity_event_faq extends serendipity_event if (!empty($serendipity['POST']['action'])) { $serendipity['GET']['action'] = &$serendipity['POST']['action']; } + // S9y 1.7 Series box sizing + $bosi = $serendipity['version'][0] > 1 ? '' : ' class="boxsizingBorder"'; + // notification switch + $error = $serendipity['version'][0] > 1 ? '
    ' : '
    '; + $ok = $serendipity['version'][0] > 1 ? '
    ' : '
    '; + // iconizr by version + $editimg = $serendipity['version'][0] > 1 ? '' : 'EDIT'; + $trashimg = $serendipity['version'][0] > 1 ? '' : 'DELETE'; + $moveupimg = $serendipity['version'][0] > 1 ? 'UP' : 'UP'; + $movedownimg = $serendipity['version'][0] > 1 ? 'DOWN' : 'DOWN'; - echo ''.FAQs.'
    '; + echo "

    FAQs

    \n\n"; switch ($serendipity['GET']['action']) { case 'faqs': - if (($serendipity['POST']['typeSave'] == "true") && (!empty($serendipity['POST']['SAVECONF']))) { $serendipity['POST']['typeSubmit'] = true; $bag = new serendipity_property_bag(); @@ -624,7 +638,7 @@ class serendipity_event_faq extends serendipity_event $desc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('description')) : htmlspecialchars($bag->get('description'), ENT_COMPAT, LANG_CHARSET)); $config_faq = $bag->get('configuration_faq'); - foreach ($config_faq as $config_item) { + foreach ($config_faq AS $config_item) { $cbag = new serendipity_property_bag(); if ($this->introspect_faq_item($config_item, $cbag)) { $this->faq[$config_item] = serendipity_get_bool($serendipity['POST']['plugin'][$config_item]); @@ -632,9 +646,9 @@ class serendipity_event_faq extends serendipity_event } $result = $this->updateFAQ(); if (is_bool($result)) { - echo '
    '. DONE .': '. sprintf(SETTINGS_SAVED_AT, serendipity_strftime('%H:%M:%S')) .'
    '; + echo $ok . DONE .': '. sprintf(SETTINGS_SAVED_AT, serendipity_strftime('%H:%M:%S')) .'
    '."\n"; } else { - echo '
    '. ERROR. ': ' . $result . '
    '; + echo $error . ERROR. ': ' . $result . '
    '."\n"; } } @@ -651,26 +665,30 @@ class serendipity_event_faq extends serendipity_event $cid = &$serendipity['GET']['cid']; } - echo '

    '.FAQ_CATEGORIES.' '. FAQS . '

    '; + echo '
    '."\n"; + echo ' ' . FAQ_CATEGORIES . ' :: ' . FAQS . "\n"; + echo "
    \n\n"; - echo '
    '; - echo ''; - echo ''; - echo ''; - echo '
    '; - - echo ''; - $this->showFAQForm(); - - echo '
    '; - echo '
    '; + echo '
    '."\n"; + echo '
    '."\n"; + echo ' '."\n"; + echo ' '."\n"; + echo ' '."\n"; + echo ' '."\n"; + echo '
    '."\n"; + $this->showFAQForm(); // gathers inspectConfig items + echo "
    \n"; + echo "
    \n"; + echo "
    \n\n"; break; case 'categories': + echo '
    '."\n"; + echo ' ' . FAQ_CATEGORIES . "\n"; + echo "
    \n\n"; - echo '

    '.FAQ_CATEGORIES.'

    '; if (!empty($serendipity['GET']['id'])) { $serendipity['POST']['id'] = &$serendipity['GET']['id']; } @@ -685,7 +703,7 @@ class serendipity_event_faq extends serendipity_event $name = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('name')) : htmlspecialchars($bag->get('name'), ENT_COMPAT, LANG_CHARSET)); $desc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($bag->get('description')) : htmlspecialchars($bag->get('description'), ENT_COMPAT, LANG_CHARSET)); $config_faq = $bag->get('configuration_category'); - foreach ($config_faq as $config_item) { + foreach ($config_faq AS $config_item) { $cbag = new serendipity_property_bag(); if ($this->introspect_category_item($config_item, $cbag)) { $this->category[$config_item] = serendipity_get_bool($serendipity['POST']['plugin'][$config_item]); @@ -694,36 +712,39 @@ class serendipity_event_faq extends serendipity_event $result = $this->updateCategory(); if (is_bool($result)) { - echo '
    '. DONE .': '. sprintf(SETTINGS_SAVED_AT, serendipity_strftime('%H:%M:%S')) .'
    '; + echo $ok . DONE .': '. sprintf(SETTINGS_SAVED_AT, serendipity_strftime('%H:%M:%S')) .'
    '."\n"; } else { - echo '
    ERROR: ' . $result . '
    '; + echo $error . ERROR .': ' . $result . '
    '."\n"; } } - echo '
    '; - echo ''; - echo ''; - echo ''; - echo '
    '; + echo '
    '."\n"; + echo ''."\n"; + echo ' '."\n"; + echo ' '."\n"; + echo ' '."\n"; + echo ' '."\n"; + echo '
    '."\n"; - echo ''; $this->showCategoryForm(); - echo '
    '; - echo ''; + echo "
    \n"; + echo "\n"; + echo "
    \n\n"; break; case 'show_faqs': - - echo '

    '.FAQ_CATEGORIES.' '.FAQS.'

    '; + echo '
    '."\n\n"; + echo ' ' . FAQ_CATEGORIES.' :: ' . FAQS . "\n"; + echo '
    '."\n\n"; if ((!empty($serendipity['POST']['faqDelete'])) && (is_numeric($serendipity['POST']['id']))) { $result = $this->deleteFAQ($serendipity['POST']['id']); if (is_bool($result)) { - echo '
    '. DONE .': '. sprintf(RIP_ENTRY, $serendipity['POST']['id']) . '
    '; + echo $ok . DONE .': '. sprintf(RIP_ENTRY, $serendipity['POST']['id']) . '
    '."\n"; } else { - echo '
    ERROR: ' . $result . '
    '; + echo $error . ERROR .': ' . $result . '
    '."\n"; } } @@ -740,55 +761,57 @@ class serendipity_event_faq extends serendipity_event $faqs = $this->fetchFaqByCid($serendipity['GET']['cid']); $faqs = $this->prepareMove($faqs); - echo ''; + echo '
    '."\n"; if (is_array($faqs)) { - foreach ($faqs as $faq) { - echo '
    '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + foreach ($faqs AS $faq) { + echo ' \n"; } } - echo ''; - echo ''; - echo ''; - echo '
      '.$faq['question'].''.(($faq['up'] == true) ? (''.UP.'') : ' ').''.(($faq['down'] == true) ? (''.DOWN.'') : ' ').'
    '.FAQ_NEWFAQ.'
    '; + echo '
    '."\n"; + echo ' '.FAQ_NEWFAQ.''."\n"; + echo "
    \n"; + echo "
    \n"; break; case 'deleteCategory': if (is_numeric($serendipity['GET']['id'])) { - echo '
    '; - echo ''; - echo ''; - echo ''; - echo ''. FAQ_CATEGORIES. '

    '; - echo FAQ_REALYDELETECATEGORY.' '; - echo '   '; - echo '
    '; + echo '
    '."\n"; + echo "
    "; + echo ' '."\n"; + echo ' '."\n"; + echo ' '."\n"; + echo "
    "; + echo ' '. FAQ_CATEGORIES. '

    '."\n"; + echo ' '.FAQ_REALYDELETECATEGORY." \n"; + echo '   '."\n"; + echo "
    \n\n"; } break; case 'deleteFAQ': if (is_numeric($serendipity['GET']['id'])) { - echo '
    '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''. FAQ_CATEGORIES. '

    '; - echo FAQ_REALYDELETECATEGORY.' '; - echo '   '; - echo '
    '; + echo '
    '."\n"; + echo "
    "; + echo ' '."\n"; + echo ' '."\n"; + echo ' '."\n"; + echo ' '."\n"; + echo ' '."\n"; + echo "
    "; + echo ' '. FAQ_CATEGORIES. '

    '; + echo ' '.FAQ_REALYDELETECATEGORY." \n"; + echo '   '."\n"; + echo "
    \n\n"; } break; default: - if (isset($serendipity['GET']['cat_lang'])) { $this_cat_lang = &$serendipity['GET']['cat_lang']; } else { @@ -801,69 +824,78 @@ class serendipity_event_faq extends serendipity_event $this->categoryMove($serendipity['GET']['id'], D_FAQ_MOVEDOWN); } - echo ''.FAQ_CATEGORIES.' ('.$serendipity['languages'][$this_cat_lang].')

    '; + echo '

    '.FAQ_CATEGORIES.' ('.$serendipity['languages'][$this_cat_lang].")

    \n\n"; if ((!empty($serendipity['POST']['categoryDelete'])) && (is_numeric($serendipity['POST']['id']))) { $faqs = $this->fetchFaqByCid($serendipity['POST']['id']); if (is_array($faqs)) { - foreach ($faqs as $faq) { + foreach ($faqs AS $faq) { $this->deleteFAQ($faq['id']); } } $result = $this->deleteCategory($serendipity['POST']['id']); if (is_bool($result)) { - echo '
    '. DONE .': '. sprintf(RIP_ENTRY, $serendipity['POST']['id']) . '
    '; + echo $ok . DONE .': '. sprintf(RIP_ENTRY, $serendipity['POST']['id']) . '
    '."\n"; } else { - echo '
    ERROR: ' . $result . '
    '; + echo $error . ERROR .': ' . $result . '
    '."\n"; } } - echo ''; - echo ''; + echo ' '."\n\n"; + $fcats = $this->fetchCategories($this_cat_lang); + echo '
    '."\n"; + // WALK CATEGORIES if (is_array($fcats)) { $fcats = serendipity_walkRecursive($fcats); $fcats = $this->prepareMove($fcats); - foreach ($fcats as $category) { - echo '
    '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + foreach ($fcats AS $category) { + echo ' \n"; } } - echo ''; - echo ''; - echo ''; - echo '
    '; + echo '
    '."\n"; + + // LANG NAVI $lang_links = ''; - foreach ($serendipity['languages'] as $lang_key => $lang_value) { + foreach ($serendipity['languages'] AS $lang_key => $lang_value) { if (strlen($lang_links)) { $lang_links .= ' '; } if ($this_cat_lang == $lang_key) { - $lang_links .= ''; + $lang_links .= ''; } $lang_links .= ''.$lang_key.''; if ($this_cat_lang == $lang_key) { - $lang_links .= ''; - } + $lang_links .= ''."\n"; + } else $lang_links .= "\n"; } + echo '
    '."\n\n"; echo $lang_links; - echo '
      '.$category['category'].''.$this->countFAQbyCid($category['id']).' '.FAQ_NAME.''.(($category['up'] == true) ? (''.UP.'') : ' ').''.(($category['down'] == true) ? (''.DOWN.'') : ' ').'
    '.FAQ_NEWCATEGORY.'
    '; - break; + echo '
    '."\n\n"; + echo '
    '."\n"; + echo ' '.FAQ_NEWCATEGORY.''."\n"; + echo "
    \n\n"; + + echo "
    \n"; + break; } } + /** + * This method is the external_plugin wrapper + */ function showFrontend() { global $serendipity; @@ -880,13 +912,13 @@ class serendipity_event_faq extends serendipity_event $faq_categoryid = $serendipity['uriArguments'][2]; $faq_faqid = $serendipity['uriArguments'][3]; } - if (is_numeric($faq_categoryid)) { - $res['parent_id'] = $faq_categoryid; + if (is_numeric($faq_categoryid)) { + $res['parent_id'] = (int)$faq_categoryid; do { - $q = 'SELECT id, category, parent_id - FROM '.$serendipity['dbPrefix'].'faq_categorys - WHERE id = '.$res['parent_id']; + $q = "SELECT id, category, parent_id + FROM {$serendipity['dbPrefix']}faq_categorys + WHERE id = " . $res['parent_id']; $res = serendipity_db_query($q, true, 'assoc'); $cat_tree[] = $res; } while ($res['parent_id'] != 0); @@ -895,60 +927,60 @@ class serendipity_event_faq extends serendipity_event $serendipity['smarty']->assign('cat_tree', $cat_tree); if (is_numeric($faq_faqid)) { - - $q = 'SELECT question, answer, category, faqorder, catorder, parent_id - FROM '.$serendipity['dbPrefix'].'faqs, '.$serendipity['dbPrefix'].'faq_categorys - WHERE '.$serendipity['dbPrefix'].'faqs.id = '.$faq_faqid.' - AND '.$serendipity['dbPrefix'].'faqs.cid = '.$serendipity['dbPrefix'].'faq_categorys.id - ORDER BY faqorder'; + $q = "SELECT question, answer, category, faqorder, catorder, parent_id + FROM {$serendipity['dbPrefix']}faqs, {$serendipity['dbPrefix']}faq_categorys + WHERE {$serendipity['dbPrefix']}faqs.id = $faq_faqid + AND {$serendipity['dbPrefix']}faqs.cid = {$serendipity['dbPrefix']}faq_categorys.id + ORDER BY faqorder"; $faq = serendipity_db_query($q, true, 'assoc'); - if (is_array($faq)) { - - $q = 'SELECT '.$serendipity['dbPrefix'].'faqs.id, question, cid, category - FROM '.$serendipity['dbPrefix'].'faqs, '.$serendipity['dbPrefix'].'faq_categorys - WHERE '.$serendipity['dbPrefix'].'faqs.cid = '.$faq_categoryid.' - AND '.$serendipity['dbPrefix'].'faqs.faqorder = '.($faq['faqorder'] + 1).' - AND '.$serendipity['dbPrefix'].'faqs.cid = '.$serendipity['dbPrefix'].'faq_categorys.id'; + if (is_array($faq) && !empty($faq)) { + $faqorder = ($faq['faqorder'] + 1); + $q = "SELECT {$serendipity['dbPrefix']}faqs.id, question, cid, category + FROM {$serendipity['dbPrefix']}faqs, {$serendipity['dbPrefix']}faq_categorys + WHERE {$serendipity['dbPrefix']}faqs.cid = $faq_categoryid + AND {$serendipity['dbPrefix']}faqs.faqorder = $faqorder + AND {$serendipity['dbPrefix']}faqs.cid = {$serendipity['dbPrefix']}faq_categorys.id"; $nfaq = serendipity_db_query($q, true, 'assoc'); if (!is_array($nfaq)) { - $q = 'SELECT '.$serendipity['dbPrefix'].'faqs.id, question, cid, category - FROM '.$serendipity['dbPrefix'].'faqs, '.$serendipity['dbPrefix'].'faq_categorys - WHERE '.$serendipity['dbPrefix'].'faq_categorys.catorder = '.($faq['catorder'] + 1).' - AND '.$serendipity['dbPrefix'].'faq_categorys.parent_id = '.$faq['parent_id'].' - AND '.$serendipity['dbPrefix'].'faqs.faqorder = 1 - AND '.$serendipity['dbPrefix'].'faqs.cid = '.$serendipity['dbPrefix'].'faq_categorys.id'; + $catorder = ($faq['catorder'] + 1); + $q = "SELECT {$serendipity['dbPrefix']}faqs.id, question, cid, category + FROM {$serendipity['dbPrefix']}faqs, {$serendipity['dbPrefix']}faq_categorys + WHERE {$serendipity['dbPrefix']}faq_categorys.catorder = $catorder + AND {$serendipity['dbPrefix']}faq_categorys.parent_id = {$faq['parent_id']} + AND {$serendipity['dbPrefix']}faqs.faqorder = 1 + AND {$serendipity['dbPrefix']}faqs.cid = {$serendipity['dbPrefix']}faq_categorys.id"; $nfaq = serendipity_db_query($q, true, 'assoc'); - } - $q = 'SELECT '.$serendipity['dbPrefix'].'faqs.id, question, cid, category - FROM '.$serendipity['dbPrefix'].'faqs, '.$serendipity['dbPrefix'].'faq_categorys - WHERE '.$serendipity['dbPrefix'].'faqs.cid = '.$faq_categoryid.' - AND '.$serendipity['dbPrefix'].'faqs.faqorder = '.($faq['faqorder'] - 1).' - AND '.$serendipity['dbPrefix'].'faqs.cid = '.$serendipity['dbPrefix'].'faq_categorys.id'; + $faqorder = ($faq['faqorder'] - 1); + $q = "SELECT {$serendipity['dbPrefix']}faqs.id, question, cid, category + FROM {$serendipity['dbPrefix']}faqs, {$serendipity['dbPrefix']}faq_categorys + WHERE {$serendipity['dbPrefix']}faqs.cid = $faq_categoryid + AND {$serendipity['dbPrefix']}faqs.faqorder = $faqorder + AND {$serendipity['dbPrefix']}faqs.cid = {$serendipity['dbPrefix']}faq_categorys.id"; $pfaq = serendipity_db_query($q, true, 'assoc'); if (!is_array($pfaq)) { - $q = 'SELECT MAX(faqorder) AS fmax - FROM '.$serendipity['dbPrefix'].'faqs, '.$serendipity['dbPrefix'].'faq_categorys - WHERE '.$serendipity['dbPrefix'].'faq_categorys.catorder = '.($faq['catorder'] - 1).' - AND '.$serendipity['dbPrefix'].'faq_categorys.parent_id = '.$faq['parent_id'].' - AND '.$serendipity['dbPrefix'].'faqs.cid = '.$serendipity['dbPrefix'].'faq_categorys.id'; + $catorder = ($faq['catorder'] - 1); + $q = "SELECT MAX(faqorder) AS fmax + FROM {$serendipity['dbPrefix']}faqs, {$serendipity['dbPrefix']}faq_categorys + WHERE {$serendipity['dbPrefix']}faq_categorys.catorder = $catorder + AND {$serendipity['dbPrefix']}faq_categorys.parent_id = {$faq['parent_id']} + AND {$serendipity['dbPrefix']}faqs.cid = {$serendipity['dbPrefix']}faq_categorys.id"; $max = serendipity_db_query($q, true, 'assoc'); - $q = 'SELECT '.$serendipity['dbPrefix'].'faqs.id, question, cid, category - FROM '.$serendipity['dbPrefix'].'faqs, '.$serendipity['dbPrefix'].'faq_categorys - WHERE '.$serendipity['dbPrefix'].'faq_categorys.catorder = '.($faq['catorder'] - 1).' - AND '.$serendipity['dbPrefix'].'faqs.faqorder = '.($max['fmax'] ? $max['fmax'] : 0).' - AND '.$serendipity['dbPrefix'].'faqs.cid = '.$serendipity['dbPrefix'].'faq_categorys.id'; + $q = "SELECT {$serendipity['dbPrefix']}faqs.id, question, cid, category + FROM {$serendipity['dbPrefix']}faqs, {$serendipity['dbPrefix']}faq_categorys + WHERE {$serendipity['dbPrefix']}faq_categorys.catorder = $catorder + AND {$serendipity['dbPrefix']}faqs.faqorder = ".($max['fmax'] ? $max['fmax'] : 0)." + AND {$serendipity['dbPrefix']}faqs.cid = {$serendipity['dbPrefix']}faq_categorys.id"; $pfaq = serendipity_db_query($q, true, 'assoc'); } - } - if(serendipity_db_bool($this->get_config('markup', true))) { + if (serendipity_db_bool($this->get_config('markup', 'true'))) { $entry['body'] = &$faq['question']; serendipity_plugin_api::hook_event('frontend_display', $entry); $entry['body'] = &$faq['answer']; @@ -980,11 +1012,12 @@ class serendipity_event_faq extends serendipity_event )); } else { - $q = 'SELECT id, cid, question, changedate, changetype - FROM '.$serendipity['dbPrefix'].'faqs - WHERE cid = '.$faq_categoryid.' - ORDER BY faqorder'; + $q = "SELECT id, cid, question, changedate, changetype + FROM {$serendipity['dbPrefix']}faqs + WHERE cid = $faq_categoryid + ORDER BY faqorder"; $faqs = serendipity_db_query($q, false, 'assoc'); + if (is_array($faqs)) { $now = time(); $days_new = ($this->get_config('daysnew') * 86400); @@ -998,6 +1031,7 @@ class serendipity_event_faq extends serendipity_event $faqs[$i]['status'] = ''; } break; + case 'update': if (($now - $faqs[$i]['changedate']) <= $days_upd) { $faqs[$i]['status'] = FAQ_UPDATE; @@ -1005,24 +1039,28 @@ class serendipity_event_faq extends serendipity_event $faqs[$i]['status'] = ''; } break; + default: $faqs[$i]['status'] = ''; break; } } } - $q = 'SELECT id, category - FROM '.$serendipity['dbPrefix'].'faq_categorys - WHERE parent_id = '.$faq_categoryid.' - ORDER BY catorder'; + + $q = "SELECT id, category + FROM {$serendipity['dbPrefix']}faq_categorys + WHERE parent_id = $faq_categoryid + ORDER BY catorder"; $scat = serendipity_db_query($q, false, 'assoc'); - $q = 'SELECT category, introduction - FROM '.$serendipity['dbPrefix'].'faq_categorys - WHERE id = '.$faq_categoryid; + + $q = "SELECT category, introduction + FROM {$serendipity['dbPrefix']}faq_categorys + WHERE id = " . $faq_categoryid; $cat = serendipity_db_query($q, true, 'assoc'); + $filename = 'plugin_faq_category_faqs.tpl'; - if(serendipity_db_bool($this->get_config('markup', true))) { + if (serendipity_db_bool($this->get_config('markup', 'true'))) { $entry['body'] = &$cat['introduction']; serendipity_plugin_api::hook_event('frontend_display', $entry); } @@ -1041,20 +1079,21 @@ class serendipity_event_faq extends serendipity_event WHERE language = '$faq_language' ORDER BY catorder"; $cats = serendipity_db_query($q, false, 'assoc'); + if (is_array($cats)) { $cats = serendipity_walkRecursive($cats); - if(serendipity_db_bool($this->get_config('markup', true))) { + if (serendipity_db_bool($this->get_config('markup', 'true'))) { for ($i = 0, $ii = count($cats); $i < $ii; $i++) { $entry['body'] = &$cats[$i]['introduction']; serendipity_plugin_api::hook_event('frontend_display', $entry); } } + $serendipity['smarty']->assign('faq_plugin', array( 'categories' => $cats )); } $filename = 'plugin_faq_categories.tpl'; - } if ($serendipity['rewrite'] == 'none') { @@ -1063,21 +1102,15 @@ class serendipity_event_faq extends serendipity_event $pluginpath = $serendipity['permalinkPluginPath'].'/'.$this->get_config('faqurl', 'faqs'); } - $serendipity['smarty']->append('faq_plugin', array( - 'plugin_url' => trim($pluginpath) - ), true); + $serendipity['smarty']->append('faq_plugin', + array( + 'plugin_url' => trim($pluginpath) + ), true); - $tfile = serendipity_getTemplateFile($filename, 'serendipityPath'); - if (!$tfile || $tfile == $filename) { - $tfile = dirname(__FILE__) . '/' . $filename; - } - $inclusion = $serendipity['smarty']->security_settings[INCLUDE_ANY]; - $serendipity['smarty']->security_settings[INCLUDE_ANY] = true; - $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $content = $this->parseTemplate($filename); $serendipity['smarty']->assign('CONTENT', $content); + // redirect out via index.tpl $serendipity['smarty']->display(serendipity_getTemplateFile($serendipity['smarty_file'], 'serendipityPath')); - } function showSearch() @@ -1085,16 +1118,17 @@ class serendipity_event_faq extends serendipity_event global $serendipity; $term = serendipity_db_escape_string($serendipity['GET']['searchTerm']); + if ($serendipity['dbType'] == 'postgres') { $group = ''; $distinct = 'DISTINCT'; $find_part = "(question ILIKE '%$term%' OR answer ILIKE '%$term%')"; - } elseif ($serendipity['dbType'] == 'sqlite') { + } elseif (stristr($serendipity['dbType'], 'sqlite') !== FALSE) { $group = 'GROUP BY id'; $distinct = ''; $term = serendipity_mb('strtolower', $term); $find_part = "(lower(question) LIKE '%$term%' OR lower(answer) LIKE '%$term%')"; - } else { + } else { // MYSQL $group = 'GROUP BY id'; $distinct = ''; $term = str_replace('"', '"', $term); @@ -1111,6 +1145,7 @@ class serendipity_event_faq extends serendipity_event $group ORDER BY changedate DESC"; $results = serendipity_db_query($querystring); + if (!is_array($results)) { if ($results !== 1 && $results !== true) { echo (function_exists('serendipity_specialchars') ? serendipity_specialchars($results) : htmlspecialchars($results, ENT_COMPAT, LANG_CHARSET)); @@ -1133,564 +1168,241 @@ class serendipity_event_faq extends serendipity_event ); $filename = 'plugin_faq_searchresults.tpl'; - $tfile = serendipity_getTemplateFile($filename, 'serendipityPath'); - if (!$tfile) { - $tfile = dirname(__FILE__) . '/' . $filename; - } - $inclusion = $serendipity['smarty']->security_settings[INCLUDE_ANY]; - $serendipity['smarty']->security_settings[INCLUDE_ANY] = true; - $content = $serendipity['smarty']->fetch('file:'. $tfile); - $serendipity['smarty']->security_settings[INCLUDE_ANY] = $inclusion; + $content = $this->parseTemplate($filename); echo $content; - } function showFAQForm() { - global $serendipity; - - $serendipity['EditorBrowsers'] = '@(IE|Mozilla|Safari)@i'; + global $serendipity, $inspectConfig; if (file_exists(S9Y_INCLUDE_PATH.'include/functions_entries_admin.inc.php')) { include_once(S9Y_INCLUDE_PATH.'include/functions_entries_admin.inc.php'); } -?> -
    - -config_faq as $config_item) { - $elcount++; - $config_value = $this->faq[$config_item]; - $cbag = new serendipity_property_bag(); - $this->introspect_faq_item($config_item, $cbag); - - $cname = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('name')) : htmlspecialchars($cbag->get('name'), ENT_COMPAT, LANG_CHARSET)); - $cdesc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('description')) : htmlspecialchars($cbag->get('description'), ENT_COMPAT, LANG_CHARSET)); - $value = $this->getFaq($config_item, 'unset'); - $lang_direction = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('lang_direction')) : htmlspecialchars($cbag->get('lang_direction'), ENT_COMPAT, LANG_CHARSET)); - - if (empty($lang_direction)) { - $lang_direction = LANG_DIRECTION; + // call moduled abstract class + if (!is_callable('inspectConfig')) { + require_once dirname(__FILE__).'/class_inspectConfig.php'; } + $elcount = 0; + $htmlnugget = array(); + $inspectConfig = array(); + // add some $serendipity items to check for + $inspectConfig['s9y']['wysiwyg'] = $serendipity['wysiwyg']; + $inspectConfig['s9y']['version'] = $serendipity['version'][0]; + $inspectConfig['s9y']['nl2br']['iso2br'] = $serendipity['nl2br']['iso2br']; + $inspectConfig['s9y']['plugin_path'] = $serendipity['serendipityHTTPPath'] . 'plugins/serendipity_event_faq/'; - if ($value === 'unset') { - $value = $cbag->get('default'); - } + foreach ($this->config_faq AS $config_item) { + $elcount++; + #$inspectConfig['config_value'] = $config_value = $this->faq[$config_item]; // no use, why was it set? + $cbag = new serendipity_property_bag(); + $this->introspect_faq_item($config_item, $cbag); - $hvalue = (!isset($serendipity['POST']['faqSubmit']) && isset($serendipity['POST']['plugin'][$config_item]) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['plugin'][$config_item]) : htmlspecialchars($serendipity['POST']['plugin'][$config_item], ENT_COMPAT, LANG_CHARSET)) : (function_exists('serendipity_specialchars') ? serendipity_specialchars($value) : htmlspecialchars($value, ENT_COMPAT, LANG_CHARSET))); - $radio = array(); - $select = array(); - $per_row = null; + $inspectConfig['cname'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('name')) : htmlspecialchars($cbag->get('name'), ENT_COMPAT, LANG_CHARSET)); + $inspectConfig['cdesc'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('description')) : htmlspecialchars($cbag->get('description'), ENT_COMPAT, LANG_CHARSET)); + $inspectConfig['value'] = $value = $this->getFaq($config_item, 'unset'); // case hidden + $inspectConfig['lang_direction'] = $lang_direction = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('lang_direction')) : htmlspecialchars($cbag->get('lang_direction'), ENT_COMPAT, LANG_CHARSET)); - switch ($cbag->get('type')) { - case 'seperator': -?> - - - -get('type'); + if (empty($lang_direction)) { + $inspectConfig['lang_direction'] = LANG_DIRECTION; + } + if ($value === 'unset') { + $inspectConfig['value'] = $value = $cbag->get('default'); // check prop type default for alles cases, except case hidden language and id and cid! + } + // check the special cases + if (($config_item == 'language' || $config_item == 'id' || $config_item == 'cid') + && $type == 'hidden' && trim($value) == '') { + $inspectConfig['value'] = $value = $cbag->get('value'); // case 'language' prop type hidden 'default' = 'value'! + } - case 'select': - $select = $cbag->get('select_values'); -?> - - - - -get('default'); // case default + $inspectConfig['radio'] = $radio = $cbag->get('radio'); // case radio + $inspectConfig['per_row'] = $per_row = $cbag->get('radio_per_row'); // case radio + $inspectConfig['select_values'] = $select_values = $cbag->get('select_values'); // case select - case 'boolean': - $radio['value'][] = 'true'; - $radio['desc'][] = YES; - - $radio['value'][] = 'false'; - $radio['desc'][] = NO; - - case 'radio': - if (!count($radio) > 0) { - $radio = $cbag->get('radio'); - } - - if (empty($per_row)) { - $per_row = $cbag->get('radio_per_row'); - if (empty($per_row)) { - $per_row = 2; - } - } -?> - - - - - - - - - - - - - - - - - - - - - -get('type') == 'html') { + if ($type) { + echo "\n"; // tag dynamic form items + $ctype = 'ic'.ucfirst($type); + ${$ctype} = new $ctype(); + if ($type == 'text' && $serendipity['wysiwyg']) { $htmlnugget[] = $elcount; - if (version_compare(preg_replace('@[^0-9\.]@', '', $serendipity['version']), '0.9', '<')) { - serendipity_emit_htmlarea_code('nuggets' . $elcount, 'nuggets' . $elcount); - } else { - serendipity_emit_htmlarea_code('nuggets', 'nuggets', true); - } + serendipity_emit_htmlarea_code('nuggets', 'nuggets', true); } - break; + } - case 'content': - ?> 0) { + $ev = array('nuggets' => $htmlnugget, 'skip_nuggets' => false); + serendipity_plugin_api::hook_event('backend_wysiwyg_nuggets', $ev); - if (isset($serendipity['wysiwyg']) && $serendipity['wysiwyg'] && count($htmlnugget) > 0) { - $ev = array('nuggets' => $htmlnugget, 'skip_nuggets' => false); - serendipity_plugin_api::hook_event('backend_wysiwyg_nuggets', $ev); - - if ($ev['skip_nuggets'] === false) { + if ($ev['skip_nuggets'] === false) { ?> - + } + + + + +
    + +
    + + + +
    + +
    + -
    - -
      - -     		-
    - -
    -
    - -
      - -     		- $radio_value) { - $id = (function_exists('serendipity_specialchars') ? serendipity_specialchars($config_item . $radio_value) : htmlspecialchars($config_item . $radio_value, ENT_COMPAT, LANG_CHARSET)); - $counter++; - $checked = ""; - - if ($radio_value == 'true' && ($hvalue === '1' || $hvalue === 'true')) { - $checked = " checked"; - } elseif ($radio_value == 'false' && ($hvalue === '' || $hvalue ==='0' || $hvalue === 'false')) { - $checked = " checked"; - } elseif ($radio_value == $hvalue) { - $checked = " checked"; - } - - if ($counter == 1) { -?> -
    - - title="" /> - - -
    - -
    - -
      -     		-
    - -
    -
    -    - - - - - - -    - - -
    -
    - -
    -
    get('default'); ?>
    -
    -
    - -
    - - -config_category as $config_item) { - $elcount++; - $config_value = $this->category[$config_item]; - $cbag = new serendipity_property_bag(); - $this->introspect_category_item($config_item, $cbag); - - $cname = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('name')) : htmlspecialchars($cbag->get('name'), ENT_COMPAT, LANG_CHARSET)); - $cdesc = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('description')) : htmlspecialchars($cbag->get('description'), ENT_COMPAT, LANG_CHARSET)); - $value = $this->getCategory($config_item, 'unset'); - $lang_direction = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('lang_direction')) : htmlspecialchars($cbag->get('lang_direction'), ENT_COMPAT, LANG_CHARSET)); - - if (empty($lang_direction)) { - $lang_direction = LANG_DIRECTION; + // call moduled abstract class + if (!is_callable('inspectConfig')) { + require_once dirname(__FILE__).'/class_inspectConfig.php'; } - if ($value === 'unset') { - $value = $cbag->get('default'); - } + $elcount = 0; + $htmlnugget = array(); + $inspectConfig = array(); + // add some $serendipity items to check for + $inspectConfig['s9y']['wysiwyg'] = $serendipity['wysiwyg']; + $inspectConfig['s9y']['version'] = $serendipity['version'][0]; + $inspectConfig['s9y']['nl2br']['iso2br'] = $serendipity['nl2br']['iso2br']; + $inspectConfig['s9y']['plugin_path'] = $serendipity['serendipityHTTPPath'] . 'plugins/serendipity_event_faq/'; - $hvalue = (!isset($serendipity['POST']['categorySubmit']) && isset($serendipity['POST']['plugin'][$config_item]) ? (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['POST']['plugin'][$config_item]) : htmlspecialchars($serendipity['POST']['plugin'][$config_item], ENT_COMPAT, LANG_CHARSET)) : (function_exists('serendipity_specialchars') ? serendipity_specialchars($value) : htmlspecialchars($value, ENT_COMPAT, LANG_CHARSET))); - $radio = array(); - $select = array(); - $per_row = null; + foreach ($this->config_category AS $config_item) { + $elcount++; + #$inspectConfig['config_value'] = $config_value = $this->category[$config_item]; // no use, why was it set? + $cbag = new serendipity_property_bag(); + $this->introspect_category_item($config_item, $cbag); - switch ($cbag->get('type')) { - case 'seperator': - echo ''; - break; + $inspectConfig['cname'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('name')) : htmlspecialchars($cbag->get('name'), ENT_COMPAT, LANG_CHARSET)); + $inspectConfig['cdesc'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('description')) : htmlspecialchars($cbag->get('description'), ENT_COMPAT, LANG_CHARSET)); + $inspectConfig['value'] = $value = $this->getCategory($config_item, 'unset'); // case hidden + $inspectConfig['lang_direction'] = $lang_direction = (function_exists('serendipity_specialchars') ? serendipity_specialchars($cbag->get('lang_direction')) : htmlspecialchars($cbag->get('lang_direction'), ENT_COMPAT, LANG_CHARSET)); - case 'select': - $select = $cbag->get('select_values'); -?> - - - - -get('type'); + if (empty($lang_direction)) { + $inspectConfig['lang_direction'] = LANG_DIRECTION; + } + if ($value === 'unset') { + $inspectConfig['value'] = $value = $cbag->get('default'); // check prop type default for alles cases, except case hidden language and id and cid! + } + // check the special cases + if (($config_item == 'language' || $config_item == 'id' || $config_item == 'cid') + && $type == 'hidden' && trim($value) == '') { + $inspectConfig['value'] = $value = $cbag->get('value'); // case 'language' prop type hidden 'default' = 'value'! + } - case 'tristate': - $per_row = 3; - $radio['value'][] = 'default'; - $radio['desc'][] = USE_DEFAULT; + $hvalue = (!isset($serendipity['POST']['categorySubmit']) && isset($serendipity['POST']['plugin'][$config_item]) + ? (function_exists('serendipity_specialchars') + ? serendipity_specialchars($serendipity['POST']['plugin'][$config_item]) + : htmlspecialchars($serendipity['POST']['plugin'][$config_item], ENT_COMPAT, LANG_CHARSET) + ) + : (function_exists('serendipity_specialchars') + ? serendipity_specialchars($value) + : htmlspecialchars($value, ENT_COMPAT, LANG_CHARSET)) + ); - case 'boolean': - $radio['value'][] = 'true'; - $radio['desc'][] = YES; + $inspectConfig['config_item'] = $config_item; + $inspectConfig['elcount'] = $elcount; + $inspectConfig['hvalue'] = $hvalue; + $inspectConfig['radio'] = $radio = array(); + $inspectConfig['select'] = $select = array(); + $inspectConfig['per_row'] = $per_row = null; + $inspectConfig['type'] = $type; + $inspectConfig['default'] = $default = $cbag->get('default'); // case default + $inspectConfig['radio'] = $radio = $cbag->get('radio'); // case radio + $inspectConfig['per_row'] = $per_row = $cbag->get('radio_per_row'); // case radio + $inspectConfig['select_values'] = $select_values = $cbag->get('select_values'); // case select - $radio['value'][] = 'false'; - $radio['desc'][] = NO; - - case 'radio': - if (!count($radio) > 0) { - $radio = $cbag->get('radio'); - } - - if (empty($per_row)) { - $per_row = $cbag->get('radio_per_row'); - if (empty($per_row)) { - $per_row = 2; - } - } -?> - - - - - - - - - - - - - - - - - - - - - -get('type') == 'html') { + if ($type) { + echo "\n"; // tag dynamic form items + $ctype = 'ic'.ucfirst($type); + ${$ctype} = new $ctype(); + if ($type == 'text' && $serendipity['wysiwyg']) { $htmlnugget[] = $elcount; - if (version_compare(preg_replace('@[^0-9\.]@', '', $serendipity['version']), '0.9', '<')) { - serendipity_emit_htmlarea_code('nuggets' . $elcount, 'nuggets' . $elcount); - } else { - serendipity_emit_htmlarea_code('nuggets', 'nuggets', true); - } + serendipity_emit_htmlarea_code('nuggets', 'nuggets', true); } - break; + } - case 'content': - ?> 0) { + $ev = array('nuggets' => $htmlnugget, 'skip_nuggets' => false); + serendipity_plugin_api::hook_event('backend_wysiwyg_nuggets', $ev); - if (isset($serendipity['wysiwyg']) && $serendipity['wysiwyg'] && count($htmlnugget) > 0) { - $ev = array('nuggets' => $htmlnugget, 'skip_nuggets' => false); - serendipity_plugin_api::hook_event('backend_wysiwyg_nuggets', $ev); - - if ($ev['skip_nuggets'] === false) { + if ($ev['skip_nuggets'] === false) { ?> - + } + + + + +
    + +
    + + +
    + +
    + -
    - -
      - -     		-
    - -
    -
    - -
      - -     		- $radio_value) { - $id = (function_exists('serendipity_specialchars') ? serendipity_specialchars($config_item . $radio_value) : htmlspecialchars($config_item . $radio_value, ENT_COMPAT, LANG_CHARSET)); - $counter++; - $checked = ""; - - if ($radio_value == 'true' && ($hvalue === '1' || $hvalue === 'true')) { - $checked = " checked"; - } elseif ($radio_value == 'false' && ($hvalue === '' || $hvalue ==='0' || $hvalue === 'false')) { - $checked = " checked"; - } elseif ($radio_value == $hvalue) { - $checked = " checked"; - } - - if ($counter == 1) { -?> -
    - - title="" /> - - -
    - -
    - -
      -     		-
    - -
    -
    -    - - - - - - -    - - -
    -
    - -
    -
    get('default'); ?>
    -
    -
    - -
    -setupDB(); - } + } // showCategoryForm() end function event_hook($event, &$bag, &$eventData, $addData = null) { @@ -1714,8 +1426,25 @@ class serendipity_event_faq extends serendipity_event break; case 'backend_sidebar_entries': - $this->setupDB(); - echo '
  • ' . FAQ_NAME . '
    • '; + // forbid entry if not admin + #if (!serendipity_userLoggedIn() && $_SESSION['serendipityAuthedUser'] !== true && $_SESSION['serendipityUserlevel'] != '255') { + # break; + #} + if ($serendipity['version'][0] < 2) { + $this->setupDB(); + echo "\n".'
  • ' . FAQ_NAME . '
    • '; + } + break; + + case 'backend_sidebar_admin_appearance': + // forbid entry if not admin + #if (!serendipity_userLoggedIn() && $_SESSION['serendipityAuthedUser'] !== true && $_SESSION['serendipityUserlevel'] != '255') { + # break; + #} + if ($serendipity['version'][0] > 1) { + $this->setupDB(); + echo "\n".'
  • ' . FAQ_NAME . '
    • '."\n"; + } break; case 'backend_sidebar_entries_event_display_faq': @@ -1729,14 +1458,24 @@ class serendipity_event_faq extends serendipity_event break; case 'css_backend': - if (!strpos($eventData, '#serendipityFAQNav')) { - echo file_get_contents(dirname(__FILE__).'/style_faq_backend.css'); + if (strpos($eventData, '#serendipityFAQNav') === false) { + $filename = 'style_faq_backend.css'; + $tfile = serendipity_getTemplateFile($filename, 'serendipityPath'); + if (!$tfile || $tfile == $filename) { + $tfile = dirname(__FILE__) . '/' . $filename; + } + $eventData .= file_get_contents($tfile); } break; case 'css': - if (!strpos($eventData, '#serendipityFAQNav')) { - echo file_get_contents(dirname(__FILE__).'/style_faq_frontend.css'); + if (strpos($eventData, '#serendipityFAQNav') === false) { + $filename = 'style_faq_frontend.css'; + $tfile = serendipity_getTemplateFile($filename, 'serendipityPath'); + if (!$tfile || $tfile == $filename) { + $tfile = dirname(__FILE__) . '/' . $filename; + } + $eventData .= file_get_contents($tfile); } break; @@ -1753,6 +1492,8 @@ class serendipity_event_faq extends serendipity_event } return false; } + } + /* vim: set sts=4 ts=4 expandtab : */ ?> \ No newline at end of file diff --git a/serendipity_event_faq/serendipity_plugin_faq.php b/serendipity_event_faq/serendipity_plugin_faq.php index b2b7fef9..7389dade 100644 --- a/serendipity_event_faq/serendipity_plugin_faq.php +++ b/serendipity_event_faq/serendipity_plugin_faq.php @@ -1,17 +1,10 @@ -add('description', FAQ_PLUGIN_NAME_DESC); $propbag->add('author', 'Falk Doering'); $propbag->add('stackable', true); - $propbag->add('version', '0.2'); + $propbag->add('version', '0.3'); $propbag->add('copyright', 'LGPL'); $propbag->add('configuration', array( 'title', 'category' )); $propbag->add('requirements', array( - 'serendipity' => '1.0', + 'serendipity' => '1.6', 'smarty' => '2.6.7', 'php' => '4.1.0' )); @@ -70,14 +63,14 @@ class serendipity_plugin_faq extends serendipity_plugin { global $serendipity; - $title = $this->get_config('title'); - $categoryids = explode('^',$this->get_config('category')); + $title = $this->get_config('title'); + $categoryids = explode('^', $this->get_config('category')); if (is_array($categoryids)) { $categories = $this->get_categories($categoryids); - $q = 'SELECT value - FROM '.$serendipity['dbPrefix'].'config - WHERE name LIKE \'%faqurl%\''; + $q = "SELECT value + FROM {$serendipity['dbPrefix']}config + WHERE name LIKE '%faqurl%'"; $res = serendipity_db_query($q, true, 'assoc'); $faqurl = $res['value']; @@ -101,9 +94,9 @@ class serendipity_plugin_faq extends serendipity_plugin { global $serendipity; - $q = 'SELECT id, category - FROM '.$serendipity['dbPrefix'].'faq_categorys - WHERE '; + $q = "SELECT id, category + FROM {$serendipity['dbPrefix']}faq_categorys + WHERE "; if (is_array($ids)) { $q .= serendipity_db_in_sql('id', $ids, ''); } else { @@ -119,4 +112,5 @@ class serendipity_plugin_faq extends serendipity_plugin } } -?> + +?> \ No newline at end of file diff --git a/serendipity_event_faq/style_faq_backend.css b/serendipity_event_faq/style_faq_backend.css index 470d31fe..0416ba83 100644 --- a/serendipity_event_faq/style_faq_backend.css +++ b/serendipity_event_faq/style_faq_backend.css @@ -1,21 +1,130 @@ -#serendipityFAQNav ul { - padding:3px 0; - margin-left:0; - border-bottom:1px solid #000000; +/* Set a content max-width for 1.7 backend Series */ +.serendipityAdminContent * { max-width: 1002px; } +/* Set the content width responsive for 1.7 backend Series */ +.serendipityAdminContent #faqBackendPage { width: 100%; } +/* Set box sizing for 1.7 backend Series */ +.serendipityAdminContent .boxsizingBorder { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } -#serendipityFAQNav ul li { - list-style:none; - margin:0; - display:inline; +#faqBackendPage .plainList { + display: inline-table; + width: 100%; +} +#content #faqBackendPage ul.plainList { + /* 2.0 only fixes - unset ul margins */ + margin-top: .5em; + margin-bottom: .5em; +} +#faqBackendPage ul li { + list-style: none outside none; + display: inline; + width: auto; + margin: 0 0 0 1em; + padding-left: 0; +} +#faqBackendPage ul li:first-of-type { + margin-left: 1.5em; +} +#faqBackendPage li.fixed { + display: inline-table; + width: 30%; +} +#faqBackendPage li.fixed * { + display: inline; +} +#content #faqBackendPage li.fixed { + /* 2.0 only fixes - while 2.0 font.size is bigger */ + width: 28%; +} +#faqBackendPage li.col, +#content #faqBackendPage li.col { + width: 60%; +} +#faqBackendPage li.empty { + display: inline-table; + width: 1rem; +} +#content #faqBackendPage li.empty { + /* 2.0 only fixes - while 2.0 font.size is bigger */ + width: 1.45rem; /* 24px */ +} +#faqBackendPage ul li img { + width: auto; + vertical-align: middle; +} +#content #faqBackendPage ul li img { + /* 2.0 only fixes - unset auto */ + width: 24px; + height: 24px; } - #serendipityFAQNav ul li a { padding: 3px 0.5em; - margin-left:5px; - border:1px solid #000000; + margin-left: 5px; + border: 1px solid #222; +} +#serendipityFAQNav ul li a#active { + border-bottom: 1px solid #FFF; +} +#backend_faq_formpage label { + clear: both; + font-size: 1.125em; + font-weight: 600; + margin: 1em 0; + display: inline-table; +} +#backend_faq_formpage .title_descriptor { + display: table; + margin: 0; +} +#faqBackendPage .clear, +#backend_faq_formpage .clear { + clear: right; +} +#content #faqBackendPage .clear, +#content #backend_faq_formpage .clear { + /* 2.0 only fixes - unset styles */ + margin: 0 auto; /* form_field */ + line-height: 0; /* body */ +} +#content #backend_faq_formpage .submit_set { + /* 2.0 only style - needs the #content though */ + margin: 1.5em auto; +} +#faqBackendPage .action_field, +#backend_faq_formpage .action_field, +#backend_faq_formpage .plain_editor { + float: right; +} +#backend_faq_formpage .hook_buttons { + display: inline; +} +#backend_faq_formpage textarea { + width: 100%; } -#serendipityFAQNav ul li a#active { - border-bottom:1px solid #ffffff; +.faq_lang { + border: 1px solid #999; + background: #efefef; + padding: .1em .2em; +} +.faq_lang_navigation { + border: 1px solid #DDD; + padding: .5em; + display: table; +} +.faq_navigator { + background: #EEE; + border: 1px solid #CCC; + margin: 1em 0; + padding: .5em; +} + +/* LARGER SCREENS */ +@media only screen and (min-width: 1200px) { + #faqBackendPage .action_field { + margin-right: 20%; + } } diff --git a/serendipity_event_faq/style_faq_frontend.css b/serendipity_event_faq/style_faq_frontend.css index 4e4a0dfa..6fc55c34 100644 --- a/serendipity_event_faq/style_faq_frontend.css +++ b/serendipity_event_faq/style_faq_frontend.css @@ -1,13 +1,87 @@ -#serendipityFAQNav { - border-bottom:1px solid #000000; - margin:auto auto 10px auto; +.faq-categoryfaqs, +.faq-categories, +.faq-category, +.faq-searchresults { + display: table; +} +#serendipityFAQPagination p { + margin: inherit; + display: inline-block; +} +#serendipity_faq_plugin ul { + margin: 0 1.5em; +} +.faq-nav { + border-bottom: 1px solid #222; + margin: auto auto 1em auto; } -#serendipityFAQNav a { - text-decoration:none; +.faq-nav a { + text-decoration: none; } -#serendipityFAQNav p { - margin:0px 0px 0px 0px; - padding:2px 2px 2px 2px; +.faq-nav div { + margin: 0; + padding: .2em; } + +.faq-results { + text-align: left; +} + +.faq_question-icon { + display: inline-block; + text-indent: -9999px; + width: 24px; + height: 24px; + background: url(plugins/serendipity_event_faq/img/question.svg); + background-size: 24px 24px; + vertical-align: middle; + margin-right: .5em; +} +.faq-faqs { + list-style: none outside none; + margin: 0; + padding: 0; +} +.faq-faqs li { + display: block; + margin-bottom: .5em; +} +/* while uing the SVG icon */ +.faq_q *, +.faq-faqs li *{ + display: inline-block; +} +/* check for theme block elements with a margin set */ +.faq_q p, .faq_q div, +.faq-faqs li p,.faq-faqs li div{ + margin: auto; +} +.faq-status { + font-size: 0.875em; + color: #FF851B; + margin-left: .5em; +} +.faq-new { + color: #2ECC40; +} +.faq_a, .faq_q { + border: 1px solid #EEE; + margin: .5em 1em; + padding: .5em; + display: inline-table; + width: 100%; +} +.faq_q { + background: aliceblue; +} +.faq_a { + background: #F0F0F0; +} +.faq-footer { + display: block; +} +.faq-footer > div { + margin: .5em auto; +} \ No newline at end of file