merge redmatrix fixes

mod/display.php

@@ -52,6 +52,7 @@ function display_content(&$a, $update = 0, $load = false) {
 			'deny_gid' => $channel['channel_deny_gid']
 		); 
 
+
 		$x = array(
 			'is_owner' => true,
 			'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''),

mod/editblock.php

@@ -108,12 +108,6 @@ function editblock_content(&$a) {
 	else
 		$mimeselect = mimetype_select($itm[0]['uid'],$mimetype); 
 
-	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
-		'$title' => t('Edit Block'),
-		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
-		'$id' => $itm[0]['id']
-	));
-
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
 		'$baseurl'       => $a->get_baseurl(),
 		'$editselect'    => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
@@ -133,7 +127,7 @@ function editblock_content(&$a) {
 
 	$rp = 'blocks/' . $channel['channel_address'];
 
-	$o .= replace_macros($tpl,array(
+	$editor = replace_macros($tpl,array(
 		'$return_path'         => $rp,
 		'$action'              => 'item',
 		'$webpage'             => ITEM_TYPE_BLOCK,
@@ -181,6 +175,13 @@ function editblock_content(&$a) {
 		'$expires'             => t('Set expiration date'),
 	));
 
+	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+		'$title' => t('Edit Block'),
+		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+		'$id' => $itm[0]['id'],
+		'$editor' => $editor
+	));
+
 	return $o;
 
 }

mod/editlayout.php

@@ -101,12 +101,6 @@ function editlayout_content(&$a) {
 		$layout_title = $item_id[0]['sid'];
 
 	$plaintext = true;
-
-	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
-		'$title' => t('Edit Layout'),
-		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
-		'$id' => $itm[0]['id']
-	));
 	
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
 		'$baseurl'       => $a->get_baseurl(),
@@ -132,7 +126,7 @@ function editlayout_content(&$a) {
 
 	$rp = 'layouts/' . $which;
 
-	$o .= replace_macros($tpl,array(
+	$editor = replace_macros($tpl,array(
 		'$return_path'         => $rp,
 		'$action'              => 'item',
 		'$webpage'             => ITEM_TYPE_PDL,
@@ -178,6 +172,14 @@ function editlayout_content(&$a) {
 		'$expires'             => t('Set expiration date'),
 	));
 
+
+	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+		'$title' => t('Edit Layout'),
+		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+		'$id' => $itm[0]['id'],
+		'$editor' => $editor
+	));
+
 	return $o;
 
 }

mod/editpost.php

@@ -38,11 +38,6 @@ function editpost_content(&$a) {
 
 	$channel = $a->get_channel();
 
-	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
-		'$title' => t('Edit post')
-	));
-
-	
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
 		'$baseurl' => $a->get_baseurl(),
 		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
@@ -53,8 +48,6 @@ function editpost_content(&$a) {
 	    '$confirmdelete' => t('Delete item?'),
 	));
 
-
-
 	if(intval($itm[0]['item_obscured'])) {
 		$key = get_config('system','prvkey');
 		if($itm[0]['title'])
@@ -107,7 +100,7 @@ function editpost_content(&$a) {
 		$cipher = 'aes256';
 
 
-	$o .= replace_macros($tpl,array(
+	$editor = replace_macros($tpl,array(
 		'$return_path' => $_SESSION['return_url'],
 		'$action' => 'item',
 		'$share' => t('Edit'),
@@ -161,6 +154,11 @@ function editpost_content(&$a) {
 		'$expiryModalCANCEL' => t('Cancel'),
 	));
 
+	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
+		'$title' => t('Edit post'),
+		'$editor' => $editor
+	));
+
 	return $o;
 
 }

mod/profile_photo.php

@@ -135,7 +135,7 @@ function profile_photo_post(&$a) {
 			$im = photo_factory($base_image['data'], $base_image['type']);
 			if($im->is_valid()) {
 
-				$im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
+				$im->cropImage(300,$srcX,$srcY,$srcW,$srcH);
 
 				$aid = get_account_id();
 
@@ -412,7 +412,7 @@ function profile_photo_crop_ui_head(&$a, $ph, $hash, $smallest){
 	$width  = $ph->getWidth();
 	$height = $ph->getHeight();
 
-	if($width < 175 || $height < 175) {
+	if($width < 300 || $height < 300) {
 		$ph->scaleImageUp(200);
 		$width  = $ph->getWidth();
 		$height = $ph->getHeight();