X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js_upload%2Fjs_upload.php;h=089cb7e214802739e5a921487bda2726adee421f;hb=d685663ac068584d4ed88f5424ab74ef55a4d9c1;hp=d4f0ec1eada10332a83895041c503860738ad857;hpb=c3fdf45b6dff82146a5f0c617d7f33df0cb12267;p=friendica-addons.git diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php index d4f0ec1e..089cb7e2 100644 --- a/js_upload/js_upload.php +++ b/js_upload/js_upload.php @@ -1,358 +1,256 @@ + * Maintainer: Hypolite Petovan */ -/** - * - * JavaScript Photo/Image Uploader - * - * Uses Valum 'qq' Uploader. - * Module Author: Chris Case - * - */ -use Friendica\Core\Addon; -use Friendica\Core\Config; -use Friendica\Core\L10n; +use Friendica\App; +use Friendica\Core\Hook; use Friendica\Core\Logger; - -function js_upload_install() { - Addon::registerHook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form'); - Addon::registerHook('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init'); - Addon::registerHook('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file'); - Addon::registerHook('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end'); -} - - -function js_upload_uninstall() { - Addon::unregisterHook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form'); - Addon::unregisterHook('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init'); - Addon::unregisterHook('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file'); - Addon::unregisterHook('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end'); +use Friendica\Core\Renderer; +use Friendica\DI; +use Friendica\Util\Strings; + +global $js_upload_jsonresponse; +global $js_upload_result; + +function js_upload_install() +{ + Hook::register('photo_upload_form', __FILE__, 'js_upload_form'); + Hook::register('photo_post_init', __FILE__, 'js_upload_post_init'); + Hook::register('photo_post_file', __FILE__, 'js_upload_post_file'); + Hook::register('photo_post_end', __FILE__, 'js_upload_post_end'); } - -function js_upload_form(&$a,&$b) { - +function js_upload_form(array &$b) +{ $b['default_upload'] = false; - $b['addon_text'] .= ''; - $b['addon_text'] .= ''; - - $upload_msg = L10n::t('Select files for upload'); - $drop_msg = L10n::t('Drop files here to upload'); - $cancel = L10n::t('Cancel'); - $failed = L10n::t('Failed'); - - $maximagesize = intval(Config::get('system','maximagesize')); - - $b['addon_text'] .= <<< EOT - -
- -
- - - -EOT; - - -} - -function js_upload_post_init(&$a,&$b) { - - // list of valid extensions, ex. array("jpeg", "xml", "bmp") - - $allowedExtensions = ["jpeg","gif","png","jpg"]; + // list of valid extensions + $allowedExtensions = ['jpeg', 'gif', 'png', 'jpg']; // max file size in bytes - - $sizeLimit = Config::get('system','maximagesize'); //6 * 1024 * 1024; + $sizeLimit = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')); $uploader = new qqFileUploader($allowedExtensions, $sizeLimit); $result = $uploader->handleUpload(); - // to pass data through iframe you will need to encode all html tags - $a->data['upload_jsonresponse'] = htmlspecialchars(json_encode($result), ENT_NOQUOTES); + $js_upload_jsonresponse = htmlspecialchars(json_encode($result), ENT_NOQUOTES); - if(isset($result['error'])) { - Logger::log('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , Logger::DEBUG); + if (isset($result['error'])) { + Logger::info('mod/photos.php: photos_post(): error uploading photo: ' . $result['error']); echo json_encode($result); - killme(); + exit(); } - $a->data['upload_result'] = $result; - + $js_upload_result = $result; } -function js_upload_post_file(&$a,&$b) { +function js_upload_post_file(array &$b) +{ + global $js_upload_result; - $result = $a->data['upload_result']; + $result = $js_upload_result; - $b['src'] = $result['path']; - $b['filename'] = $result['filename']; - $b['filesize'] = filesize($b['src']); + $b['src'] = $result['path']; + $b['filename'] = $result['filename']; + $b['filesize'] = filesize($b['src']); } +function js_upload_post_end(int &$b) +{ + global $js_upload_jsonresponse; -function js_upload_post_end(&$a,&$b) { - -Logger::log('upload_post_end'); - if(x($a->data,'upload_jsonresponse')) { - echo $a->data['upload_jsonresponse']; - killme(); + Logger::notice('upload_post_end'); + if (!empty($js_upload_jsonresponse)) { + echo $js_upload_jsonresponse; + exit(); } - } - /** * Handle file uploads via XMLHttpRequest */ -class qqUploadedFileXhr { - +class qqUploadedFileXhr +{ private $pathnm = ''; - /** - * Save the file in the temp dir. - * @return boolean TRUE on success - */ - function save() { - $input = fopen("php://input", "r"); - - $upload_dir = Config::get('system','tempdir'); - if(! $upload_dir) + /** + * Save the file in the temp dir. + * + * @return boolean TRUE on success + */ + function save() + { + $input = fopen('php://input', 'r'); + + $upload_dir = DI::config()->get('system', 'tempdir'); + if (!$upload_dir) $upload_dir = sys_get_temp_dir(); - $this->pathnm = tempnam($upload_dir,'frn'); + $this->pathnm = tempnam($upload_dir, 'frn'); - $temp = fopen($this->pathnm,"w"); - $realSize = stream_copy_to_stream($input, $temp); + $temp = fopen($this->pathnm, 'w'); + $realSize = stream_copy_to_stream($input, $temp); - fclose($input); + fclose($input); fclose($temp); - if ($realSize != $this->getSize()){ - return false; - } - return true; - } + if ($realSize != $this->getSize()) { + return false; + } + return true; + } - function getPath() { + function getPath() + { return $this->pathnm; } - function getName() { - return $_GET['qqfile']; - } - - function getSize() { - if (isset($_SERVER["CONTENT_LENGTH"])){ - return (int)$_SERVER["CONTENT_LENGTH"]; - } else { - throw new Exception('Getting content length is not supported.'); - } - } + function getName() + { + return $_GET['qqfile']; + } + + function getSize() + { + if (isset($_SERVER['CONTENT_LENGTH'])) { + return (int)$_SERVER['CONTENT_LENGTH']; + } else { + throw new Exception('Getting content length is not supported.'); + } + } } /** * Handle file uploads via regular form post (uses the $_FILES array) */ +class qqUploadedFileForm +{ + /** + * Save the file to the specified path + * + * @return boolean TRUE on success + */ + function save() + { + return true; + } -class qqUploadedFileForm { - - - /** - * Save the file to the specified path - * @return boolean TRUE on success - */ - - - function save() { - return true; - } - - function getPath() { + function getPath() + { return $_FILES['qqfile']['tmp_name']; } - function getName() { - return $_FILES['qqfile']['name']; - } - function getSize() { - return $_FILES['qqfile']['size']; - } -} - -class qqFileUploader { - private $allowedExtensions = []; - private $sizeLimit = 10485760; - private $file; - - function __construct(array $allowedExtensions = [], $sizeLimit = 10485760){ - $allowedExtensions = array_map("strtolower", $allowedExtensions); - - $this->allowedExtensions = $allowedExtensions; - $this->sizeLimit = $sizeLimit; - - if (isset($_GET['qqfile'])) { - $this->file = new qqUploadedFileXhr(); - } elseif (isset($_FILES['qqfile'])) { - $this->file = new qqUploadedFileForm(); - } else { - $this->file = false; - } - - } - + function getName() + { + return $_FILES['qqfile']['name']; + } - private function toBytes($str){ - $val = trim($str); - $last = strtolower($str[strlen($str)-1]); - switch($last) { - case 'g': $val *= 1024; - case 'm': $val *= 1024; - case 'k': $val *= 1024; - } - return $val; - } + function getSize() + { + return $_FILES['qqfile']['size']; + } +} - /** - * Returns array('success'=>true) or array('error'=>'error message') - */ - function handleUpload(){ +class qqFileUploader +{ + private $allowedExtensions = []; + private $sizeLimit = 10485760; + private $file; + + function __construct(array $allowedExtensions = [], $sizeLimit = 10485760) + { + $allowedExtensions = array_map('strtolower', $allowedExtensions); + + $this->allowedExtensions = $allowedExtensions; + $this->sizeLimit = $sizeLimit; + + if (isset($_GET['qqfile'])) { + $this->file = new qqUploadedFileXhr(); + } elseif (isset($_FILES['qqfile'])) { + $this->file = new qqUploadedFileForm(); + } else { + $this->file = false; + } - if (!$this->file){ - return ['error' => L10n::t('No files were uploaded.')]; - } + } - $size = $this->file->getSize(); + /** + * Returns array('success'=>true) or array('error'=>'error message') + */ + function handleUpload() + { + if (!$this->file) { + return ['error' => DI::l10n()->t('No files were uploaded.')]; + } - if ($size == 0) { - return ['error' => L10n::t('Uploaded file is empty')]; - } + $size = $this->file->getSize(); -// if ($size > $this->sizeLimit) { + if ($size == 0) { + return ['error' => DI::l10n()->t('Uploaded file is empty')]; + } -// return array('error' => L10n::t('Uploaded file is too large')); -// } +// if ($size > $this->sizeLimit) { +// return array('error' => DI::l10n()->t('Uploaded file is too large')); +// } - $maximagesize = Config::get('system','maximagesize'); - if(($maximagesize) && ($size > $maximagesize)) { - return ['error' => L10n::t('Image exceeds size limit of ') . $maximagesize ]; + $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')); + if (($maximagesize) && ($size > $maximagesize)) { + return ['error' => DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize))]; } - $pathinfo = pathinfo($this->file->getName()); - $filename = $pathinfo['filename']; + $pathinfo = pathinfo($this->file->getName()); + $filename = $pathinfo['filename']; - $ext = $pathinfo['extension']; + if (!isset($pathinfo['extension'])) { + Logger::warning('extension isn\'t set.', ['filename' => $filename]); + } + $ext = $pathinfo['extension'] ?? ''; - if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){ - $these = implode(', ', $this->allowedExtensions); - return ['error' => L10n::t('File has an invalid extension, it should be one of ') . $these . '.']; - } + if ($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)) { + return ['error' => DI::l10n()->t('File has an invalid extension, it should be one of %s.', implode(', ', $this->allowedExtensions))]; + } - if ($this->file->save()){ - return [ - 'success'=>true, + if ($this->file->save()) { + return [ + 'success' => true, 'path' => $this->file->getPath(), 'filename' => $filename . '.' . $ext ]; - } else { - return [ - 'error'=> L10n::t('Upload was cancelled, or server error encountered'), + } else { + return [ + 'error' => DI::l10n()->t('Upload was cancelled, or server error encountered'), 'path' => $this->file->getPath(), 'filename' => $filename . '.' . $ext ]; - } - - } + } + } }