keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

filebrowser: link image to original picture, show error messages

Browse source
This commit is contained in:
fabrixxm 2015-08-24 13:54:41 +02:00
parent 109620ae99
commit cbabac298d
6 changed files with 183 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
js/filebrowser.js
View file

@ -1,6 +1,6 @@
/**
* Filebrowser - Friendica Communications Server
*
*
* Copyright (c) 2010-2013 the Friendica Project
*
* This program is free software: you can redistribute it and/or modify
@ -28,7 +28,7 @@
* The event is named
*
* fbrowser.<type>.[<eventname>]
*
*
* with params:
*
* filemane: filename of item choosed by user
@ -49,13 +49,13 @@
* $(id).value = bbcode;
* });
**/
var FileBrowser = {
nickname : "",
type : "",
event: "",
id : null,
init: function(nickname, type) {
FileBrowser.nickname = nickname;
FileBrowser.type = type;
@ -65,18 +65,23 @@ var FileBrowser = {
FileBrowser.event = FileBrowser.event + "." + h.split("-")[0];
FileBrowser.id = h.split("-")[1];
}
console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id );
$(".error a.close").on("click", function(e) {
e.preventDefault();
$(".error").addClass("hidden");
});
$(".folders a, .path a").on("click", function(e){
e.preventDefault();
var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=minimal" + location['hash'];
location.href = url;
});
$(".photo-album-photo-link").on('click', function(e){
e.preventDefault();
var embed = "";
if (FileBrowser.type == "image") {
embed = "[url="+this.dataset.link+"][img]"+this.dataset.img+"[/img][/url]";
@ -91,31 +96,45 @@ var FileBrowser = {
embed,
FileBrowser.id
]);
});
if ($("#upload-image").length)
var image_uploader = new window.AjaxUpload(
'upload-image',
{ action: 'wall_upload/'+FileBrowser.nickname,
{ action: 'wall_upload/'+FileBrowser.nickname+'?response=json',
name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
responseType: 'json',
onSubmit: function(file,ext) { $('#profile-rotator').show(); $(".error").addClass('hidden'); },
onComplete: function(file,response) {
if (response['error']!= undefined) {
$(".error span").html(response['error']);
$(".error").removeClass('hidden');
$('#profile-rotator').hide();
return;
}
location = baseurl + "/fbrowser/image/?mode=minimal"+location['hash'];
location.reload(true);
}
}
}
);
if ($("#upload-file").length)
var file_uploader = new window.AjaxUpload(
'upload-file',
{ action: 'wall_attach/'+FileBrowser.nickname,
{ action: 'wall_attach/'+FileBrowser.nickname+'?response=json',
name: 'userfile',
onSubmit: function(file,ext) { $('#profile-rotator').show(); },
onSubmit: function(file,ext) { $('#profile-rotator').show(); $(".error").addClass('hidden'); },
onComplete: function(file,response) {
if (response['error']!= undefined) {
$(".error span").html(response['error']);
$(".error").removeClass('hidden');
$('#profile-rotator').hide();
return;
}
location = baseurl + "/fbrowser/file/?mode=minimal"+location['hash'];
location.reload(true); }
location.reload(true);
}
}
);
}

62
mod/fbrowser.php
View file

