Merge pull request #552 from annando/master

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
old mode 100755 (executable)
new mode 100644 (file)
index 4c00201..d6539e1
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -28,15 +28,17 @@ function editpost_content(&$a) {
                return;
        }
 
-       $plaintext = false;
-       if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
-               $plaintext = true;
+/*     $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 .= '<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)/'),
@@ -45,6 +47,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");
                
@@ -94,13 +105,19 @@ function editpost_content(&$a) {
                '$action' => 'item',
                '$share' => t('Edit'),
                '$upload' => t('Upload photo'),
+               '$shortupload' => t('upload photo'),
                '$attach' => t('Attach file'),
+               '$shortattach' => t('attach file'),
                '$weblink' => t('Insert web link'),
-               '$youtube' => t('Insert YouTube video'),
-               '$video' => t('Insert Vorbis [.ogg] video'),
-               '$audio' => t('Insert Vorbis [.ogg] audio'),
+               '$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'],
@@ -115,8 +132,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)'),
+               '$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'),
                '$lockstate' => $lockstate,
                '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb),
@@ -124,6 +141,9 @@ function editpost_content(&$a) {
                '$profile_uid' => $_SESSION['uid'],
                '$preview' => t('Preview'),
                '$jotplugins' => $jotplugins,
+               '$sourceapp' => t($a->sourcename),
+               '$cancel' => t('Cancel'),
+               '$rand_num' => random_digits(12)
        ));
 
        return $o;