X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Feditpost.php;h=cc72dbd3c2eddbd864b28250254b6467d96ce32d;hb=fca93793480839660870e899bea88f3637859fff;hp=86099e74575e1125db89215c35aa9c29c48e8c8f;hpb=2f8d78fd9f2039ebd8aa1acfa363c5cb06d37b7f;p=friendica.git
diff --git a/mod/editpost.php b/mod/editpost.php
index 86099e7457..cc72dbd3c2 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,69 +1,78 @@
.
+ *
*/
+
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\Database\DBM;
-
-require_once 'include/acl_selectors.php';
-
-function editpost_content(App $a) {
-
+use Friendica\Core\Hook;
+use Friendica\Core\Renderer;
+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)
+{
$o = '';
- if (! local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ if (!local_user()) {
+ 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);
+ if (!$post_id) {
+ notice(DI::l10n()->t('Item not found'));
return;
}
- $itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($post_id),
- intval(local_user())
- );
+ $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+ 'body', 'title', 'uri-id', 'wall', 'post-type', 'guid'];
- if (! DBM::is_result($itm)) {
- notice(L10n::t('Item not found') . EOL);
+ $item = Post::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
+
+ if (!DBA::isResult($item)) {
+ notice(DI::l10n()->t('Item not found'));
return;
}
- $geotag = '';
+ $user = User::getById(local_user());
- $o .= replace_macros(get_markup_template("section_title.tpl"),[
- '$title' => L10n::t('Edit post')
- ]);
+ $geotag = '';
- $tpl = get_markup_template('jot-header.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl, [
- '$baseurl' => System::baseUrl(),
- '$ispublic' => ' ', // L10n::t('Visible to everybody'),
- '$geotag' => $geotag,
- '$nickname' => $a->user['nickname']
+ $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate("section_title.tpl"), [
+ '$title' => DI::l10n()->t('Edit post')
]);
- $tpl = get_markup_template('jot-end.tpl');
- $a->page['end'] .= replace_macros($tpl, [
- '$baseurl' => System::baseUrl(),
- '$ispublic' => ' ', // L10n::t('Visible to everybody'),
+ $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
+ DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
+ '$ispublic' => ' ', // DI::l10n()->t('Visible to everybody'),
'$geotag' => $geotag,
- '$nickname' => $a->user['nickname']
+ '$nickname' => $a->getLoggedInUserNickname(),
+ '$is_mobile' => DI::mode()->isMobile(),
]);
-
- $tpl = get_markup_template("jot.tpl");
-
- if (strlen($itm['allow_cid']) || strlen($itm['allow_gid']) || strlen($itm['deny_cid']) || strlen($itm['deny_gid'])) {
+ if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
$lockstate = 'lock';
} else {
$lockstate = 'unlock';
@@ -72,90 +81,77 @@ 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 (DBM::is_result($r)) {
- $mail_enabled = true;
- 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 .= '
'
- . L10n::t("Post to Email") . '
';
- }*/
-
-
-
- Addon::callHooks('jot_tool', $jotplugins);
- //Addon::callHooks('jot_networks', $jotnets);
-
+ Hook::callAll('jot_tool', $jotplugins);
- //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
-
- $o .= replace_macros($tpl,[
+ $tpl = Renderer::getMarkupTemplate("jot.tpl");
+ $o .= Renderer::replaceMacros($tpl, [
'$is_edit' => true,
- '$return_path' => $_SESSION['return_url'],
+ '$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'),
- '$ptyp' => $itm[0]['type'],
- '$content' => undo_post_tagging($itm[0]['body']),
+ '$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'],
+ '$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' => htmlspecialchars($itm[0]['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 \x28comma-separated list\x29") : ''),
- '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
+ '$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") : ''),
+ '$emtitle' => DI::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'),
+ '$preview' => DI::l10n()->t('Preview'),
'$jotplugins' => $jotplugins,
- '$sourceapp' => L10n::t($a->sourcename),
- '$cancel' => L10n::t('Cancel'),
- '$rand_num' => random_digits(12),
+ '$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'),
+
+ '$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;
+}