X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Feditpost.php;h=c1c0d16d7fd712497476e6c7742a23624dac119d;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=04caaf0a20fe2a0fa15ed192a4c03c951a7fb555;hpb=78114c13d5ce27b36682a960859056d4ebf9d9be;p=friendica.git
diff --git a/mod/editpost.php b/mod/editpost.php
index 04caaf0a20..c1c0d16d7f 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -2,17 +2,20 @@
/**
* @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\Model\FileTag;
use Friendica\Model\Item;
-use Friendica\Database\DBM;
-
-function editpost_content(App $a) {
+use Friendica\Database\DBA;
+use Friendica\Util\Crypto;
+function editpost_content(App $a)
+{
$o = '';
if (!local_user()) {
@@ -28,38 +31,29 @@ function editpost_content(App $a) {
}
$fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
- 'type', 'body', 'title', 'file'];
+ 'type', 'body', 'title', 'file', 'wall', 'post-type', 'guid'];
+
$item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
- if (!DBM::is_result($item)) {
+
+ if (!DBA::isResult($item)) {
notice(L10n::t('Item not found') . EOL);
return;
}
$geotag = '';
- $o .= replace_macros(get_markup_template("section_title.tpl"), [
+ $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate("section_title.tpl"), [
'$title' => L10n::t('Edit post')
]);
- $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']
- ]);
-
- $tpl = get_markup_template('jot-end.tpl');
- $a->page['end'] .= replace_macros($tpl, [
+ $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
+ $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$baseurl' => System::baseUrl(),
'$ispublic' => ' ', // L10n::t('Visible to everybody'),
'$geotag' => $geotag,
'$nickname' => $a->user['nickname']
]);
-
- $tpl = get_markup_template("jot.tpl");
-
if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
$lockstate = 'lock';
} else {
@@ -69,29 +63,12 @@ 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;
- }
- }
- }
-
- Addon::callHooks('jot_tool', $jotplugins);
- //Addon::callHooks('jot_networks', $jotnets);
+ Hook::callAll('jot_tool', $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'),
@@ -110,7 +87,8 @@ function editpost_content(App $a) {
'$shortnoloc' => L10n::t('clear location'),
'$wait' => L10n::t('Please wait'),
'$permset' => L10n::t('Permission settings'),
- '$ptyp' => $item['type'],
+ '$wall' => $item['wall'],
+ '$posttype' => $item['post-type'],
'$content' => undo_post_tagging($item['body']),
'$post_id' => $post_id,
'$baseurl' => System::baseUrl(),
@@ -120,9 +98,9 @@ function editpost_content(App $a) {
'$emailcc' => L10n::t('CC: email addresses'),
'$public' => L10n::t('Public post'),
'$jotnets' => $jotnets,
- '$title' => htmlspecialchars($item['title']),
+ '$title' => $item['title'],
'$placeholdertitle' => L10n::t('Set title'),
- '$category' => file_tag_file_to_list($item['file'], 'category'),
+ '$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'),
'$lockstate' => $lockstate,
@@ -133,7 +111,7 @@ function editpost_content(App $a) {
'$jotplugins' => $jotplugins,
'$sourceapp' => L10n::t($a->sourcename),
'$cancel' => L10n::t('Cancel'),
- '$rand_num' => random_digits(12),
+ '$rand_num' => Crypto::randomDigits(12),
//jot nav tab (used in some themes)
'$message' => L10n::t('Message'),