Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[10211] XoopsModules/smallworld/trunk/smallworld
|
From: <dj...@us...> - 2013-02-11 16:06:41
|
Revision: 10211
http://xoops.svn.sourceforge.net/xoops/?rev=10211&view=rev
Author: djculex
Date: 2013-02-11 16:06:28 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
New: Upgraded uploadHandler.php and edited img_upload.php and imgupload.php to use new class
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/img_upload.php
XoopsModules/smallworld/trunk/smallworld/imgupload.php
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_imgupload.html
Added Paths:
-----------
XoopsModules/smallworld/trunk/smallworld/class/UploadHandler.php
Added: XoopsModules/smallworld/trunk/smallworld/class/UploadHandler.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/class/UploadHandler.php (rev 0)
+++ XoopsModules/smallworld/trunk/smallworld/class/UploadHandler.php 2013-02-11 16:06:28 UTC (rev 10211)
@@ -0,0 +1,805 @@
+<?php
+/*
+ * jQuery File Upload Plugin PHP Class 6.1.2
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2010, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+class UploadHandler
+{
+ var $xoopsUser;
+ protected $options;
+
+ // PHP File Upload error message codes:
+ // http://php.net/manual/en/features.file-upload.errors.php
+ protected $error_messages = array(
+ 1 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini',
+ 2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form',
+ 3 => 'The uploaded file was only partially uploaded',
+ 4 => 'No file was uploaded',
+ 6 => 'Missing a temporary folder',
+ 7 => 'Failed to write file to disk',
+ 8 => 'A PHP extension stopped the file upload',
+ 'post_max_size' => 'The uploaded file exceeds the post_max_size directive in php.ini',
+ 'max_file_size' => 'File is too big',
+ 'min_file_size' => 'File is too small',
+ 'accept_file_types' => 'Filetype not allowed',
+ 'max_number_of_files' => 'Maximum number of files exceeded',
+ 'max_width' => 'Image exceeds maximum width',
+ 'min_width' => 'Image requires a minimum width',
+ 'max_height' => 'Image exceeds maximum height',
+ 'min_height' => 'Image requires a minimum height'
+ );
+
+ function __construct($options = null, $initialize = true) {
+ global $xoopsUser;
+ $userID = $xoopsUser->getVar('uid');
+ $this->options = array(
+ 'script_url' => $this->get_full_url().'/imgupload.php',
+ 'upload_dir' => XOOPS_ROOT_PATH.'/uploads/albums_smallworld/'.$userID."/",
+ 'upload_url' => XOOPS_URL.'/uploads/albums_smallworld/'.$userID."/",
+ 'user_dirs' => false,
+ 'mkdir_mode' => 0755,
+ 'param_name' => 'files',
+ // Set the following option to 'POST', if your server does not support
+ // DELETE requests. This is a parameter sent to the client:
+ 'delete_type' => 'DELETE',
+ 'access_control_allow_origin' => '*',
+ 'access_control_allow_credentials' => false,
+ 'access_control_allow_methods' => array(
+ 'OPTIONS',
+ 'HEAD',
+ 'GET',
+ 'POST',
+ 'PUT',
+ 'PATCH',
+ 'DELETE'
+ ),
+ 'access_control_allow_headers' => array(
+ 'Content-Type',
+ 'Content-Range',
+ 'Content-Disposition'
+ ),
+ // Enable to provide file downloads via GET requests to the PHP script:
+ 'download_via_php' => false,
+ // Defines which files can be displayed inline when downloaded:
+ 'inline_file_types' => '/\.(gif|jpe?g|png|JPE?G)$/i',
+ // Defines which files (based on their names) are accepted for upload:
+ 'accept_file_types' => '/.+$/i',
+ // The php.ini settings upload_max_filesize and post_max_size
+ // take precedence over the following max_file_size setting:
+ 'max_file_size' => null,
+ 'min_file_size' => 1,
+ // The maximum number of files for the upload directory:
+ 'max_number_of_files' => null,
+ // Image resolution restrictions:
+ 'max_width' => null,
+ 'max_height' => null,
+ 'min_width' => 1,
+ 'min_height' => 1,
+ // Set the following option to false to enable resumable uploads:
+ 'discard_aborted_uploads' => true,
+ // Set to true to rotate images based on EXIF meta data, if available:
+ 'orient_image' => false,
+ 'image_versions' => array(
+ // Uncomment the following version to restrict the size of
+ // uploaded images:
+ /*
+ '' => array(
+ 'max_width' => 1920,
+ 'max_height' => 1200,
+ 'jpeg_quality' => 95
+ ),
+ */
+ // Uncomment the following to create medium sized images:
+ /*
+ 'medium' => array(
+ 'max_width' => 800,
+ 'max_height' => 600,
+ 'jpeg_quality' => 80
+ ),
+ */
+ 'thumbnails' => array(
+ 'upload_dir' => XOOPS_ROOT_PATH.'/uploads/albums_smallworld'.'/'.$userID.'/thumbnails/',
+ 'upload_url' => XOOPS_URL.'/uploads/albums_smallworld'.'/'.$userID.'/thumbnails/',
+ 'max_width' => 80,
+ 'max_height' => 80
+ )
+ )
+ );
+ if ($options) {
+ $this->options = array_merge($this->options, $options);
+ }
+ if ($initialize) {
+ $this->initialize();
+ }
+ }
+
+ protected function initialize() {
+ switch ($_SERVER['REQUEST_METHOD']) {
+ case 'OPTIONS':
+ case 'HEAD':
+ $this->head();
+ break;
+ case 'GET':
+ $this->get();
+ break;
+ case 'PATCH':
+ case 'PUT':
+ case 'POST':
+ $this->post();
+ break;
+ case 'DELETE':
+ $this->delete();
+ break;
+ default:
+ $this->header('HTTP/1.1 405 Method Not Allowed');
+ }
+ }
+
+ protected function get_full_url() {
+ $https = !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off';
+ return
+ ($https ? 'https://' : 'http://').
+ (!empty($_SERVER['REMOTE_USER']) ? $_SERVER['REMOTE_USER'].'@' : '').
+ (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : ($_SERVER['SERVER_NAME'].
+ ($https && $_SERVER['SERVER_PORT'] === 443 ||
+ $_SERVER['SERVER_PORT'] === 80 ? '' : ':'.$_SERVER['SERVER_PORT']))).
+ substr($_SERVER['SCRIPT_NAME'],0, strrpos($_SERVER['SCRIPT_NAME'], '/'));
+ }
+
+ protected function get_user_id() {
+ @session_start();
+ return session_id();
+ }
+
+ protected function get_user_path() {
+ if ($this->options['user_dirs']) {
+ return $this->get_user_id().'/';
+ }
+ return '';
+ }
+
+ protected function get_upload_path($file_name = null, $version = null) {
+ $file_name = $file_name ? $file_name : '';
+ $version_path = empty($version) ? '' : $version.'/';
+ return $this->options['upload_dir'].$this->get_user_path()
+ .$version_path.$file_name;
+ }
+
+ protected function get_query_separator($url) {
+ return strpos($url, '?') === false ? '?' : '&';
+ }
+
+ protected function get_download_url($file_name, $version = null) {
+ if ($this->options['download_via_php']) {
+ $url = $this->options['script_url']
+ .$this->get_query_separator($this->options['script_url'])
+ .'file='.rawurlencode($file_name);
+ if ($version) {
+ $url .= '&version='.rawurlencode($version);
+ }
+ return $url.'&download=1';
+ }
+ $version_path = empty($version) ? '' : rawurlencode($version).'/';
+ return $this->options['upload_url'].$this->get_user_path()
+ .$version_path.rawurlencode($file_name);
+ }
+
+ protected function set_file_delete_properties($file) {
+ $file->delete_url = $this->options['script_url']
+ .$this->get_query_separator($this->options['script_url'])
+ .'file='.rawurlencode($file->name);
+ $file->delete_type = $this->options['delete_type'];
+ if ($file->delete_type !== 'DELETE') {
+ $file->delete_url .= '&_method=DELETE';
+ }
+ if ($this->options['access_control_allow_credentials']) {
+ $file->delete_with_credentials = true;
+ }
+ }
+
+ // Fix for overflowing signed 32 bit integers,
+ // works for sizes up to 2^32-1 bytes (4 GiB - 1):
+ protected function fix_integer_overflow($size) {
+ if ($size < 0) {
+ $size += 2.0 * (PHP_INT_MAX + 1);
+ }
+ return $size;
+ }
+
+ protected function get_file_size($file_path, $clear_stat_cache = false) {
+ if ($clear_stat_cache) {
+ clearstatcache(true, $file_path);
+ }
+ return $this->fix_integer_overflow(filesize($file_path));
+
+ }
+
+ protected function is_valid_file_object($file_name) {
+ $file_path = $this->get_upload_path($file_name);
+ if (is_file($file_path) && $file_name[0] !== '.') {
+ return true;
+ }
+ return false;
+ }
+
+ protected function get_file_object($file_name) {
+ if ($this->is_valid_file_object($file_name)) {
+ $file = new stdClass();
+ $file->name = $file_name;
+ $file->size = $this->get_file_size(
+ $this->get_upload_path($file_name)
+ );
+ $file->url = $this->get_download_url($file->name);
+ foreach($this->options['image_versions'] as $version => $options) {
+ if (!empty($version)) {
+ if (is_file($this->get_upload_path($file_name, $version))) {
+ $file->{$version.'_url'} = $this->get_download_url(
+ $file->name,
+ $version
+ );
+ }
+ }
+ }
+ $this->set_file_delete_properties($file);
+ return $file;
+ }
+ return null;
+ }
+
+ protected function get_file_objects($iteration_method = 'get_file_object') {
+ $upload_dir = $this->get_upload_path();
+ if (!is_dir($upload_dir)) {
+ return array();
+ }
+ return array_values(array_filter(array_map(
+ array($this, $iteration_method),
+ scandir($upload_dir)
+ )));
+ }
+
+ protected function count_file_objects() {
+ return count($this->get_file_objects('is_valid_file_object'));
+ }
+
+ protected function create_scaled_image($file_name, $version, $options) {
+ $file_path = $this->get_upload_path($file_name);
+ if (!empty($version)) {
+ $version_dir = $this->get_upload_path(null, $version);
+ if (!is_dir($version_dir)) {
+ mkdir($version_dir, $this->options['mkdir_mode'], true);
+ }
+ $new_file_path = $version_dir.'/'.$file_name;
+ } else {
+ $new_file_path = $file_path;
+ }
+ list($img_width, $img_height) = @getimagesize($file_path);
+ if (!$img_width || !$img_height) {
+ return false;
+ }
+ $scale = min(
+ $options['max_width'] / $img_width,
+ $options['max_height'] / $img_height
+ );
+ if ($scale >= 1) {
+ if ($file_path !== $new_file_path) {
+ return copy($file_path, $new_file_path);
+ }
+ return true;
+ }
+ $new_width = $img_width * $scale;
+ $new_height = $img_height * $scale;
+ $new_img = @imagecreatetruecolor($new_width, $new_height);
+ switch (strtolower(substr(strrchr($file_name, '.'), 1))) {
+ case 'jpg':
+ case 'jpeg':
+ $src_img = @imagecreatefromjpeg($file_path);
+ $write_image = 'imagejpeg';
+ $image_quality = isset($options['jpeg_quality']) ?
+ $options['jpeg_quality'] : 75;
+ break;
+ case 'gif':
+ @imagecolortransparent($new_img, @imagecolorallocate($new_img, 0, 0, 0));
+ $src_img = @imagecreatefromgif($file_path);
+ $write_image = 'imagegif';
+ $image_quality = null;
+ break;
+ case 'png':
+ @imagecolortransparent($new_img, @imagecolorallocate($new_img, 0, 0, 0));
+ @imagealphablending($new_img, false);
+ @imagesavealpha($new_img, true);
+ $src_img = @imagecreatefrompng($file_path);
+ $write_image = 'imagepng';
+ $image_quality = isset($options['png_quality']) ?
+ $options['png_quality'] : 9;
+ break;
+ default:
+ $src_img = null;
+ }
+ $success = $src_img && @imagecopyresampled(
+ $new_img,
+ $src_img,
+ 0, 0, 0, 0,
+ $new_width,
+ $new_height,
+ $img_width,
+ $img_height
+ ) && $write_image($new_img, $new_file_path, $image_quality);
+ // Free up memory (imagedestroy does not delete files):
+ @imagedestroy($src_img);
+ @imagedestroy($new_img);
+ return $success;
+ }
+
+ protected function get_error_message($error) {
+ return array_key_exists($error, $this->error_messages) ?
+ $this->error_messages[$error] : $error;
+ }
+
+ function get_config_bytes($val) {
+ $val = trim($val);
+ $last = strtolower($val[strlen($val)-1]);
+ switch($last) {
+ case 'g':
+ $val *= 1024;
+ case 'm':
+ $val *= 1024;
+ case 'k':
+ $val *= 1024;
+ }
+ return $this->fix_integer_overflow($val);
+ }
+
+ protected function validate($uploaded_file, $file, $error, $index) {
+ if ($error) {
+ $file->error = $this->get_error_message($error);
+ return false;
+ }
+ $content_length = $this->fix_integer_overflow(intval($_SERVER['CONTENT_LENGTH']));
+ $post_max_size = $this->get_config_bytes(ini_get('post_max_size'));
+ if ($post_max_size && ($content_length > $post_max_size)) {
+ $file->error = $this->get_error_message('post_max_size');
+ return false;
+ }
+ if (!preg_match($this->options['accept_file_types'], $file->name)) {
+ $file->error = $this->get_error_message('accept_file_types');
+ return false;
+ }
+ if ($uploaded_file && is_uploaded_file($uploaded_file)) {
+ $file_size = $this->get_file_size($uploaded_file);
+ } else {
+ $file_size = $content_length;
+ }
+ if ($this->options['max_file_size'] && (
+ $file_size > $this->options['max_file_size'] ||
+ $file->size > $this->options['max_file_size'])
+ ) {
+ $file->error = $this->get_error_message('max_file_size');
+ return false;
+ }
+ if ($this->options['min_file_size'] &&
+ $file_size < $this->options['min_file_size']) {
+ $file->error = $this->get_error_message('min_file_size');
+ return false;
+ }
+ if (is_int($this->options['max_number_of_files']) && (
+ $this->count_file_objects() >= $this->options['max_number_of_files'])
+ ) {
+ $file->error = $this->get_error_message('max_number_of_files');
+ return false;
+ }
+ list($img_width, $img_height) = @getimagesize($uploaded_file);
+ if (is_int($img_width)) {
+ if ($this->options['max_width'] && $img_width > $this->options['max_width']) {
+ $file->error = $this->get_error_message('max_width');
+ return false;
+ }
+ if ($this->options['max_height'] && $img_height > $this->options['max_height']) {
+ $file->error = $this->get_error_message('max_height');
+ return false;
+ }
+ if ($this->options['min_width'] && $img_width < $this->options['min_width']) {
+ $file->error = $this->get_error_message('min_width');
+ return false;
+ }
+ if ($this->options['min_height'] && $img_height < $this->options['min_height']) {
+ $file->error = $this->get_error_message('min_height');
+ return false;
+ }
+ }
+ return true;
+ }
+
+ protected function upcount_name_callback($matches) {
+ $index = isset($matches[1]) ? intval($matches[1]) + 1 : 1;
+ $ext = isset($matches[2]) ? $matches[2] : '';
+ return ' ('.$index.')'.$ext;
+ }
+
+ protected function upcount_name($name) {
+ return preg_replace_callback(
+ '/(?:(?: \(([\d]+)\))?(\.[^.]+))?$/',
+ array($this, 'upcount_name_callback'),
+ $name,
+ 1
+ );
+ }
+
+ protected function get_unique_filename($name, $type, $index, $content_range) {
+ while(is_dir($this->get_upload_path($name))) {
+ $name = $this->upcount_name($name);
+ }
+ // Keep an existing filename if this is part of a chunked upload:
+ $uploaded_bytes = $this->fix_integer_overflow(intval($content_range[1]));
+ while(is_file($this->get_upload_path($name))) {
+ if ($uploaded_bytes === $this->get_file_size(
+ $this->get_upload_path($name))) {
+ break;
+ }
+ $name = $this->upcount_name($name);
+ }
+ return $name;
+ }
+
+ protected function trim_file_name($name, $type, $index, $content_range) {
+ // Remove path information and dots around the filename, to prevent uploading
+ // into different directories or replacing hidden system files.
+ // Also remove control characters and spaces (\x00..\x20) around the filename:
+ $name = trim(basename(stripslashes($name)), ".\x00..\x20");
+ // Use a timestamp for empty filenames:
+ if (!$name) {
+ $name = str_replace('.', '-', microtime(true));
+ }
+ // Add missing file extension for known image types:
+ if (strpos($name, '.') === false &&
+ preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) {
+ $name .= '.'.$matches[1];
+ }
+ return $name;
+ }
+
+ protected function get_file_name($name, $type, $index, $content_range) {
+ return $this->get_unique_filename(
+ $this->trim_file_name($name, $type, $index, $content_range),
+ $type,
+ $index,
+ $content_range
+ );
+ }
+
+ protected function handle_form_data($file, $index) {
+ // Handle form data, e.g. $_REQUEST['description'][$index]
+ }
+
+ protected function orient_image($file_path) {
+ if (!function_exists('exif_read_data')) {
+ return false;
+ }
+ $exif = @exif_read_data($file_path);
+ if ($exif === false) {
+ return false;
+ }
+ $orientation = intval(@$exif['Orientation']);
+ if (!in_array($orientation, array(3, 6, 8))) {
+ return false;
+ }
+ $image = @imagecreatefromjpeg($file_path);
+ switch ($orientation) {
+ case 3:
+ $image = @imagerotate($image, 180, 0);
+ break;
+ case 6:
+ $image = @imagerotate($image, 270, 0);
+ break;
+ case 8:
+ $image = @imagerotate($image, 90, 0);
+ break;
+ default:
+ return false;
+ }
+ $success = imagejpeg($image, $file_path);
+ // Free up memory (imagedestroy does not delete files):
+ @imagedestroy($image);
+ return $success;
+ }
+
+ protected function handle_file_upload($uploaded_file, $name, $size, $type, $error,
+ $index = null, $content_range = null) {
+ global $xoopsUser, $SmallWorldDB;
+ $file = new stdClass();
+
+ $file->name = $this->get_file_name($name, $type, $index, $content_range);
+ $file->size = $this->fix_integer_overflow(intval($size));
+ $file->type = $type;
+
+ // Save to database for later use
+ $db = new SmallWorldDB;
+ $userid = $xoopsUser->getVar('uid');
+
+ // Generate new name for file
+ $file->name = basename(stripslashes($name));
+ $file->name = time().rand(0,99999).".".$this->getFileExtension($name);
+ $img = XOOPS_URL."/uploads/albums_smallworld/".$userid."/".$file->name;
+ $db->saveImage ("'', '".$userid."', '".$file->name."', '".addslashes($img)."', '".time()."', ''");
+
+ if ($this->validate($uploaded_file, $file, $error, $index)) {
+ $this->handle_form_data($file, $index);
+ $upload_dir = $this->get_upload_path();
+ if (!is_dir($upload_dir)) {
+ mkdir($upload_dir, $this->options['mkdir_mode'], true);
+ }
+ $file_path = $this->get_upload_path($file->name);
+ $append_file = $content_range && is_file($file_path) &&
+ $file->size > $this->get_file_size($file_path);
+ if ($uploaded_file && is_uploaded_file($uploaded_file)) {
+ // multipart/formdata uploads (POST method uploads)
+ if ($append_file) {
+ file_put_contents(
+ $file_path,
+ fopen($uploaded_file, 'r'),
+ FILE_APPEND
+ );
+ } else {
+ move_uploaded_file($uploaded_file, $file_path);
+ }
+ } else {
+ // Non-multipart uploads (PUT method support)
+ file_put_contents(
+ $file_path,
+ fopen('php://input', 'r'),
+ $append_file ? FILE_APPEND : 0
+ );
+ }
+ $file_size = $this->get_file_size($file_path, $append_file);
+ if ($file_size === $file->size) {
+ if ($this->options['orient_image']) {
+ $this->orient_image($file_path);
+ }
+ $file->url = $this->get_download_url($file->name);
+ foreach($this->options['image_versions'] as $version => $options) {
+ if ($this->create_scaled_image($file->name, $version, $options)) {
+ if (!empty($version)) {
+ $file->{$version.'_url'} = $this->get_download_url(
+ $file->name,
+ $version
+ );
+ } else {
+ $file_size = $this->get_file_size($file_path, true);
+ }
+ }
+ }
+ } else if (!$content_range && $this->options['discard_aborted_uploads']) {
+ unlink($file_path);
+ $file->error = 'abort';
+ }
+ $file->size = $file_size;
+ $this->set_file_delete_properties($file);
+ }
+ return $file;
+ }
+
+ //function to return file extension from a path or file name
+ function getFileExtension($path){
+ $parts=pathinfo($path);
+ return $parts['extension'];
+ }
+
+ protected function readfile($file_path) {
+ return readfile($file_path);
+ }
+
+ protected function body($str) {
+ echo $str;
+ }
+
+ protected function header($str) {
+ header($str);
+ }
+
+ protected function generate_response($content, $print_response = true) {
+ if ($print_response) {
+ $json = json_encode($content);
+ $redirect = isset($_REQUEST['redirect']) ?
+ stripslashes($_REQUEST['redirect']) : null;
+ if ($redirect) {
+ $this->header('Location: '.sprintf($redirect, rawurlencode($json)));
+ return;
+ }
+ $this->head();
+ if (isset($_SERVER['HTTP_CONTENT_RANGE'])) {
+ $files = isset($content[$this->options['param_name']]) ?
+ $content[$this->options['param_name']] : null;
+ if ($files && is_array($files) && is_object($files[0]) && $files[0]->size) {
+ $this->header('Range: 0-'.($this->fix_integer_overflow(intval($files[0]->size)) - 1));
+ }
+ }
+ $this->body($json);
+ }
+ return $content;
+ }
+
+ protected function get_version_param() {
+ return isset($_GET['version']) ? basename(stripslashes($_GET['version'])) : null;
+ }
+
+ protected function get_file_name_param() {
+ return isset($_GET['file']) ? basename(stripslashes($_GET['file'])) : null;
+ }
+
+ protected function get_file_type($file_path) {
+ switch (strtolower(pathinfo($file_path, PATHINFO_EXTENSION))) {
+ case 'jpeg':
+ case 'jpg':
+ return 'image/jpeg';
+ case 'png':
+ return 'image/png';
+ case 'gif':
+ return 'image/gif';
+ default:
+ return '';
+ }
+ }
+
+ protected function download() {
+ if (!$this->options['download_via_php']) {
+ $this->header('HTTP/1.1 403 Forbidden');
+ return;
+ }
+ $file_name = $this->get_file_name_param();
+ if ($this->is_valid_file_object($file_name)) {
+ $file_path = $this->get_upload_path($file_name, $this->get_version_param());
+ if (is_file($file_path)) {
+ if (!preg_match($this->options['inline_file_types'], $file_name)) {
+ $this->header('Content-Description: File Transfer');
+ $this->header('Content-Type: application/octet-stream');
+ $this->header('Content-Disposition: attachment; filename="'.$file_name.'"');
+ $this->header('Content-Transfer-Encoding: binary');
+ } else {
+ // Prevent Internet Explorer from MIME-sniffing the content-type:
+ $this->header('X-Content-Type-Options: nosniff');
+ $this->header('Content-Type: '.$this->get_file_type($file_path));
+ $this->header('Content-Disposition: inline; filename="'.$file_name.'"');
+ }
+ $this->header('Content-Length: '.$this->get_file_size($file_path));
+ $this->header('Last-Modified: '.gmdate('D, d M Y H:i:s T', filemtime($file_path)));
+ $this->readfile($file_path);
+ }
+ }
+ }
+
+ protected function send_content_type_header() {
+ $this->header('Vary: Accept');
+ if (isset($_SERVER['HTTP_ACCEPT']) &&
+ (strpos($_SERVER['HTTP_ACCEPT'], 'application/json') !== false)) {
+ $this->header('Content-type: application/json');
+ } else {
+ $this->header('Content-type: text/plain');
+ }
+ }
+
+ protected function send_access_control_headers() {
+ $this->header('Access-Control-Allow-Origin: '.$this->options['access_control_allow_origin']);
+ $this->header('Access-Control-Allow-Credentials: '
+ .($this->options['access_control_allow_credentials'] ? 'true' : 'false'));
+ $this->header('Access-Control-Allow-Methods: '
+ .implode(', ', $this->options['access_control_allow_methods']));
+ $this->header('Access-Control-Allow-Headers: '
+ .implode(', ', $this->options['access_control_allow_headers']));
+ }
+
+ public function head() {
+ $this->header('Pragma: no-cache');
+ $this->header('Cache-Control: no-store, no-cache, must-revalidate');
+ $this->header('Content-Disposition: inline; filename="files.json"');
+ // Prevent Internet Explorer from MIME-sniffing the content-type:
+ $this->header('X-Content-Type-Options: nosniff');
+ if ($this->options['access_control_allow_origin']) {
+ $this->send_access_control_headers();
+ }
+ $this->send_content_type_header();
+ }
+
+ public function get($print_response = true) {
+ if ($print_response && isset($_GET['download'])) {
+ return $this->download();
+ }
+ $file_name = $this->get_file_name_param();
+ if ($file_name) {
+ $response = array(
+ substr($this->options['param_name'], 0, -1) => $this->get_file_object($file_name)
+ );
+ } else {
+ $response = array(
+ $this->options['param_name'] => $this->get_file_objects()
+ );
+ }
+ return $this->generate_response($response, $print_response);
+ }
+
+ public function post($print_response = true) {
+ if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
+ return $this->delete($print_response);
+ }
+ $upload = isset($_FILES[$this->options['param_name']]) ?
+ $_FILES[$this->options['param_name']] : null;
+ // Parse the Content-Disposition header, if available:
+ $file_name = isset($_SERVER['HTTP_CONTENT_DISPOSITION']) ?
+ rawurldecode(preg_replace(
+ '/(^[^"]+")|("$)/',
+ '',
+ $_SERVER['HTTP_CONTENT_DISPOSITION']
+ )) : null;
+ // Parse the Content-Range header, which has the following form:
+ // Content-Range: bytes 0-524287/2000000
+ $content_range = isset($_SERVER['HTTP_CONTENT_RANGE']) ?
+ preg_split('/[^0-9]+/', $_SERVER['HTTP_CONTENT_RANGE']) : null;
+ $size = $content_range ? $content_range[3] : null;
+ $files = array();
+ if ($upload && is_array($upload['tmp_name'])) {
+ // param_name is an array identifier like "files[]",
+ // $_FILES is a multi-dimensional array:
+ foreach ($upload['tmp_name'] as $index => $value) {
+ $files[] = $this->handle_file_upload(
+ $upload['tmp_name'][$index],
+ $file_name ? $file_name : $upload['name'][$index],
+ $size ? $size : $upload['size'][$index],
+ $upload['type'][$index],
+ $upload['error'][$index],
+ $index,
+ $content_range
+ );
+ }
+ } else {
+ // param_name is a single object identifier like "file",
+ // $_FILES is a one-dimensional array:
+ $files[] = $this->handle_file_upload(
+ isset($upload['tmp_name']) ? $upload['tmp_name'] : null,
+ $file_name ? $file_name : (isset($upload['name']) ?
+ $upload['name'] : null),
+ $size ? $size : (isset($upload['size']) ?
+ $upload['size'] : $_SERVER['CONTENT_LENGTH']),
+ isset($upload['type']) ?
+ $upload['type'] : $_SERVER['CONTENT_TYPE'],
+ isset($upload['error']) ? $upload['error'] : null,
+ null,
+ $content_range
+ );
+ }
+ return $this->generate_response(
+ array($this->options['param_name'] => $files),
+ $print_response
+ );
+ }
+
+ public function delete($print_response = true) {
+ global $xoopsUser;
+ $userid = $xoopsUser->getVar('uid');
+ $db = new SmallWorldDB;
+ $file_name = $this->get_file_name_param();
+ $file_path = $this->get_upload_path($file_name);
+ $success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);
+
+ // Delete file based on user and filename
+ $db->DeleteImage ($userid, $file_name);
+ $db->DeleteImage ($userid, 'Thumbs.db');
+
+ if ($success) {
+ foreach($this->options['image_versions'] as $version => $options) {
+ if (!empty($version)) {
+ $file = $this->get_upload_path($file_name, $version);
+ if (is_file($file)) {
+ unlink($file);
+ }
+ }
+ }
+ }
+ return $this->generate_response(array('success' => $success), $print_response);
+ }
+
+}
Modified: XoopsModules/smallworld/trunk/smallworld/img_upload.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/img_upload.php 2013-02-11 16:04:59 UTC (rev 10210)
+++ XoopsModules/smallworld/trunk/smallworld/img_upload.php 2013-02-11 16:06:28 UTC (rev 10211)
@@ -26,12 +26,37 @@
include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
if ($xoopsUser) {
- global $xoTheme;
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-uix.js');
+ global $xoTheme;
+$xoopsLogger->activated = false;
+ //$xoTheme->addScript("http://code.jquery.com/jquery-migrate-1.0.0.js");
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/bootstrap.min.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/style.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/bootstrap-responsive.min.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/bootstrap-image-gallery.min.css');
+//$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/jquery.fileupload-ui.css');
+//$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/uploader/jquery.fileupload-ui-noscript.css');
+
+
+
+//$xoTheme->addScript("http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js");
+$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/vendor/jquery.ui.widget.js');
+$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/tmpl.js');
+$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/load-image.js');
+$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/canvas-to-blob.js');
+$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/bootstrap.js');
+$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/uploader/bootstrap-image-gallery.js');
+$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.iframe-transport.js');
+$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload.js');
+$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-fp.js');
+$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-ui.js');
+$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/main.js');
+
+ /* $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-uix.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload-ui.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.fileupload.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/upload_application.js');
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/jquery.fileupload-ui.css');
+ */
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.colorbox.js');
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/colorbox.css');
$id = $xoopsUser->getVar('uid');
@@ -46,7 +71,7 @@
// ------------ IMAGE UPLOADER ------------ //
// Image upload form
$upload = $item->uploadform ($id);
- $xoopsTpl->append('uploadform',$upload);
+ //$xoopsTpl->append('uploadform',$upload);
} else {
redirect_header("register.php", 1);
}
Modified: XoopsModules/smallworld/trunk/smallworld/imgupload.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/imgupload.php 2013-02-11 16:04:59 UTC (rev 10210)
+++ XoopsModules/smallworld/trunk/smallworld/imgupload.php 2013-02-11 16:06:28 UTC (rev 10211)
@@ -17,24 +17,22 @@
include_once("../../mainfile.php");
include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php");
include_once(XOOPS_ROOT_PATH."/modules/smallworld/include/functions.php");
+include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/UploadHandler.php");
if ($xoopsUser) {
$xoopsLogger->activated = false;
$img = new smallWorldImages;
$userID = $xoopsUser->getVar('uid');
$user = new XoopsUser($userID);
- $options = array(
+ /* $options = array(
'upload_dir' => XOOPS_ROOT_PATH.'/uploads/albums_smallworld/'.$userID."/",
'upload_url' => XOOPS_URL.'/uploads/albums_smallworld/'.$userID."/",
'thumbnails_dir' => XOOPS_ROOT_PATH.'/uploads/albums_smallworld'.'/'.$userID.'/thumbnails/',
- 'thumbnails_url' => XOOPS_URL.'/uploads/albums_smallworld'.'/'.$userID.'/thumbnails/',
- 'thumbnail_max_width' => 80,
- 'thumbnail_max_height' => 80,
- 'field_name' => 'file'
+ 'thumbnails_url' => XOOPS_URL.'/uploads/albums_smallworld'.'/'.$userID.'/thumbnails/'
);
+ */
+ $upload_handler = new UploadHandler();
- $upload_handler = new SmallworldUploadHandler($options);
-
- switch ($_SERVER['REQUEST_METHOD']) {
+ /*switch ($_SERVER['REQUEST_METHOD']) {
case 'HEAD':
case 'GET':
$upload_handler->get();
@@ -47,6 +45,6 @@
break;
default:
header('HTTP/1.0 405 Method Not Allowed');
- }
+ }*/
}
?>
\ No newline at end of file
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_imgupload.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_imgupload.html 2013-02-11 16:04:59 UTC (rev 10210)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_imgupload.html 2013-02-11 16:06:28 UTC (rev 10211)
@@ -1,32 +1,154 @@
- <{if $xoops_isuser}>
- <{if $check >= 1}>
- <div id="file_upload" class="smallworld_content" title="<{$smarty.const._SMALLWORLD_UPLOAD_TITLE}>">
- <{$smarty.const._SMALLWORLD_UPLOAD_HOWTO}>
- <{section name=i loop=$uploadform}>
- <{$uploadform[i]}>
- <{/section}>
- <table style="height:500px" class="files">
- <tr class="file_upload_template" style="display:none;">
- <td class="file_upload_preview"></td>
- <td class="file_name"></td>
- <td class="file_size"></td>
- <td class="file_upload_progress"><div></div></td>
- <td class="file_upload_start"><button><{$smarty.const._SMALLWORLD_IMAGES_START}></button></td>
- <td class="file_upload_cancel"><button><{$smarty.const._SMALLWORLD_IMAGES_CANCEL}></button></td>
- </tr>
- <tr class="file_download_template" style="height:59px;display:none;">
- <td style="vertical-align: middle;" class="file_download_preview"></td>
- <td style="vertical-align: middle;" class="file_name"><a></a></td>
- <td style="vertical-align: middle;" class="file_size"></td>
- <td style="vertical-align: middle;" class="file_download_delete" colspan="3"><button><{$smarty.const._SMALLWORLD_IMAGES_DELETE}></button></td>
- </tr>
- </table>
- <div class="file_upload_overall_progress"><div style="display:none;"></div></div>
- <div class="file_upload_buttons">
- <button class="file_upload_start"><{$smarty.const._SMALLWORLD_IMAGES_STARTALL}></button>
- <button class="file_upload_cancel"><{$smarty.const._SMALLWORLD_IMAGES_CANCELALL}></button>
- <button class="file_download_delete"><{$smarty.const._SMALLWORLD_IMAGES_DELETEALL}></button>
- </div>
- </div>
- <{/if}>
- <{/if}>
\ No newline at end of file
+<{if $xoops_isuser}>
+ <{if $check >= 1}>
+ <div id="file_upload" class="smallworld_content" title="<{$smarty.const._SMALLWORLD_UPLOAD_TITLE}>">
+ <div class="container">
+ <div class="page-header">
+ <h1><{$smarty.const._SMALLWORLD_UPLOAD_TITLE}></h1>
+ </div>
+ <blockquote>
+ <p><{$smarty.const._SMALLWORLD_UPLOAD_HOWTO}></p>
+ </blockquote>
+ <br>
+ <!-- The file upload form used as target for the file upload widget -->
+ <form id="fileupload" action="imgupload.php" method="POST" enctype="multipart/form-data">
+ <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
+ <div class="row fileupload-buttonbar">
+ <div class="span7">
+ <!-- The fileinput-button span is used to style the file input field as button -->
+ <span class="btn btn-success fileinput-button">
+ <i class="icon-plus icon-white"></i>
+ <span>Add files...</span>
+ <input type="file" name="files[]" multiple>
+ </span>
+ <button type="submit" class="btn btn-primary start">
+ <i class="icon-upload icon-white"></i>
+ <span><{$smarty.const._SMALLWORLD_IMAGES_START}></span>
+ </button>
+ <button type="reset" class="btn btn-warning cancel">
+ <i class="icon-ban-circle icon-white"></i>
+ <span><{$smarty.const._SMALLWORLD_IMAGES_CANCEL}></span>
+ </button>
+ <button type="button" class="btn btn-danger delete">
+ <i class="icon-trash icon-white"></i>
+ <span><{$smarty.const._SMALLWORLD_IMAGES_DELETE}></span>
+ </button>
+ <input type="checkbox" class="toggle">
+ </div>
+ <!-- The global progress information -->
+ <div class="span5 fileupload-progress fade">
+ <!-- The global progress bar -->
+ <div class="progress progress-success progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100">
+ <div class="bar" style="width:0%;"></div>
+ </div>
+ <!-- The extended global progress information -->
+ <div class="progress-extended"> </div>
+ </div>
+ </div>
+ <!-- The loading indicator is shown during file processing -->
+ <div class="fileupload-loading"></div>
+ <br>
+ <!-- The table listing the files available for upload/download -->
+ <table role="presentation" class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
+ </form>
+ <br>
+ <div class="well">
+ <h3>Demo Notes</h3>
+ <ul>
+ <li>The maximum file size for uploads in this demo is <strong>5 MB</strong> (default file size is unlimited).</li>
+ <li>Only image files (<strong>JPG, GIF, PNG</strong>) are allowed in this demo (by default there is no file type restriction).</li>
+ <li>Uploaded files will be deleted automatically after <strong>5 minutes</strong> (demo setting).</li>
+ <li>You can <strong>drag & drop</strong> files from your desktop on this webpage with Google Chrome, Mozilla Firefox and Apple Safari.</li>
+ <li>Please refer to the <a href="https://github.com/blueimp/jQuery-File-Upload">project website</a> and <a href="https://github.com/blueimp/jQuery-File-Upload/wiki">documentation</a> for more information.</li>
+ <li>Built with Twitter's <a href="http://twitter.github.com/bootstrap/">Bootstrap</a> toolkit and Icons from <a href="http://glyphicons.com/">Glyphicons</a>.</li>
+ </ul>
+ </div>
+ </div>
+<!-- modal-gallery is the modal dialog used for the image gallery -->
+<div id="modal-gallery" class="modal modal-gallery hide fade" data-filter=":odd" tabindex="-1">
+ <div class="modal-header">
+ <a class="close" data-dismiss="modal">×</a>
+ <h3 class="modal-title"></h3>
+ </div>
+ <div class="modal-body"><div class="modal-image"></div></div>
+ <div class="modal-footer">
+ <a class="btn modal-download" target="_blank">
+ <i class="icon-download"></i>
+ <span><{$smarty.const._SMALLWORLD_IMAGES_DOWNLOAD}></span>
+ </a>
+ <a class="btn btn-success modal-play modal-slideshow" data-slideshow="5000">
+ <i class="icon-play icon-white"></i>
+ <span><{$smarty.const._SMALLWORLD_IMAGES_SLIDESHOW}></span>
+ </a>
+ <a class="btn btn-info modal-prev">
+ <i class="icon-arrow-left icon-white"></i>
+ <span><{$smarty.const._SMALLWORLD_IMAGES_PREVIOUS}></span>
+ </a>
+ <a class="btn btn-primary modal-next">
+ <span><{$smarty.const._SMALLWORLD_IMAGES_NEXT}></span>
+ <i class="icon-arrow-right icon-white"></i>
+ </a>
+ </div>
+</div>
+ <!-- The template to display files available for upload -->
+ <script id="template-upload" type="text/x-tmpl">
+ {% for (var i=0, file; file=o.files[i]; i++) { %}
+ <tr class="template-upload fade">
+ <td class="preview"><span class="fade"></span></td>
+ <td class="name"><span>{%=file.name%}</span></td>
+ <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+ {% if (file.error) { %}
+ <td class="error" colspan="2"><span class="label label-important">Error</span> {%=file.error%}</td>
+ {% } else if (o.files.valid && !i) { %}
+ <td>
+ <div class="progress progress-success progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="bar" style="width:0%;"></div></div>
+ </td>
+ <td class="start">{% if (!o.options.autoUpload) { %}
+ <button class="btn btn-primary">
+ <i class="icon-upload icon-white"></i>
+ <span><{$smarty.const._SMALLWORLD_IMAGES_START}></span>
+ </button>
+ {% } %}</td>
+ {% } else { %}
+ <td colspan="2"></td>
+ {% } %}
+ <td class="cancel">{% if (!i) { %}
+ <button class="btn btn-warning">
+ <i class="icon-ban-circle icon-white"></i>
+ <span><{$smarty.const._SMALLWORLD_IMAGES_CANCEL}></span>
+ </button>
+ {% } %}</td>
+ </tr>
+ {% } %}
+ </script>
+ <!-- The template to display files available for download -->
+ <script id="template-download" type="text/x-tmpl">
+ {% for (var i=0, file; file=o.files[i]; i++) { %}
+ <tr class="template-download fade">
+ {% if (file.error) { %}
+ <td></td>
+ <td class="name"><span>{%=file.name%}</span></td>
+ <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+ <td class="error" colspan="2"><span class="label label-important">Error</span> {%=file.error%}</td>
+ {% } else { %}
+ <td class="preview">{% if (file.thumbnails_url) { %}
+ <a href="{%=file.url%}" title="{%=file.name%}" data-gallery="gallery" download="{%=file.name%}"><img src="{%=file.thumbnails_url%}"></a>
+ {% } %}</td>
+ <td class="name">
+ <a href="{%=file.url%}" title="{%=file.name%}" data-gallery="{%=file.thumbnails_url&&'gallery'%}" download="{%=file.name%}">{%=file.name%}</a>
+ </td>
+ <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+ <td colspan="2"></td>
+ {% } %}
+ <td class="delete">
+ <button class="btn btn-danger" data-type="{%=file.delete_type%}" data-url="{%=file.delete_url%}"{% if (file.delete_with_credentials) { %} data-xhr-fields='{"withCredentials":true}'{% } %}>
+ <i class="icon-trash icon-white"></i>
+ <span><{$smarty.const._SMALLWORLD_IMAGES_DELETE}></span>
+ </button>
+ <input type="checkbox" name="delete" value="1">
+ </td>
+ </tr>
+ {% } %}
+ </script>
+ </div>
+ <{/if}>
+<{/if}>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
