Skip to content

Commit 333f701

Browse files
yanniksyanniks
committed
version 1.0.5
1 parent 933be06 commit 333f701

File tree

7 files changed

+85
-26
lines changed

7 files changed

+85
-26
lines changed

‎release.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=1.0.4
1+
version=1.0.5
22
if [ "$1" = "zip" ]; then
33
rm -rf shariff-wp
44
mkdir -p shariff-wp

‎shariff‎

‎src/backend/index.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ public static function run()
2121
if (strpos($_GET["service"],"l") !== false) {
2222
$services[] = "LinkedIn";
2323
}
24+
if (strpos($_GET["service"],"p") !== false) {
25+
$services[] = "Pinterest";
26+
}
2427
$arrayconfig = Array ( "cache" => Array ( "ttl" => $_GET["ttl"]),"domain" => $_SERVER["HTTP_HOST"],"services" => $services);
2528
$shariff = new Backend($arrayconfig);
2629
echo json_encode($shariff->get($_GET["url"]));

‎src/locale/shariff-de_DE.mo‎

144 Bytes
Binary file not shown.

‎src/locale/shariff-de_DE.po‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: shariff\n"
4-
"POT-Creation-Date: 2014-12-01 20:39+0100\n"
5-
"PO-Revision-Date: 2014-12-01 20:39+0100\n"
4+
"POT-Creation-Date: 2014-12-02 16:50+0100\n"
5+
"PO-Revision-Date: 2014-12-02 16:50+0100\n"
66
"Last-Translator: Yannik Ehlert <kontakt@yanniks.de>\n"
77
"Language-Team: Yannik Ehlert <kontakt@yanniks.de>\n"
88
"Language: de\n"
@@ -16,78 +16,86 @@ msgstr ""
1616
"X-Poedit-KeywordsList: __;_e\n"
1717
"X-Poedit-SearchPath-0: .\n"
1818

19-
#: shariff-wp.php:70
19+
#: shariff-wp.php:99
2020
msgid "en"
2121
msgstr "de"
2222

23-
#: shariff-wp.php:86
23+
#: shariff-wp.php:115
2424
msgid "Shariff platforms"
2525
msgstr "Shariff-Plattformen"
2626

27-
#: shariff-wp.php:90
27+
#: shariff-wp.php:119 shariff-wp.php:120 shariff-wp.php:121
2828
msgid "Experimental"
2929
msgstr "Experimentell"
3030

31-
#: shariff-wp.php:93
31+
#: shariff-wp.php:124
3232
msgid "Other Shariff settings"
3333
msgstr "Andere Shariff-Einstellungen"
3434

35-
#: shariff-wp.php:94
35+
#: shariff-wp.php:125
3636
msgid "Privacy information"
3737
msgstr "Datenschutz-Informationen"
3838

39-
#: shariff-wp.php:95
39+
#: shariff-wp.php:126
40+
msgid "Default Image URL"
41+
msgstr "Standard Bild-URL"
42+
43+
#: shariff-wp.php:127
4044
msgid "Color"
4145
msgstr "Farbe"
4246

43-
#: shariff-wp.php:96
47+
#: shariff-wp.php:128
4448
msgid "Orientation"
4549
msgstr "Orientierung"
4650

47-
#: shariff-wp.php:97
51+
#: shariff-wp.php:129
4852
msgid "Button location"
4953
msgstr "Schaltflächen-Position"
5054

51-
#: shariff-wp.php:115
55+
#: shariff-wp.php:150
5256
msgid "Before"
5357
msgstr "Vor"
5458

55-
#: shariff-wp.php:118
59+
#: shariff-wp.php:153
5660
msgid "After"
5761
msgstr "Nach"
5862

59-
#: shariff-wp.php:119
63+
#: shariff-wp.php:154
6064
msgid "Show the sharing buttons before or after the article."
6165
msgstr "Zeige die Teilen-Schaltflächen vor oder nach dem Artikel."
6266

63-
#: shariff-wp.php:149
67+
#: shariff-wp.php:178
68+
msgid "Used for services such as Pinterest"
69+
msgstr "Wird für Dienste wie Pinterest genutzt"
70+
71+
#: shariff-wp.php:193
6472
msgid "Horizontal"
6573
msgstr "Horizontal"
6674

