X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_attach.php;h=e9591c228bc56e1985407100aaa15c163cf34be7;hb=882925b8248d3058d5178da378cbf69d2ff52df2;hp=096439fa74ef335f199cfc5752f1bbce1906e8f9;hpb=ec66553032820d6fff718a716e5cfdb2c38cd6cd;p=friendica.git diff --git a/mod/wall_attach.php b/mod/wall_attach.php index 096439fa74..e9591c228b 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -1,12 +1,28 @@ . + * */ use Friendica\App; -use Friendica\Core\Config; -use Friendica\Core\L10n; +use Friendica\Core\Session; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Attach; use Friendica\Model\User; use Friendica\Util\Strings; @@ -15,22 +31,19 @@ function wall_attach_post(App $a) { $r_json = (!empty($_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", - 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' => L10n::t('Invalid request.')]); + echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); exit(); } return; } } else { if ($r_json) { - echo json_encode(['error' => L10n::t('Invalid request.')]); + echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); exit(); } @@ -39,36 +52,29 @@ 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(remote_user($page_owner_uid))) { - $contact_id = remote_user($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; - } + } elseif ($community_page && !empty(Session::getRemoteContactID($page_owner_uid))) { + $contact_id = Session::getRemoteContactID($page_owner_uid); + $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' => L10n::t('Permission denied.')]); + echo json_encode(['error' => DI::l10n()->t('Permission denied.')]); exit(); } - notice(L10n::t('Permission denied.') . EOL ); + notice(DI::l10n()->t('Permission denied.') . EOL ); exit(); } if (empty($_FILES['userfile'])) { if ($r_json) { - echo json_encode(['error' => L10n::t('Invalid request.')]); + echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); } exit(); } @@ -77,7 +83,7 @@ function wall_attach_post(App $a) { $filename = basename($_FILES['userfile']['name']); $filesize = intval($_FILES['userfile']['size']); - $maxfilesize = Config::get('system','maxfilesize'); + $maxfilesize = DI::config()->get('system','maxfilesize'); /* Found html code written in text field of form, * when trying to upload a file with filesize @@ -86,18 +92,18 @@ function wall_attach_post(App $a) { */ if ($filesize <= 0) { - $msg = L10n::t('Sorry, maybe your upload is bigger than the PHP configuration allows') . EOL .(L10n::t('Or - did you try to upload an empty file?')); + $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?')); if ($r_json) { echo json_encode(['error' => $msg]); } else { - notice($msg . EOL); + notice($msg); } @unlink($src); exit(); } if ($maxfilesize && $filesize > $maxfilesize) { - $msg = L10n::t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize)); + $msg = DI::l10n()->t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize)); if ($r_json) { echo json_encode(['error' => $msg]); } else { @@ -112,7 +118,7 @@ function wall_attach_post(App $a) { @unlink($src); if ($newid === false) { - $msg = L10n::t('File upload failed.'); + $msg = DI::l10n()->t('File upload failed.'); if ($r_json) { echo json_encode(['error' => $msg]); } else {