X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Feditpost.php;h=9e3401e958a7d7e6e19d11d28e7ba071525549a6;hb=391c5913227c7f62f19b4f08906b0b1b0b618b33;hp=c62252bc84ca8fc52d0ca8ea8388e95f5616392f;hpb=f962ecdd6483679879d7608a47dbf8549a431a8f;p=friendica.git
diff --git a/mod/editpost.php b/mod/editpost.php
index c62252bc84..9e3401e958 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,19 +1,28 @@
argc > 1) ? intval($a->argv[1]) : 0);
- if(! $post_id) {
+ if (! $post_id) {
notice( t('Item not found') . EOL);
return;
}
@@ -23,53 +32,43 @@ function editpost_content(&$a) {
intval(local_user())
);
- if(! count($itm)) {
+ if (! DBM::is_result($itm)) {
notice( t('Item not found') . EOL);
return;
}
-/* $plaintext = false;
- if( local_user() && intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext') )
- $plaintext = true;*/
- $plaintext = true;
- if( local_user() && feature_enabled(local_user(),'richtext') )
- $plaintext = false;
-
-
- $o .= '
' . t('Edit post') . '
';
+ $o .= replace_macros(get_markup_template("section_title.tpl"),[
+ '$title' => t('Edit post')
+ ]);
$tpl = get_markup_template('jot-header.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl, array(
- '$baseurl' => $a->get_baseurl(),
- '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+ $a->page['htmlhead'] .= replace_macros($tpl, [
+ '$baseurl' => System::baseUrl(),
'$ispublic' => ' ', // t('Visible to everybody'),
'$geotag' => $geotag,
'$nickname' => $a->user['nickname']
- ));
+ ]);
$tpl = get_markup_template('jot-end.tpl');
- $a->page['end'] .= replace_macros($tpl, array(
- '$baseurl' => $a->get_baseurl(),
- '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+ $a->page['end'] .= replace_macros($tpl, [
+ '$baseurl' => System::baseUrl(),
'$ispublic' => ' ', // 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'])))))
$lockstate = 'lock';
else
$lockstate = 'unlock';
- $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
-
$jotplugins = '';
$jotnets = '';
- $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+ $mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1);
$mail_enabled = false;
$pubmail_enabled = false;
@@ -78,32 +77,35 @@ function editpost_content(&$a) {
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
intval(local_user())
);
- if(count($r)) {
+ if (DBM::is_result($r)) {
$mail_enabled = true;
if(intval($r[0]['pubmail']))
$pubmail_enabled = true;
}
}
- if($mail_enabled) {
+ // 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);
+ Addon::callHooks('jot_tool', $jotplugins);
+ //Addon::callHooks('jot_networks', $jotnets);
-
- //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
-
- $o .= replace_macros($tpl,array(
+ //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
+
+ $o .= replace_macros($tpl,[
+ '$is_edit' => true,
'$return_path' => $_SESSION['return_url'],
'$action' => 'item',
- '$share' => t('Edit'),
+ '$share' => t('Save'),
'$upload' => t('Upload photo'),
'$shortupload' => t('upload photo'),
'$attach' => t('Attach file'),
@@ -123,28 +125,33 @@ function editpost_content(&$a) {
'$ptyp' => $itm[0]['type'],
'$content' => undo_post_tagging($itm[0]['body']),
'$post_id' => $post_id,
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => System::baseUrl(),
'$defloc' => $a->user['default-location'],
'$visitor' => 'none',
'$pvisit' => 'none',
'$emailcc' => t('CC: email addresses'),
'$public' => t('Public post'),
'$jotnets' => $jotnets,
- '$title' => $itm[0]['title'],
+ '$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)') : ''),
+ '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate,
- '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb),
+ '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user)),
'$bang' => (($group) ? '!' : ''),
'$profile_uid' => $_SESSION['uid'],
'$preview' => t('Preview'),
'$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename),
'$cancel' => t('Cancel'),
- '$rand_num' => random_digits(12)
- ));
+ '$rand_num' => random_digits(12),
+
+ //jot nav tab (used in some themes)
+ '$message' => t('Message'),
+ '$browser' => t('Browser'),
+ '$shortpermset' => t('permissions'),
+ ]);
return $o;