67-
#: shariff-wp.php:152
75+
#: shariff-wp.php:196
6876
msgid "Vertical"
6977
msgstr "Vertikal"
7078

71-
#: shariff-wp.php:162
79+
#: shariff-wp.php:206
7280
msgid "Colored"
7381
msgstr "Farbig"
7482

75-
#: shariff-wp.php:165
83+
#: shariff-wp.php:209
7684
msgid "Grey"
7785
msgstr "Grau"
7886

79-
#: shariff-wp.php:168
87+
#: shariff-wp.php:212
8088
msgid "White"
8189
msgstr "Weiß"
8290

83-
#: shariff-wp.php:177
91+
#: shariff-wp.php:221
8492
msgid "Shariff configuration"
8593
msgstr "Shariff-Konfiguration"
8694

87-
#: shariff-wp.php:193
95+
#: shariff-wp.php:237
8896
msgid "Shariff settings"
8997
msgstr "Shariff-Einstellungen"
9098

91-
#: shariff-wp.php:199
99+
#: shariff-wp.php:243
92100
msgid "Deactivate Shariff?"
93101
msgstr "Shariff deaktivieren?"

‎src/readme.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ Select which color you want, set the button location, select the orientation fit
4444

4545
== Changelog ==
4646

47+
= 1.0.5 =
48+
* Add Pinterest and XING (without count)
49+
* Fix mail
50+
4751
= 1.0.4 =
4852
* Add experimental LinkedIn support
4953
* Set default TTL to 60

‎src/shariff-wp.php‎

