Merge pull request #2148 from annando/issue-1871

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
index 4270ef1133f8cdde128e06f0685f4e48dcda6e1d..9a80d0b2f4ba622badbaac42f617e973eeed926a 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('acl_selectors.php');
+require_once('include/acl_selectors.php');
 
 function editpost_content(&$a) {
 
@@ -28,17 +28,22 @@ 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>';
+       $o .= replace_macros(get_markup_template("section_title.tpl"),array(
+               '$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)/'),
+               '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                '$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
                '$geotag' => $geotag,
                '$nickname' => $a->user['nickname']
@@ -55,14 +60,12 @@ function editpost_content(&$a) {
 
 
        $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 = '';
 
@@ -82,33 +85,42 @@ function editpost_content(&$a) {
                }
        }
 
-       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 .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
                . t("Post to Email") . '</div>';
-       }
-                                       
+       }*/
+
 
 
        call_hooks('jot_tool', $jotplugins);
-       call_hooks('jot_networks', $jotnets);
+       //call_hooks('jot_networks', $jotnets);
+
 
-       
-       //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));      
-       
+       //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));
 
        $o .= replace_macros($tpl,array(
+               '$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'),
+               '$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'],
@@ -121,18 +133,20 @@ function editpost_content(&$a) {
                '$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' => 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),
+               '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user)),
                '$bang' => (($group) ? '!' : ''),
                '$profile_uid' => $_SESSION['uid'],
                '$preview' => t('Preview'),
                '$jotplugins' => $jotplugins,
-               '$mobileapp' => t('Friendica mobile web'),
+               '$sourceapp' => t($a->sourcename),
+               '$cancel' => t('Cancel'),
+               '$rand_num' => random_digits(12)
        ));
 
        return $o;