From 2e14dc242e552629cac5914e85096d423e6fd43c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 19 Aug 2013 17:18:13 -0700
Subject: if changing primary hub during an import operation - remove the old
 xchan and create a fresh xchan pointing at this instance. Also a minor edit
 to increase the default photo upload limit for new sites. There aren't many
 cameras left that will take photos < 800k in size.

---
 view/en/htconfig.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view')

diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 0417e9af2..3e1269441 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -64,7 +64,7 @@ $a->config['system']['max_import_size'] = 200000;
 
 // maximum size of uploaded photos
 
-$a->config['system']['maximagesize'] = 800000;
+$a->config['system']['maximagesize'] = 3000000;
 
 // Location of PHP command line processor
 
-- 
cgit v1.2.3


From cd5fdbcb48a2e05198bb9daaf0753e8218ea4285 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 19 Aug 2013 21:19:39 -0700
Subject: email attachments (and fix email photos)

---
 view/theme/redbasic/css/style.css |  1 +
 view/tpl/msg-header.tpl           | 29 ++++++++++++++++++++++++++---
 view/tpl/prv_message.tpl          |  6 ++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index abfeb44bc..f4c399735 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1882,6 +1882,7 @@ tr.mceLast {
 	margin-right: 30px;
 }
 #prvmail-upload-wrapper,
+#prvmail-attach-wrapper,
 #prvmail-link-wrapper,
 #prvmail-rotator-wrapper {
 	float: left;
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 0be288709..5e2597605 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -54,7 +54,19 @@ else
 				name: 'userfile',
 				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
 				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					addeditortext(response);
+					$('#profile-rotator').spin(false);
+				}				 
+			}
+		);
+
+		var file_uploader = new window.AjaxUpload(
+			'prvmail-attach',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addeditortext(response);
 					$('#profile-rotator').spin(false);
 				}				 
 			}
@@ -67,7 +79,7 @@ else
 		if(reply && reply.length) {
 			$('#profile-rotator').spin('tiny');
 			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				addeditortext(response);
 				$('#profile-rotator').spin(false);
 			});
 		}
@@ -86,11 +98,22 @@ else
 		if(reply && reply.length) {
 			$('#profile-rotator').spin('tiny');
 			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				addeditortext(response);
 				$('#profile-rotator').spin(false);
 			});
 		}
 	}
 
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#prvmail-text").val();
+			$("#prvmail-text").val(currentText + data);
+		}
+		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+	}	
+
+
+
 </script>
 
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 2ddf75544..164ba0c6d 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -26,6 +26,12 @@
 	<div id="prvmail-upload-wrapper" >
 		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
 	</div> 
+
+	<div id="prvmail-attach-wrapper" >
+		<div id="prvmail-attach" class="icon attach" title="{{$attach}}" ></div>
+	</div> 
+
+
 	<div id="prvmail-link-wrapper" >
 		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
 	</div> 
-- 
cgit v1.2.3