summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin/mail.php2
-rw-r--r--lib/class/mailer.class.php (renamed from lib/class/ampache_mail.class.php)6
-rw-r--r--lib/class/registration.class.php2
-rw-r--r--lostpassword.php2
4 files changed, 6 insertions, 6 deletions
diff --git a/admin/mail.php b/admin/mail.php
index b5f9c802..20d4986b 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -43,7 +43,7 @@ switch ($_REQUEST['action']) {
mb_language("uni");
}
- $mailer = new Ampache_Mail();
+ $mailer = new Mailer();
// Set the vars on the object
$mailer->subject = $_REQUEST['subject'];
diff --git a/lib/class/ampache_mail.class.php b/lib/class/mailer.class.php
index 278a374f..1e5bffa5 100644
--- a/lib/class/ampache_mail.class.php
+++ b/lib/class/mailer.class.php
@@ -21,12 +21,12 @@
*/
/**
- * Ampache_Mail Class
+ * Mailer Class
*
* This class handles the Mail
*
*/
-class Ampache_Mail {
+class Mailer {
// The message, recipient and from
public $message;
@@ -210,5 +210,5 @@ class Ampache_Mail {
return $this->send($mail);
}
-} // Ampache_Mail class
+} // Mailer class
?>
diff --git a/lib/class/registration.class.php b/lib/class/registration.class.php
index 5df8e563..72a4af5d 100644
--- a/lib/class/registration.class.php
+++ b/lib/class/registration.class.php
@@ -43,7 +43,7 @@ class Registration {
* This sends the confirmation e-mail for the specified user
*/
public static function send_confirmation($username, $fullname, $email, $password, $validation) {
- $mailer = new Ampache_Mail();
+ $mailer = new Mailer();
// We are the system
$mailer->set_default_sender();
diff --git a/lostpassword.php b/lostpassword.php
index b7e1d520..1b5fae00 100644
--- a/lostpassword.php
+++ b/lostpassword.php
@@ -54,7 +54,7 @@ function send_newpassword($email,$current_ip){
$newpassword = generate_password(6);
$client->update_password($newpassword);
- $mailer = new Ampache_Mail();
+ $mailer = new Mailer();
$mailer->set_default_sender();
$mailer->subject = T_("Lost Password");
$mailer->recipient_name = $client->fullname;