/**\r
* Filebrowser - Friendica Communications Server\r
- * \r
+ *\r
* Copyright (c) 2010-2013 the Friendica Project\r
*\r
* This program is free software: you can redistribute it and/or modify\r
* The event is named\r
*\r
* fbrowser.<type>.[<eventname>]\r
- * \r
+ *\r
* with params:\r
*\r
* filemane: filename of item choosed by user\r
* $(id).value = bbcode;\r
* });\r
**/\r
- \r
+\r
var FileBrowser = {\r
nickname : "",\r
type : "",\r
event: "",\r
id : null,\r
- \r
+\r
init: function(nickname, type) {\r
FileBrowser.nickname = nickname;\r
FileBrowser.type = type;\r
FileBrowser.event = FileBrowser.event + "." + h.split("-")[0];\r
FileBrowser.id = h.split("-")[1];\r
}\r
- \r
+\r
console.log("FileBrowser:", nickname, type,FileBrowser.event, FileBrowser.id );\r
- \r
+\r
+ $(".error a.close").on("click", function(e) {\r
+ e.preventDefault();\r
+ $(".error").addClass("hidden");\r
+ });\r
+\r
$(".folders a, .path a").on("click", function(e){\r
e.preventDefault();\r
var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=minimal" + location['hash'];\r
location.href = url;\r
});\r
- \r
+\r
$(".photo-album-photo-link").on('click', function(e){\r
e.preventDefault();\r
- \r
+\r
var embed = "";\r
if (FileBrowser.type == "image") {\r
embed = "[url="+this.dataset.link+"][img]"+this.dataset.img+"[/img][/url]";\r
embed,\r
FileBrowser.id\r
]);\r
- \r
+\r
});\r
- \r
+\r
if ($("#upload-image").length)\r
var image_uploader = new window.AjaxUpload(\r
'upload-image',\r
- { action: 'wall_upload/'+FileBrowser.nickname,\r
+ { action: 'wall_upload/'+FileBrowser.nickname+'?response=json',\r
name: 'userfile',\r
- onSubmit: function(file,ext) { $('#profile-rotator').show(); },\r
+ responseType: 'json',\r
+ onSubmit: function(file,ext) { $('#profile-rotator').show(); $(".error").addClass('hidden'); },\r
onComplete: function(file,response) {\r
+ if (response['error']!= undefined) {\r
+ $(".error span").html(response['error']);\r
+ $(".error").removeClass('hidden');\r
+ $('#profile-rotator').hide();\r
+ return;\r
+ }\r
location = baseurl + "/fbrowser/image/?mode=minimal"+location['hash'];\r
location.reload(true);\r
- } \r
+ }\r
}\r
);\r
\r
if ($("#upload-file").length)\r
var file_uploader = new window.AjaxUpload(\r
'upload-file',\r
- { action: 'wall_attach/'+FileBrowser.nickname,\r
+ { action: 'wall_attach/'+FileBrowser.nickname+'?response=json',\r
name: 'userfile',\r
- onSubmit: function(file,ext) { $('#profile-rotator').show(); },\r
+ onSubmit: function(file,ext) { $('#profile-rotator').show(); $(".error").addClass('hidden'); },\r
onComplete: function(file,response) {\r
+ if (response['error']!= undefined) {\r
+ $(".error span").html(response['error']);\r
+ $(".error").removeClass('hidden');\r
+ $('#profile-rotator').hide();\r
+ return;\r
+ }\r
location = baseurl + "/fbrowser/file/?mode=minimal"+location['hash'];\r
- location.reload(true); } \r
+ location.reload(true);\r
+ }\r
}\r
);\r
}\r
* @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())
// 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]);
$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']];
$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(),
'$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");
$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',
'$cancel' => t('Cancel'),
'$nickname' => $a->user['nickname'],
));
-
+
}
-
+
break;
}
-
+
if (x($_GET,'mode')) {
return $o;
} else {
echo $o;
killme();
}
-
-
+
+
}
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;
}
}
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']);
*/
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();
}
$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();
}
@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();
}
);
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
}
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(! count($r))
- return;
- }
- else {
+ 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)){
+ 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;
}
}
+
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']);
$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;
// 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'];
$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();
}
$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();
}
$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();
}
$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();
}
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"];
$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)
.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;
});
</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>
</ul>
</div>
{{/if}}
-
+
<div class="list">
{{foreach $files as $f}}
<div class="photo-album-image-wrapper">
</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>
projects / friendica.git / commitdiff