LanguagesManager setLanguageForUser() and setLanguageForSession(): rename $language param to $languageCode.

Piwik::isPhpCliMode() deprecated; moved to Piwik_Common::isPhpCliMode()

Piwik_Common::getBrowserLanguage() uses $_ENV['LANG'] if PHP CLI

Fixes #749 - Login form changes
1) Lost password form now sends an email with reset instructions and link to a password change form instead of changing the password.
2) Added password change form which requires input of a generated token (valid for 24 hrs).
3) Fix $urlToRedirect handling; refactoring; phpdoc comments; minor reformatting

1 files changed, 13 insertions, 7 deletions

diff --git a/lang/en.php b/lang/en.php
index f789eee632..0ea2088585 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 $translations = array(
 	'General_Locale' => 'en_EN.UTF-8',
 	'General_TranslatorName' => '-',
@@ -121,7 +121,7 @@ $translations = array(
 	'API_QuickDocumentation' => '<h2>API quick documentation</h2><p>If you don\'t have data for today you can first <a href=\'misc/generateVisits.php\' target=_blank>generate some data</a> using the Visits Generator script.</p><p>You can try the different formats available for every method. It is very easy to extract any data you want from Piwik!</p><p><b>For more information have a look at the <a href=\'http://dev.piwik.org/trac/wiki/API\'>official API Documentation</a> or the <a href=\'http://dev.piwik.org/trac/wiki/API/Reference\'>API Reference</a>.</b></P><h2>User authentication</h2><p>If you want to <b>request the data in your scripts, in a crontab, etc. </b> you need to add the parameter <code><u>&token_auth=%s</u></code> to the API calls URLs that require authentication.</p><p>This token_auth is as secret as your login and password, <b>do not share it!</p>',
 	'API_LoadedAPIs' => 'Loaded successfully %s APIs',
 	'CoreHome_NoPrivileges' => 'You are logged in as \'%s\' but it seems you don\'t have any permission set in Piwik.<br />Ask your Piwik administrator to give you \'view\' access to a website.',
-	'CoreHome_JavascriptDisabled' => 'JavaScript must be enabled in order for you to use Piwik in standard view.<br />However, it seems JavaScript is either disabled or not supported by your browser.<br />To use standard view, enable JavaScript by changing your browser options, then %1stry again%2s.<br />',
+	'CoreHome_JavascriptDisabled' => 'JavaScript must be enabled in order for you to use Piwik in standard view.<br />However, it seems JavaScript is either disabled or not supported by your browser.<br />To use standard view, enable JavaScript by changing your browser options, then %stry again%s.<br />',
 	'CoreHome_TableNoData' => 'No data for this table.',
 	'CoreHome_CategoryNoData' => 'No data in this category. Try to "Include all population".',
 	'CoreHome_ShowJSCode' => 'Show the JavaScript code to insert',
@@ -225,7 +225,7 @@ $translations = array(
 	'Referers_DirectEntry' => 'Direct Entry',
 	'Referers_Websites' => 'Websites',
 	'Referers_Campaigns' => 'Campaigns',
-	'Referers_MetricsFromRefererTypeGraphLegend' => '%1s (from %2s)',
+	'Referers_MetricsFromRefererTypeGraphLegend' => '%s (from %s)',
 	'Referers_Evolution' => 'Evolution over the period',
 	'Referers_Type' => 'Referer Type',
 	'Referers_ColumnRefererType' => 'Referer Type',
@@ -604,16 +604,22 @@ $translations = array(
 	'Login_LoginPasswordNotCorrect' => 'Username & Password not correct',
 	'Login_Login' => 'Username',
 	'Login_Password' => 'Password',
+	'Login_PasswordRepeat' => 'Password (repeat)',
+	'Login_ChangePassword' => 'Change password',
 	'Login_LoginOrEmail' => 'Login or E-mail',
 	'Login_LogIn' => 'Sign in',
 	'Login_Logout' => 'Sign out',
 	'Login_LostYourPassword' => 'Lost your password?',
-	'Login_RemindPassword' => 'Remind password',
-	'Login_PasswordReminder' => 'Please enter your username or e-mail address. You will receive a new password via e-mail.',
+	'Login_RemindPassword' => 'Send password reset',
+	'Login_PasswordResetToken' => 'Password reset token',
+	'Login_PasswordReminder' => 'Please enter your username or e-mail address. You will receive an e-mail with information to reset your password.',
+	'Login_PasswordsDoNotMatch' => 'Passwords do not match.',
+	'Login_PasswordSuccessfullyChanged' => 'Password successfully changed!',
 	'Login_InvalidUsernameEmail' => 'Invalid username and/or e-mail address',
+	'Login_InvalidOrExpiredToken' => 'Token is invalid or has expired',
 	'Login_MailTopicPasswordRecovery' => 'Password recovery',
-	'Login_MailPasswordRecoveryBody' => 'Hi %1s, \n\n Your new password is: %2s \n\n You can login now at: %3s',
-	'Login_PasswordSent' => 'Password has been just sent. Check your e-mail.',
+	'Login_MailPasswordRecoveryBody' => "Hi %s,\n\nA password reset request was received from %s.\n\nTo reset your password:\n\n1) Go to the Password Reset Form at:\n\t%s\n\n2) Enter the following token:\n\t%s\n\n3) Fill out the form (entering your new password twice) and submit.\n\nNote: this token will expire in 24 hrs.\n",
+	'Login_PasswordSent' => 'Information to reset your password has been sent. Check your e-mail.',
 	'Login_ContactAdmin' => 'Possible reason: your host may have disabled the mail() function. <br />Please contact your Piwik administrator.',
 	'UsersManager_UsersManagement' => 'Users Management',
 	'UsersManager_UsersManagementMainDescription' => 'Create new users or update the existing users. You can then set their permissions above.',