Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
index d211074c92caf5519b99d92b0bdb99b3309e1d12..4c00201ca89fcf804f108d19b4a871d7876a4eb7 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -28,6 +28,10 @@ function editpost_content(&$a) {
                return;
        }
 
+       $plaintext = false;
+       if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+               $plaintext = true;
+
 
        $o .= '<h2>' . t('Edit post') . '</h2>';
 
@@ -35,6 +39,7 @@ function editpost_content(&$a) {
        
        $a->page['htmlhead'] .= replace_macros($tpl, array(
                '$baseurl' => $a->get_baseurl(),
+               '$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                '$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
                '$geotag' => $geotag,
                '$nickname' => $a->user['nickname']
@@ -71,7 +76,7 @@ function editpost_content(&$a) {
 
        if($mail_enabled) {
        $selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
-               $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . 'value="1" /> '
+               $jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
                . t("Post to Email") . '</div>';
        }
                                        
@@ -80,13 +85,16 @@ function editpost_content(&$a) {
        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'),
@@ -96,7 +104,7 @@ function editpost_content(&$a) {
                '$wait' => t('Please wait'),
                '$permset' => t('Permission settings'),
                '$ptyp' => $itm[0]['type'],
-               '$content' => $itm[0]['body'],
+               '$content' => undo_post_tagging($itm[0]['body']),
                '$post_id' => $post_id,
                '$baseurl' => $a->get_baseurl(),
                '$defloc' => $a->user['default-location'],
@@ -105,14 +113,19 @@ function editpost_content(&$a) {
                '$emailcc' => t('CC: email addresses'),
                '$public' => t('Public post'),
                '$jotnets' => $jotnets,
+               '$title' => $itm[0]['title'],
+               '$placeholdertitle' => t('Set title'),
+                '$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
+                '$placeholdercategory' => 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),
                '$bang' => (($group) ? '!' : ''),
-               '$profile_uid' => $_SESSION['uid']
+               '$profile_uid' => $_SESSION['uid'],
+               '$preview' => t('Preview'),
+               '$jotplugins' => $jotplugins,
        ));
 
-
        return $o;
 
 }