X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fsettings.php;h=1b4098de8f6c1c6b929bfd00785df79d1a63b4b7;hb=18c8f4d8b57988ce5e22c261d7ab9d73aa2a3dd5;hp=ea71f7020decdcf238d75a6ece36ac1b1454bab2;hpb=94ca19c016591430ccf2bb8b6a2a2f0239f9cb96;p=friendica.git

diff --git a/mod/settings.php b/mod/settings.php
index ea71f7020d..1b4098de8f 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -115,6 +115,8 @@ function settings_post(&$a) {
 
 
 	$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+	if(get_config('system','dfrn_only'))
+		$mail_disabled = 1;
 
 	if(! $mail_disabled) {
 		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
@@ -355,6 +357,8 @@ function settings_content(&$a) {
 
 
 	$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+	if(get_config('system','dfrn_only'))
+		$mail_disabled = 1;
 
 	if(! $mail_disabled) {
 		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
@@ -431,11 +435,6 @@ function settings_content(&$a) {
 	));
 
 
-
-
-
-
-
 	$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
 		? true : false);
 
@@ -491,6 +490,7 @@ function settings_content(&$a) {
 		'$h_pass' 	=> t('Password Settings'),
 		'$password1'=> array('npassword', t('New Password:'), '', ''),
 		'$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
+		'$oid_enable' => (! get_config('system','no_openid')),
 		'$openid'	=> $openid_field,
 		
 		'$h_basic' 	=> t('Basic Settings'),
@@ -523,11 +523,11 @@ function settings_content(&$a) {
 		
 		'$h_not' 	=> t('Notification Settings'),
 		'$lbl_not' 	=> t('Send a notification email when:'),
-		'$notify1'	=> array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), ''),
-		'$notify2'	=> array('notify1', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), ''),
-		'$notify3'	=> array('notify1', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), ''),
-		'$notify4'	=> array('notify1', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), ''),
-		'$notify5'	=> array('notify1', t('You receive a private message'), ($notify & NOTIFY_MAIL), ''),
+		'$notify1'	=> array('notify1', t('You receive an introduction'), ($notify & NOTIFY_INTRO), NOTIFY_INTRO, ''),
+		'$notify2'	=> array('notify2', t('Your introductions are confirmed'), ($notify & NOTIFY_CONFIRM), NOTIFY_CONFIRM, ''),
+		'$notify3'	=> array('notify3', t('Someone writes on your profile wall'), ($notify & NOTIFY_WALL), NOTIFY_WALL, ''),
+		'$notify4'	=> array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''),
+		'$notify5'	=> array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''),