valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move phpmailer to lib/

This commit is contained in:
Andrew Dolgov 2009-01-22 14:28:15 +01:00
parent b6775838b9
commit d134e3a313
7 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.php-dist
View File

@ -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

6
functions.php
View File

@ -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";

0
phpmailer/class.phpmailer.php → lib/phpmailer/class.phpmailer.php
View File

0
phpmailer/class.smtp.php → lib/phpmailer/class.smtp.php
View File

0
phpmailer/language/phpmailer.lang-en.php → lib/phpmailer/language/phpmailer.lang-en.php
View File

6
modules/pref-users.php
View File

@ -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";

8
register.php
View File

@ -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";