Merge branch 'master' of git://github.com/friendica/friendica

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
old mode 100644 (file)
new mode 100755 (executable)
index 7a10211..778ac3d
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -18,29 +18,35 @@ 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;
        }
 
+       $plaintext = false;
+       if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+               $plaintext = true;
+
 
        $o .= '<h2>' . t('Edit post') . '</h2>';
 
-       $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(),
+               '$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+               '$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
                '$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';
@@ -52,22 +58,25 @@ 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;
 
-
-       $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_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 .= '<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>';
        }
                                        
@@ -76,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'),
@@ -91,21 +103,27 @@ 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,
+               '$title' => $itm[0]['title'],
+               '$placeholdertitle' => t('Set title'),
                '$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;
 
 }