X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Feditpost.php;h=ca5db3e08105b7372f14f85a37cfc860b8962f07;hb=4c07c725b61506a4c4bf82b0acc30b4cfebd6933;hp=1e53285830dd5d2d272cc8182076bd878a704999;hpb=fabc90e9dd5f1c4280a9bfa6c6930a3fc985f87a;p=friendica.git
diff --git a/mod/editpost.php b/mod/editpost.php
index 1e53285830..ca5db3e081 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -2,17 +2,16 @@
/**
* @file mod/editpost.php
*/
+
use Friendica\App;
use Friendica\Content\Feature;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Contact;
use Friendica\Model\FileTag;
use Friendica\Model\Item;
-use Friendica\Database\DBA;
use Friendica\Util\Crypto;
function editpost_content(App $a)
@@ -20,14 +19,14 @@ function editpost_content(App $a)
$o = '';
if (!local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return;
}
$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
if (!$post_id) {
- notice(L10n::t('Item not found') . EOL);
+ notice(DI::l10n()->t('Item not found') . EOL);
return;
}
@@ -37,20 +36,19 @@ function editpost_content(App $a)
$item = Item::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') . EOL);
return;
}
$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, [
- '$baseurl' => System::baseUrl(),
- '$ispublic' => ' ', // L10n::t('Visible to everybody'),
+ DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
+ '$ispublic' => ' ', // DI::l10n()->t('Visible to everybody'),
'$geotag' => $geotag,
'$nickname' => $a->user['nickname']
]);
@@ -64,25 +62,6 @@ function editpost_content(App $a)
$jotplugins = '';
$jotnets = '';
- $mail_disabled = ((function_exists('imap_open') && !Config::get('system', 'imap_disabled')) ? 0 : 1);
-
- $mail_enabled = false;
- $pubmail_enabled = false;
-
- if (!$mail_disabled) {
- $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
- intval(local_user())
- );
-
- if (DBA::isResult($r)) {
- $mail_enabled = true;
-
- if (intval($r[0]['pubmail'])) {
- $pubmail_enabled = true;
- }
- }
- }
-
Hook::callAll('jot_tool', $jotplugins);
$tpl = Renderer::getMarkupTemplate("jot.tpl");
@@ -90,54 +69,69 @@ 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,
- '$baseurl' => System::baseUrl(),
'$defloc' => $a->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'),
+ '$placeholdertitle' => DI::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'),
+ '$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'),
+ '$sourceapp' => DI::l10n()->t($a->sourcename),
+ '$cancel' => DI::l10n()->t('Cancel'),
'$rand_num' => Crypto::randomDigits(12),
//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'),
]);
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::getDetailsByURL($mtch[2]);
+ $mtch[3] = empty($contact['addr']) ? $mtch[2] : $contact['addr'];
+ }
+ $s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
+ }
+ }
+ return $s;
+}