From: dongsheng <dongsheng>
Date: Mon, 20 Oct 2008 01:40:19 +0000 (+0000)
Subject: "MDL-16650, return raw URLs directly"
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=122d195baca0e1f834082ca160572659c8cf3bd9;p=moodle.git

"MDL-16650, return raw URLs directly"
---

diff --git a/repository/ws.php b/repository/ws.php
index dbcbe98a55..cc5924b366 100644
--- a/repository/ws.php
+++ b/repository/ws.php
@@ -155,12 +155,15 @@ EOD;
             $path = $repo->get_file($file, $title);
             $itemid = (int)substr(hexdec(uniqid()), 0, 9)+rand(1,100);
             try {
-                $info = repository_move_to_filepool($path, $title, $itemid);
-                if ($env == 'form'){
-                    echo json_encode($info);
-                } else if ($env == 'editor') {
-                    echo json_encode($info);
+                if (preg_match('#(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.]*(\?\S+)?)?)?)#', $path)) {
+                    return array('url'=>$path);
                 } else {
+                    $info = repository_move_to_filepool($path, $title, $itemid);
+                    if ($env == 'form'){
+                        echo json_encode($info);
+                    } else if ($env == 'editor') {
+                        echo json_encode($info);
+                    }
                 }
             } catch (repository_exception $e){
                 $err = new stdclass;