From 8387cd8ae35a0ad94a49a27ad8622bb7b8ed2b06 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 12 Feb 2014 17:21:41 +0100
Subject: Add option to change email settings in admin section

Fix issue #7166
---
 settings/js/admin.js | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'settings/js/admin.js')

diff --git a/settings/js/admin.js b/settings/js/admin.js
index e957bd68f1f..f39f53d413a 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -34,4 +34,42 @@ $(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').toggle(false);
+		} else {
+			$('#mail_credentials').toggle(true);
+		}
+	});
+
+	$('#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);
+		});
+	});
 });
+
+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');
+		}
+	}
+};
-- 
cgit v1.2.3


From fdb0d2067ff66017a3cae76f1da7b18e94dc5364 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 19 Feb 2014 10:20:52 +0100
Subject: Remove duplicated definition and move OC.msg to js/js.js

Fix issue #7166
---
 apps/files_encryption/js/settings-admin.js | 22 ----------------------
 core/js/js.js                              | 28 ++++++++++++++++++++++++++++
 settings/js/admin.js                       | 22 ----------------------
 settings/js/personal.js                    | 22 ----------------------
 4 files changed, 28 insertions(+), 66 deletions(-)

(limited to 'settings/js/admin.js')

diff --git a/apps/files_encryption/js/settings-admin.js b/apps/files_encryption/js/settings-admin.js
index c2140a6f1eb..785d02002fa 100644
--- a/apps/files_encryption/js/settings-admin.js
+++ b/apps/files_encryption/js/settings-admin.js
@@ -7,28 +7,6 @@
  * See the COPYING-README file.
  */
 
-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');
-		}
-	}
-};
-
 $(document).ready(function(){
 	// Trigger ajax on recoveryAdmin status change
 	var enabledStatus = $('#adminEnableRecovery').val();
diff --git a/core/js/js.js b/core/js/js.js
index cb177712a3a..ac79f13a6d1 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -467,6 +467,34 @@ OC.search.lastResults={};
 OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
+OC.msg={
+	startSaving:function(selector, message){
+		OC.msg.startAction(selector, t('settings', 'Saving...'));
+	},
+	finishedSaving:function(selector, data){
+		OC.msg.finishedAction(selector, data);
+	},
+	startAction:function(selector, message){
+		$(selector)
+			.html( message )
+			.removeClass('success')
+			.removeClass('error')
+			.stop(true, true)
+			.show();
+	},
+	finishedAction: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');
+		}
+	}
+};
+
 OC.Notification={
 	queuedNotifications: [],
 	getDefaultNotificationFunction: null,
diff --git a/settings/js/admin.js b/settings/js/admin.js
index f39f53d413a..923e267513e 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -51,25 +51,3 @@ $(document).ready(function(){
 		});
 	});
 });
-
-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');
-		}
-	}
-};
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 3b876467756..cff149db55b 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -313,25 +313,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');
-		}
-	}
-};
-- 
cgit v1.2.3


From 331bd527a7d130ec050018e971f1d42f9ea35a5b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 19 Feb 2014 17:42:05 +0100
Subject: Hide SMTP options based on selected send mode

Fix #7166
---
 settings/js/admin.js         | 22 ++++++++++++++++++++--
 settings/templates/admin.php | 32 ++++++++++++++++----------------
 2 files changed, 36 insertions(+), 18 deletions(-)

(limited to 'settings/js/admin.js')

