mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2025-07-09 18:08:49 +00:00
Use short form array syntax everywhere
This commit is contained in:
Hypolite Petovan
parent
4ee41c64a3
commit
27b60e003f
68 changed files with 869 additions and 869 deletions
|
|
@ -11,7 +11,7 @@
|
|||
*
|
||||
* JavaScript Photo/Image Uploader
|
||||
*
|
||||
* Uses Valum 'qq' Uploader.
|
||||
* Uses Valum 'qq' Uploader.
|
||||
* Module Author: Chris Case
|
||||
*
|
||||
*/
|
||||
|
|
@ -41,7 +41,7 @@ function js_upload_form(&$a,&$b) {
|
|||
|
||||
$b['addon_text'] .= '<link href="' . $a->get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.css" rel="stylesheet" type="text/css">';
|
||||
$b['addon_text'] .= '<script src="' . $a->get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.js" type="text/javascript"></script>';
|
||||
|
||||
|
||||
$upload_msg = t('Upload a file');
|
||||
$drop_msg = t('Drop files here to upload');
|
||||
$cancel = t('Cancel');
|
||||
|
|
@ -50,16 +50,16 @@ function js_upload_form(&$a,&$b) {
|
|||
$maximagesize = intval(Config::get('system','maximagesize'));
|
||||
|
||||
$b['addon_text'] .= <<< EOT
|
||||
|
||||
<div id="file-uploader-demo1">
|
||||
<noscript>
|
||||
|
||||
<div id="file-uploader-demo1">
|
||||
<noscript>
|
||||
<p>Please enable JavaScript to use file uploader.</p>
|
||||
<!-- or put a simple form for upload here -->
|
||||
</noscript>
|
||||
</noscript>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
var uploader = null;
|
||||
var uploader = null;
|
||||
function getSelected(opt) {
|
||||
var selected = new Array();
|
||||
var index = 0;
|
||||
|
|
@ -73,16 +73,16 @@ function getSelected(opt) {
|
|||
}
|
||||
}
|
||||
return selected;
|
||||
}
|
||||
}
|
||||
function createUploader() {
|
||||
uploader = new qq.FileUploader({
|
||||
element: document.getElementById('file-uploader-demo1'),
|
||||
action: '{$b['post_url']}',
|
||||
|
||||
template: '<div class="qq-uploader">' +
|
||||
template: '<div class="qq-uploader">' +
|
||||
'<div class="qq-upload-drop-area"><span>$drop_msg</span></div>' +
|
||||
'<div class="qq-upload-button">$upload_msg</div>' +
|
||||
'<ul class="qq-upload-list"></ul>' +
|
||||
'<ul class="qq-upload-list"></ul>' +
|
||||
'</div>',
|
||||
|
||||
// template for one item in file list
|
||||
|
|
@ -92,7 +92,7 @@ function createUploader() {
|
|||
'<span class="qq-upload-size"></span>' +
|
||||
'<a class="qq-upload-cancel" href="#">$cancel</a>' +
|
||||
'<span class="qq-upload-failed-text">$failed</span>' +
|
||||
'</li>',
|
||||
'</li>',
|
||||
|
||||
debug: true,
|
||||
sizeLimit: $maximagesize,
|
||||
|
|
@ -119,17 +119,17 @@ function createUploader() {
|
|||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// in your app create uploader as soon as the DOM is ready
|
||||
// don't wait for the window to load
|
||||
window.onload = createUploader;
|
||||
// don't wait for the window to load
|
||||
window.onload = createUploader;
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
EOT;
|
||||
|
||||
|
||||
|
|
@ -139,7 +139,7 @@ function js_upload_post_init(&$a,&$b) {
|
|||
|
||||
// list of valid extensions, ex. array("jpeg", "xml", "bmp")
|
||||
|
||||
$allowedExtensions = array("jpeg","gif","png","jpg");
|
||||
$allowedExtensions = ["jpeg","gif","png","jpg"];
|
||||
|
||||
// max file size in bytes
|
||||
|
||||
|
|
@ -196,7 +196,7 @@ class qqUploadedFileXhr {
|
|||
* Save the file in the temp dir.
|
||||
* @return boolean TRUE on success
|
||||
*/
|
||||
function save() {
|
||||
function save() {
|
||||
$input = fopen("php://input", "r");
|
||||
|
||||
$upload_dir = Config::get('system','tempdir');
|
||||
|
|
@ -210,8 +210,8 @@ class qqUploadedFileXhr {
|
|||
|
||||
fclose($input);
|
||||
fclose($temp);
|
||||
|
||||
if ($realSize != $this->getSize()){
|
||||
|
||||
if ($realSize != $this->getSize()){
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
|
@ -227,18 +227,18 @@ class qqUploadedFileXhr {
|
|||
|
||||
function getSize() {
|
||||
if (isset($_SERVER["CONTENT_LENGTH"])){
|
||||
return (int)$_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 {
|
||||
class qqUploadedFileForm {
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -264,63 +264,63 @@ class qqUploadedFileForm {
|
|||
}
|
||||
|
||||
class qqFileUploader {
|
||||
private $allowedExtensions = array();
|
||||
private $allowedExtensions = [];
|
||||
private $sizeLimit = 10485760;
|
||||
private $file;
|
||||
|
||||
function __construct(array $allowedExtensions = array(), $sizeLimit = 10485760){
|
||||
function __construct(array $allowedExtensions = [], $sizeLimit = 10485760){
|
||||
$allowedExtensions = array_map("strtolower", $allowedExtensions);
|
||||
|
||||
$this->allowedExtensions = $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;
|
||||
$this->file = false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
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;
|
||||
case 'k': $val *= 1024;
|
||||
}
|
||||
return $val;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns array('success'=>true) or array('error'=>'error message')
|
||||
*/
|
||||
function handleUpload(){
|
||||
|
||||
|
||||
if (!$this->file){
|
||||
return array('error' => t('No files were uploaded.'));
|
||||
return ['error' => t('No files were uploaded.')];
|
||||
}
|
||||
|
||||
|
||||
$size = $this->file->getSize();
|
||||
|
||||
|
||||
if ($size == 0) {
|
||||
return array('error' => t('Uploaded file is empty'));
|
||||
return ['error' => t('Uploaded file is empty')];
|
||||
}
|
||||
|
||||
|
||||
// if ($size > $this->sizeLimit) {
|
||||
|
||||
// return array('error' => t('Uploaded file is too large'));
|
||||
// }
|
||||
|
||||
|
||||
|
||||
$maximagesize = Config::get('system','maximagesize');
|
||||
|
||||
if(($maximagesize) && ($size > $maximagesize)) {
|
||||
return array('error' => t('Image exceeds size limit of ') . $maximagesize );
|
||||
return ['error' => t('Image exceeds size limit of ') . $maximagesize ];
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -331,22 +331,22 @@ class qqFileUploader {
|
|||
|
||||
if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){
|
||||
$these = implode(', ', $this->allowedExtensions);
|
||||
return array('error' => t('File has an invalid extension, it should be one of ') . $these . '.');
|
||||
return ['error' => t('File has an invalid extension, it should be one of ') . $these . '.'];
|
||||
}
|
||||
|
||||
|
||||
if ($this->file->save()){
|
||||
return array(
|
||||
return [
|
||||
'success'=>true,
|
||||
'path' => $this->file->getPath(),
|
||||
'path' => $this->file->getPath(),
|
||||
'filename' => $filename . '.' . $ext
|
||||
);
|
||||
];
|
||||
} else {
|
||||
return array(
|
||||
return [
|
||||
'error'=> t('Upload was cancelled, or server error encountered'),
|
||||
'path' => $this->file->getPath(),
|
||||
'path' => $this->file->getPath(),
|
||||
'filename' => $filename . '.' . $ext
|
||||
);
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue