2 files changed, 12 insertions, 3 deletions
diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php
index 63796a474b..f7134dca7e 100644
--- a/phpBB/includes/auth/auth_ldap.php
+++ b/phpBB/includes/auth/auth_ldap.php
@@ -51,6 +51,9 @@ function init_ldap()
 
 	@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
 	@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
+	
+	/* Patch by maat */
+	@ldap_start_tls($ldap);
 
 	if ($config['ldap_user'] || $config['ldap_password'])
 	{
@@ -152,6 +155,9 @@ function login_ldap(&$username, &$password)
 	@ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, 3);
 	@ldap_set_option($ldap, LDAP_OPT_REFERRALS, 0);
 
+	/* Patch by maat */
+	@ldap_start_tls($ldap);
+
 	if ($config['ldap_user'] || $config['ldap_password'])
 	{
 		if (!@ldap_bind($ldap, htmlspecialchars_decode($config['ldap_user']), htmlspecialchars_decode($config['ldap_password'])))
@@ -350,4 +356,4 @@ function acp_ldap(&$new)
 	);
 }
 
-?>
-\ No newline at end of file
+?>
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index abb057df5b..40b06836a4 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -213,7 +213,10 @@ function user_add($user_row, $cp_data = false)
 		'user_full_folder'		=> PRIVMSGS_NO_BOX,
 		'user_emailtime'		=> 0,
 
-		'user_notify'			=> 0,
+		// Mageia Config tweak [ https://bugs.mageia.org/show_bug.cgi?id=1188 ]
+		'user_notify'			=> 1,
+		// Mageia Config tweak
+
 		'user_notify_pm'		=> 1,
 		'user_notify_type'		=> NOTIFY_EMAIL,
 		'user_allow_pm'			=> 1,
@@ -3628,4 +3631,4 @@ function phpbb_get_banned_user_ids($user_ids = array())
 	return $banned_ids_list;
 }
 
-?>
-\ No newline at end of file
+?>