Skip to content

Commit 59937ab

Browse files
committed
version 1.0.7
1 parent 0a00fba commit 59937ab

File tree

7 files changed

+47
-30
lines changed

7 files changed

+47
-30
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.6
1+
version=1.0.7
22
if [ "$1" = "zip" ]; then
33
rm -rf shariff-wp
44
mkdir -p shariff-wp

src/backend/index.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ public static function run()
2424
if (strpos($_GET["service"],"p") !== false) {
2525
$services[] = "Pinterest";
2626
}
27-
$arrayconfig = Array ( "cache" => Array ( "ttl" => $_GET["ttl"]),"domain" => $_SERVER["HTTP_HOST"],"services" => $services);
27+
if ($_GET["temp"] != "/tmp" && !empty($_GET["temp"])) {
28+
$arrayconfig = Array ( "cache" => Array ( "ttl" => $_GET["ttl"], "cacheDir" => $_GET["temp"] ),"domain" => $_SERVER["HTTP_HOST"],"services" => $services);
29+
} else {
30+
$arrayconfig = Array ( "cache" => Array ( "ttl" => $_GET["ttl"]),"domain" => $_SERVER["HTTP_HOST"],"services" => $services);
31+
}
2832
$shariff = new Backend($arrayconfig);
2933
echo json_encode($shariff->get($_GET["url"]));
3034
}

src/locale/shariff-de_DE.mo

53 Bytes
Binary file not shown.

src/locale/shariff-de_DE.po

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,105 @@
11
msgid ""
22
msgstr ""
33
"Project-Id-Version: shariff\n"
4-
"POT-Creation-Date: 2014-12-02 16:50+0100\n"
5-
"PO-Revision-Date: 2014-12-02 16:50+0100\n"
4+
"POT-Creation-Date: 2014-12-05 15:42+0100\n"
5+
"PO-Revision-Date: 2014-12-05 15:43+0100\n"
66
"Last-Translator: Yannik Ehlert <kontakt@yanniks.de>\n"
77
"Language-Team: Yannik Ehlert <kontakt@yanniks.de>\n"
88
"Language: de\n"
99
"MIME-Version: 1.0\n"
1010
"Content-Type: text/plain; charset=UTF-8\n"
1111
"Content-Transfer-Encoding: 8bit\n"
12-
"X-Generator: Poedit 1.6.10\n"
12+
"X-Generator: Poedit 1.7\n"
1313
"X-Poedit-Basepath: ..\n"
1414
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
1515
"X-Poedit-SourceCharset: UTF-8\n"
1616
"X-Poedit-KeywordsList: __;_e\n"
1717
"X-Poedit-SearchPath-0: .\n"
1818

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

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

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

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

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

39-
#: shariff-wp.php:126
39+
#: shariff-wp.php:127
4040
msgid "Default Image URL"
4141
msgstr "Standard Bild-URL"
4242

43-
#: shariff-wp.php:127
43+
#: shariff-wp.php:128
4444
msgid "Color"
4545
msgstr "Farbe"
4646

47-
#: shariff-wp.php:128
47+
#: shariff-wp.php:129
4848
msgid "Orientation"
4949
msgstr "Orientierung"
5050

51-
#: shariff-wp.php:129
51+
#: shariff-wp.php:130
5252
msgid "Button location"
5353
msgstr "Schaltflächen-Position"
5454

55-
#: shariff-wp.php:150
55+
#: shariff-wp.php:132
56+
msgid "Temp directory"
57+
msgstr "Zwischenspeicher"
58+
59+
#: shariff-wp.php:153
5660
msgid "Before"
5761
msgstr "Vor"
5862

59-
#: shariff-wp.php:153
63+
#: shariff-wp.php:156
6064
msgid "After"
6165
msgstr "Nach"
6266

63-
#: shariff-wp.php:154
67+
#: shariff-wp.php:157
6468
msgid "Show the sharing buttons before or after the article."
6569
msgstr "Zeige die Teilen-Schaltflächen vor oder nach dem Artikel."
6670

67-
#: shariff-wp.php:178
71+
#: shariff-wp.php:181
6872
msgid "Used for services such as Pinterest"
6973
msgstr "Wird für Dienste wie Pinterest genutzt"
7074

71-
#: shariff-wp.php:193
75+
#: shariff-wp.php:196
7276
msgid "Horizontal"
7377
msgstr "Horizontal"
7478

