From 7921a9c93160475d4ba566d21cce547b891d1145 Mon Sep 17 00:00:00 2001 From: onli Date: Tue, 16 Aug 2016 20:28:38 +0200 Subject: [PATCH] social 0.10: twittervia fix, @ allowed, og:desc newlines stripped --- serendipity_event_social/ChangeLog | 5 +++++ serendipity_event_social/UTF-8/lang_de.inc.php | 2 +- serendipity_event_social/UTF-8/lang_en.inc.php | 2 +- serendipity_event_social/lang_de.inc.php | 2 +- serendipity_event_social/lang_en.inc.php | 2 +- serendipity_event_social/serendipity_event_social.php | 8 +++++--- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/serendipity_event_social/ChangeLog b/serendipity_event_social/ChangeLog index cdb140d1..fda09b69 100644 --- a/serendipity_event_social/ChangeLog +++ b/serendipity_event_social/ChangeLog @@ -1,3 +1,8 @@ +0.10: + * Strip newlines from description + * Fix unfilled language variable TWITTERVIA_DESC + * Work with and without @ in the twittervia username + 0.9: * Add option to set a fallback image for twitter and facebook tags diff --git a/serendipity_event_social/UTF-8/lang_de.inc.php b/serendipity_event_social/UTF-8/lang_de.inc.php index 5630d172..053452e3 100644 --- a/serendipity_event_social/UTF-8/lang_de.inc.php +++ b/serendipity_event_social/UTF-8/lang_de.inc.php @@ -12,7 +12,7 @@ @define('PLUGIN_EVENT_SOCIAL_OVERVIEW', 'Auf Ãœbersichtsseiten anzeigen'); @define('PLUGIN_EVENT_SOCIAL_OVERVIEW_DESC', 'Zeige die Sharebuttons auch auf Ãœbersichtsseiten (wie z.B. der Startseite).'); @define('PLUGIN_EVENT_SOCIAL_TWITTERVIA', 'Twittererwähnung'); -@define('PLUGIN_EVENT_SOCIAL_TWITTER_DESC', 'Twittername, der am Ende des Tweets angehängtwerden soll ("none" deaktiviert dies).'); +@define('PLUGIN_EVENT_SOCIAL_TWITTERVIA_DESC', 'Twittername, der am Ende des Tweets angehängt werden soll ("none" deaktiviert dies).'); @define('PLUGIN_EVENT_SOCIAL_LANG_DESC', 'Sprache der Sharebuttons.'); @define('PLUGIN_EVENT_SOCIAL_BACKEND', 'Backend für Zähler'); @define('PLUGIN_EVENT_SOCIAL_BACKEND_DESC', 'URL für ein Shariff-Backend, mit dem einige der Buttons (u.a. Facebook) anzeigen wie oft der Artikel geteilt wurde. "none" deaktiviert den Zähler. Standard: "https://onli.columba.uberspace.de/s9y_shariff"'); diff --git a/serendipity_event_social/UTF-8/lang_en.inc.php b/serendipity_event_social/UTF-8/lang_en.inc.php index 80b89550..b63b7ba8 100644 --- a/serendipity_event_social/UTF-8/lang_en.inc.php +++ b/serendipity_event_social/UTF-8/lang_en.inc.php @@ -12,7 +12,7 @@ @define('PLUGIN_EVENT_SOCIAL_OVERVIEW', 'Show on overview pages'); @define('PLUGIN_EVENT_SOCIAL_OVERVIEW_DESC', 'Also show the share buttons on overview pages (like i.e. the front page).'); @define('PLUGIN_EVENT_SOCIAL_TWITTERVIA', 'Twitter mention'); -@define('PLUGIN_EVENT_SOCIAL_TWITTER_DESC', 'Username of the twitter user that shall be mentioned (set to "none" to disable.'); +@define('PLUGIN_EVENT_SOCIAL_TWITTERVIA_DESC', 'Username of the twitter user that shall be mentioned (set to "none" to disable.'); @define('PLUGIN_EVENT_SOCIAL_LANG_DESC', 'Language of the share buttons'); @define('PLUGIN_EVENT_SOCIAL_BACKEND', 'Backend for share counter'); @define('PLUGIN_EVENT_SOCIAL_BACKEND_DESC', 'URL to a shariff backend, that provides some buttons (like Facebook) with a share counter. Set to "none" to deacivate. Default: "https://onli.columba.uberspace.de/s9y_shariff"'); diff --git a/serendipity_event_social/lang_de.inc.php b/serendipity_event_social/lang_de.inc.php index 96d34762..cd47b3bd 100644 --- a/serendipity_event_social/lang_de.inc.php +++ b/serendipity_event_social/lang_de.inc.php @@ -12,7 +12,7 @@ @define('PLUGIN_EVENT_SOCIAL_OVERVIEW', 'Auf Übersichtsseiten anzeigen'); @define('PLUGIN_EVENT_SOCIAL_OVERVIEW_DESC', 'Zeige die Sharebuttons auch auf Übersichtsseiten (wie z.B. der Startseite).'); @define('PLUGIN_EVENT_SOCIAL_TWITTERVIA', 'Twittererwähnung'); -@define('PLUGIN_EVENT_SOCIAL_TWITTER_DESC', 'Twittername, der am Ende des Tweets angehängtwerden soll ("none" deaktiviert dies).'); +@define('PLUGIN_EVENT_SOCIAL_TWITTERVIA_DESC', 'Twittername, der am Ende des Tweets angehängt werden soll ("none" deaktiviert dies).'); @define('PLUGIN_EVENT_SOCIAL_LANG_DESC', 'Sprache der Sharebuttons.'); @define('PLUGIN_EVENT_SOCIAL_BACKEND', 'Backend für Zähler'); @define('PLUGIN_EVENT_SOCIAL_BACKEND_DESC', 'URL für ein Shariff-Backend, mit dem einige der Buttons (u.a. Facebook) anzeigen wie oft der Artikel geteilt wurde. "none" deaktiviert den Zähler. Standard: "https://onli.columba.uberspace.de/s9y_shariff"'); diff --git a/serendipity_event_social/lang_en.inc.php b/serendipity_event_social/lang_en.inc.php index 9a65b2ad..5bad54a6 100644 --- a/serendipity_event_social/lang_en.inc.php +++ b/serendipity_event_social/lang_en.inc.php @@ -12,7 +12,7 @@ @define('PLUGIN_EVENT_SOCIAL_OVERVIEW', 'Show on overview pages'); @define('PLUGIN_EVENT_SOCIAL_OVERVIEW_DESC', 'Also show the share buttons on overview pages (like i.e. the front page.'); @define('PLUGIN_EVENT_SOCIAL_TWITTERVIA', 'Twitter mention'); -@define('PLUGIN_EVENT_SOCIAL_TWITTER_DESC', 'Username of the twitter user that shall be mentioned (set to "none" to disable.'); +@define('PLUGIN_EVENT_SOCIAL_TWITTERVIA_DESC', 'Username of the twitter user that shall be mentioned (set to "none" to disable.'); @define('PLUGIN_EVENT_SOCIAL_LANG_DESC', 'Language of the share buttons'); @define('PLUGIN_EVENT_SOCIAL_BACKEND', 'Backend for share counter'); @define('PLUGIN_EVENT_SOCIAL_BACKEND_DESC', 'URL to a shariff backend, that provides some buttons (like Facebook) with a share counter. Set to "none" to deacivate. Default: "https://onli.columba.uberspace.de/s9y_shariff"'); diff --git a/serendipity_event_social/serendipity_event_social.php b/serendipity_event_social/serendipity_event_social.php index 2d427a97..cad469ad 100644 --- a/serendipity_event_social/serendipity_event_social.php +++ b/serendipity_event_social/serendipity_event_social.php @@ -16,7 +16,7 @@ class serendipity_event_social extends serendipity_event { $propbag->add('description', PLUGIN_EVENT_SOCIAL_DESC); $propbag->add('stackable', false); $propbag->add('author', 'onli, Matthias Mees'); - $propbag->add('version', '0.9'); + $propbag->add('version', '0.10'); $propbag->add('requirements', array( 'serendipity' => '2.0' )); @@ -106,7 +106,7 @@ class serendipity_event_social extends serendipity_event { } $twitter_via = $this->get_config('twitter_via', 'none'); if ($twitter_via != 'none') { - $twitter_via_tag = ' data-twitter-via="' . $twitter_via .'"'; + $twitter_via_tag = ' data-twitter-via="' . str_replace('@', '', $twitter_via) .'"'; } $backend = $this->get_config('backend', 'https://onli.columba.uberspace.de/s9y_shariff/'); if ($backend != 'none') { @@ -148,7 +148,8 @@ class serendipity_event_social extends serendipity_event { echo '' . "\n"; echo '' . "\n"; echo '' . "\n"; - echo '' . "\n"; + # /\s+/: multiple newline and whitespaces + echo '' . "\n"; echo '' . "\n"; echo '' . "\n"; echo '' . "\n"; @@ -168,6 +169,7 @@ class serendipity_event_social extends serendipity_event { echo '' . "\n"; } } + break; default: return false; }