diff options
| -rw-r--r-- | config.php-dist | 3 | ||||
| -rw-r--r-- | functions.php | 6 | ||||
| -rw-r--r-- | lib/phpmailer/class.phpmailer.php (renamed from phpmailer/class.phpmailer.php) | 0 | ||||
| -rw-r--r-- | lib/phpmailer/class.smtp.php (renamed from phpmailer/class.smtp.php) | 0 | ||||
| -rw-r--r-- | lib/phpmailer/language/phpmailer.lang-en.php (renamed from phpmailer/language/phpmailer.lang-en.php) | 0 | ||||
| -rw-r--r-- | modules/pref-users.php | 6 | ||||
| -rw-r--r-- | register.php | 8 |
7 files changed, 10 insertions, 13 deletions
diff --git a/config.php-dist b/config.php-dist index 78f1a2b3f..e7238a609 100644 --- a/config.php-dist +++ b/config.php-dist @@ -43,9 +43,6 @@ // some use-cases (if you have more than one tt-rss window open, for example) // so it is disabled by default. - define('MAIL_RESET_PASS', true); - // Send mail to user on password reset - define('ENABLE_FEED_BROWSER', true); // Enable or disable local feed browser diff --git a/functions.php b/functions.php index bddee8b17..0d82f817e 100644 --- a/functions.php +++ b/functions.php @@ -96,7 +96,7 @@ require_once 'errors.php'; require_once 'version.php'; - require_once 'phpmailer/class.phpmailer.php'; + require_once 'lib/phpmailer/class.phpmailer.php'; define('MAGPIE_USER_AGENT_EXT', ' (Tiny Tiny RSS/' . VERSION . ')'); define('MAGPIE_OUTPUT_ENCODING', 'UTF-8'); @@ -3618,8 +3618,8 @@ $mail = new PHPMailer(); - $mail->PluginDir = "phpmailer/"; - $mail->SetLanguage("en", "phpmailer/language/"); + $mail->PluginDir = "lib/phpmailer/"; + $mail->SetLanguage("en", "lib/phpmailer/language/"); $mail->CharSet = "UTF-8"; diff --git a/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php index 061a16f47..061a16f47 100644 --- a/phpmailer/class.phpmailer.php +++ b/lib/phpmailer/class.phpmailer.php diff --git a/phpmailer/class.smtp.php b/lib/phpmailer/class.smtp.php index df3cfb58b..df3cfb58b 100644 --- a/phpmailer/class.smtp.php +++ b/lib/phpmailer/class.smtp.php diff --git a/phpmailer/language/phpmailer.lang-en.php b/lib/phpmailer/language/phpmailer.lang-en.php index 14b677ff1..14b677ff1 100644 --- a/phpmailer/language/phpmailer.lang-en.php +++ b/lib/phpmailer/language/phpmailer.lang-en.php diff --git a/modules/pref-users.php b/modules/pref-users.php index 6a768cede..392e596ab 100644 --- a/modules/pref-users.php +++ b/modules/pref-users.php @@ -283,7 +283,7 @@ print_notice(T_sprintf("Changed password of user <b>%s</b> to <b>%s</b>", $login, $tmp_user_pwd)); - if (MAIL_RESET_PASS && $email) { + if ($email) { print_notice(T_sprintf("Notifying <b>%s</b>.", $email)); require_once "MiniTemplator.class.php"; @@ -303,8 +303,8 @@ $mail = new PHPMailer(); - $mail->PluginDir = "phpmailer/"; - $mail->SetLanguage("en", "phpmailer/language/"); + $mail->PluginDir = "lib/phpmailer/"; + $mail->SetLanguage("en", "lib/phpmailer/language/"); $mail->CharSet = "UTF-8"; diff --git a/register.php b/register.php index edd289375..db6dcb86c 100644 --- a/register.php +++ b/register.php @@ -268,8 +268,8 @@ $mail = new PHPMailer(); - $mail->PluginDir = "phpmailer/"; - $mail->SetLanguage("en", "phpmailer/language/"); + $mail->PluginDir = "lib/phpmailer/"; + $mail->SetLanguage("en", "lib/phpmailer/language/"); $mail->CharSet = "UTF-8"; @@ -302,8 +302,8 @@ $mail = new PHPMailer(); - $mail->PluginDir = "phpmailer/"; - $mail->SetLanguage("en", "phpmailer/language/"); + $mail->PluginDir = "lib/phpmailer/"; + $mail->SetLanguage("en", "lib/phpmailer/language/"); $mail->CharSet = "UTF-8"; |