X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Feditpost.php;h=c396ee44b04e13d39117b2e1a74abb201391f55b;hb=c8cf2d1773623980d8055ff392b400aecb2a09b3;hp=862ba937f08467648b81af3a8e8bf5478f9f3d2f;hpb=9f5201dcaa4737427da7ec37969556c574e4711f;p=friendica.git
diff --git a/mod/editpost.php b/mod/editpost.php
index 862ba937f0..c396ee44b0 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -18,12 +18,12 @@ function editpost_content(&$a) {
return;
}
- $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ $itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($post_id),
intval(local_user())
);
- if(! count($r)) {
+ if(! count($itm)) {
notice( t('Item not found') . EOL);
return;
}
@@ -31,16 +31,17 @@ function editpost_content(&$a) {
$o .= '
' . t('Edit post') . '
';
- $tpl = load_view_file('view/jot-header.tpl');
+ $tpl = get_markup_template('jot-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
+ '$ispublic' => ' ', // t('Visible to everybody'),
'$geotag' => $geotag,
'$nickname' => $a->user['nickname']
));
- $tpl = load_view_file("view/jot.tpl");
+ $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';
@@ -51,16 +52,44 @@ function editpost_content(&$a) {
$jotplugins = '';
$jotnets = '';
+
+ $mail_disabled = ((function_exists('imap_open') && (! get_config('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(count($r)) {
+ $mail_enabled = true;
+ if(intval($r[0]['pubmail']))
+ $pubmail_enabled = true;
+ }
+ }
+
+ 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));
+
+ //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
+
$o .= replace_macros($tpl,array(
'$return_path' => $_SESSION['return_url'],
'$action' => 'item',
'$share' => t('Edit'),
'$upload' => t('Upload photo'),
+ '$attach' => t('Attach file'),
'$weblink' => t('Insert web link'),
'$youtube' => t('Insert YouTube video'),
'$video' => t('Insert Vorbis [.ogg] video'),
@@ -69,21 +98,24 @@ function editpost_content(&$a) {
'$noloc' => t('Clear browser location'),
'$wait' => t('Please wait'),
'$permset' => t('Permission settings'),
- '$content' => $r[0]['body'],
+ '$ptyp' => $itm[0]['type'],
+ '$content' => $itm[0]['body'],
'$post_id' => $post_id,
'$baseurl' => $a->get_baseurl(),
'$defloc' => $a->user['default-location'],
'$visitor' => 'none',
+ '$pvisit' => 'none',
'$emailcc' => t('CC: email addresses'),
+ '$public' => t('Public post'),
'$jotnets' => $jotnets,
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate,
'$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb),
'$bang' => (($group) ? '!' : ''),
- '$profile_uid' => $_SESSION['uid']
+ '$profile_uid' => $_SESSION['uid'],
+ '$jotplugins' => $jotplugins,
));
-
return $o;
}