pass full url back to client

2 files changed, 3 insertions, 3 deletions

diff --git a/js/pomf.js b/js/pomf.js
index 52d03ee..f5dd06b 100644
--- a/js/pomf.js
+++ b/js/pomf.js
@@ -124,9 +124,9 @@ $(function () {
 					eachRow(res.files, function (row, file, files) {
 						var link = $('<a>')
 
-						link.attr('href', 'http://a.pomf.se/' + file.url)
+						link.attr('href', file.url)
 							.attr('target', '_BLANK')
-							.text('a.pomf.se/' + file.url)
+							.text(file.url.replace("http://","").replace("https://",""))
 
 						$('.file-url', row).append(link)
 					})
diff --git a/static/upload.php b/static/upload.php
index 7756e03..5675eeb 100644
--- a/static/upload.php
+++ b/static/upload.php
@@ -86,7 +86,7 @@ function upload_file ($file) {
 		return array(
 			'hash' => $file->get_sha1(),
 			'name' => $file->name,
-			'url'  => $result['filename'],
+			'url'  => POMF_URL . $result['filename'],
 			'size' => $file->size
 		);
 	}