X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Feditpost.php;h=9f4aee31d6c63421a2692990b123a3926ac17ec8;hb=761bdafa34bfdf1b2b43a3f06ae092e0925898ac;hp=aa2c296845c95ce7d3dd34f201fa48024a703854;hpb=a0451e1c6285212ed406b343b97e4a53859a673d;p=friendica.git diff --git a/mod/editpost.php b/mod/editpost.php index aa2c296845..9f4aee31d6 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -8,37 +8,44 @@ use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\System; -use Friendica\Database\DBM; - -function editpost_content(App $a) { +use Friendica\Model\Item; +use Friendica\Database\DBA; +function editpost_content(App $a) +{ $o = ''; - if (! local_user()) { + if (!local_user()) { notice(L10n::t('Permission denied.') . EOL); return; } $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); + $return_url = (($a->argc > 2) ? base64_decode($a->argv[2]) : ''); - if (! $post_id) { + if (!$post_id) { notice(L10n::t('Item not found') . EOL); return; } - $itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($post_id), - intval(local_user()) - ); + // Fallback to SESSION return_path + if (empty($return_url)) { + $return_url = $_SESSION['return_url']; + } + + $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', + 'type', 'body', 'title', 'file', 'wall', 'post-type']; - if (! DBM::is_result($itm)) { + $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]); + + if (!DBA::isResult($item)) { notice(L10n::t('Item not found') . EOL); return; } $geotag = ''; - $o .= replace_macros(get_markup_template("section_title.tpl"),[ + $o .= replace_macros(get_markup_template("section_title.tpl"), [ '$title' => L10n::t('Edit post') ]); @@ -61,7 +68,7 @@ function editpost_content(App $a) { $tpl = get_markup_template("jot.tpl"); - if (strlen($itm['allow_cid']) || strlen($itm['allow_gid']) || strlen($itm['deny_cid']) || strlen($itm['deny_gid'])) { + if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) { $lockstate = 'lock'; } else { $lockstate = 'unlock'; @@ -70,42 +77,31 @@ function editpost_content(App $a) { $jotplugins = ''; $jotnets = ''; - $mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1); + $mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1); $mail_enabled = false; $pubmail_enabled = false; - if(! $mail_disabled) { + if (!$mail_disabled) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); - if (DBM::is_result($r)) { + + if (DBA::isResult($r)) { $mail_enabled = true; - if(intval($r[0]['pubmail'])) + + if (intval($r[0]['pubmail'])) { $pubmail_enabled = true; + } } } - // I don't think there's any need for the $jotnets when editing the post, - // and including them makes it difficult for the JS-free theme, so let's - // disable them -/* if($mail_enabled) { - $selected = (($pubmail_enabled) ? ' checked="checked" ' : ''); - $jotnets .= '