X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Feditpost.php;h=ae5f55e9052df6ced69f18abc1e924a00f53a92d;hb=98f55ddb2ba8888dfc75845ed5aaa4c663b90b64;hp=e14baffa28aca2cad4f483c097cc38487a9194c1;hpb=1de3960e267a8d298348fbca18cf1be1f6a20f7a;p=friendica.git

diff --git a/mod/editpost.php b/mod/editpost.php
index e14baffa28..ae5f55e905 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,16 +1,33 @@
 <?php
 /**
- * @file mod/editpost.php
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Model\FileTag;
-use Friendica\Model\Item;
 use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Contact;
+use Friendica\Model\Post;
+use Friendica\Model\User;
 use Friendica\Util\Crypto;
 
 function editpost_content(App $a)
@@ -18,38 +35,41 @@ function editpost_content(App $a)
 	$o = '';
 
 	if (!local_user()) {
-		notice(L10n::t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.'));
 		return;
 	}
 
-	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
+	$post_id = ((DI::args()->getArgc() > 1) ? intval(DI::args()->getArgv()[1]) : 0);
 
 	if (!$post_id) {
-		notice(L10n::t('Item not found') . EOL);
+		notice(DI::l10n()->t('Item not found'));
 		return;
 	}
 
 	$fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
-		'type', 'body', 'title', 'file', 'wall', 'post-type', 'guid'];
+		'body', 'title', 'uri-id', 'wall', 'post-type', 'guid'];
 
-	$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
+	$item = Post::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
 
 	if (!DBA::isResult($item)) {
-		notice(L10n::t('Item not found') . EOL);
+		notice(DI::l10n()->t('Item not found'));
 		return;
 	}
 
+	$user = User::getById(local_user());
+
 	$geotag = '';
 
 	$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate("section_title.tpl"), [
-		'$title' => L10n::t('Edit post')
+		'$title' => DI::l10n()->t('Edit post')
 	]);
 
 	$tpl = Renderer::getMarkupTemplate('jot-header.tpl');
-	$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
-		'$ispublic' => '&nbsp;', // L10n::t('Visible to <strong>everybody</strong>'),
+	DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
+		'$ispublic' => '&nbsp;', // DI::l10n()->t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
-		'$nickname' => $a->user['nickname']
+		'$nickname' => $a->getLoggedInUserNickname(),
+		'$is_mobile' => DI::mode()->isMobile(),
 	]);
 
 	if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
@@ -68,53 +88,79 @@ function editpost_content(App $a)
 		'$is_edit' => true,
 		'$return_path' => '/display/' . $item['guid'],
 		'$action' => 'item',
-		'$share' => L10n::t('Save'),
-		'$upload' => L10n::t('Upload photo'),
-		'$shortupload' => L10n::t('upload photo'),
-		'$attach' => L10n::t('Attach file'),
-		'$shortattach' => L10n::t('attach file'),
-		'$weblink' => L10n::t('Insert web link'),
-		'$shortweblink' => L10n::t('web link'),
-		'$video' => L10n::t('Insert video link'),
-		'$shortvideo' => L10n::t('video link'),
-		'$audio' => L10n::t('Insert audio link'),
-		'$shortaudio' => L10n::t('audio link'),
-		'$setloc' => L10n::t('Set your location'),
-		'$shortsetloc' => L10n::t('set location'),
-		'$noloc' => L10n::t('Clear browser location'),
-		'$shortnoloc' => L10n::t('clear location'),
-		'$wait' => L10n::t('Please wait'),
-		'$permset' => L10n::t('Permission settings'),
+		'$share' => DI::l10n()->t('Save'),
+		'$loading' => DI::l10n()->t('Loading...'),
+		'$upload' => DI::l10n()->t('Upload photo'),
+		'$shortupload' => DI::l10n()->t('upload photo'),
+		'$attach' => DI::l10n()->t('Attach file'),
+		'$shortattach' => DI::l10n()->t('attach file'),
+		'$weblink' => DI::l10n()->t('Insert web link'),
+		'$shortweblink' => DI::l10n()->t('web link'),
+		'$video' => DI::l10n()->t('Insert video link'),
+		'$shortvideo' => DI::l10n()->t('video link'),
+		'$audio' => DI::l10n()->t('Insert audio link'),
+		'$shortaudio' => DI::l10n()->t('audio link'),
+		'$setloc' => DI::l10n()->t('Set your location'),
+		'$shortsetloc' => DI::l10n()->t('set location'),
+		'$noloc' => DI::l10n()->t('Clear browser location'),
+		'$shortnoloc' => DI::l10n()->t('clear location'),
+		'$wait' => DI::l10n()->t('Please wait'),
+		'$permset' => DI::l10n()->t('Permission settings'),
 		'$wall' => $item['wall'],
 		'$posttype' => $item['post-type'],
 		'$content' => undo_post_tagging($item['body']),
 		'$post_id' => $post_id,
-		'$defloc' => $a->user['default-location'],
+		'$defloc' => $user['default-location'],
 		'$visitor' => 'none',
 		'$pvisit' => 'none',
-		'$emailcc' => L10n::t('CC: email addresses'),
-		'$public' => L10n::t('Public post'),
+		'$emailcc' => DI::l10n()->t('CC: email addresses'),
+		'$public' => DI::l10n()->t('Public post'),
 		'$jotnets' => $jotnets,
 		'$title' => $item['title'],
-		'$placeholdertitle' => L10n::t('Set title'),
-		'$category' => FileTag::fileToList($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'),
+		'$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") : ''),
+		'$emtitle' => DI::l10n()->t('Example: bob@example.com, mary@example.com'),
 		'$lockstate' => $lockstate,
 		'$acl' => '', // populate_acl((($group) ? $group_acl : $a->user)),
 		'$bang' => ($lockstate === 'lock' ? '!' : ''),
 		'$profile_uid' => $_SESSION['uid'],
-		'$preview' => L10n::t('Preview'),
+		'$preview' => DI::l10n()->t('Preview'),
 		'$jotplugins' => $jotplugins,
-		'$sourceapp' => L10n::t($a->sourcename),
-		'$cancel' => L10n::t('Cancel'),
+		'$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' => L10n::t('Message'),
-		'$browser' => L10n::t('Browser'),
-		'$shortpermset' => L10n::t('permissions'),
+		'$message' => DI::l10n()->t('Message'),
+		'$browser' => DI::l10n()->t('Browser'),
+		'$shortpermset' => DI::l10n()->t('Permissions'),
+
+		'$compose_link_title' => DI::l10n()->t('Open Compose page'),
 	]);
 
 	return $o;
 }
+
+function undo_post_tagging($s) {
+	$matches = null;
+	$cnt = preg_match_all('/([!#@])\[url=(.*?)\](.*?)\[\/url\]/ism', $s, $matches, PREG_SET_ORDER);
+	if ($cnt) {
+		foreach ($matches as $mtch) {
+			if (in_array($mtch[1], ['!', '@'])) {
+				$contact = Contact::getByURL($mtch[2], false, ['addr']);
+				$mtch[3] = empty($contact['addr']) ? $mtch[2] : $contact['addr'];
+			}
+			$s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
+		}
+	}
+	return $s;
+}