diff --git a/settings/js/admin.js b/settings/js/admin.js
index 923e267513e..e2bc125b8f5 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -37,9 +37,27 @@ $(document).ready(function(){
 
 	$('#mail_smtpauth').change(function() {
 		if (!this.checked) {
-			$('#mail_credentials').toggle(false);
+			$('#mail_credentials').addClass('hidden');
 		} else {
-			$('#mail_credentials').toggle(true);
+			$('#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');
+			}
 		}
 	});
 
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d81840b5b66..377c05eb4b9 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -288,8 +288,8 @@ if (!$_['internetconnectionworking']) {
 			<?php endforeach;?>
 		</select>
 
-		<label for="mail_smtpsecure"><?php p($l->t( 'Encryption' )); ?></label>
-		<select name='mail_smtpsecure' id='mail_smtpsecure'>
+		<label id="mail_smtpsecure_label" for="mail_smtpsecure"<?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>><?php p($l->t( 'Encryption' )); ?></label>
+		<select name="mail_smtpsecure" id="mail_smtpsecure"<?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
 			<?php foreach ($mail_smtpsecure as $secure => $name):
 				$selected = '';
 				if ($secure == $_['mail_smtpsecure']):
@@ -301,7 +301,14 @@ if (!$_['internetconnectionworking']) {
 	</p>
 
 	<p>
-		<label for="mail_smtpauthtype"><?php p($l->t( 'Authentification method for SMTP' )); ?></label>
+		<label for="mail_from_address"><?php p($l->t( 'From address' )); ?></label>
+		<input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p('owncloud')?>" value='<?php p($_['mail_from_address']) ?>' />
+		@
+		<input type="text" name='mail_domain' id="mail_domain" placeholder="<?php p('example.com')?>" value='<?php p($_['mail_domain']) ?>' />
+	</p>
+
+	<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<label for="mail_smtpauthtype"><?php p($l->t( 'Authentification method' )); ?></label>
 		<select name='mail_smtpauthtype' id='mail_smtpauthtype'>
 			<?php foreach ($mail_smtpauthtype as $authtype => $name):
 				$selected = '';
@@ -316,24 +323,17 @@ if (!$_['internetconnectionworking']) {
 		<label for="mail_smtpauth"><?php p($l->t( 'Authentication required' )); ?></label>
 	</p>
 
-	<p id="mail_credentials" <?php if (!$_['mail_smtpauth']) print_unescaped(' style="display: none;"'); ?>>
-		<label for="mail_smtpname"><?php p($l->t( 'SMTP credentials' )); ?></label>
-		<input type="text" name='mail_smtpname' id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>" value='<?php p($_['mail_smtpname']) ?>' />
-		<input type="password" name='mail_smtppassword' id="mail_smtppassword" placeholder="<?php p($l->t('SMTP Password'))?>" value='<?php p($_['mail_smtppassword']) ?>' />
-	</p>
-
-	<p>
-		<label for="mail_smtphost"><?php p($l->t( 'SMTP server address' )); ?></label>
+	<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<label for="mail_smtphost"><?php p($l->t( 'Server address' )); ?></label>
 		<input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="<?php p('smtp.example.com')?>" value='<?php p($_['mail_smtphost']) ?>' />
 		:
 		<input type="text" name='mail_smtpport' id="mail_smtpport" placeholder="<?php p($l->t('Port'))?>" value='<?php p($_['mail_smtpport']) ?>' />
 	</p>
 
-	<p>
-		<label for="mail_from_address"><?php p($l->t( 'From address' )); ?></label>
-		<input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p('owncloud')?>" value='<?php p($_['mail_from_address']) ?>' />
-		@
-		<input type="text" name='mail_domain' id="mail_domain" placeholder="<?php p('example.com')?>" value='<?php p($_['mail_domain']) ?>' />
+	<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<label for="mail_smtpname"><?php p($l->t( 'Credentials' )); ?></label>
+		<input type="text" name='mail_smtpname' id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>" value='<?php p($_['mail_smtpname']) ?>' />
+		<input type="password" name='mail_smtppassword' id="mail_smtppassword" placeholder="<?php p($l->t('SMTP Password'))?>" value='<?php p($_['mail_smtppassword']) ?>' />
 	</p>
 
 </fieldset>
-- 
cgit v1.2.3


From 9847912257de1910f99879caac8ea925fb85caed Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 26 Feb 2014 13:10:46 +0100
Subject: Remove unused variables, add doc blocks and break lines

Fix #7166
---
 core/js/js.js                 |  4 ++--
 settings/admin/controller.php | 18 ++++++++++++++----
 settings/js/admin.js          |  2 +-
 settings/templates/admin.php  | 29 ++++++++++++++++++++---------
 4 files changed, 37 insertions(+), 16 deletions(-)

(limited to 'settings/js/admin.js')

diff --git a/core/js/js.js b/core/js/js.js
index ac79f13a6d1..88b70723dd1 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -468,8 +468,8 @@ OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
 OC.msg={
-	startSaving:function(selector, message){
-		OC.msg.startAction(selector, t('settings', 'Saving...'));
+	startSaving:function(selector){
+		OC.msg.startAction(selector, t('core', 'Saving...'));
 	},
 	finishedSaving:function(selector, data){
 		OC.msg.finishedAction(selector, data);
diff --git a/settings/admin/controller.php b/settings/admin/controller.php
index 9bbcd356580..a075d774361 100644
--- a/settings/admin/controller.php
+++ b/settings/admin/controller.php
@@ -20,7 +20,10 @@
 namespace OC\Settings\Admin;
 
 class Controller {
-	public static function setMailSettings($args) {
+	/**
+	 * Set mail settings
+	 */
+	public static function setMailSettings() {
 		\OC_Util::checkAdminUser();
 		\OCP\JSON::callCheck();
 
@@ -70,14 +73,21 @@ class Controller {
 		\OC_JSON::success(array("data" => array( "message" => $l->t("Saved") )));
 	}
 
+	/**
+	 * Get the field name to use it in error messages
+	 *
+	 * @param $setting string
+	 * @param $l \OC_L10N
+	 * @return string
+	 */
 	public static function getFieldname($setting, $l) {
 		switch ($setting) {
 			case 'mail_smtpmode':
-				return $l->t( 'SMTP mode' );
+				return $l->t( 'Send mode' );
 			case 'mail_smtpsecure':
-				return $l->t( 'Secure SMTP' );
+				return $l->t( 'Encryption' );
 			case 'mail_smtpauthtype':
-				return $l->t( 'Authentification method for SMTP' );
+				return $l->t( 'Authentification method' );
 		}
 	}
 }
diff --git a/settings/js/admin.js b/settings/js/admin.js
index e2bc125b8f5..5ea6a5af2df 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -44,7 +44,7 @@ $(document).ready(function(){
 	});
 
 	$('#mail_smtpmode').change(function() {
-		if ($(this).val() != 'smtp') {
+		if ($(this).val() !== 'smtp') {
 			$('#setting_smtpauth').addClass('hidden');
 			$('#setting_smtphost').addClass('hidden');
 			$('#mail_smtpsecure_label').addClass('hidden');
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 377c05eb4b9..139a9dd076c 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -288,8 +288,12 @@ if (!$_['internetconnectionworking']) {
 			<?php endforeach;?>
 		</select>
 
-		<label id="mail_smtpsecure_label" for="mail_smtpsecure"<?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>><?php p($l->t( 'Encryption' )); ?></label>
-		<select name="mail_smtpsecure" id="mail_smtpsecure"<?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<label id="mail_smtpsecure_label" for="mail_smtpsecure"
+			   <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+			<?php p($l->t( 'Encryption' )); ?>
+		</label>
+		<select name="mail_smtpsecure" id="mail_smtpsecure"
+				<?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
 			<?php foreach ($mail_smtpsecure as $secure => $name):
 				$selected = '';
 				if ($secure == $_['mail_smtpsecure']):
@@ -302,9 +306,11 @@ if (!$_['internetconnectionworking']) {
 
 	<p>
 		<label for="mail_from_address"><?php p($l->t( 'From address' )); ?></label>
-		<input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p('owncloud')?>" value='<?php p($_['mail_from_address']) ?>' />
+		<input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p('mail')?>"
+			   value='<?php p($_['mail_from_address']) ?>' />
 		@
-		<input type="text" name='mail_domain' id="mail_domain" placeholder="<?php p('example.com')?>" value='<?php p($_['mail_domain']) ?>' />
+		<input type="text" name='mail_domain' id="mail_domain" placeholder="<?php p('example.com')?>"
+			   value='<?php p($_['mail_domain']) ?>' />
 	</p>
 
 	<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
@@ -319,21 +325,26 @@ if (!$_['internetconnectionworking']) {
 			<?php endforeach;?>
 		</select>
 
-		<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" value="1" <?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
+		<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" value="1"
+			   <?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
 		<label for="mail_smtpauth"><?php p($l->t( 'Authentication required' )); ?></label>
 	</p>
 
 	<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
 		<label for="mail_smtphost"><?php p($l->t( 'Server address' )); ?></label>
-		<input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="<?php p('smtp.example.com')?>" value='<?php p($_['mail_smtphost']) ?>' />
+		<input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="<?php p('smtp.example.com')?>"
+			   value='<?php p($_['mail_smtphost']) ?>' />
 		:
-		<input type="text" name='mail_smtpport' id="mail_smtpport" placeholder="<?php p($l->t('Port'))?>" value='<?php p($_['mail_smtpport']) ?>' />
+		<input type="text" name='mail_smtpport' id="mail_smtpport" placeholder="<?php p($l->t('Port'))?>"
+			   value='<?php p($_['mail_smtpport']) ?>' />
 	</p>
 
 	<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
 		<label for="mail_smtpname"><?php p($l->t( 'Credentials' )); ?></label>
-		<input type="text" name='mail_smtpname' id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>" value='<?php p($_['mail_smtpname']) ?>' />
-		<input type="password" name='mail_smtppassword' id="mail_smtppassword" placeholder="<?php p($l->t('SMTP Password'))?>" value='<?php p($_['mail_smtppassword']) ?>' />
+		<input type="text" name='mail_smtpname' id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>"
+			   value='<?php p($_['mail_smtpname']) ?>' />
+		<input type="password" name='mail_smtppassword' id="mail_smtppassword"
+			   placeholder="<?php p($l->t('SMTP Password'))?>" value='<?php p($_['mail_smtppassword']) ?>' />
 	</p>
 
 </fieldset>
-- 
cgit v1.2.3