From 665c2c33375f215c6c3d75b768b03020ee429e6b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 30 Nov 2019 12:06:51 -0500 Subject: [PATCH 1/4] [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 @@ + +
+ +
+ + -- 2.43.5 From d2ef577d93ba48a35c1581a297f8a578e5a7780d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 1 Dec 2019 16:33:19 -0500 Subject: [PATCH 2/4] [js_upload] Restore public image upload --- js_upload/templates/js_upload.tpl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/js_upload/templates/js_upload.tpl b/js_upload/templates/js_upload.tpl index 4f0ad14f..f45b495c 100644 --- a/js_upload/templates/js_upload.tpl +++ b/js_upload/templates/js_upload.tpl @@ -34,14 +34,19 @@ let newalbumElm = document.getElementById('photos-upload-newalbum'); let albumElm = document.getElementById('photos-upload-album-select'); + let contact_allow = document.querySelector('[name="contact_allow"]:not(:disabled)'); + let group_allow = document.querySelector('[name="group_allow"]:not(:disabled)'); + let contact_deny = document.querySelector('[name="contact_deny"]:not(:disabled)'); + let group_deny = document.querySelector('[name="group_deny"]:not(:disabled)'); + uploader.setParams({ newalbum : newalbumElm ? newalbumElm.value : '', album : albumElm ? albumElm.value : '', not_visible : document.getElementById('photos-upload-noshare').checked, - contact_allow : document.querySelector('[name="contact_allow"]').value, - group_allow : document.querySelector('[name="group_allow"]').value, - contact_deny : document.querySelector('[name="contact_deny"]').value, - group_deny : document.querySelector('[name="group_deny"]').value, + contact_allow : contact_allow ? contact_allow.value : '', + group_allow : group_allow ? group_allow.value : '', + contact_deny : contact_deny ? contact_deny.value : '', + group_deny : group_deny ? group_deny.value : '', }); } }); -- 2.43.5 From a797db56adae86bc52a7a1c639da4c6878fad097 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2019 19:21:35 +0000 Subject: [PATCH 3/4] Bump symfony/cache from 3.4.8 to 3.4.36 in /advancedcontentfilter Bumps [symfony/cache](https://github.com/symfony/cache) from 3.4.8 to 3.4.36. - [Release notes](https://github.com/symfony/cache/releases) - [Changelog](https://github.com/symfony/cache/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/cache/compare/v3.4.8...v3.4.36) Signed-off-by: dependabot[bot] --- advancedcontentfilter/composer.lock | 37 +++++++++++++++-------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/advancedcontentfilter/composer.lock b/advancedcontentfilter/composer.lock index 0b0114db..774b5ec8 100644 --- a/advancedcontentfilter/composer.lock +++ b/advancedcontentfilter/composer.lock @@ -1,7 +1,7 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], "content-hash": "d0e3662dd9d910ffe4f71d325bc39319", @@ -35,6 +35,7 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", + "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, { @@ -280,16 +281,16 @@ }, { "name": "psr/log", - "version": "1.0.2", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "shasum": "" }, "require": { @@ -298,7 +299,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -323,7 +324,7 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2019-11-01T11:05:21+00:00" }, { "name": "psr/simple-cache", @@ -446,16 +447,16 @@ }, { "name": "symfony/cache", - "version": "v3.4.8", + "version": "v3.4.36", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "13255ddd056e49f3154747943f8ee175d555d394" + "reference": "3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/13255ddd056e49f3154747943f8ee175d555d394", - "reference": "13255ddd056e49f3154747943f8ee175d555d394", + "url": "https://api.github.com/repos/symfony/cache/zipball/3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3", + "reference": "3d9f46a6960fd5cd7f030f86adc5b4b63bcfa4e3", "shasum": "" }, "require": { @@ -512,7 +513,7 @@ "caching", "psr6" ], - "time": "2018-04-02T14:35:16+00:00" + "time": "2019-12-01T10:45:41+00:00" }, { "name": "symfony/expression-language", @@ -566,16 +567,16 @@ }, { "name": "symfony/polyfill-apcu", - "version": "v1.7.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00" + "reference": "a8e961c841b9ec52927a87914f8820a1ad8f8116" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/e8ae2136ddb53dea314df56fcd88e318ab936c00", - "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a8e961c841b9ec52927a87914f8820a1ad8f8116", + "reference": "a8e961c841b9ec52927a87914f8820a1ad8f8116", "shasum": "" }, "require": { @@ -584,7 +585,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -618,7 +619,7 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2019-11-27T13:56:44+00:00" } ], "packages-dev": [], -- 2.43.5 From 1b08661d9d4387f47e83e1ac5ce34f925326c43b Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 7 Dec 2019 21:56:43 +0000 Subject: [PATCH 4/4] Issue 7916: Buffer is unsupported now --- buffer/buffer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/buffer/buffer.php b/buffer/buffer.php index 689127cf..13b5309d 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -4,6 +4,7 @@ * Description: Post to Buffer (Facebook Pages, LinkedIn, Twitter) * Version: 0.2 * Author: Michael Vogel + * Status: Unsupported */ require 'addon/buffer/bufferapp.php'; -- 2.43.5