X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Feditpost.php;h=9f4aee31d6c63421a2692990b123a3926ac17ec8;hb=761bdafa34bfdf1b2b43a3f06ae092e0925898ac;hp=a655801d7727ec11b60837fd3e2fbb4fcc76bc13;hpb=ee39aba490fb7e17ba9c01a9a4f4aedc51bee564;p=friendica.git diff --git a/mod/editpost.php b/mod/editpost.php index a655801d77..9f4aee31d6 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -1,161 +1,156 @@ argc > 1) ? intval($a->argv[1]) : 0); + $return_url = (($a->argc > 2) ? base64_decode($a->argv[2]) : ''); - if (! $post_id) { - notice( t('Item not found') . EOL); + 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)) { - notice( t('Item not found') . EOL); + $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]); + + if (!DBA::isResult($item)) { + notice(L10n::t('Item not found') . EOL); return; } -/* $plaintext = false; - if( local_user() && intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext') ) - $plaintext = true;*/ - $plaintext = true; - if( local_user() && feature_enabled(local_user(),'richtext') ) - $plaintext = false; - + $geotag = ''; - $o .= replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => t('Edit post') - )); + $o .= replace_macros(get_markup_template("section_title.tpl"), [ + '$title' => L10n::t('Edit post') + ]); $tpl = get_markup_template('jot-header.tpl'); - $a->page['htmlhead'] .= replace_macros($tpl, array( - '$baseurl' => App::get_baseurl(), - '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), - '$ispublic' => ' ', // t('Visible to everybody'), + $a->page['htmlhead'] .= replace_macros($tpl, [ + '$baseurl' => System::baseUrl(), + '$ispublic' => ' ', // L10n::t('Visible to everybody'), '$geotag' => $geotag, '$nickname' => $a->user['nickname'] - )); + ]); $tpl = get_markup_template('jot-end.tpl'); - $a->page['end'] .= replace_macros($tpl, array( - '$baseurl' => App::get_baseurl(), - '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), - '$ispublic' => ' ', // t('Visible to everybody'), + $a->page['end'] .= replace_macros($tpl, [ + '$baseurl' => System::baseUrl(), + '$ispublic' => ' ', // L10n::t('Visible to everybody'), '$geotag' => $geotag, '$nickname' => $a->user['nickname'] - )); + ]); $tpl = get_markup_template("jot.tpl"); - if(($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) + if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) { $lockstate = 'lock'; - else + } else { $lockstate = 'unlock'; + } $jotplugins = ''; $jotnets = ''; - $mail_disabled = ((function_exists('imap_open') && (! get_config('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 .= '