Lines changed: 47 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Plugin Name: Shariff for Wordpress
44
* Plugin URI: http://www.heise.de/newsticker/meldung/c-t-entwickelt-datenschutzfreundliche-Social-Media-Buttons-weiter-2466687.html
55
* Description: Shariff enables website users to share their favorite content without compromising their privacy.
6-
* Version: 1.0.4
6+
* Version: 1.0.5
77
* Author: Heise Zeitschriften Verlag / Yannik Ehlert
88
* Author URI: http://www.heise.de
99
* Text Domain: shariff
@@ -44,6 +44,18 @@ function shariffsharing($content) {
4444
}
4545
$services = $services.'"linkedin"';
4646
}
47+
if (get_option('shariff_pinterest',false) == true) {
48+
if ($services != "[") {
49+
$services = $services.",";
50+
}
51+
$services = $services.'"pinterest"';
52+
}
53+
if (get_option('shariff_xing',false) == true) {
54+
if ($services != "[") {
55+
$services = $services.",";
56+
}
57+
$services = $services.'"xing"';
58+
}
4759
if (get_option('shariff_whatsapp',false) == true) {
4860
if ($services != "[") {
4961
$services = $services.",";
@@ -66,8 +78,25 @@ function shariffsharing($content) {
6678
if (get_option('shariff_beforeafter','before') != 'before') {
6779
$content2 = $content;
6880
}
81+
if (get_option('shariff_image','leer') != 'leer') {
82+
if (strpos($content,'<img') !== false) {
83+
$imgurls = explode("\"",explode(">",strstr($content,"<img"))[0]);
84+
$int = 0;
85+
foreach($imgurls as $imgurl) {
86+
$int = $int + 1;
87+
if (strpos($imgurl,"src") !== false) {
88+
if (!(strpos($imgurls[$int],"http") !== false)) {
89+
$image = get_site_url()."/";
90+
}
91+
$image .= $imgurls[$int];
92+
}
93+
}
94+
} else {
95+
$image = get_option('shariff_image','');
96+
}
97+
}
6998
if (!((strpos($content,'hideshariff') !== false) && (strpos($content,'/hideshariff') == false)) && !(get_post_meta($post->ID, 'shariff_enabled', true))) {
70-
$content2 .= '<div class="shariff" data-backend-url="'.plugins_url( 'backend/index.php', __FILE__ ).'" data-ttl="'.get_option('shariff_ttl',"60").'" data-service="'.$serv.'" data-services=\''.$services.'\' data-url="'.get_permalink().'" data-lang="'.__('en', 'shariff').'" data-theme="'.get_option('shariff_color',"colored").'" data-orientation="'.get_option('shariff_orientation',"horizontal").'"></div>';
99+
$content2 .= '<div class="shariff" data-backend-url="'.plugins_url( 'backend/index.php', __FILE__ ).'" data-ttl="'.get_option('shariff_ttl',"60").'" data-service="'.$serv.'" data-services=\''.$services.'\' data-image="'.$image.'" data-url="'.get_permalink().'" data-lang="'.__('en', 'shariff').'" data-theme="'.get_option('shariff_color',"colored").'" data-orientation="'.get_option('shariff_orientation',"horizontal").'"></div>';
71100
}
72101
if (get_option('shariff_beforeafter','before') != 'after') {
73102
$content2 .= $content;
@@ -88,10 +117,13 @@ function init_settings() {
88117
add_settings_field('shariff_fb','Facebook','setting_fb_callback','shariff','shariff_platforms');
89118
add_settings_field('shariff_twitter','Twitter','setting_twitter_callback','shariff','shariff_platforms');
90119
add_settings_field('shariff_linkedin','LinkedIn ('.__('Experimental','shariff').')','setting_linkedin_callback','shariff','shariff_platforms');
120+
add_settings_field('shariff_pinterest','Pinterest ('.__('Experimental','shariff').')','setting_pinterest_callback','shariff','shariff_platforms');
121+
add_settings_field('shariff_xing','XING ('.__('Experimental','shariff').')','setting_xing_callback','shariff','shariff_platforms');
91122
add_settings_field('shariff_whatsapp','WhatsApp','setting_whatsapp_callback','shariff','shariff_platforms');
92123
add_settings_field('shariff_email','E-Mail','setting_email_callback','shariff','shariff_platforms');
93124
add_settings_section('shariff_other',__('Other Shariff settings',"shariff"),'setting_plat_callback','shariff');
94125
add_settings_field('shariff_info',__('Privacy information',"shariff"),'setting_info_callback','shariff','shariff_other');
126+
add_settings_field('shariff_image',__('Default Image URL',"shariff"),'setting_imageurl','shariff','shariff_other');
95127
add_settings_field('shariff_color',__('Color',"shariff"),'setting_color_callback','shariff','shariff_other');
96128
add_settings_field('shariff_orientation',__('Orientation',"shariff"),'setting_orientation_callback','shariff','shariff_other');
97129
add_settings_field('shariff_beforeafter',__('Button location',"shariff"),'setting_before_callback','shariff','shariff_other');
@@ -100,6 +132,9 @@ function init_settings() {
100132
register_setting('shariff','shariff_fb');
101133
register_setting('shariff','shariff_twitter');
102134
register_setting('shariff','shariff_linkedin');
135+
register_setting('shariff','shariff_pinterest');
136+
register_setting('shariff','shariff_xing');
137+
register_setting('shariff','shariff_image');
103138
register_setting('shariff','shariff_whatsapp');
104139
register_setting('shariff','shariff_email');
105140
register_setting('shariff','shariff_info');
@@ -127,12 +162,21 @@ function setting_gplus_callback() {
127162
function setting_fb_callback() {
128163
checkbox_setting('shariff_fb','Facebook',true);
129164
}
165+
function setting_xing_callback() {
166+
checkbox_setting('shariff_xing','XING',false);
167+
}
130168
function setting_twitter_callback() {
131169
checkbox_setting('shariff_twitter','Twitter',true);
132170
}
133171
function setting_linkedin_callback() {
134172
checkbox_setting('shariff_linkedin','LinkedIn',false);
135173
}
174+
function setting_pinterest_callback() {
175+
checkbox_setting('shariff_pinterest','Pinterest',false);
176+
}
177+
function setting_imageurl() {
178+
echo '<input type="text" name="shariff_image" value="'.get_option('shariff_image','').'"> '.__('Used for services such as Pinterest','shariff');
179+
}
136180
function setting_whatsapp_callback() {
137181
checkbox_setting('shariff_whatsapp','WhatsApp',false);
138182
}
@@ -220,7 +264,7 @@ function save_details(){
220264
update_post_meta($post->ID, "shariff_enabled", $_POST["shariff_enabled"]);
221265
}
222266
add_action("admin_init", "select_init");
223-
add_action( 'save_post', 'shariff_save_checkbox' );
267+
add_action('save_post', 'shariff_save_checkbox' );
224268
add_action('admin_menu','shariffconfigmenu');
225269
add_action('admin_init','init_settings');
226270
add_action('init','init_locale');

0 commit comments

Comments
 (0)