X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Feditpost.php;h=c1c0d16d7fd712497476e6c7742a23624dac119d;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=57c9339047707e2c95ce4889d30c8f201f82e170;hpb=9e99066fd70a9dd9a291a523afba1a390f0e3a0b;p=friendica.git
diff --git a/mod/editpost.php b/mod/editpost.php
index 57c9339047..c1c0d16d7f 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,156 +1,123 @@
argc > 1) ? intval($a->argv[1]) : 0);
- if (! $post_id) {
- notice( t('Item not found') . EOL);
+ if (!$post_id) {
+ notice(L10n::t('Item not found') . EOL);
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',
+ 'type', 'body', 'title', 'file', 'wall', 'post-type', 'guid'];
+
+ $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]);
- if (! DBM::is_result($itm)) {
- notice( t('Item not found') . EOL);
+ if (!DBA::isResult($item)) {
+ notice(L10n::t('Item not found') . EOL);
return;
}
- $o .= replace_macros(get_markup_template("section_title.tpl"),array(
- '$title' => t('Edit post')
- ));
+ $geotag = '';
- $tpl = get_markup_template('jot-header.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl, array(
- '$baseurl' => System::baseUrl(),
- '$ispublic' => ' ', // t('Visible to everybody'),
- '$geotag' => $geotag,
- '$nickname' => $a->user['nickname']
- ));
+ $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate("section_title.tpl"), [
+ '$title' => L10n::t('Edit post')
+ ]);
- $tpl = get_markup_template('jot-end.tpl');
- $a->page['end'] .= replace_macros($tpl, array(
+ $tpl = Renderer::getMarkupTemplate('jot-header.tpl');
+ $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
'$baseurl' => System::baseUrl(),
- '$ispublic' => ' ', // t('Visible to everybody'),
+ '$ispublic' => ' ', // L10n::t('Visible to everybody'),
'$geotag' => $geotag,
'$nickname' => $a->user['nickname']
- ));
+ ]);
-
- $tpl = get_markup_template("jot.tpl");
-
- if(($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid'])))))
+ if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
$lockstate = 'lock';
- else
+ } else {
$lockstate = 'unlock';
+ }
$jotplugins = '';
$jotnets = '';
- $mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1);
+ Hook::callAll('jot_tool', $jotplugins);
- $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 .= '
'
- . t("Post to Email") . '
';
- }*/
-
-
-
- call_hooks('jot_tool', $jotplugins);
- //call_hooks('jot_networks', $jotnets);
-
-
- //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
-
- $o .= replace_macros($tpl,array(
+ $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' => t('Save'),
- '$upload' => t('Upload photo'),
- '$shortupload' => t('upload photo'),
- '$attach' => t('Attach file'),
- '$shortattach' => t('attach file'),
- '$weblink' => t('Insert web link'),
- '$shortweblink' => t('web link'),
- '$video' => t('Insert video link'),
- '$shortvideo' => t('video link'),
- '$audio' => t('Insert audio link'),
- '$shortaudio' => t('audio link'),
- '$setloc' => t('Set your location'),
- '$shortsetloc' => t('set location'),
- '$noloc' => t('Clear browser location'),
- '$shortnoloc' => t('clear location'),
- '$wait' => t('Please wait'),
- '$permset' => t('Permission settings'),
- '$ptyp' => $itm[0]['type'],
- '$content' => undo_post_tagging($itm[0]['body']),
+ '$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'),
+ '$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' => t('CC: email addresses'),
- '$public' => t('Public post'),
+ '$emailcc' => L10n::t('CC: email addresses'),
+ '$public' => L10n::t('Public post'),
'$jotnets' => $jotnets,
- '$title' => htmlspecialchars($itm[0]['title']),
- '$placeholdertitle' => t('Set title'),
- '$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
- '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''),
- '$emtitle' => t('Example: bob@example.com, mary@example.com'),
+ '$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'),
'$lockstate' => $lockstate,
'$acl' => '', // populate_acl((($group) ? $group_acl : $a->user)),
- '$bang' => (($group) ? '!' : ''),
+ '$bang' => ($lockstate === 'lock' ? '!' : ''),
'$profile_uid' => $_SESSION['uid'],
- '$preview' => t('Preview'),
+ '$preview' => L10n::t('Preview'),
'$jotplugins' => $jotplugins,
- '$sourceapp' => t($a->sourcename),
- '$cancel' => t('Cancel'),
- '$rand_num' => random_digits(12),
+ '$sourceapp' => L10n::t($a->sourcename),
+ '$cancel' => L10n::t('Cancel'),
+ '$rand_num' => Crypto::randomDigits(12),
//jot nav tab (used in some themes)
- '$message' => t('Message'),
- '$browser' => t('Browser'),
- '$shortpermset' => t('permissions'),
- ));
+ '$message' => L10n::t('Message'),
+ '$browser' => L10n::t('Browser'),
+ '$shortpermset' => L10n::t('permissions'),
+ ]);
return $o;
-
}
-
-