@ -11,29 +11,29 @@ require_once('include/Photo.php');
* @param App $a
*/
function fbrowser_content($a){
if (!local_user())
killme();
if ($a->argc==1)
killme();
$template_file = "filebrowser.tpl";
$mode = "";
if (x($_GET,'mode')) {
$template_file = "filebrowser_plain.tpl";
$mode = "?mode=".$_GET['mode'];
}
//echo "<pre>"; var_dump($a->argv); killme();
//echo "<pre>"; var_dump($a->argv); killme();
switch($a->argv[1]){
case "image":
$path = array( array("", t("Photos")));
$albums = false;
$sql_extra = "";
$sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
if ($a->argc==2){
$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ",
intval(local_user())
@ -41,9 +41,9 @@ function fbrowser_content($a){
// anon functions only from 5.3.0... meglio tardi che mai..
$folder1 = function($el) use ($mode) {return array(bin2hex($el['album']),$el['album']);};
$albums = array_map( $folder1 , $albums);
}
$album = "";
if ($a->argc==3){
$album = hex2bin($a->argv[2]);
@ -51,14 +51,14 @@ function fbrowser_content($a){
$sql_extra2 = "";
$path[]=array($a->argv[2], $album);
}
$r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`
FROM `photo` WHERE `uid` = %d AND (height <= 320 AND width <= 320) $sql_extra
$r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`
FROM `photo` WHERE `uid` = %d $sql_extra
GROUP BY `resource-id` $sql_extra2",
intval(local_user())
intval(local_user())
);
function files1($rr){
function files1($rr){
global $a;
$types = Photo::supportedTypes();
$ext = $types[$rr['type']];
@ -70,16 +70,16 @@ function fbrowser_content($a){
$filename_e = $rr['filename'];
}
return array(
$a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.' .$ext,
$filename_e,
return array(
$a->get_baseurl() . '/photo/' . $rr['resource-id'] . '.' .$ext,
$filename_e,
$a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.'. $ext
);
}
$files = array_map("files1", $r);
$tpl = get_markup_template($template_file);
$o = replace_macros($tpl, array(
'$type' => 'image',
'$baseurl' => $a->get_baseurl(),
@ -89,16 +89,16 @@ function fbrowser_content($a){
'$cancel' => t('Cancel'),
'$nickname' => $a->user['nickname'],
));
break;
case "file":
if ($a->argc==2){
$files = q("SELECT id, filename, filetype FROM `attach` WHERE `uid` = %d ",
intval(local_user())
);
function files2($rr){ global $a;
function files2($rr){ global $a;
list($m1,$m2) = explode("/",$rr['filetype']);
$filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
@ -109,12 +109,12 @@ function fbrowser_content($a){
$filename_e = $rr['filename'];
}
return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png');
return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png');
}
$files = array_map("files2", $files);
//echo "<pre>"; var_dump($files); killme();
$tpl = get_markup_template($template_file);
$o = replace_macros($tpl, array(
'$type' => 'file',
@ -125,18 +125,18 @@ function fbrowser_content($a){
'$cancel' => t('Cancel'),
'$nickname' => $a->user['nickname'],
));
}
break;
}
if (x($_GET,'mode')) {
return $o;
} else {
echo $o;
killme();
}
}

55
mod/wall_attach.php
View file

@ -5,17 +5,22 @@ require_once('include/datetime.php');
function wall_attach_post(&$a) {
$r_json = (x($_GET,'response') && $_GET['response']=='json');
if($a->argc > 1) {
$nick = $a->argv[1];
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick)
);
if(! count($r))
if(! count($r)){
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
return;
}
}
else
} else {
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
return;
}
$can_post = false;
$visitor = 0;
@ -52,12 +57,15 @@ function wall_attach_post(&$a) {
}
}
if(! $can_post) {
if ($r_json) { echo json_encode(['error'=>t('Permission denied.')]); killme(); }
notice( t('Permission denied.') . EOL );
killme();
}
if(! x($_FILES,'userfile'))
if(! x($_FILES,'userfile')) {
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
killme();
}
$src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']);
@ -72,13 +80,23 @@ function wall_attach_post(&$a) {
*/
if($filesize <=0) {
notice(t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(t('Or - did you try to upload an empty file?')) . EOL);
$msg = t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(t('Or - did you try to upload an empty file?'));
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
notice( $msg. EOL );
}
@unlink($src);
killme();
}
if(($maxfilesize) && ($filesize > $maxfilesize)) {
echo sprintf(t('File exceeds size limit of %s'), formatBytes($maxfilesize)) . EOL;
$msg = sprintf(t('File exceeds size limit of %s'), formatBytes($maxfilesize));
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
echo $msg. EOL ;
}
@unlink($src);
killme();
}
@ -90,7 +108,12 @@ function wall_attach_post(&$a) {
$limit = service_class_fetch($page_owner_uid,'attach_upload_limit');
if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
echo upgrade_message(true) . EOL ;
$msg = upgrade_message(true);
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
echo $msg. EOL ;
}
@unlink($src);
killme();
}
@ -119,7 +142,12 @@ function wall_attach_post(&$a) {
@unlink($src);
if(! $r) {
echo ( t('File upload failed.') . EOL);
$msg = t('File upload failed.');
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
echo $msg. EOL ;
}
killme();
}
@ -130,14 +158,21 @@ function wall_attach_post(&$a) {
);
if(! count($r)) {
echo ( t('File upload failed.') . EOL);
$msg = t('File upload failed.');
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
echo $msg. EOL ;
}
killme();
}
if ($r_json) { echo json_encode(['ok'=>true]); killme(); }
$lf = "\n";
echo $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;
killme();
// NOTREACHED
}

85
mod/wall_upload.php
View file

