<?php
/**
* Name: JS Uploader
- * Description: JavaScript photo/image uploader. Uses Valum 'qq' Uploader.
+ * Description: JavaScript photo/image uploader. Helpful for uploading multiple files at once. Uses Valum 'qq' Uploader.
* Version: 1.1
* Author: Chris Case <http://friendika.openmindspace.org/profile/chris_case>
* Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>
*/
use Friendica\App;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
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_post_end', __FILE__, 'js_upload_post_end');
}
-function js_upload_form(App $a, array &$b)
+function js_upload_form(array &$b)
{
$b['default_upload'] = false;
- DI::page()->registerStylesheet('addon/js_upload/file-uploader/client/fileuploader.css');
- DI::page()->registerFooterScript('addon/js_upload/file-uploader/client/fileuploader.js');
+ DI::page()->registerStylesheet(__DIR__ . '/file-uploader/client/fileuploader.css');
+ DI::page()->registerFooterScript(__DIR__ . '/file-uploader/client/fileuploader.js');
$tpl = Renderer::getMarkupTemplate('js_upload.tpl', 'addon/js_upload');
$b['addon_text'] .= Renderer::replaceMacros($tpl, [
- '$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'),
+ '$upload_msg' => DI::l10n()->t('Select files for upload'),
+ '$drop_msg' => DI::l10n()->t('Drop files here to upload'),
+ '$cancel' => DI::l10n()->t('Cancel'),
+ '$failed' => DI::l10n()->t('Failed'),
'$post_url' => $b['post_url'],
- '$maximagesize' => intval(Config::get('system', 'maximagesize')),
+ '$maximagesize' => Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')),
]);
}
-function js_upload_post_init(App $a, &$b)
+function js_upload_post_init(array &$b)
{
+ global $js_upload_result, $js_upload_jsonresponse;
+
// list of valid extensions
$allowedExtensions = ['jpeg', 'gif', 'png', 'jpg'];
// max file size in bytes
- $sizeLimit = Config::get('system', 'maximagesize');
+ $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);
+ Logger::info('mod/photos.php: photos_post(): error uploading photo: ' . $result['error']);
echo json_encode($result);
exit();
}
- $a->data['upload_result'] = $result;
+ $js_upload_result = $result;
}
-function js_upload_post_file(App $a, &$b)
+function js_upload_post_file(array &$b)
{
- $result = $a->data['upload_result'];
+ global $js_upload_result;
+
+ $result = $js_upload_result;
$b['src'] = $result['path'];
$b['filename'] = $result['filename'];
}
-function js_upload_post_end(App $a, &$b)
+function js_upload_post_end(int &$b)
{
- Logger::log('upload_post_end');
- if (!empty($a->data['upload_jsonresponse'])) {
- echo $a->data['upload_jsonresponse'];
+ global $js_upload_jsonresponse;
+
+ Logger::notice('upload_post_end');
+ if (!empty($js_upload_jsonresponse)) {
+ echo $js_upload_jsonresponse;
exit();
}
}
{
$input = fopen('php://input', 'r');
- $upload_dir = Config::get('system', 'tempdir');
+ $upload_dir = DI::config()->get('system', 'tempdir');
if (!$upload_dir)
$upload_dir = sys_get_temp_dir();
}
- 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;
- }
-
/**
* Returns array('success'=>true) or array('error'=>'error message')
*/
function handleUpload()
{
if (!$this->file) {
- return ['error' => L10n::t('No files were uploaded.')];
+ return ['error' => DI::l10n()->t('No files were uploaded.')];
}
$size = $this->file->getSize();
if ($size == 0) {
- return ['error' => L10n::t('Uploaded file is empty')];
+ return ['error' => DI::l10n()->t('Uploaded file is empty')];
}
// if ($size > $this->sizeLimit) {
-// return array('error' => L10n::t('Uploaded file is too large'));
+// return array('error' => DI::l10n()->t('Uploaded file is too large'));
// }
- $maximagesize = Config::get('system', 'maximagesize');
+ $maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
if (($maximagesize) && ($size > $maximagesize)) {
- return ['error' => L10n::t('Image exceeds size limit of ') . $maximagesize];
-
+ return ['error' => DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize))];
}
$pathinfo = pathinfo($this->file->getName());
$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 . '.'];
+ return ['error' => DI::l10n()->t('File has an invalid extension, it should be one of %s.', implode(', ', $this->allowedExtensions))];
}
if ($this->file->save()) {
];
} else {
return [
- 'error' => L10n::t('Upload was cancelled, or server error encountered'),
+ 'error' => DI::l10n()->t('Upload was cancelled, or server error encountered'),
'path' => $this->file->getPath(),
'filename' => $filename . '.' . $ext
];
projects / friendica-addons.git / blobdiff