social 0.10: twittervia fix, @ allowed, og:desc newlines stripped
This commit is contained in:
parent
b4716db10b
commit
7921a9c931
6 changed files with 14 additions and 7 deletions
|
@ -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:
|
0.9:
|
||||||
* Add option to set a fallback image for
|
* Add option to set a fallback image for
|
||||||
twitter and facebook tags
|
twitter and facebook tags
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
@define('PLUGIN_EVENT_SOCIAL_OVERVIEW', 'Auf Übersichtsseiten anzeigen');
|
@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_OVERVIEW_DESC', 'Zeige die Sharebuttons auch auf Übersichtsseiten (wie z.B. der Startseite).');
|
||||||
@define('PLUGIN_EVENT_SOCIAL_TWITTERVIA', 'Twittererwähnung');
|
@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_LANG_DESC', 'Sprache der Sharebuttons.');
|
||||||
@define('PLUGIN_EVENT_SOCIAL_BACKEND', 'Backend für Zähler');
|
@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"');
|
@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"');
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
@define('PLUGIN_EVENT_SOCIAL_OVERVIEW', 'Show on overview pages');
|
@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_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_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_LANG_DESC', 'Language of the share buttons');
|
||||||
@define('PLUGIN_EVENT_SOCIAL_BACKEND', 'Backend for share counter');
|
@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"');
|
@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"');
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
@define('PLUGIN_EVENT_SOCIAL_OVERVIEW', 'Auf Übersichtsseiten anzeigen');
|
@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_OVERVIEW_DESC', 'Zeige die Sharebuttons auch auf Übersichtsseiten (wie z.B. der Startseite).');
|
||||||
@define('PLUGIN_EVENT_SOCIAL_TWITTERVIA', 'Twittererwähnung');
|
@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_LANG_DESC', 'Sprache der Sharebuttons.');
|
||||||
@define('PLUGIN_EVENT_SOCIAL_BACKEND', 'Backend für Zähler');
|
@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"');
|
@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"');
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
@define('PLUGIN_EVENT_SOCIAL_OVERVIEW', 'Show on overview pages');
|
@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_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_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_LANG_DESC', 'Language of the share buttons');
|
||||||
@define('PLUGIN_EVENT_SOCIAL_BACKEND', 'Backend for share counter');
|
@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"');
|
@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"');
|
||||||
|
|
|
@ -16,7 +16,7 @@ class serendipity_event_social extends serendipity_event {
|
||||||
$propbag->add('description', PLUGIN_EVENT_SOCIAL_DESC);
|
$propbag->add('description', PLUGIN_EVENT_SOCIAL_DESC);
|
||||||
$propbag->add('stackable', false);
|
$propbag->add('stackable', false);
|
||||||
$propbag->add('author', 'onli, Matthias Mees');
|
$propbag->add('author', 'onli, Matthias Mees');
|
||||||
$propbag->add('version', '0.9');
|
$propbag->add('version', '0.10');
|
||||||
$propbag->add('requirements', array(
|
$propbag->add('requirements', array(
|
||||||
'serendipity' => '2.0'
|
'serendipity' => '2.0'
|
||||||
));
|
));
|
||||||
|
@ -106,7 +106,7 @@ class serendipity_event_social extends serendipity_event {
|
||||||
}
|
}
|
||||||
$twitter_via = $this->get_config('twitter_via', 'none');
|
$twitter_via = $this->get_config('twitter_via', 'none');
|
||||||
if ($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/');
|
$backend = $this->get_config('backend', 'https://onli.columba.uberspace.de/s9y_shariff/');
|
||||||
if ($backend != 'none') {
|
if ($backend != 'none') {
|
||||||
|
@ -148,7 +148,8 @@ class serendipity_event_social extends serendipity_event {
|
||||||
echo '<!--serendipity_event_shariff-->' . "\n";
|
echo '<!--serendipity_event_shariff-->' . "\n";
|
||||||
echo '<meta name="twitter:card" content="summary" />' . "\n";
|
echo '<meta name="twitter:card" content="summary" />' . "\n";
|
||||||
echo '<meta property="og:title" content="' . serendipity_specialchars($entry['title']) . '" />' . "\n";
|
echo '<meta property="og:title" content="' . serendipity_specialchars($entry['title']) . '" />' . "\n";
|
||||||
echo '<meta property="og:description" content="' . substr(strip_tags($entry['body']), 0, 200) . '..." />' . "\n";
|
# /\s+/: multiple newline and whitespaces
|
||||||
|
echo '<meta property="og:description" content="' . trim(preg_replace('/\s+/', ' ', substr(strip_tags($entry['body']), 0, 200))) . '..." />' . "\n";
|
||||||
echo '<meta property="og:type" content="article" />' . "\n";
|
echo '<meta property="og:type" content="article" />' . "\n";
|
||||||
echo '<meta property="og:site_name" content="' . $serendipity['blogTitle'] . '" />' . "\n";
|
echo '<meta property="og:site_name" content="' . $serendipity['blogTitle'] . '" />' . "\n";
|
||||||
echo '<meta property="og:url" content="'. $blogURL . serendipity_specialchars($_SERVER['REQUEST_URI']) . '" />' . "\n";
|
echo '<meta property="og:url" content="'. $blogURL . serendipity_specialchars($_SERVER['REQUEST_URI']) . '" />' . "\n";
|
||||||
|
@ -168,6 +169,7 @@ class serendipity_event_social extends serendipity_event {
|
||||||
echo '<meta property="og:image" content="' . $social_image . '" />' . "\n";
|
echo '<meta property="og:image" content="' . $social_image . '" />' . "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue