X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_attach.php;h=607d0fe7a394c237b5ff8b179191fcd5dcc001bc;hb=6f70d21e07f5ae3ad96efe7c399db17ad390b73a;hp=8cb19ab1a09e4953e1a2653c667553358260fb23;hpb=fb7f7435c080e15bdafbbcbb5a3dfd94ef8dd952;p=friendica.git diff --git a/mod/wall_attach.php b/mod/wall_attach.php index 8cb19ab1a0..607d0fe7a3 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -1,6 +1,6 @@ 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", - DBA::escape($nick) - ); - - if (! DBA::isResult($r)) { + if (DI::args()->getArgc() > 1) { + $nick = DI::args()->getArgv()[1]; + $owner = User::getOwnerDataByNick($nick); + if (!DBA::isResult($owner)) { if ($r_json) { - echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); - exit(); + System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]); } return; } } else { if ($r_json) { - echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); - exit(); + System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]); } return; @@ -55,28 +51,20 @@ function wall_attach_post(App $a) { $can_post = false; - $page_owner_uid = $r[0]['uid']; - $page_owner_cid = $r[0]['id']; - $community_page = (($r[0]['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false); + $page_owner_uid = $owner['uid']; + $page_owner_cid = $owner['id']; + $community_page = $owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY; if (local_user() && (local_user() == $page_owner_uid)) { $can_post = true; } elseif ($community_page && !empty(Session::getRemoteContactID($page_owner_uid))) { $contact_id = Session::getRemoteContactID($page_owner_uid); - $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1", - intval($contact_id), - intval($page_owner_uid) - ); - - if (DBA::isResult($r)) { - $can_post = true; - } + $can_post = DBA::exists('contact', ['blocked' => false, 'pending' => false, 'id' => $contact_id, 'uid' => $page_owner_uid]); } if (!$can_post) { if ($r_json) { - echo json_encode(['error' => DI::l10n()->t('Permission denied.')]); - exit(); + System::jsonExit(['error' => DI::l10n()->t('Permission denied.')]); } notice(DI::l10n()->t('Permission denied.') . EOL ); exit(); @@ -84,7 +72,7 @@ function wall_attach_post(App $a) { if (empty($_FILES['userfile'])) { if ($r_json) { - echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); + System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]); } exit(); } @@ -103,23 +91,23 @@ function wall_attach_post(App $a) { if ($filesize <= 0) { $msg = DI::l10n()->t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(DI::l10n()->t('Or - did you try to upload an empty file?')); + @unlink($src); if ($r_json) { - echo json_encode(['error' => $msg]); + System::jsonExit(['error' => $msg]); } else { notice($msg); } - @unlink($src); exit(); } if ($maxfilesize && $filesize > $maxfilesize) { $msg = DI::l10n()->t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize)); + @unlink($src); if ($r_json) { - echo json_encode(['error' => $msg]); + System::jsonExit(['error' => $msg]); } else { echo $msg . EOL; } - @unlink($src); exit(); } @@ -130,7 +118,7 @@ function wall_attach_post(App $a) { if ($newid === false) { $msg = DI::l10n()->t('File upload failed.'); if ($r_json) { - echo json_encode(['error' => $msg]); + System::jsonExit(['error' => $msg]); } else { echo $msg . EOL; } @@ -138,8 +126,7 @@ function wall_attach_post(App $a) { } if ($r_json) { - echo json_encode(['ok' => true, 'id' => $newid]); - exit(); + System::jsonExit(['ok' => true, 'id' => $newid]); } $lf = "\n";