Merge pull request #7174 from owncloud/issue/7166

Add option to change email settings in admin section

2 files changed, 34 insertions, 22 deletions

diff --git a/settings/js/admin.js b/settings/js/admin.js
index e957bd68f1f..5ea6a5af2df 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -34,4 +34,38 @@ $(document).ready(function(){
 	$('#security').change(function(){
 		$.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#forcessl').val() },function(){} );
 	});
+
+	$('#mail_smtpauth').change(function() {
+		if (!this.checked) {
+			$('#mail_credentials').addClass('hidden');
+		} else {
+			$('#mail_credentials').removeClass('hidden');
+		}
+	});
+
+	$('#mail_smtpmode').change(function() {
+		if ($(this).val() !== 'smtp') {
+			$('#setting_smtpauth').addClass('hidden');
+			$('#setting_smtphost').addClass('hidden');
+			$('#mail_smtpsecure_label').addClass('hidden');
+			$('#mail_smtpsecure').addClass('hidden');
+			$('#mail_credentials').addClass('hidden');
+		} else {
+			$('#setting_smtpauth').removeClass('hidden');
+			$('#setting_smtphost').removeClass('hidden');
+			$('#mail_smtpsecure_label').removeClass('hidden');
+			$('#mail_smtpsecure').removeClass('hidden');
+			if ($('#mail_smtpauth').attr('checked')) {
+				$('#mail_credentials').removeClass('hidden');
+			}
+		}
+	});
+
+	$('#mail_settings').change(function(){
+		OC.msg.startSaving('#mail_settings .msg');
+		var post = $( "#mail_settings" ).serialize();
+		$.post(OC.Router.generate('settings_mail_settings'), post, function(data){
+			OC.msg.finishedSaving('#mail_settings .msg', data);
+		});
+	});
 });
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 5944272067b..98bfe7132d4 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -315,25 +315,3 @@ OC.Encryption.msg={
 		}
 	}
 };
-
-OC.msg={
-	startSaving:function(selector){
-		$(selector)
-			.html( t('settings', 'Saving...') )
-			.removeClass('success')
-			.removeClass('error')
-			.stop(true, true)
-			.show();
-	},
-	finishedSaving:function(selector, data){
-		if( data.status === "success" ){
-			 $(selector).html( data.data.message )
-				.addClass('success')
-				.stop(true, true)
-				.delay(3000)
-				.fadeOut(900);
-		}else{
-			$(selector).html( data.data.message ).addClass('error');
-		}
-	}
-};