cleanup editpost

4 files changed, 15 insertions, 26 deletions

diff --git a/install/update.php b/install/update.php
index ca95f3b57..791371ec1 100644
--- a/install/update.php
+++ b/install/update.php
@@ -103,7 +103,7 @@ PRIMARY KEY ( `site_url` )
 
 function update_r1005() {
 	q("drop table guid");
-	q("drop table `notify-threads`);
+	q("drop table `notify-threads`");
 	return UPDATE_SUCCESS;
 }
 
diff --git a/mod/editpost.php b/mod/editpost.php
index 73faa59c5..43c71ca8a 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -11,7 +11,7 @@ function editpost_content(&$a) {
 		return;
 	}
 
-	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
+	$post_id = ((argc() > 1) ? intval(argv(1)) : 0);
 
 	if(! $post_id) {
 		notice( t('Item not found') . EOL);
@@ -32,12 +32,12 @@ function editpost_content(&$a) {
 	if(feature_enabled(local_user(),'richtext'))
 		$plaintext = false;
 
+	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+		'$title' => t('Edit post')
+	));
 
-	$o .= '<h2>' . t('Edit post') . '</h2>';
-
-	$tpl = get_markup_template('jot-header.tpl');
 	
-	$a->page['htmlhead'] .= replace_macros($tpl, array(
+	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
 		'$baseurl' => $a->get_baseurl(),
 		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
@@ -48,20 +48,14 @@ 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 = '';
 
 	call_hooks('jot_tool', $jotplugins);
 	call_hooks('jot_networks', $jotnets);
 
-	
+	$channel = $a->get_channel();
+
 	//$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins));	
 	
 
@@ -83,7 +77,7 @@ function editpost_content(&$a) {
 		'$content' => undo_post_tagging($itm[0]['body']),
 		'$post_id' => $post_id,
 		'$baseurl' => $a->get_baseurl(),
-		'$defloc' => $a->user['default-location'],
+		'$defloc' => $channel['channel_location'],
 		'$visitor' => 'none',
 		'$pvisit' => 'none',
 		'$public' => t('Public post'),
@@ -94,10 +88,10 @@ function editpost_content(&$a) {
 		'$placeholdercategory' => 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),
-		'$bang' => (($group) ? '!' : ''),
-		'$profile_uid' => $_SESSION['uid'],
-		'$preview' => t('Preview'),
+		'$acl' => '', 
+		'$bang' => '',
+		'$profile_uid' => local_user(),
+		'$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''),
 		'$jotplugins' => $jotplugins,
 		'$sourceapp' => t($a->sourcename),
 	));
diff --git a/mod/login.php b/mod/login.php
index d09fc1868..8ad4704a3 100644
--- a/mod/login.php
+++ b/mod/login.php
@@ -1,13 +1,7 @@
 <?php
 
 function login_content(&$a) {
-	if(x($_SESSION,'theme'))
-		unset($_SESSION['theme']);
-	if(x($_SESSION,'mobile-theme'))
-		unset($_SESSION['mobile-theme']);
-
 	if(local_user())
 		goaway(z_root());
-	return login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
-
+	return login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? false : true);
 }
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
new file mode 100644
index 000000000..b83e606a0
--- /dev/null
+++ b/view/tpl/edpost_head.tpl
@@ -0,0 +1 @@
+<h2>$title</h2>