Merge pull request #12065 from Quix0r/cleanup/renaming-more-logging

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
index cc72dbd3c2eddbd864b28250254b6467d96ce32d..bec5d3449ef311b14928e616e97f2c919f955cf8 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -34,29 +34,29 @@ function editpost_content(App $a)
 {
        $o = '';
 
-       if (!local_user()) {
-               notice(DI::l10n()->t('Permission denied.'));
+       if (!DI::userSession()->getLocalUserId()) {
+               DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
        $post_id = ((DI::args()->getArgc() > 1) ? intval(DI::args()->getArgv()[1]) : 0);
 
        if (!$post_id) {
-               notice(DI::l10n()->t('Item not found'));
+               DI::sysmsg()->addNotice(DI::l10n()->t('Item not found'));
                return;
        }
 
        $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
                'body', 'title', 'uri-id', 'wall', 'post-type', 'guid'];
 
-       $item = Post::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
+       $item = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), $fields, ['id' => $post_id, 'uid' => DI::userSession()->getLocalUserId()]);
 
        if (!DBA::isResult($item)) {
-               notice(DI::l10n()->t('Item not found'));
+               DI::sysmsg()->addNotice(DI::l10n()->t('Item not found'));
                return;
        }
 
-       $user = User::getById(local_user());
+       $user = User::getById(DI::userSession()->getLocalUserId());
 
        $geotag = '';
 
@@ -83,7 +83,7 @@ function editpost_content(App $a)
 
        Hook::callAll('jot_tool', $jotplugins);
 
-       $tpl = Renderer::getMarkupTemplate("jot.tpl");
+       $tpl = Renderer::getMarkupTemplate('jot.tpl');
        $o .= Renderer::replaceMacros($tpl, [
                '$is_edit' => true,
                '$return_path' => '/display/' . $item['guid'],
@@ -118,8 +118,8 @@ function editpost_content(App $a)
                '$jotnets' => $jotnets,
                '$title' => $item['title'],
                '$placeholdertitle' => DI::l10n()->t('Set title'),
-               '$category' => Post\Category::getCSVByURIId($item['uri-id'], local_user(), Post\Category::CATEGORY),
-               '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? DI::l10n()->t("Categories \x28comma-separated list\x29") : ''),
+               '$category' => Post\Category::getCSVByURIId($item['uri-id'], DI::userSession()->getLocalUserId(), Post\Category::CATEGORY),
+               '$placeholdercategory' => (Feature::isEnabled(DI::userSession()->getLocalUserId(),'categories') ? DI::l10n()->t("Categories \x28comma-separated list\x29") : ''),
                '$emtitle' => DI::l10n()->t('Example: bob@example.com, mary@example.com'),
                '$lockstate' => $lockstate,
                '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user)),
@@ -130,6 +130,15 @@ function editpost_content(App $a)
                '$cancel' => DI::l10n()->t('Cancel'),
                '$rand_num' => Crypto::randomDigits(12),
 
+               // Formatting button labels
+               '$edbold'   => DI::l10n()->t('Bold'),
+               '$editalic' => DI::l10n()->t('Italic'),
+               '$eduline'  => DI::l10n()->t('Underline'),
+               '$edquote'  => DI::l10n()->t('Quote'),
+               '$edcode'   => DI::l10n()->t('Code'),
+               '$edurl'    => DI::l10n()->t('Link'),
+               '$edattach' => DI::l10n()->t('Link or Media'),
+
                //jot nav tab (used in some themes)
                '$message' => DI::l10n()->t('Message'),
                '$browser' => DI::l10n()->t('Browser'),