Just some more fixed notice

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
index 90a15345339c5d1e47c95c26ca2a62a5b6edb77a..7994e9e239aaacd17cd956202b950a287166b8d4 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -8,37 +8,36 @@ 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()) {
+       if (!local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
                return;
        }
 
        $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-       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())
-       );
-
-       if (! DBM::is_result($itm)) {
+       $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"),[
+       $geotag = '';
+
+       $o .= replace_macros(get_markup_template("section_title.tpl"), [
                '$title' => L10n::t('Edit post')
        ]);
 
@@ -61,48 +60,36 @@ 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 .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
-               . L10n::t("Post to Email") . '</div>';
-       }*/
-
-
-
        Addon::callHooks('jot_tool', $jotplugins);
        //Addon::callHooks('jot_networks', $jotnets);
 
-
-       //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
-
-       $o .= replace_macros($tpl,[
+       $o .= replace_macros($tpl, [
                '$is_edit' => true,
                '$return_path' => $_SESSION['return_url'],
                '$action' => 'item',
@@ -123,8 +110,9 @@ function editpost_content(App $a) {
                '$shortnoloc' => L10n::t('clear location'),
                '$wait' => L10n::t('Please wait'),
                '$permset' => L10n::t('Permission settings'),
-               '$ptyp' => $itm[0]['type'],
-               '$content' => undo_post_tagging($itm[0]['body']),
+               '$wall' => $item['wall'],
+               '$posttype' => $item['post-type'],
+               '$content' => undo_post_tagging($item['body']),
                '$post_id' => $post_id,
                '$baseurl' => System::baseUrl(),
                '$defloc' => $a->user['default-location'],
@@ -133,14 +121,14 @@ function editpost_content(App $a) {
                '$emailcc' => L10n::t('CC: email addresses'),
                '$public' => L10n::t('Public post'),
                '$jotnets' => $jotnets,
-               '$title' => htmlspecialchars($itm[0]['title']),
+               '$title' => htmlspecialchars($item['title']),
                '$placeholdertitle' => L10n::t('Set title'),
-               '$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
-               '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t('Categories (comma-separated list)') : ''),
+               '$category' => file_tag_file_to_list($item['file'], 'category'),
+               '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''),
                '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
                '$lockstate' => $lockstate,
                '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user)),
-               '$bang' => (($group) ? '!' : ''),
+               '$bang' => ($lockstate === 'lock' ? '!' : ''),
                '$profile_uid' => $_SESSION['uid'],
                '$preview' => L10n::t('Preview'),
                '$jotplugins' => $jotplugins,