[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [websites/forum-kde-org/experimental] /: Fix user flag page and admin login
From: Sayak Banerjee <sayakb () kde ! org>
Date: 2012-07-13 20:11:51
Message-ID: 20120713201151.02C43A6094 () git ! kde ! org
[Download RAW message or body]
Git commit 5be0cd505c4b3a51b93e1917963dc15cba62260b by Sayak Banerjee.
Committed on 13/07/2012 at 22:10.
Pushed by sayakb into branch 'experimental'.
Fix user flag page and admin login
M +0 -6 conffiles/identity_config.txt
M +2 -1 conffiles/index.html
M +19 -13 includes/functions.php
M +71 -33 includes/functions_kdeforum.php
M +8 -0 includes/ucp/ucp_remind.php
M +4 -0 language/de/common.php
M +4 -0 language/de_x_sie/common.php
M +4 -0 language/en/common.php
M +4 -0 language/en_us/common.php
M +4 -0 language/es/common.php
M +4 -0 language/fa/common.php
A +- -- language/fr/.common.php.kate-swp
M +25 -20 language/fr/common.php
M +4 -0 language/he/common.php
M +4 -0 language/it/common.php
M +4 -0 language/nl/common.php
M +4 -0 language/pl/common.php
M +4 -0 language/tr/common.php
M +4 -0 language/zh_cmn_hans/common.php
M +4 -0 language/zh_cmn_hant/common.php
http://commits.kde.org/websites/forum-kde-org/5be0cd505c4b3a51b93e1917963dc15cba62260b
diff --git a/conffiles/identity_config.txt b/conffiles/identity_config.txt
index 2a2d317..a36c599 100755
--- a/conffiles/identity_config.txt
+++ b/conffiles/identity_config.txt
@@ -17,10 +17,4 @@ $ldap_user_dn = "";
// LDAP user password
$ldap_user_pass = "";
-// Admin group on active directory
-$ldap_admin_group = "";
-
-// Admin group on forum
-$ldap_phpbb_admin_group_id = 0;
-
?>
diff --git a/conffiles/index.html b/conffiles/index.html
index 8466493..ee61319 100755
--- a/conffiles/index.html
+++ b/conffiles/index.html
@@ -50,7 +50,8 @@
<li><a href="kdialogue_config.txt">KDialogue config</a></li>
<li><a href="vote_config.txt">KDE Brainstorm config</a></li>
<li><a href="identity_config.txt">KDE Identity auth config</a></li>
- <li><a href="newsbar_config.txt">Newsbar config</a></li>
+ <li><a href="newsbar_config.txt">Newsbar config</a></li>
+ <li><a href="fbanners_config.txt">Forum banners config</a></li>
<li><a href="votestats_config.txt">Voting stats tool config</a></li>
</ul>
</div>
diff --git a/includes/functions.php b/includes/functions.php
index 9deb08f..40df15a 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -3009,17 +3009,6 @@ function login_box($redirect = '', $l_explain = '', $l_success \
= '', $admin = fa $admin = ($admin) ? 1 : 0;
$viewonline = ($admin) ? $user->data['session_viewonline'] : $viewonline;
- // Check if the supplied username is equal to the one stored within the database \
if re-authenticating
- if ($admin && utf8_clean_string($username) != \
utf8_clean_string($user->data['username']))
- {
- // We log the attempt to use a different username...
- add_log('admin', 'LOG_ADMIN_AUTH_FAIL');
- trigger_error('NO_AUTH_ADMIN_USER_DIFFER');
- }
-
- // If authentication is successful we redirect user to previous page
- // $result = $auth->login($username, $password, $autologin, $viewonline, $admin);
-
// BEGIN KDE Identity modification
if (isset($_POST['identity_complete']))
{
@@ -3029,12 +3018,25 @@ function login_box($redirect = '', $l_explain = '', \
$l_success = '', $admin = fa else
{
// Try to authenticate with Identity first
- $result = kde_identity_auth($username, $password, $autologin, $viewonline);
+ $result = kde_identity_auth($username, $password, $autologin, $viewonline, \
$admin);
// If failed, auth with local DB
if (!$result)
{
- $result = $auth->login($username, $password, $autologin, $viewonline, $admin);
+ // END KDE Identity modification
+
+ // Check if the supplied username is equal to the one stored within the database \
if re-authenticating + if ($admin && utf8_clean_string($username) != \
utf8_clean_string($user->data['username'])) + {
+ // We log the attempt to use a different username...
+ add_log('admin', 'LOG_ADMIN_AUTH_FAIL');
+ trigger_error('NO_AUTH_ADMIN_USER_DIFFER');
+ }
+
+ // If authentication is successful we redirect user to previous page
+ $result = $auth->login($username, $password, $autologin, $viewonline, $admin);
+
+ // BEGIN KDE Identity modification
}
}
// END KDE Identity modification
@@ -3158,6 +3160,10 @@ function login_box($redirect = '', $l_explain = '', $l_success \
= '', $admin = fa 'S_ADMIN_AUTH' => $admin,
'USERNAME' => ($admin) ? $user->data['username'] : '',
+ // BEGIN KDE Identity modification
+ 'USERNAME' => '',
+ // END KDE Identity modification
+
'USERNAME_CREDENTIAL' => 'username',
'PASSWORD_CREDENTIAL' => ($admin) ? 'password_' . $credential : 'password',
));
diff --git a/includes/functions_kdeforum.php b/includes/functions_kdeforum.php
index c7e9d9b..b9f131a 100755
--- a/includes/functions_kdeforum.php
+++ b/includes/functions_kdeforum.php
@@ -820,7 +820,7 @@ function validate_biography($instance)
/**
* This function provides KDE Identity (identity.kde.org) authentication
*/
-function kde_identity_auth($username, $password, $autologin = false, $viewonline = \
true) +function kde_identity_auth($username, $password, $autologin = false, \
$viewonline = 1, $admin = 0) {
global $db, $phpbb_root_path, $phpEx, $user;
@@ -896,39 +896,73 @@ function kde_identity_auth($username, $password, $autologin = \
false, $viewonline }
else
{
- // Check if user has a new email address in Identity
- if ($row['user_email'] != $user_email[0])
+ // Don't sync username or create session when logging in to acp
+ if (!$admin)
{
- // Validate new email address
- $result = validate_email($identity_email);
-
- if ($result != 'EMAIL_BANNED')
+ // Check if user has a new email address in Identity
+ if ($row['user_email'] != $user_email[0])
{
- // Update the new email address for the user
- $sql_ary = array(
- 'user_email' => $user_email[0],
- 'user_email_hash' => phpbb_email_hash($user_email[0]),
- );
+ // Validate new email address
+ $result = validate_email($identity_email);
- $sql = 'UPDATE ' . USERS_TABLE . '
- SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
- WHERE user_id = ' . $row['user_id'];
- $db->sql_query($sql);
+ if ($result != 'EMAIL_BANNED')
+ {
+ // Update the new email address for the user
+ $sql_ary = array(
+ 'user_email' => $user_email[0],
+ 'user_email_hash' => phpbb_email_hash($user_email[0]),
+ );
+
+ $sql = 'UPDATE ' . USERS_TABLE . '
+ SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
+ WHERE user_id = ' . $row['user_id'];
+ $db->sql_query($sql);
+ }
+ else
+ {
+ trigger_error('EMAIL_BANNED');
+ }
}
- else
+ }
+
+ // Capture the old session ID, we need it later
+ $old_session_id = $user->session_id;
+
+ // Expire the current session
+ if ($admin)
+ {
+ global $SID, $_SID;
+
+ $cookie_expire = time() - 31536000;
+ $user->set_cookie('u', '', $cookie_expire);
+ $user->set_cookie('sid', '', $cookie_expire);
+ unset($cookie_expire);
+
+ $SID = '?sid=';
+ $user->session_id = $_SID = '';
+ }
+
+ // Create a new session for the user
+ $result = $user->session_create($row['user_id'], $admin, $autologin, \
$viewonline); +
+ // Successful session creation
+ if ($result === true)
+ {
+ // In admin re-authentication we remove the old session entry because a new one \
has been created + if ($admin)
{
- trigger_error($user->lang['EMAIL_BANNED']);
+ $sql = 'DELETE FROM ' . SESSIONS_TABLE . "
+ WHERE session_id = '" . $db->sql_escape($old_session_id) . "'
+ AND session_user_id = {$row['user_id']}";
+ $db->sql_query($sql);
}
- }
- // All OK!
- $user->session_create($row['user_id'], false, $autologin, $viewonline);
-
- $result = array(
- 'status' => LOGIN_SUCCESS,
- 'error_msg' => false,
- 'user_row' => $row,
- );
+ return array(
+ 'status' => LOGIN_SUCCESS,
+ 'error_msg' => false,
+ 'user_row' => $row,
+ );
+ }
return $result;
}
@@ -1021,7 +1055,7 @@ function kde_identity_chooseuname($identity_username = "", \
$identity_email = "") // Do validations
if (!check_form_key('ucp_identity_choose'))
{
- trigger_error($user->lang['FORM_INVALID']);
+ trigger_error('FORM_INVALID');
}
if (!in_array($choice, array('auto', 'new', 'existing')))
@@ -1057,7 +1091,7 @@ function kde_identity_chooseuname($identity_username = "", \
$identity_email = "")
if ($user_data !== false)
{
- kde_identity_link_user($row['user_id'], $user_data['username']);
+ kde_identity_link_user($row['user_id'], $user_data['username'], true);
}
}
}
@@ -1257,13 +1291,17 @@ function kde_identity_generate_username($identity_username)
/**
* This function will link a user from the reg screen and redirect
*/
-function kde_identity_link_user($user_id, $identity_username)
+function kde_identity_link_user($user_id, $identity_username, $existing_user = \
false) {
global $phpbb_root_path, $phpEx, $db, $user, $template;
-
+
+ // Existing users already have a password, so we needn't set them as identity only
+ $identity_only = $existing_user ? '0' : '1';
+
+ // Update the user data
$sql = "UPDATE " . USERS_TABLE . "
SET identity_username = '" . $db->sql_escape($identity_username) . "',
- identity_only = 1
+ identity_only = {$identity_only}
WHERE user_id = {$user_id}";
$db->sql_query($sql);
@@ -1311,7 +1349,7 @@ function kde_identity_account_settings()
{
if ($submit)
{
- trigger_error($user->lang['IDENTITY_ACT_SETTINGS']);
+ trigger_error('IDENTITY_ACT_SETTINGS');
}
else
{
diff --git a/includes/ucp/ucp_remind.php b/includes/ucp/ucp_remind.php
index cb89ad9..6f3e894 100755
--- a/includes/ucp/ucp_remind.php
+++ b/includes/ucp/ucp_remind.php
@@ -37,6 +37,7 @@ class ucp_remind
if ($submit)
{
$sql = 'SELECT user_id, username, user_permissions, user_email, user_jabber, \
user_notify_type, user_type, user_lang, user_inactive_reason + , identity_only
FROM ' . USERS_TABLE . "
WHERE user_email_hash = '" . $db->sql_escape(phpbb_email_hash($email)) . "'
AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
@@ -49,6 +50,13 @@ class ucp_remind
trigger_error('NO_EMAIL_USER');
}
+ // BEGIN KDE Identity MOD
+ if (isset($user_row['identity_only']) && $user_row['identity_only'] == 1)
+ {
+ trigger_error('IDENTITY_REMIND');
+ }
+ // END KDE Identity MOD
+
if ($user_row['user_type'] == USER_IGNORE)
{
trigger_error('NO_USER');
diff --git a/language/de/common.php b/language/de/common.php
index 3801885..be7cdfb 100755
--- a/language/de/common.php
+++ b/language/de/common.php
@@ -978,6 +978,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
diff --git a/language/de_x_sie/common.php b/language/de_x_sie/common.php
index 0554d39..5aae9bf 100755
--- a/language/de_x_sie/common.php
+++ b/language/de_x_sie/common.php
@@ -978,6 +978,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
diff --git a/language/en/common.php b/language/en/common.php
index 5578d71..f0cf446 100755
--- a/language/en/common.php
+++ b/language/en/common.php
@@ -1006,6 +1006,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
diff --git a/language/en_us/common.php b/language/en_us/common.php
index fc81d38..87b5ce3 100755
--- a/language/en_us/common.php
+++ b/language/en_us/common.php
@@ -979,6 +979,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
diff --git a/language/es/common.php b/language/es/common.php
index e100064..86a4b4e 100755
--- a/language/es/common.php
+++ b/language/es/common.php
@@ -1010,6 +1010,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
diff --git a/language/fa/common.php b/language/fa/common.php
index eea9829..d4a4d90 100755
--- a/language/fa/common.php
+++ b/language/fa/common.php
@@ -1004,6 +1004,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
diff --git a/language/fr/.common.php.kate-swp b/language/fr/.common.php.kate-swp
new file mode 100644
index 0000000..1c3e3fd
Binary files /dev/null and b/language/fr/.common.php.kate-swp differ
diff --git a/language/fr/common.php b/language/fr/common.php
index 2f487d3..c686259 100755
--- a/language/fr/common.php
+++ b/language/fr/common.php
@@ -935,7 +935,7 @@ $lang = array_merge($lang, array(
// START Identity auth modification
'LOGIN_USING_IDENTITY' => 'Log in using <b>KDE Identity</b>',
- 'IDENTITY_REGISTER' => 'Dear user,<br /><br />You can now register at <a \
href="http://identity.kde.org">KDE Identity</a>, ' . + 'IDENTITY_REGISTER' => \
'Dear user,<br /><br />You can now register at <a href="http://identity.kde.org">KDE \
Identity</a>, ' .
'the centralized login system for KDE websites. Having an Identity \
account not only allows you to ' .
'login to KDE Community Forums with your Identity credentials, but also \
lets you use the same ' .
'credentials in all Identity enabled KDE websites.<br /><br />Please note \
that if you register at ' . @@ -954,29 +954,34 @@ $lang = array_merge($lang, array(
'username and password.',
'IDENTITY_ALREADY_LINKED' => 'This Identity username is already linked to another \
account. Contact the ' .
'<a href="mailto:forum-admin@kde.org">Forum Administrators</a> for \
details.',
- 'LINK_ACCOUNTS' => 'Link accounts',
- 'LINK_ACCOUNTS_EXPLAIN' => 'This KDE Identity user is not linked with any KDE \
Community Forum user. You\'ll need to either link ' .
- 'it to an existing account, or create a new account to use your identity \
login. Once you have done this ' .
- 'once, you can use your Identity credentials to login in the future.',
- 'LINK_TO_EXISTING' => 'Link to an existing account',
- 'CREATE_NEW_ACCOUNT' => 'Create a new account',
+ 'DISPLAY_USERNAME' => 'Choose a display username',
+ 'DISPLAY_USERNAME_EXPLAIN' => 'Looks like you are logging into the forum with your \
Identity credentials for the first time.<br />' . + 'You need to choose a \
display username which will be visible to all forum users. This is a one time ' . \
+ 'activity, we promise!', + 'CHOOSE_EXISTING' => 'Choose username from \
an existing forum.kde.org account', + 'CHOOSE_NEW' => 'Specify your own username \
(subject to availability)', + 'CHOOSE_AUTO' => 'Use this auto generated \
username:', 'INVALID_PASSWORD' => 'You have entered an incorrect password.',
'SELECT_LINK_METHOD' => 'Please select one of the linking methods.',
'INVALID_USERNAME' => 'The specified user does not exist.',
- 'SUCCESSFULLY_LINKED' => 'The Identity account was successfully linked to your \
forum user.<br /><br /><a href="%s">Return ' . + 'IDENTITY_REG_COMPLETE' => 'Your \
KDE Identity registration is now complete.<br /><br /><a href="%s">Return ' . 'to \
index page</a>',
- 'USERNAME_TAKEN' => 'The specified username already exists on this forum. Please \
choose an alternative.',
- 'USERNAME_DISALLOWED' => 'This username has been disallowed on this forum. Please \
choose an alternative.',
- 'USERNAME_INVALID_CHARS' => 'The specified username contains invalid characters.',
- 'USERNAME_MANDATORY' => 'Please enter the username.',
- 'PASSWORD_INVALID_CHARS' => 'The specified password contains invalid characters.',
- 'PASSWORDS_DONOT_MATCH' => 'The passwords you entered do not match with each \
other.',
- 'PASSWORD_MANDATORY' => 'Please enter the password twice.',
- 'EMAIL_INVALID' => 'Invalid e-mail address entered.',
- 'EMAIL_NO_MX' => 'E-mail domain does not contain a valid MX record.',
- 'EMAIL_BANNED' => 'This e-mail address has been banned from the forum.',
- 'EMAIL_TAKEN' => 'The specified e-mail address already exists on this forum. \
Please choose an alternative.',
- 'EMAIL_MANDATORY' => 'Please enter the e-mail address.',
+ 'USERNAME_TAKEN' => 'This display username is already in use by another user. \
Please choose an alternative.', + 'USERNAME_DISALLOWED' => 'This display username \
has been disallowed on this forum. Please choose an alternative.', \
+ 'USERNAME_INVALID_CHARS' => 'The specified display username contains invalid \
characters.', + 'USERNAME_MANDATORY' => 'Please enter the display username.',
+ 'EMAIL_BANNED' => 'Your e-mail address has been banned from the forum.',
+ 'EMAIL_TAKEN' => 'You already have an account on this forum (e-mail exists in \
our database). Please select the ' . + '\'choose from existing\' option \
below instead.', + 'COMPLETE_REGISTRATION' => 'Complete registration',
+ 'IDENTITY_ACT_SETTINGS' => 'KDE Identity users cannot modify their account \
settings from the forum. If you want to change ' . + 'your password or \
update your email address, please log into <a href="http://identity.kde.org">' . \
+ 'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' . + 'please feel free to ask the <a \
href="mailto:forum-admin@kde.org">Forum Administrators</a>', + 'IDENTITY_REMIND' => \
'This feature isn\'t available for KDE Identity users.<br />Please use the <a \
href="https://identity.' . + 'kde.org/index.php?r=site/passwordReset">reset \
password</a> option on <a href="http://identity.kde.' . + 'org">KDE \
Identity</a> for resetting your account password.<br /><br />If you have any \
questions, ' . + 'please feel free to ask the <a \
href="mailto:forum-admin@kde.org">Forum Administrators</a>', // END Identity auth \
modification
// BEGIN Neverland changes
diff --git a/language/he/common.php b/language/he/common.php
index 32fbbb9..682524e 100755
--- a/language/he/common.php
+++ b/language/he/common.php
@@ -971,6 +971,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
diff --git a/language/it/common.php b/language/it/common.php
index 6f26b56..06b38d4 100755
--- a/language/it/common.php
+++ b/language/it/common.php
@@ -975,6 +975,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
diff --git a/language/nl/common.php b/language/nl/common.php
index 71b5b44..ce3b6bf 100755
--- a/language/nl/common.php
+++ b/language/nl/common.php
@@ -971,6 +971,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
diff --git a/language/pl/common.php b/language/pl/common.php
index 5c735a1..7a4236c 100755
--- a/language/pl/common.php
+++ b/language/pl/common.php
@@ -999,6 +999,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
diff --git a/language/tr/common.php b/language/tr/common.php
index f12c563..71d6322 100755
--- a/language/tr/common.php
+++ b/language/tr/common.php
@@ -971,6 +971,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
diff --git a/language/zh_cmn_hans/common.php b/language/zh_cmn_hans/common.php
index 98d6b5f..1b0bcfa 100755
--- a/language/zh_cmn_hans/common.php
+++ b/language/zh_cmn_hans/common.php
@@ -986,6 +986,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
diff --git a/language/zh_cmn_hant/common.php b/language/zh_cmn_hant/common.php
index 11958d0..582b439 100755
--- a/language/zh_cmn_hant/common.php
+++ b/language/zh_cmn_hant/common.php
@@ -990,6 +990,10 @@ $lang = array_merge($lang, array(
'your password or update your email address, please log into <a \
href="http://identity.kde.org">' .
'KDE Identity</a> and update them in your profile settings.<br /><br />If \
you have any questions, ' .
'please feel free to ask the <a href="mailto:forum-admin@kde.org">Forum \
Administrators</a>', + 'IDENTITY_REMIND' => 'This feature isn\'t available for KDE \
Identity users.<br />Please use the <a href="https://identity.' . + \
'kde.org/index.php?r=site/passwordReset">reset password</a> option on <a \
href="http://identity.kde.' . + 'org">KDE Identity</a> for resetting your \
account password.<br /><br />If you have any questions, ' . + 'please feel \
free to ask the <a href="mailto:forum-admin@kde.org">Forum Administrators</a>', // \
END Identity auth modification
// BEGIN Neverland changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic