Frost-mobile: media query in css for tablets

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
old mode 100755 (executable)
new mode 100644 (file)
index f23b305..b44afe2
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -28,11 +28,14 @@ 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>';
 
        $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)/'),
@@ -41,6 +44,15 @@ function editpost_content(&$a) {
                '$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)/'),
+               '$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
+               '$geotag' => $geotag,
+               '$nickname' => $a->user['nickname']
+       ));
+
 
        $tpl = get_markup_template("jot.tpl");
                
@@ -100,7 +112,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'],
@@ -111,6 +123,8 @@ function editpost_content(&$a) {
                '$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),
@@ -118,6 +132,7 @@ function editpost_content(&$a) {
                '$profile_uid' => $_SESSION['uid'],
                '$preview' => t('Preview'),
                '$jotplugins' => $jotplugins,
+               '$sourceapp' => t($a->sourcename),
        ));
 
        return $o;