X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fwall_upload.php;h=1f71f36b62d1036f6b224e3df19f0b6d6463bc18;hb=f94a10bf00de699a5f3d22ea74665053a5661175;hp=eb2a92323ab0115b489e92bb371039d02b17e0f6;hpb=fb676335dbfb90d282622a68cb9a7113be19bc31;p=friendica.git
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index eb2a92323a..1f71f36b62 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -2,7 +2,7 @@
require_once('include/Photo.php');
-function wall_upload_post(&$a, $desktopmode = true) {
+function wall_upload_post(App $a, $desktopmode = true) {
logger("wall upload: starting new upload", LOGGER_DEBUG);
@@ -166,21 +166,19 @@ function wall_upload_post(&$a, $desktopmode = true) {
intval($page_owner_uid)
);
$size = $r[0]['total'];
- } else
- $size = 0;
- if(($limit !== false) && (($size + strlen($imagedata)) > $limit)) {
- $msg = upgrade_message(true);
- if ($r_json) {
- echo json_encode(array('error'=>$msg));
- } else {
- echo $msg. EOL;
+ if (($size + strlen($imagedata)) > $limit) {
+ $msg = upgrade_message(true);
+ if ($r_json) {
+ echo json_encode(array('error'=>$msg));
+ } else {
+ echo $msg. EOL;
+ }
+ @unlink($src);
+ killme();
}
- @unlink($src);
- killme();
}
-
$imagedata = @file_get_contents($src);
$ph = new Photo($imagedata, $filetype);
@@ -279,16 +277,10 @@ function wall_upload_post(&$a, $desktopmode = true) {
/* 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)
+ // if we get the signal then return the image url info in BBCODE
if ($_REQUEST['hush']!='yeah') {
- if(local_user() && (! feature_enabled(local_user(),'richtext') || x($_REQUEST['nomce'])) ) {
- echo "\n\n" . '[url=' . App::get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . App::get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
- }
- else {
- echo '
getExt()."\" alt=\"$basename\" />
";
- }
- }
- else {
+ echo "\n\n" . '[url=' . App::get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . App::get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
+ } else {
$m = '[url='.App::get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash.'][img]'.App::get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
return($m);
}