From 665c2c33375f215c6c3d75b768b03020ee429e6b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 30 Nov 2019 12:06:51 -0500 Subject: [PATCH] [js_upload] Rewrite addon after ACl changes - Move HTML to template - Remove redundant uninstall method - Enforce coding standards - Add type-hinting --- js_upload/js_upload.php | 290 ++++++++++-------------------- js_upload/templates/js_upload.tpl | 51 ++++++ 2 files changed, 147 insertions(+), 194 deletions(-) create mode 100644 js_upload/templates/js_upload.tpl diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php index 5a6c37c8..d0f92127 100644 --- a/js_upload/js_upload.php +++ b/js_upload/js_upload.php @@ -2,217 +2,110 @@ /** * Name: JS Uploader * Description: JavaScript photo/image uploader. Uses Valum 'qq' Uploader. - * Version: 1.0 + * Version: 1.1 * Author: Chris Case + * Maintainer: Hypolite Petovan */ -/** - * - * JavaScript Photo/Image Uploader - * - * Uses Valum 'qq' Uploader. - * Module Author: Chris Case - * - */ - +use Friendica\App; use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; +use Friendica\Core\Renderer; -function js_upload_install() { - Hook::register('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form'); - Hook::register('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init'); - Hook::register('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file'); - Hook::register('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end'); +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_uninstall() { - Hook::unregister('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form'); - Hook::unregister('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init'); - Hook::unregister('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file'); - Hook::unregister('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end'); -} - - -function js_upload_form(&$a,&$b) { - +function js_upload_form(App $a, array &$b) +{ $b['default_upload'] = false; - $b['addon_text'] .= ''; - $b['addon_text'] .= ''; + $a->page->registerStylesheet('addon/js_upload/file-uploader/client/fileuploader.css'); + $a->page->registerFooterScript('addon/js_upload/file-uploader/client/fileuploader.js'); - $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"]; +function js_upload_post_init(App $a, &$b) +{ + // list of valid extensions + $allowedExtensions = ['jpeg', 'gif', 'png', 'jpg']; // max file size in bytes - - $sizeLimit = Config::get('system','maximagesize'); //6 * 1024 * 1024; + $sizeLimit = 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); + $a->data['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::log('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'], Logger::DEBUG); echo json_encode($result); exit(); } $a->data['upload_result'] = $result; - } -function js_upload_post_file(&$a,&$b) { - +function js_upload_post_file(App $a, &$b) +{ $result = $a->data['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(&$a,&$b) { - -Logger::log('upload_post_end'); - if(!empty($a->data['upload_jsonresponse'])) { +function js_upload_post_end(App $a, &$b) +{ + Logger::log('upload_post_end'); + if (!empty($a->data['upload_jsonresponse'])) { echo $a->data['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"); + function save() + { + $input = fopen('php://input', 'r'); - $upload_dir = Config::get('system','tempdir'); - if(! $upload_dir) + $upload_dir = 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"); + $temp = fopen($this->pathnm, 'w'); $realSize = stream_copy_to_stream($input, $temp); fclose($input); @@ -224,17 +117,20 @@ class qqUploadedFileXhr { return true; } - function getPath() { + function getPath() + { return $this->pathnm; } - function getName() { + function getName() + { return $_GET['qqfile']; } - function getSize() { - if (isset($_SERVER["CONTENT_LENGTH"])){ - return (int)$_SERVER["CONTENT_LENGTH"]; + function getSize() + { + if (isset($_SERVER['CONTENT_LENGTH'])) { + return (int)$_SERVER['CONTENT_LENGTH']; } else { throw new Exception('Getting content length is not supported.'); } @@ -244,39 +140,43 @@ class qqUploadedFileXhr { /** * Handle file uploads via regular form post (uses the $_FILES array) */ - -class qqUploadedFileForm { - - +class qqUploadedFileForm +{ /** * Save the file to the specified path + * * @return boolean TRUE on success */ - - - function save() { + function save() + { return true; } - function getPath() { + function getPath() + { return $_FILES['qqfile']['tmp_name']; } - function getName() { + function getName() + { return $_FILES['qqfile']['name']; } - function getSize() { + + function getSize() + { return $_FILES['qqfile']['size']; } } -class qqFileUploader { +class qqFileUploader +{ private $allowedExtensions = []; private $sizeLimit = 10485760; private $file; - function __construct(array $allowedExtensions = [], $sizeLimit = 10485760){ - $allowedExtensions = array_map("strtolower", $allowedExtensions); + function __construct(array $allowedExtensions = [], $sizeLimit = 10485760) + { + $allowedExtensions = array_map('strtolower', $allowedExtensions); $this->allowedExtensions = $allowedExtensions; $this->sizeLimit = $sizeLimit; @@ -291,14 +191,17 @@ class qqFileUploader { } - - private function toBytes($str){ + 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; + $last = strtolower($str[strlen($str) - 1]); + switch ($last) { + case 'g': + $val *= 1024; + case 'm': + $val *= 1024; + case 'k': + $val *= 1024; } return $val; } @@ -306,8 +209,8 @@ class qqFileUploader { /** * Returns array('success'=>true) or array('error'=>'error message') */ - function handleUpload(){ - + function handleUpload() + { if (!$this->file) { return ['error' => L10n::t('No files were uploaded.')]; } @@ -324,10 +227,10 @@ class qqFileUploader { // } - $maximagesize = Config::get('system','maximagesize'); + $maximagesize = Config::get('system', 'maximagesize'); - if(($maximagesize) && ($size > $maximagesize)) { - return ['error' => L10n::t('Image exceeds size limit of ') . $maximagesize ]; + if (($maximagesize) && ($size > $maximagesize)) { + return ['error' => L10n::t('Image exceeds size limit of ') . $maximagesize]; } @@ -339,24 +242,23 @@ class qqFileUploader { } $ext = $pathinfo['extension'] ?? ''; - if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){ + 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->file->save()){ + if ($this->file->save()) { return [ - 'success' => true, - 'path' => $this->file->getPath(), + 'success' => true, + 'path' => $this->file->getPath(), 'filename' => $filename . '.' . $ext ]; } else { return [ - 'error' => L10n::t('Upload was cancelled, or server error encountered'), - 'path' => $this->file->getPath(), + 'error' => L10n::t('Upload was cancelled, or server error encountered'), + 'path' => $this->file->getPath(), 'filename' => $filename . '.' . $ext ]; } - } } diff --git a/js_upload/templates/js_upload.tpl b/js_upload/templates/js_upload.tpl new file mode 100644 index 00000000..4f0ad14f --- /dev/null +++ b/js_upload/templates/js_upload.tpl @@ -0,0 +1,51 @@ + +
+ +
+ +