Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1322) +++ branches/2.8.x/CHANGELOG (revision 1323) @@ -12,6 +12,11 @@ ------------------------------------- 2.8.1 ------------------------------------- 14-Apr-2010 Dietmar Woellbrink (Luisehahne) +# Ticket #985 With #1318 no login in backend possible +# Ticket #986 Typo inside the german language file +# Ticket #982 Unnessesary heredoc causes on errors while installation! +# Ticket #926/Ticket #928 Mail Notification on new user registration +14-Apr-2010 Dietmar Woellbrink (Luisehahne) # Ticket #984 Removing outdated comment-block in class.login.php # Ticket #983 Sorting order of modules and templates inside groups.php 14-Apr-2010 Dietrich Roland Pehlke (Aldus) Index: branches/2.8.x/wb/admin/groups/groups.php =================================================================== --- branches/2.8.x/wb/admin/groups/groups.php (revision 1322) +++ branches/2.8.x/wb/admin/groups/groups.php (revision 1323) @@ -21,7 +21,7 @@ require_once(WB_PATH.'/framework/class.admin.php'); // Create new database object -$database = new database(); +// $database = new database(); if(!isset($_POST['action']) OR ($_POST['action'] != "modify" AND $_POST['action'] != "delete")) { header("Location: index.php"); Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1322) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1323) @@ -52,6 +52,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.x'); -if(!defined('REVISION')) define('REVISION', '1322'); +if(!defined('REVISION')) define('REVISION', '1323'); ?> \ No newline at end of file Index: branches/2.8.x/wb/account/forgot_form.php =================================================================== --- branches/2.8.x/wb/account/forgot_form.php (revision 1322) +++ branches/2.8.x/wb/account/forgot_form.php (revision 1323) @@ -22,7 +22,7 @@ } // Create new database object -$database = new database(); +// $database = new database(); // Check if the user has already submitted the form, otherwise show it if(isset($_POST['email']) && $_POST['email'] != "" && @@ -74,7 +74,7 @@ // Replace placeholders from language variable with values $search = array('{LOGIN_DISPLAY_NAME}', '{LOGIN_WEBSITE_TITLE}', '{LOGIN_NAME}', '{LOGIN_PASSWORD}'); $replace = array($results_array['display_name'], WEBSITE_TITLE, $results_array['username'], $new_pass); - $mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2']['BODY_LOGIN_INFO']); + $mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2']['BODY_LOGIN_FORGOT']); // Try sending the email if($wb->mail(SERVER_EMAIL,$mail_to,$mail_subject,$mail_message)) { Index: branches/2.8.x/wb/framework/class.login.php =================================================================== --- branches/2.8.x/wb/framework/class.login.php (revision 1322) +++ branches/2.8.x/wb/framework/class.login.php (revision 1323) @@ -32,7 +32,7 @@ class login extends admin { function login($config_array) { // Get language vars - global $MESSAGE; + global $MESSAGE, $database; $this->wb(); // Get configuration values $this->USERS_TABLE = $config_array['USERS_TABLE']; @@ -61,8 +61,8 @@ $username_fieldname = 'username'; $password_fieldname = 'password'; } + $this->username = htmlspecialchars (strtolower($this->get_post($username_fieldname)), ENT_QUOTES); - $this->username = htmlspecialchars (strtolower($this->get_post($username_fieldname)), ENT_QUOTES); $this->password = $this->get_post($password_fieldname); // Figure out if the "remember me" option has been checked if($this->get_post('remember') == 'true') { @@ -90,7 +90,7 @@ } elseif($this->is_remembered() == true) { // User has been "remembered" // Get the users password - $database = new database(); + // $database = new database(); $query_details = $database->query("SELECT * FROM ".$this->USERS_TABLE." WHERE user_id = '".$this->get_safe_remember_key()."' LIMIT 1"); $fetch_details = $query_details->fetchRow(); $this->username = $fetch_details['username']; @@ -142,9 +142,12 @@ // Authenticate the user (check if they exist in the database) function authenticate() { + global $database; // Get user information - $database = new database(); - $query = 'SELECT * FROM `'.$this->USERS_TABLE.'` WHERE MD5(`username`) = "'.md5($this->username).'" AND `password` = "'.$this->password.'" AND `active` = 1'; + // $database = new database(); + // $query = 'SELECT * FROM `'.$this->USERS_TABLE.'` WHERE MD5(`username`) = "'.md5($this->username).'" AND `password` = "'.$this->password.'" AND `active` = 1'; + $loginname = ( preg_match('/[\;\=\&\|\<\> ]/',$this->username) ? '' : $this->username ); + $query = 'SELECT * FROM `'.$this->USERS_TABLE.'` WHERE `username` = "'.$loginname.'" AND `password` = "'.$this->password.'" AND `active` = 1'; $results = $database->query($query); $results_array = $results->fetchRow(); $num_rows = $results->numRows(); @@ -246,6 +249,7 @@ // Function to set a "remembering" cookie for the user function remember($user_id) { + global $database; $remember_key = ''; // Generate user id to append to the remember key $length = 11-strlen($user_id); @@ -267,7 +271,7 @@ } $remember_key = $remember_key; // Update the remember key in the db - $database = new database(); + // $database = new database(); $database->query("UPDATE ".$this->USERS_TABLE." SET remember_key = '$remember_key' WHERE user_id = '$user_id' LIMIT 1"); if($database->is_error()) { return false; @@ -287,9 +291,10 @@ // Function to check if a user has been remembered function is_remembered() { + global $database; if(isset($_COOKIE['REMEMBER_KEY']) AND $_COOKIE['REMEMBER_KEY'] != '') { // Check if the remember key is correct - $database = new database(); + // $database = new database(); $sql = "SELECT `user_id` FROM `" . $this->USERS_TABLE . "` WHERE `remember_key` = '"; $sql .= $this->get_safe_remember_key() . "' LIMIT 1"; $check_query = $database->query($sql); Index: branches/2.8.x/wb/languages/FI.php =================================================================== --- branches/2.8.x/wb/languages/FI.php (revision 1322) +++ branches/2.8.x/wb/languages/FI.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Anna sähköpostiosoite'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. -EOT; +Regards +------------------------------------ +This message was automatic generated +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Anna sähköpostiosoite'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Virheellinen sähköpostiosoite'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Salasanan postitus ei onnistu, ota yhteyttä pääkäyttäjään'; Index: branches/2.8.x/wb/languages/EN.php =================================================================== --- branches/2.8.x/wb/languages/EN.php (revision 1322) +++ branches/2.8.x/wb/languages/EN.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'You must enter an email address'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards - $MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. -EOT; +Regards +------------------------------------ +This message was automatic generated +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Please enter your email address below'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'The email that you entered cannot be found in the database'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Unable to email password, please contact system administrator'; @@ -623,7 +637,7 @@ $MESSAGE['SIGNUP']['NO_EMAIL'] = $MESSAGE['SIGNUP_NO_EMAIL'] ; $MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] ; $MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = $MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] ; - $MESSAGE['SIGNUP2']['BODY_LOGIN_FORGOT'] = $MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] ; +$MESSAGE['SIGNUP2']['BODY_LOGIN_FORGOT'] = $MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] ; $MESSAGE['FORGOT_PASS']['NO_DATA'] = $MESSAGE['FORGOT_PASS_NO_DATA'] ; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] ; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] ; Index: branches/2.8.x/wb/languages/CS.php =================================================================== --- branches/2.8.x/wb/languages/CS.php (revision 1322) +++ branches/2.8.x/wb/languages/CS.php (revision 1323) @@ -451,28 +451,42 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Musíte zadat e-mailovou adresu'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; $MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " - Hello {LOGIN_DISPLAY_NAME}, +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. +Regards + +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! "; $MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. +Regards +------------------------------------ +This message was automatic generated + "; $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Zadejte svoji e-mailovou adresu:'; Index: branches/2.8.x/wb/languages/SE.php =================================================================== --- branches/2.8.x/wb/languages/SE.php (revision 1322) +++ branches/2.8.x/wb/languages/SE.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Du måste skriva en e-postadress'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. -EOT; +Regards +------------------------------------ +This message was automatic generated +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Skriv din e-postadress'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'E-postadressen som du skrev in kan inte hittas i vår databas'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Kunde inte skicka lösenordet, vänligen kontakta administratatören'; Index: branches/2.8.x/wb/languages/ES.php =================================================================== --- branches/2.8.x/wb/languages/ES.php (revision 1322) +++ branches/2.8.x/wb/languages/ES.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Debe ingresar una direccion de email'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. -EOT; +Regards +------------------------------------ +This message was automatic generated +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Por favor ingrese su direccion de email'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Email no encontrado en base de datos'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'No puedo enviarle la contraseña, contacte a su Administrador'; Index: branches/2.8.x/wb/languages/FR.php =================================================================== --- branches/2.8.x/wb/languages/FR.php (revision 1322) +++ branches/2.8.x/wb/languages/FR.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'L'adresse email est obligatoire'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Paramètres de votre connexion ...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT -Bonjour, {LOGIN_DISPLAY_NAME}, +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; -Les paramètres de connexion au site web '{LOGIN_WEBSITE_TITLE}' sont : -identifiant : {LOGIN_NAME} -mot de passe : {LOGIN_PASSWORD} +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " +Hello {LOGIN_DISPLAY_NAME}, -Votre mot de passe a été modifié avec la valeur ci-dessus. -Par conséquent, votre ancien mot de passe n'est plus valide. +This mail was sent because the 'forgot password' function has been applied to your account. -Si vous avez re&ccdil;u ce message par erreur, merci de le supprimer immédiatement. -EOT; +Your new '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. + +Regards +------------------------------------ +This message was automatic generated + +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Merci de saisir votre adresse email'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'L'adresse email que vous avez saisi est introuvable dans la base de données'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Impossible de vous renvoyer vos identifiants, merci de contacter l'administrateur du site'; Index: branches/2.8.x/wb/languages/ET.php =================================================================== --- branches/2.8.x/wb/languages/ET.php (revision 1322) +++ branches/2.8.x/wb/languages/ET.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Sa pead sisestama emaili aadressi'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. -EOT; +Regards +------------------------------------ +This message was automatic generated +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Palun sisesta oma emaili aadress allapoole'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Sisestatud emaili eileitud andmebaasist'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Võimetu emailima parooli, palun kontakteeru süsteemi administraatoriga'; Index: branches/2.8.x/wb/languages/HR.php =================================================================== --- branches/2.8.x/wb/languages/HR.php (revision 1322) +++ branches/2.8.x/wb/languages/HR.php (revision 1323) @@ -451,28 +451,42 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Unesite email adresu'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; $MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " - Hello {LOGIN_DISPLAY_NAME}, +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. - "; +Regards +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + $MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. +Regards +------------------------------------ +This message was automatic generated + "; $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Unesite svoju email adresu ispod'; Index: branches/2.8.x/wb/languages/NL.php =================================================================== --- branches/2.8.x/wb/languages/NL.php (revision 1322) +++ branches/2.8.x/wb/languages/NL.php (revision 1323) @@ -449,31 +449,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'U moet een e-mailadres invullen'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Uw login-gegevens...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT -Hallo {LOGIN_DISPLAY_NAME}, +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; -Uw '{LOGIN_WEBSITE_TITLE}' inloggegevens zijn: -Gebruikersnaam: {LOGIN_NAME} -Wachtwoord: {LOGIN_PASSWORD} +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " +Hello {LOGIN_DISPLAY_NAME}, -Uw wachtwoord is ingesteld en zichtbaar hierboven. -Dit betekent dat uw oude wachtwoord niet meer werkt. +This mail was sent because the 'forgot password' function has been applied to your account. -Indien deze melding niet voor u bestemd is, verwijder deze dan onmiddellijk. -EOT; +Your new '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. + +Regards +------------------------------------ +This message was automatic generated + +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Vult u alstublieft uw e-mailadres hieronder in'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Het door u opgegeven e-mailadres is niet gevonden in onze database'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Het is niet mogelijk uw wachtwoord per e-mail te versturen. Neem contact op met de beheerder'; Index: branches/2.8.x/wb/languages/PL.php =================================================================== --- branches/2.8.x/wb/languages/PL.php (revision 1322) +++ branches/2.8.x/wb/languages/PL.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Należy wprowadzić adres e-mail'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. -EOT; +Regards +------------------------------------ +This message was automatic generated +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Proszę wprowadzić poniżej swój adres e-mail'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Wprowadzonego adresu e-mail nie ma w bazie danych'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Nie udało się wysłać hasła, proszę się skontaktować z administratorem'; Index: branches/2.8.x/wb/languages/HU.php =================================================================== --- branches/2.8.x/wb/languages/HU.php (revision 1322) +++ branches/2.8.x/wb/languages/HU.php (revision 1323) @@ -452,31 +452,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'E-mail címet meg kell adnia'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Bejelentkezési részletek...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT -¤vözöllek {LOGIN_DISPLAY_NAME}, +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; -A te belépésed a(z) '{LOGIN_WEBSITE_TITLE}' oldalra az alábbiak: -Felhasználónév: {LOGIN_NAME} -Jelszó: {LOGIN_PASSWORD} +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " +Hello {LOGIN_DISPLAY_NAME}, -A jelszavadat elküldük az email címedre. -Ez azt jelenti, hogy a régi jelszavad már nem használható. +This mail was sent because the 'forgot password' function has been applied to your account. -Ha nem te kérted a jelszó változtatást, akkor kérlek töröld ezt az emailt. -EOT; +Your new '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. + +Regards +------------------------------------ +This message was automatic generated + +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Kérem írja be az E-mail címét'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Az ® által megadott E-mail cím nem talalható adatbázisunkban'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Az E-mail küldés problémába ütközött, kérem vegye fel a kapcsolatot az adminisztrátorral'; Index: branches/2.8.x/wb/languages/IT.php =================================================================== --- branches/2.8.x/wb/languages/IT.php (revision 1322) +++ branches/2.8.x/wb/languages/IT.php (revision 1323) @@ -449,32 +449,45 @@ $MESSAGE['LOGIN_AUTHENTICATION_FAILED'] = 'Username o password errati'; $MESSAGE['SIGNUP_NO_EMAIL'] = 'Deve inserire un indirizzo di email'; -$MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; - $MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards - $MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. -EOT; +Regards +------------------------------------ +This message was automatic generated +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Prego inserire email'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'L\'Email inserita non è stata trovata nel database'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Impossibile inviare l\'email. Contattare l\'ammnistratore'; @@ -621,9 +634,8 @@ $MESSAGE['LOGIN']['PASSWORD_TOO_LONG'] = $MESSAGE['LOGIN_PASSWORD_TOO_LONG'] ; $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = $MESSAGE['LOGIN_AUTHENTICATION_FAILED'] ; $MESSAGE['SIGNUP']['NO_EMAIL'] = $MESSAGE['SIGNUP_NO_EMAIL'] ; -$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] ; - $MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = $MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] ; - $MESSAGE['SIGNUP2']['BODY_LOGIN_FORGOT'] = $MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] ; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = $MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] ; +$MESSAGE['SIGNUP2']['BODY_LOGIN_FORGOT'] = $MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] ; $MESSAGE['FORGOT_PASS']['NO_DATA'] = $MESSAGE['FORGOT_PASS_NO_DATA'] ; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] ; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] ; Index: branches/2.8.x/wb/languages/NO.php =================================================================== --- branches/2.8.x/wb/languages/NO.php (revision 1322) +++ branches/2.8.x/wb/languages/NO.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Du må skrive inn en e-post adresse'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Dine på-loggings detaljer...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT -Hei {LOGIN_DISPLAY_NAME}, +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; -Dine på-loggings detaljer for '{LOGIN_WEBSITE_TITLE}' er: -Brukernavn: {LOGIN_NAME} -Passord: {LOGIN_PASSWORD} +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " +Hello {LOGIN_DISPLAY_NAME}, -Dit passord er sendt til e-postadressen over. -Dette betyr at ditt tidligere passord ikke er gyldig lenger. +This mail was sent because the 'forgot password' function has been applied to your account. -Hvis du har mottatt denne e-posten ved en feil, vær vennlig å slette den med en gang. -EOT; +Your new '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. + +Regards +------------------------------------ +This message was automatic generated + +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Vennligst skriv e-post adressen nedenfor'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'E-post adressen ble ikke funnet i databasen'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Kunne ikke sende passord. Kontakt system administrator'; Index: branches/2.8.x/wb/languages/SK.php =================================================================== --- branches/2.8.x/wb/languages/SK.php (revision 1322) +++ branches/2.8.x/wb/languages/SK.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Musíte zadať e-mailovou adresu'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Vase prihlasovacie udaje...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT -Vážený {LOGIN_DISPLAY_NAME}, +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; -Pre Vaše prihlásenie do '{LOGIN_WEBSITE_TITLE}' použite: -Meno: {LOGIN_NAME} -Heslo: {LOGIN_PASSWORD} +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " +Hello {LOGIN_DISPLAY_NAME}, -Vaše heslo bolo nastavené na nové, uvedené vyššie. -To znamená, že vaše staré heslo už nebude fungovať. +This mail was sent because the 'forgot password' function has been applied to your account. -Ak ste túto správu dostali omylom, prosím, ihneď ju zmažte. -EOT; +Your new '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. + +Regards +------------------------------------ +This message was automatic generated + +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Zadajte svoju e-mailovou adresu:'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Zadaná e-mailová adresa alebola nájdená'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Nejde odoslať heslo e-mailom, kontaktujte prosím správcu systému'; Index: branches/2.8.x/wb/languages/LV.php =================================================================== --- branches/2.8.x/wb/languages/LV.php (revision 1322) +++ branches/2.8.x/wb/languages/LV.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Jaievada e-pasta adrese'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. -EOT; +Regards +------------------------------------ +This message was automatic generated +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Ludzu ievadi savu e-pasta adresi zemak redzamaja lauka'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Ievadito e-pasta adresi nebija iespejams atrast datu baze'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Lietotajvardu un paroli pa e-pastu nebija iespejams nosutit, ludzu sakontakte sistemas administratoru'; Index: branches/2.8.x/wb/languages/CA.php =================================================================== --- branches/2.8.x/wb/languages/CA.php (revision 1322) +++ branches/2.8.x/wb/languages/CA.php (revision 1323) @@ -450,31 +450,44 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Heu d\'Introduir una adreça de correu'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. -EOT; +Regards +------------------------------------ +This message was automatic generated +"; $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Per favor introduïu la vostra adreça de correu a baix'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'El correu que heu introduït no s\'ha trobat a la base de dades'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'No ha estat possible enviar la contrasenya, per favor contacteu amb l\'administrador del sistema'; @@ -622,6 +635,7 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = $MESSAGE['LOGIN_AUTHENTICATION_FAILED'] ; $MESSAGE['SIGNUP']['NO_EMAIL'] = $MESSAGE['SIGNUP_NO_EMAIL'] ; $MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] ; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = $MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] ; $MESSAGE['SIGNUP2']['BODY_LOGIN_FORGOT'] = $MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] ; $MESSAGE['FORGOT_PASS']['NO_DATA'] = $MESSAGE['FORGOT_PASS_NO_DATA'] ; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] ; Index: branches/2.8.x/wb/languages/PT.php =================================================================== --- branches/2.8.x/wb/languages/PT.php (revision 1322) +++ branches/2.8.x/wb/languages/PT.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Você precisa informar um endere&ccdil;o de email'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. -EOT; +Regards +------------------------------------ +This message was automatic generated +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Favor inserir seu email abaixo'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'O email informado não pode ser encontrado no banco de dados'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Não foi possível enviar a senha, favor contatar o administrador do sistema'; Index: branches/2.8.x/wb/languages/DA.php =================================================================== --- branches/2.8.x/wb/languages/DA.php (revision 1322) +++ branches/2.8.x/wb/languages/DA.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Du skal indtaste en gyldig email-adresse'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Dine login-oplysninger...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT -Hej {LOGIN_DISPLAY_NAME}, +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; -Dine '{LOGIN_WEBSITE_TITLE}' loginoplysninger er: -Brugernavn: {LOGIN_NAME} -Adgangskode: {LOGIN_PASSWORD} +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " +Hello {LOGIN_DISPLAY_NAME}, -Din adgangskode er sat til ovenstående. -Det betyder, at din gamle adgangskode ikke virker mere. +This mail was sent because the 'forgot password' function has been applied to your account. -Hvis du har modtaget denne besked ved en fejl, bedes du straks slette den. -EOT; +Your new '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. + +Regards +------------------------------------ +This message was automatic generated + +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Indtast din email-adresse nedenfor'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Den email-adresse du indtastede findes ikke i vores database'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Kunne ikke sende din adgangskode til din email-adresse - Kontakt en systemadministrator'; Index: branches/2.8.x/wb/languages/TR.php =================================================================== --- branches/2.8.x/wb/languages/TR.php (revision 1322) +++ branches/2.8.x/wb/languages/TR.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Bir email adresi girmelisiniz.'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. -EOT; +Regards +------------------------------------ +This message was automatic generated +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Lütfen email adresini girin'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Bu email adresi veritabanýnda bulunamadý'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Uygunsuz email þifresi, Lütfen Yönetici ile Kontak kurun'; Index: branches/2.8.x/wb/languages/RU.php =================================================================== --- branches/2.8.x/wb/languages/RU.php (revision 1322) +++ branches/2.8.x/wb/languages/RU.php (revision 1323) @@ -450,31 +450,45 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Вы должны ввести email адрес'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hello {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. -EOT; +Regards -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. -EOT; +Regards +------------------------------------ +This message was automatic generated +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Пожалуйста введите ваш email'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Email, который вы ввели, не найден в базе'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Невозможно выслать пароль, обратитесь к вашему администратору'; Index: branches/2.8.x/wb/languages/DE.php =================================================================== --- branches/2.8.x/wb/languages/DE.php (revision 1322) +++ branches/2.8.x/wb/languages/DE.php (revision 1323) @@ -451,22 +451,29 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Bitte geben Sie Ihre E-Mail Adresse an'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Deine WB Logindaten ...'; -$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = <<< EOT - Hallo {LOGIN_DISPLAY_NAME}, +$MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " +Hallo {LOGIN_DISPLAY_NAME}, - Vielen Dank für deine Registrieung. +Herlich willkommen bei '{LOGIN_WEBSITE_TITLE}' - Deine Logindaten für {LOGIN_WEBSITE_TITLE} lauten: - Benutzername: {LOGIN_NAME} - Passwort: {LOGIN_PASSWORD} +Ihre Logindaten für '{LOGIN_WEBSITE_TITLE}' lauten: +Benutzername: {LOGIN_NAME} +Passwort: Registrierungspasswort - Wenn Du dieses E-Mail versehentlich erhalten hast, bitte einfach löschen. -EOT; +Vielen Dank für Ihre Registrierung -$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = <<< EOT +Wenn Sie dieses E-Mail versehentlich erhalten haben, löschen Sie bitte diese E-Mail. +---------------------------------------- +Diese E-Mail wurde automatisch erstellt! +"; + +$MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hallo {LOGIN_DISPLAY_NAME}, -Deine neuen Logindaten für {LOGIN_WEBSITE_TITLE} lauten: +Sie erhalten diese E-Mail, weil sie ein neues Passwort angefordert haben. + +Ihre neuen Logindaten für {LOGIN_WEBSITE_TITLE} lauten: + Benutzername: {LOGIN_NAME} Passwort: {LOGIN_PASSWORD} @@ -473,9 +480,13 @@ Dein bisheriges Passwort wurde durch das neue Passwort oben ersetzt. Das bisherige Passwort ist nicht mehr gültig. -Wenn Du dieses E-Mail versehentlich erhalten hast, bitte einfach löschen. -EOT; +Sollten Sie kein neues Kennwort angefordert haben, löschen Sie bitte diese E-Mail. +Mit freundlichen Grüssen +---------------------------------------- +Diese E-Mail wurde automatisch erstellt! +"; + $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Bitte geben Sie nachfolgend Ihre E-Mail Adresse an'; $MESSAGE['FORGOT_PASS_EMAIL_NOT_FOUND'] = 'Die angegebene E-Mail Adresse wurde nicht in der Datenbank gefunden'; $MESSAGE['FORGOT_PASS_CANNOT_EMAIL'] = 'Das Passwort konnte nicht versendet werden, bitte kontaktieren Sie den Systemadministrator'; Index: branches/2.8.x/wb/languages/BG.php =================================================================== --- branches/2.8.x/wb/languages/BG.php (revision 1322) +++ branches/2.8.x/wb/languages/BG.php (revision 1323) @@ -451,28 +451,42 @@ $MESSAGE['SIGNUP_NO_EMAIL'] = 'Трябва да въведете e-mail адрес'; $MESSAGE['SIGNUP2_SUBJECT_LOGIN_INFO'] = 'Your login details...'; $MESSAGE['SIGNUP2_BODY_LOGIN_INFO'] = " - Hello {LOGIN_DISPLAY_NAME}, +Hello {LOGIN_DISPLAY_NAME}, - You are welcome to our {LOGIN_WEBSITE_TITLE}. +Welcome to our '{LOGIN_WEBSITE_TITLE}'. - Your '{LOGIN_WEBSITE_TITLE}' login details are: - Username: {LOGIN_NAME} - Password: {LOGIN_PASSWORD} +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} - If you have received this message in error, please delete it immediately. +Regards + +Please: +if you have received this message by an error, please delete it immediately! +------------------------------------- +This message was automatic generated! "; $MESSAGE['SIGNUP2_BODY_LOGIN_FORGOT'] = " Hello {LOGIN_DISPLAY_NAME}, -Your '{LOGIN_WEBSITE_TITLE}' login details are: +This mail was sent because the 'forgot password' function has been applied to your account. + +Your new '{LOGIN_WEBSITE_TITLE}' login details are: + Username: {LOGIN_NAME} Password: {LOGIN_PASSWORD} -Your password has been set to the one above. -This means that your old password will no longer work. +Your password has been reset to the one above. +This means that your old password will no longer work anymore! +If you've got any questions or problems within the new login-data +you should contact the website-team or the admin of '{LOGIN_WEBSITE_TITLE}'. +Please remember to clean you browser-cache before using the new one to avoid unexpected fails. -If you have received this message in error, please delete it immediately. +Regards +------------------------------------ +This message was automatic generated + "; $MESSAGE['FORGOT_PASS_NO_DATA'] = 'Въведете email адрес';