X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Flostpass.php;h=b3304fda12bba312b3149025bb21f3f8c76b2107;hb=88ef61df95ed1b26e44d0b28bf22a1c682b5899a;hp=3dca3a8b81d51d80137b25c86408a3257094d7e8;hpb=63610c7b73fcaf862adbf880d4968dd2b1678d9b;p=friendica.git
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 3dca3a8b81..b3304fda12 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -1,23 +1,28 @@
config['sitename'];
- $siteurl = $a->get_baseurl();
- $resetlink = $a->get_baseurl() . '/lostpass?verify=' . $new_password;
+ $resetlink = System::baseUrl() . '/lostpass?verify=' . $new_password;
$preamble = deindent(t('
Dear %1$s,
@@ -64,21 +68,21 @@ function lostpass_post(&$a) {
Login Name: %3$s'));
$preamble = sprintf($preamble, $username, $sitename);
- $body = sprintf($body, $resetlink, $siteurl, $email);
+ $body = sprintf($body, $resetlink, System::baseUrl(), $email);
notification(array(
- 'type' => "SYSTEM_EMAIL",
+ 'type' => SYSTEM_EMAIL,
'to_email' => $email,
'subject'=> sprintf( t('Password reset requested at %s'),$sitename),
'preamble'=> $preamble,
'body' => $body));
- goaway(z_root());
+ goaway(System::baseUrl());
}
-function lostpass_content(&$a) {
+function lostpass_content(App $a) {
if(x($_GET,'verify')) {
@@ -88,7 +92,7 @@ function lostpass_content(&$a) {
$r = q("SELECT * FROM `user` WHERE `pwdreset` = '%s' LIMIT 1",
dbesc($hash)
);
- if(! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
$o = t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.");
return $o;
}
@@ -103,24 +107,25 @@ function lostpass_content(&$a) {
dbesc($new_password_encoded),
intval($uid)
);
- if($r) {
+
+ /// @TODO Is DBM::is_result() okay here?
+ if ($r) {
$tpl = get_markup_template('pwdreset.tpl');
$o .= replace_macros($tpl,array(
'$lbl1' => t('Password Reset'),
'$lbl2' => t('Your password has been reset as requested.'),
'$lbl3' => t('Your new password is'),
'$lbl4' => t('Save or copy your new password - and then'),
- '$lbl5' => '' . t('click here to login') . '.',
+ '$lbl5' => '' . t('click here to login') . '.',
'$lbl6' => t('Your password may be changed from the Settings page after successful login.'),
'$newpass' => $new_password,
- '$baseurl' => $a->get_baseurl()
+ '$baseurl' => System::baseUrl()
));
info("Your password has been reset." . EOL);
$sitename = $a->config['sitename'];
- $siteurl = $a->get_baseurl();
// $username, $email, $new_password
$preamble = deindent(t('
Dear %1$s,
@@ -139,10 +144,10 @@ function lostpass_content(&$a) {
'));
$preamble = sprintf($preamble, $username);
- $body = sprintf($body, $siteurl, $email, $new_password);
+ $body = sprintf($body, System::baseUrl(), $email, $new_password);
notification(array(
- 'type' => "SYSTEM_EMAIL",
+ 'type' => SYSTEM_EMAIL,
'to_email' => $email,
'subject'=> sprintf( t('Your password has been changed at %s'),$sitename),
'preamble'=> $preamble,