X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Feditpost.php;h=04caaf0a20fe2a0fa15ed192a4c03c951a7fb555;hb=22816c49a1972fff2e201dd66ac59b80624ee8aa;hp=9e3401e958a7d7e6e19d11d28e7ba071525549a6;hpb=11cf36105ccd359c9d21a006e13b3767712196b6;p=friendica.git diff --git a/mod/editpost.php b/mod/editpost.php index 9e3401e958..04caaf0a20 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -6,45 +6,45 @@ use Friendica\App; use Friendica\Content\Feature; use Friendica\Core\Addon; use Friendica\Core\Config; +use Friendica\Core\L10n; use Friendica\Core\System; +use Friendica\Model\Item; use Friendica\Database\DBM; -require_once('include/acl_selectors.php'); - function editpost_content(App $a) { $o = ''; - if (! local_user()) { - notice( t('Permission denied.') . EOL); + if (!local_user()) { + notice(L10n::t('Permission denied.') . EOL); return; } $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); - 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()) - ); - - if (! DBM::is_result($itm)) { - notice( t('Item not found') . EOL); + $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', + 'type', 'body', 'title', 'file']; + $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]); + if (!DBM::is_result($item)) { + notice(L10n::t('Item not found') . EOL); return; } - $o .= replace_macros(get_markup_template("section_title.tpl"),[ - '$title' => t('Edit post') + $geotag = ''; + + $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, [ '$baseurl' => System::baseUrl(), - '$ispublic' => ' ', // t('Visible to everybody'), + '$ispublic' => ' ', // L10n::t('Visible to everybody'), '$geotag' => $geotag, '$nickname' => $a->user['nickname'] ]); @@ -52,7 +52,7 @@ function editpost_content(App $a) { $tpl = get_markup_template('jot-end.tpl'); $a->page['end'] .= replace_macros($tpl, [ '$baseurl' => System::baseUrl(), - '$ispublic' => ' ', // t('Visible to everybody'), + '$ispublic' => ' ', // L10n::t('Visible to everybody'), '$geotag' => $geotag, '$nickname' => $a->user['nickname'] ]); @@ -60,101 +60,86 @@ function editpost_content(App $a) { $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') && (! 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)) { $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 .= '