From 0b5120a2acbdd85ae4610200f0324222794e2b9d Mon Sep 17 00:00:00 2001 From: Tyler Blair Date: Wed, 8 Feb 2012 23:57:12 -0400 Subject: [PATCH] Initial commit :-) --- docs/network-api.txt | 10 +++++ docs/rewrite.txt | 10 +++++ web/config.php | 28 ++++++++++++++ web/func.php | 92 ++++++++++++++++++++++++++++++++++++++++++++ web/index.php | 0 web/upload.php | 42 ++++++++++++++++++++ web/view.php | 47 ++++++++++++++++++++++ 7 files changed, 229 insertions(+) create mode 100644 docs/network-api.txt create mode 100644 docs/rewrite.txt create mode 100644 web/config.php create mode 100644 web/func.php create mode 100644 web/index.php create mode 100644 web/upload.php create mode 100644 web/view.php diff --git a/docs/network-api.txt b/docs/network-api.txt new file mode 100644 index 0000000..208d52c --- /dev/null +++ b/docs/network-api.txt @@ -0,0 +1,10 @@ +puush version r83 +puush server 216.155.137.235 + +UPLOADING +POST -> http://puush.me/api/up + "k" = ? + "c" = ? + "z" = "poop" -- junk + "f" = image + <- 0,http://puu.sh/IMGID,??,?? \ No newline at end of file diff --git a/docs/rewrite.txt b/docs/rewrite.txt new file mode 100644 index 0000000..267eb3f --- /dev/null +++ b/docs/rewrite.txt @@ -0,0 +1,10 @@ +Lighttpd +img\.griefcraft\.com would of course become whatever your image domain is + +$HTTP["host"] =~ "^(img\.griefcraft\.com|puush\.me)$" { + server.document-root = "/var/www/servers/img.griefcraft.com/" + url.rewrite-once = ( + "^/api/up" => "/upload.php", + "^/([a-zA-Z0-9]+)$" => "/view.php?image=$1" + ) +} diff --git a/web/config.php b/web/config.php new file mode 100644 index 0000000..6b72f69 --- /dev/null +++ b/web/config.php @@ -0,0 +1,28 @@ + 'gif', + 'image/jpeg' => 'jpeg', + 'image/jpeg' => 'jpg', + 'image/png' => 'png', + 'image/psd' => 'psd', + 'image/bmp' => 'bmp', + 'image/tiff' => 'tiff', + 'image/tiff' => 'tiff', + 'image/jp2' => 'jp2', + 'image/iff' => 'iff', + 'image/vnd.wap.wbmp' => 'bmp', + 'image/xbm' => 'xbm', + 'image/vnd.microsoft.icon' => 'ico'); + +// Extension whitelist +$image_whitelist = array('jpg', 'jpeg', 'png', 'gif','bmp'); \ No newline at end of file diff --git a/web/func.php b/web/func.php new file mode 100644 index 0000000..20a49ee --- /dev/null +++ b/web/func.php @@ -0,0 +1,92 @@ + MAX_FILE_SIZE) +{ + exit ('ERR File is too big.'); +} + +// Ensure the image is actually a file and not a friendly virus +if (validate_image($file) === FALSE) +{ + exit ('ERR Invalid image.'); +} + +// Generate a new file name +$ext = get_ext($file['name']); +$generated_name = generate_upload_name($ext); + +// Move the file +move_uploaded_file($file['tmp_name'], UPLOAD_DIR . $generated_name . '.' . $ext); + +// ahem +echo '0,' . sprintf(FORMATTED_URL, $generated_name) . ',-1,-1'; \ No newline at end of file diff --git a/web/view.php b/web/view.php new file mode 100644 index 0000000..aa3e861 --- /dev/null +++ b/web/view.php @@ -0,0 +1,47 @@ +