75-
#: shariff-wp.php:196
79+
#: shariff-wp.php:199
7680
msgid "Vertical"
7781
msgstr "Vertikal"
7882

79-
#: shariff-wp.php:206
83+
#: shariff-wp.php:212
8084
msgid "Colored"
8185
msgstr "Farbig"
8286

83-
#: shariff-wp.php:209
87+
#: shariff-wp.php:215
8488
msgid "Grey"
8589
msgstr "Grau"
8690

87-
#: shariff-wp.php:212
91+
#: shariff-wp.php:218
8892
msgid "White"
8993
msgstr "Weiß"
9094

91-
#: shariff-wp.php:221
95+
#: shariff-wp.php:227
9296
msgid "Shariff configuration"
9397
msgstr "Shariff-Konfiguration"
9498

95-
#: shariff-wp.php:237
99+
#: shariff-wp.php:243
96100
msgid "Shariff settings"
97101
msgstr "Shariff-Einstellungen"
98102

99-
#: shariff-wp.php:243
103+
#: shariff-wp.php:249
100104
msgid "Deactivate Shariff?"
101105
msgstr "Shariff deaktivieren?"

src/readme.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Contributors: yanniks
33
Tags: sharing, social, networks, network, privacy, facebook, twitter, google, whatsapp, linkedin, heise
44
Requires at least: 3.0
55
Tested up to: 4.0.1
6-
Stable tag: 1.0.4
6+
Stable tag: 1.0.7
77
License: MIT
88
License URI: http://opensource.org/licenses/MIT
99

@@ -44,6 +44,10 @@ Select which color you want, set the button location, select the orientation fit
4444

4545
== Changelog ==
4646

47+
= 1.0.7 =
48+
* upstream changes
49+
* possibility to manually change temp dir
50+
4751
= 1.0.6 =
4852
* Bug fixes
4953

src/shariff-wp.php

Lines changed: 7 additions & 2 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.6
6+
* Version: 1.0.7
77
* Author: Heise Zeitschriften Verlag / Yannik Ehlert
88
* Author URI: http://www.heise.de
99
* Text Domain: shariff
@@ -97,7 +97,7 @@ function shariffsharing($content) {
9797
}
9898
}
9999
if (!((strpos($content,'hideshariff') !== false) && (strpos($content,'/hideshariff') == false)) && !(get_post_meta($post->ID, 'shariff_enabled', true))) {
100-
$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>';
100+
$content2 .= '<div class="shariff" data-backend-url="'.plugins_url( 'backend/index.php', __FILE__ ).'" data-temp="'.get_option('shariff_temp',"/tmp").'" 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>';
101101
}
102102
if (get_option('shariff_beforeafter','before') != 'after') {
103103
$content2 .= $content;
@@ -129,6 +129,7 @@ function init_settings() {
129129
add_settings_field('shariff_orientation',__('Orientation',"shariff"),'setting_orientation_callback','shariff','shariff_other');
130130
add_settings_field('shariff_beforeafter',__('Button location',"shariff"),'setting_before_callback','shariff','shariff_other');
131131
add_settings_field('shariff_ttl','TTL','setting_ttl_callback','shariff','shariff_other');
132+
add_settings_field('shariff_temp',__('Temp directory',"shariff"),'setting_temp_callback','shariff','shariff_other');
132133
register_setting('shariff','shariff_gplus');
133134
register_setting('shariff','shariff_fb');
134135
register_setting('shariff','shariff_twitter');
@@ -143,6 +144,7 @@ function init_settings() {
143144
register_setting('shariff','shariff_orientation');
144145
register_setting('shariff','shariff_beforeafter');
145146
register_setting('shariff','shariff_ttl');
147+
register_setting('shariff','shariff_temp');
146148
}
147149
function setting_before_callback() {
148150
echo '<select name="shariff_beforeafter">
@@ -200,6 +202,9 @@ function setting_orientation_callback() {
200202
function setting_ttl_callback() {
201203
echo '<input type="number" name="shariff_ttl" value="'.get_option("shariff_ttl","60").'">';
202204
}
205+
function setting_temp_callback() {
206+
echo '<input type="text" name="shariff_temp" value="'.get_option("shariff_temp","/tmp").'">';
207+
}
203208
function setting_color_callback() {
204209
echo '<select name="shariff_color">
205210
<option value="color" ';

0 commit comments

Comments
 (0)