added curly braces + space between "if" and brace

[friendica.git] / mod / editpost.php

diff --git a/mod/editpost.php b/mod/editpost.php
index c62252bc84ca8fc52d0ca8ea8388e95f5616392f..29f3dadff083aed698662fafd78372506e14ee5d 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -2,7 +2,7 @@
 
 require_once('include/acl_selectors.php');
 
-function editpost_content(&$a) {
+function editpost_content(App &$a) {
 
        $o = '';
 
@@ -36,12 +36,14 @@ function editpost_content(&$a) {
                $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)/'),
+               '$baseurl' => App::get_baseurl(),
+               '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                '$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
                '$geotag' => $geotag,
                '$nickname' => $a->user['nickname']
@@ -49,7 +51,7 @@ function editpost_content(&$a) {
 
        $tpl = get_markup_template('jot-end.tpl');
        $a->page['end'] .= replace_macros($tpl, array(
-               '$baseurl' => $a->get_baseurl(),
+               '$baseurl' => App::get_baseurl(),
                '$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
                '$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
                '$geotag' => $geotag,
@@ -58,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 = '';
 
@@ -78,32 +78,35 @@ function editpost_content(&$a) {
                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
                        intval(local_user())
                );
-               if(count($r)) {
+               if (dbm::is_result($r)) {
                        $mail_enabled = true;
                        if(intval($r[0]['pubmail']))
                                $pubmail_enabled = true;
                }
        }
 
-       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'),
@@ -123,27 +126,32 @@ function editpost_content(&$a) {
                '$ptyp' => $itm[0]['type'],
                '$content' => undo_post_tagging($itm[0]['body']),
                '$post_id' => $post_id,
-               '$baseurl' => $a->get_baseurl(),
+               '$baseurl' => App::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'],
+               '$title' => htmlspecialchars($itm[0]['title']),
                '$placeholdertitle' => t('Set title'),
                '$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,
                '$sourceapp' => t($a->sourcename),
                '$cancel' => t('Cancel'),
-               '$rand_num' => random_digits(12)
+               '$rand_num' => random_digits(12),
+
+               //jot nav tab (used in some themes)
+               '$message' => t('Message'),
+               '$browser' => t('Browser'),
+               '$shortpermset' => t('permissions'),
        ));
 
        return $o;