@ -6,26 +6,29 @@ function wall_upload_post(&$a, $desktopmode = true) {
logger("wall upload: starting new upload", LOGGER_DEBUG);
$r_json = (x($_GET,'response') && $_GET['response']=='json');
if($a->argc > 1) {
if(! x($_FILES,'media')) {
$nick = $a->argv[1];
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick)
);
if(! x($_FILES,'media')) {
$nick = $a->argv[1];
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($nick)
);
if(! count($r))
return;
}
else {
if(! count($r)){
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
return;
}
} else {
$user_info = api_get_user($a);
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($user_info['screen_name'])
);
}
}
else
$r = q("SELECT `user`.*, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
dbesc($user_info['screen_name'])
);
}
} else {
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
return;
}
$can_post = false;
$visitor = 0;
@ -62,14 +65,19 @@ function wall_upload_post(&$a, $desktopmode = true) {
}
}
if(! $can_post) {
if ($r_json) { echo json_encode(['error'=>t('Permission denied.')]); killme(); }
notice( t('Permission denied.') . EOL );
killme();
}
if(! x($_FILES,'userfile') && ! x($_FILES,'media'))
if(! x($_FILES,'userfile') && ! x($_FILES,'media')){
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
killme();
}
$src = "";
if(x($_FILES,'userfile')) {
$src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']);
@ -98,6 +106,12 @@ function wall_upload_post(&$a, $desktopmode = true) {
$filetype = $_FILES['media']['type'];
}
if ($src=="") {
if ($r_json) { echo json_encode(['error'=>t('Invalid request.')]); killme(); }
notice(t('Invalid request.').EOL);
killme();
}
// This is a special treatment for picture upload from Twidere
if (($filename == "octet-stream") AND ($filetype != "")) {
$filename = $filetype;
@ -109,6 +123,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
// If there is a temp name, then do a manual check
// This is more reliable than the provided value
$imagedata = getimagesize($src);
if ($imagedata)
$filetype = $imagedata['mime'];
@ -119,7 +134,12 @@ function wall_upload_post(&$a, $desktopmode = true) {
$maximagesize = get_config('system','maximagesize');
if(($maximagesize) && ($filesize > $maximagesize)) {
echo sprintf( t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL;
$msg = sprintf( t('Image exceeds size limit of %s'), formatBytes($maximagesize));
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
echo $msg. EOL;
}
@unlink($src);
killme();
}
@ -131,7 +151,12 @@ function wall_upload_post(&$a, $desktopmode = true) {
$limit = service_class_fetch($page_owner_uid,'photo_upload_limit');
if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
echo upgrade_message(true) . EOL ;
$msg = upgrade_message(true);
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
echo $msg. EOL;
}
@unlink($src);
killme();
}
@ -141,7 +166,12 @@ function wall_upload_post(&$a, $desktopmode = true) {
$ph = new Photo($imagedata, $filetype);
if(! $ph->is_valid()) {
echo ( t('Unable to process image.') . EOL);
$msg = t('Unable to process image.');
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
echo $msg. EOL;
}
@unlink($src);
killme();
}
@ -169,7 +199,12 @@ function wall_upload_post(&$a, $desktopmode = true) {
$r = $ph->store($page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);
if(! $r) {
echo ( t('Image upload failed.') . EOL);
$msg = t('Image upload failed.');
if ($r_json) {
echo json_encode(['error'=>$msg]);
} else {
echo $msg. EOL;
}
killme();
}
@ -192,9 +227,10 @@ function wall_upload_post(&$a, $desktopmode = true) {
if (!$desktopmode) {
$r = q("SELECT `id`, `datasize`, `width`, `height`, `type` FROM `photo` WHERE `resource-id` = '%s' ORDER BY `width` DESC LIMIT 1", $hash);
if (!$r)
if (!$r){
if ($r_json) { echo json_encode(['error'=>'']); killme(); }
return false;
}
$picture = array();
$picture["id"] = $r[0]["id"];
@ -206,9 +242,12 @@ function wall_upload_post(&$a, $desktopmode = true) {
$picture["picture"] = $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
$picture["preview"] = $a->get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt();
if ($r_json) { echo json_encode(['picture'=>$picture]); killme(); }
return $picture;
}
if ($r_json) { echo json_encode(['ok'=>true]); killme(); }
/* mod Waitman Gobble NO WARRANTY */
//if we get the signal then return the image url info in BBCODE, otherwise this outputs the info and bails (for the ajax image uploader on wall post)

3
view/global.css
View file

@ -194,6 +194,9 @@ key { display: inline; background-color: #eee; color: #666; padding:0.2em; font-
.fbrowser.file img { display: inline; }
.fbrowser.file p { display: inline; white-space: nowrap; }
.fbrowser .upload { clear: both; padding-top: 1em;}
.fbrowser .error { background: #ffeeee; border: 1px solid #994444; color: #994444; padding: 0.5em;}
.fbrowser .error a.close { float: right; font-weight: bold; }
.fbrowser .error.hidden { display: none; }
a {
cursor: pointer;

11
view/templates/filebrowser_plain.tpl
View file

@ -13,11 +13,14 @@
});
</script>
<div class="fbrowser {{$type}}">
<div class="error hidden">
<span></span> <a href="#" class='close'>X</a>
</div>
<div class="path">
{{foreach $path as $p}}<a href="#" data-folder="{{$p.0}}">{{$p.1}}</a>{{/foreach}}
</div>
{{if $folders }}
<div class="folders">
<ul>
@ -25,7 +28,7 @@
</ul>
</div>
{{/if}}
<div class="list">
{{foreach $files as $f}}
<div class="photo-album-image-wrapper">
@ -38,11 +41,11 @@
</div>
<div class="upload">
<button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button>
<button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{"Upload"|t}}</button>
</div>
</div>
</body>
</html>