X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Feditpost.php;h=bceb9250a2d44f83abe547db4f4294ed6656860e;hb=3ca3157e53d9a37f5fee6ef6c459d61b453cca72;hp=7a102119ba8a49caaa8ab4ace07bfd0a320ada10;hpb=ee1641393550eea9200f792707070e024879d466;p=friendica.git

diff --git a/mod/editpost.php b/mod/editpost.php
index 7a102119ba..bceb9250a2 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -18,12 +18,12 @@ 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;
 	}
@@ -31,16 +31,17 @@ function editpost_content(&$a) {
 
 	$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(),
+		'$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 +53,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 +80,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 +98,24 @@ 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,
 		'$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'],
+		'$jotplugins' => $jotplugins,
 	));
 
-
 	return $o;
 
 }