diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/archiveorg/archiveorg.php | 2 | ||||
-rw-r--r-- | plugins/demo_plugin/demo_plugin.php | 4 | ||||
-rw-r--r-- | plugins/markdown/markdown.php | 16 | ||||
-rw-r--r-- | plugins/pubsubhubbub/pubsubhubbub.php | 5 | ||||
-rw-r--r-- | plugins/qrcode/qrcode.php | 3 | ||||
-rw-r--r-- | plugins/wallabag/wallabag.php | 1 |
6 files changed, 16 insertions, 15 deletions
diff --git a/plugins/archiveorg/archiveorg.php b/plugins/archiveorg/archiveorg.php index cda35751..5dcea5a6 100644 --- a/plugins/archiveorg/archiveorg.php +++ b/plugins/archiveorg/archiveorg.php | |||
@@ -17,7 +17,7 @@ function hook_archiveorg_render_linklist($data) | |||
17 | $archive_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/archiveorg/archiveorg.html'); | 17 | $archive_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/archiveorg/archiveorg.html'); |
18 | 18 | ||
19 | foreach ($data['links'] as &$value) { | 19 | foreach ($data['links'] as &$value) { |
20 | if($value['private'] && preg_match('/^\?[a-zA-Z0-9-_@]{6}($|&|#)/', $value['real_url'])) { | 20 | if ($value['private'] && preg_match('/^\?[a-zA-Z0-9-_@]{6}($|&|#)/', $value['real_url'])) { |
21 | continue; | 21 | continue; |
22 | } | 22 | } |
23 | $archive = sprintf($archive_html, $value['url'], t('View on archive.org')); | 23 | $archive = sprintf($archive_html, $value['url'], t('View on archive.org')); |
diff --git a/plugins/demo_plugin/demo_plugin.php b/plugins/demo_plugin/demo_plugin.php index f3a63b6a..bdbc719b 100644 --- a/plugins/demo_plugin/demo_plugin.php +++ b/plugins/demo_plugin/demo_plugin.php | |||
@@ -73,7 +73,6 @@ function hook_demo_plugin_render_header($data) | |||
73 | { | 73 | { |
74 | // Only execute when linklist is rendered. | 74 | // Only execute when linklist is rendered. |
75 | if ($data['_PAGE_'] == Router::$PAGE_LINKLIST) { | 75 | if ($data['_PAGE_'] == Router::$PAGE_LINKLIST) { |
76 | |||
77 | // If loggedin | 76 | // If loggedin |
78 | if ($data['_LOGGEDIN_'] === true) { | 77 | if ($data['_LOGGEDIN_'] === true) { |
79 | /* | 78 | /* |
@@ -448,8 +447,7 @@ function hook_demo_plugin_render_feed($data) | |||
448 | foreach ($data['links'] as &$link) { | 447 | foreach ($data['links'] as &$link) { |
449 | if ($data['_PAGE_'] == Router::$PAGE_FEED_ATOM) { | 448 | if ($data['_PAGE_'] == Router::$PAGE_FEED_ATOM) { |
450 | $link['description'] .= ' - ATOM Feed' ; | 449 | $link['description'] .= ' - ATOM Feed' ; |
451 | } | 450 | } elseif ($data['_PAGE_'] == Router::$PAGE_FEED_RSS) { |
452 | elseif ($data['_PAGE_'] == Router::$PAGE_FEED_RSS) { | ||
453 | $link['description'] .= ' - RSS Feed'; | 451 | $link['description'] .= ' - RSS Feed'; |
454 | } | 452 | } |
455 | } | 453 | } |
diff --git a/plugins/markdown/markdown.php b/plugins/markdown/markdown.php index 08e64dae..8823af91 100644 --- a/plugins/markdown/markdown.php +++ b/plugins/markdown/markdown.php | |||
@@ -139,7 +139,6 @@ function hook_markdown_render_includes($data) | |||
139 | || $data['_PAGE_'] == Router::$PAGE_DAILY | 139 | || $data['_PAGE_'] == Router::$PAGE_DAILY |
140 | || $data['_PAGE_'] == Router::$PAGE_EDITLINK | 140 | || $data['_PAGE_'] == Router::$PAGE_EDITLINK |
141 | ) { | 141 | ) { |
142 | |||
143 | $data['css_files'][] = PluginManager::$PLUGINS_PATH . '/markdown/markdown.css'; | 142 | $data['css_files'][] = PluginManager::$PLUGINS_PATH . '/markdown/markdown.css'; |
144 | } | 143 | } |
145 | 144 | ||
@@ -195,8 +194,7 @@ function reverse_text2clickable($description) | |||
195 | // Detect and toggle block of code | 194 | // Detect and toggle block of code |
196 | if (!$codeBlockOn) { | 195 | if (!$codeBlockOn) { |
197 | $codeBlockOn = preg_match('/^```/', $descriptionLine) > 0; | 196 | $codeBlockOn = preg_match('/^```/', $descriptionLine) > 0; |
198 | } | 197 | } elseif (preg_match('/^```/', $descriptionLine) > 0) { |
199 | elseif (preg_match('/^```/', $descriptionLine) > 0) { | ||
200 | $codeBlockOn = false; | 198 | $codeBlockOn = false; |
201 | } | 199 | } |
202 | 200 | ||
@@ -302,13 +300,17 @@ function sanitize_html($description) | |||
302 | foreach ($escapeTags as $tag) { | 300 | foreach ($escapeTags as $tag) { |
303 | $description = preg_replace_callback( | 301 | $description = preg_replace_callback( |
304 | '#<\s*'. $tag .'[^>]*>(.*</\s*'. $tag .'[^>]*>)?#is', | 302 | '#<\s*'. $tag .'[^>]*>(.*</\s*'. $tag .'[^>]*>)?#is', |
305 | function ($match) { return escape($match[0]); }, | 303 | function ($match) { |
306 | $description); | 304 | return escape($match[0]); |
305 | }, | ||
306 | $description | ||
307 | ); | ||
307 | } | 308 | } |
308 | $description = preg_replace( | 309 | $description = preg_replace( |
309 | '#(<[^>]+\s)on[a-z]*="?[^ "]*"?#is', | 310 | '#(<[^>]+\s)on[a-z]*="?[^ "]*"?#is', |
310 | '$1', | 311 | '$1', |
311 | $description); | 312 | $description |
313 | ); | ||
312 | return $description; | 314 | return $description; |
313 | } | 315 | } |
314 | 316 | ||
@@ -341,7 +343,7 @@ function process_markdown($description, $escape = true, $allowedProtocols = []) | |||
341 | ->text($processedDescription); | 343 | ->text($processedDescription); |
342 | $processedDescription = sanitize_html($processedDescription); | 344 | $processedDescription = sanitize_html($processedDescription); |
343 | 345 | ||
344 | if(!empty($processedDescription)){ | 346 | if (!empty($processedDescription)) { |
345 | $processedDescription = '<div class="markdown">'. $processedDescription . '</div>'; | 347 | $processedDescription = '<div class="markdown">'. $processedDescription . '</div>'; |
346 | } | 348 | } |
347 | 349 | ||
diff --git a/plugins/pubsubhubbub/pubsubhubbub.php b/plugins/pubsubhubbub/pubsubhubbub.php index 184b588b..9f0342a3 100644 --- a/plugins/pubsubhubbub/pubsubhubbub.php +++ b/plugins/pubsubhubbub/pubsubhubbub.php | |||
@@ -6,7 +6,7 @@ | |||
6 | * PubSub is a protocol which fasten up RSS fetching: | 6 | * PubSub is a protocol which fasten up RSS fetching: |
7 | * - Every time a new link is posted, Shaarli notify the hub. | 7 | * - Every time a new link is posted, Shaarli notify the hub. |
8 | * - The hub notify all feed subscribers that a new link has been posted. | 8 | * - The hub notify all feed subscribers that a new link has been posted. |
9 | * - Subscribers retrieve the new link. | 9 | * - Subscribers retrieve the new link. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | use pubsubhubbub\publisher\Publisher; | 12 | use pubsubhubbub\publisher\Publisher; |
@@ -82,7 +82,8 @@ function hook_pubsubhubbub_save_link($data, $conf) | |||
82 | * | 82 | * |
83 | * @throws Exception An error occurred. | 83 | * @throws Exception An error occurred. |
84 | */ | 84 | */ |
85 | function nocurl_http_post($url, $postString) { | 85 | function nocurl_http_post($url, $postString) |
86 | { | ||
86 | $params = array('http' => array( | 87 | $params = array('http' => array( |
87 | 'method' => 'POST', | 88 | 'method' => 'POST', |
88 | 'content' => $postString, | 89 | 'content' => $postString, |
diff --git a/plugins/qrcode/qrcode.php b/plugins/qrcode/qrcode.php index 0f96a106..4b59caa0 100644 --- a/plugins/qrcode/qrcode.php +++ b/plugins/qrcode/qrcode.php | |||
@@ -17,7 +17,8 @@ function hook_qrcode_render_linklist($data) | |||
17 | $qrcode_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/qrcode/qrcode.html'); | 17 | $qrcode_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/qrcode/qrcode.html'); |
18 | 18 | ||
19 | foreach ($data['links'] as &$value) { | 19 | foreach ($data['links'] as &$value) { |
20 | $qrcode = sprintf($qrcode_html, | 20 | $qrcode = sprintf( |
21 | $qrcode_html, | ||
21 | urlencode($value['url']), | 22 | urlencode($value['url']), |
22 | $value['url'], | 23 | $value['url'], |
23 | PluginManager::$PLUGINS_PATH | 24 | PluginManager::$PLUGINS_PATH |
diff --git a/plugins/wallabag/wallabag.php b/plugins/wallabag/wallabag.php index 9dfd079e..a6476c71 100644 --- a/plugins/wallabag/wallabag.php +++ b/plugins/wallabag/wallabag.php | |||
@@ -69,4 +69,3 @@ function wallabag_dummy_translation() | |||
69 | t('Wallabag API URL'); | 69 | t('Wallabag API URL'); |
70 | t('Wallabag API version (1 or 2)'); | 70 | t('Wallabag API version (1 or 2)'); |
71 | } | 71 | } |
72 | |||