From 0a2029172f535e4dfa258b8fe96e457c865cf18d Mon Sep 17 00:00:00 2001
From: Klap-in <klapinklapin@gmail.com>
Date: Tue, 21 May 2013 12:36:45 +0200
Subject: Support handle of images from ftp. ml() can built url to these
 images, either fetch didn't accept them.

---
 inc/fetch.functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'inc/fetch.functions.php')

diff --git a/inc/fetch.functions.php b/inc/fetch.functions.php
index 5801e96fa..b85a1284f 100644
--- a/inc/fetch.functions.php
+++ b/inc/fetch.functions.php
@@ -97,7 +97,7 @@ function checkFileStatus(&$media, &$file, $rev = '', $width=0, $height=0) {
     global $MIME, $EXT, $CACHE, $INPUT;
 
     //media to local file
-    if(preg_match('#^(https?)://#i', $media)) {
+    if(preg_match('#^(https?|ftp)://#i', $media)) {
         //check hash
         if(substr(md5(auth_cookiesalt().$media), 0, 6) !== $INPUT->str('hash')) {
             return array(412, 'Precondition Failed');
-- 
cgit v1.2.3


From f481fb8c448406f875dbf08e2aaa94a59e3b0f93 Mon Sep 17 00:00:00 2001
From: Klap-in <klapinklapin@gmail.com>
Date: Tue, 21 May 2013 12:41:02 +0200
Subject: Update phpdocs of checkFileStatus

---
 inc/fetch.functions.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'inc/fetch.functions.php')

diff --git a/inc/fetch.functions.php b/inc/fetch.functions.php
index b85a1284f..56ca75465 100644
--- a/inc/fetch.functions.php
+++ b/inc/fetch.functions.php
@@ -89,9 +89,12 @@ function sendFile($file, $mime, $dl, $cache, $public = false) {
  * WRITE: MEDIA, FILE, array( STATUS, STATUSMESSAGE )
  *
  * @author Gerry Weissbach <gerry.w@gammaproduction.de>
- * @param $media reference to the media id
- * @param $file  reference to the file variable
- * @returns array(STATUS, STATUSMESSAGE)
+ * @param string $media  reference to the media id
+ * @param string $file   reference to the file variable
+ * @param string $rev
+ * @param int    $width
+ * @param int    $height
+ * @return array(STATUS, STATUSMESSAGE)
  */
 function checkFileStatus(&$media, &$file, $rev = '', $width=0, $height=0) {
     global $MIME, $EXT, $CACHE, $INPUT;
-- 
cgit v1.2.3


From 3e7e6067571e660cd835164c22d0973aa6343408 Mon Sep 17 00:00:00 2001
From: Klap-in <klapinklapin@gmail.com>
Date: Tue, 21 May 2013 22:52:10 +0200
Subject: apply media_isexternal

---
 inc/Mailer.class.php    | 2 +-
 inc/fetch.functions.php | 2 +-
 inc/fulltext.php        | 2 +-
 inc/parser/handler.php  | 2 +-
 inc/parser/metadata.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'inc/fetch.functions.php')

diff --git a/inc/Mailer.class.php b/inc/Mailer.class.php
index f87d7dd84..cb5f22f54 100644
--- a/inc/Mailer.class.php
+++ b/inc/Mailer.class.php
@@ -192,7 +192,7 @@ class Mailer {
         // copy over all replacements missing for HTML (autolink URLs)
         foreach($textrep as $key => $value) {
             if(isset($htmlrep[$key])) continue;
-            if(preg_match('/^https?:\/\//i', $value)) {
+            if(media_isexternal($value)) {
                 $htmlrep[$key] = '<a href="'.hsc($value).'">'.hsc($value).'</a>';
             } else {
                 $htmlrep[$key] = hsc($value);
diff --git a/inc/fetch.functions.php b/inc/fetch.functions.php
index 56ca75465..e78bbf103 100644
--- a/inc/fetch.functions.php
+++ b/inc/fetch.functions.php
@@ -100,7 +100,7 @@ function checkFileStatus(&$media, &$file, $rev = '', $width=0, $height=0) {
     global $MIME, $EXT, $CACHE, $INPUT;
 
     //media to local file
-    if(preg_match('#^(https?|ftp)://#i', $media)) {
+    if(media_isexternal($media)) {
         //check hash
         if(substr(md5(auth_cookiesalt().$media), 0, 6) !== $INPUT->str('hash')) {
             return array(412, 'Precondition Failed');
diff --git a/inc/fulltext.php b/inc/fulltext.php
index 7ee386063..2f073acea 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -172,7 +172,7 @@ function ft_mediause($id,$max){
         preg_match_all('/\{\{([^|}]*'.$pcre.'[^|}]*)(|[^}]+)?\}\}/i',rawWiki($doc),$matches);
         foreach($matches[1] as $img){
             $img = trim($img);
-            if(preg_match('/^https?:\/\//i',$img)) continue; // skip external images
+            if(media_isexternal($img)) continue; // skip external images
                 list($img) = explode('?',$img);                  // remove any parameters
             resolve_mediaid($ns,$img,$exists);               // resolve the possibly relative img
 
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 55b715ad9..1cf32aaed 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -680,7 +680,7 @@ function Doku_Handler_Parse_Media($match) {
     }
 
     // Check whether this is a local or remote image
-    if ( preg_match('#^(https?|ftp)#i',$src) ) {
+    if ( media_isexternal($src) ) {
         $call = 'externalmedia';
     } else {
         $call = 'internalmedia';
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 8638ffa6a..e17b82f8b 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -432,7 +432,7 @@ class Doku_Renderer_metadata extends Doku_Renderer {
     global $ID;
 
     list($src,$hash) = explode('#',$src,2);
-    if(!preg_match('/^https?:\/\//i',$src)){
+    if(!media_isexternal($src)){
         resolve_mediaid(getNS($ID),$src, $exists);
     }
     if(preg_match('/.(jpe?g|gif|png)$/i',$src)){
-- 
cgit v1.2.3