more post branch bug fixes

7 files changed, 108 insertions, 8 deletions

diff --git a/.htaccess b/.htaccess
index cb5cba8cc..eb30198bb 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,7 +4,7 @@ AddType application/x-java-archive .jar
 
 <IfModule mod_rewrite.c>
   RewriteEngine on
-  
+
   # Rewrite current-style URLs of the form 'index.php?q=x'.
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index a631434f3..7b73344d6 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -87,7 +87,7 @@ function dfrn_notify_post(&$a) {
 				'$fn' => $r[0]['name'],
 				'$title' => $msg['title'],
 				'$body' => strip_tags(bbcode($msg['body']))
-			);
+			));
 	
 			$res = mail($r[0]['email'], t("New mail received at ") . $a->config['sitename'],
 				$email_tpl,t("From: Administrator@") . $_SERVER[SERVER_NAME] );
diff --git a/mod/message.php b/mod/message.php
index 3aac2ec28..549ce434d 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -54,7 +54,7 @@ function message_post(&$a) {
 		dbesc($subject),
 		dbesc($body),
 		0,
-		0,
+		1,
 		0,
 		dbesc($uri),
 		dbesc($replyto),
@@ -144,7 +144,7 @@ function message_content(&$a) {
 
 	if(($a->argc > 1) && ($a->argv[1] == 'new')) {
 		
-		$tpl = file_get_contents('view/jot-header.tpl');
+		$tpl = file_get_contents('view/msg-header.tpl');
 	
 		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
 
@@ -248,7 +248,7 @@ function message_content(&$a) {
 
 		require_once("include/bbcode.php");
 
-		$tpl = file_get_contents('view/jot-header.tpl');
+		$tpl = file_get_contents('view/msg-header.tpl');
 	
 		$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
 
diff --git a/mod/photo.php b/mod/photo.php
index 6e4d981d2..6174b10ab 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -112,6 +112,9 @@ function photo_init(&$a) {
 	}
 
         header("Content-type: image/jpeg");
+	header('Expires: ' . datetime_convert('UTC','UTC', 'now + 30 minutes', 'D, d M Y H:i:s' . ' GMT'));
+	header('Expires: ' . datetime_convert('UTC','UTC', 'now + 30 minutes', 'D, d M Y H:i:s' . ' GMT'));
+	header("Cache-Control: max-age=3600, must-revalidate");
         echo $data;
 	killme();
 	return; //NOTREACHED
diff --git a/view/acl_selectors.php b/view/acl_selectors.php
index 71c244721..c0d3ddcd4 100644
--- a/view/acl_selectors.php
+++ b/view/acl_selectors.php
@@ -46,7 +46,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 		$o .= "<select name=\"{$selname}[]\" class=\"$selclass\" multiple=\"multiple\" size=\"$size\" />\r\n";
 	}
 
-	$r = q("SELECT `id`, `name` FROM `contact` 
+	$r = q("SELECT `id`, `name`, `url` FROM `contact` 
 		WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 
 		$sql_extra
 		ORDER BY `name` ASC ",
@@ -59,7 +59,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 				$selected = " selected=\"selected\" ";
 			else
 				$selected = '';
-			$o .= "<option value=\"{$rr['id']}\" $selected >{$rr['name']}</option>\r\n";
+			$o .= "<option value=\"{$rr['id']}\" $selected  title=\"{$rr['url']}\" >{$rr['name']}</option>\r\n";
 		}
 	
 	}
diff --git a/view/head.tpl b/view/head.tpl
index f522f54b8..a2b55e0b5 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -65,7 +65,7 @@
 				}
 				else { 
 					$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); 
-					$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper')); 
+					$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
 				}
 				prev = ident; 
 			});
diff --git a/view/msg-header.tpl b/view/msg-header.tpl
new file mode 100644
index 000000000..bef2a03bb
--- /dev/null
+++ b/view/msg-header.tpl
@@ -0,0 +1,97 @@
+
+<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "specific_textareas",
+	editor_selector: /(profile-jot-text|prvmail-text)/,
+	plugins : "bbcode",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle",
+	content_css : "bbcode.css",
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	convert_urls: false,
+	content_css: "$baseurl/view/custom_tinymce.css",
+	     //Character count
+	theme_advanced_path : false,
+	setup : function(ed) {
+		ed.onKeyUp.add(function(ed, e) {
+			var txt = tinyMCE.activeEditor.getContent();
+			var text = txt.length;
+			if(txt.length <= 140) {
+				$('#character-counter').removeClass('red');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('grey');
+			}
+			if((txt.length > 140) && (txt .length <= 420)) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('red');
+				$('#character-counter').addClass('orange');
+			}
+			if(txt.length > 420) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('red');
+			}
+			$('#character-counter').text(text);
+    		});
+     	}
+});
+
+</script>
+<script type="text/javascript" src="include/ajaxupload.js" ></script>
+<script>
+	$(document).ready(function() {
+		var uploader = new window.AjaxUpload(
+			'prvmail-upload',
+			{ action: 'wall_upload',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+
+	});
+
+	function jotGetLink() {
+		reply = prompt("Please enter a link URL:");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+</script>
+