diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-01-10 09:14:18 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-01-10 09:14:18 +0000 |
commit | d709751a3f5cf3fdf5b4036ef1486b14df6a646d (patch) | |
tree | 1e9d80ddc0f9d23c2e13181cb4fc6ed11d1afedb /register.php | |
parent | e0c75b5684693605d38c437b0d3857a87127ff04 (diff) | |
download | ampache-d709751a3f5cf3fdf5b4036ef1486b14df6a646d.tar.gz ampache-d709751a3f5cf3fdf5b4036ef1486b14df6a646d.tar.bz2 ampache-d709751a3f5cf3fdf5b4036ef1486b14df6a646d.zip |
fixed registration, show edit song title issue and added limit to xml api
Diffstat (limited to 'register.php')
-rw-r--r-- | register.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/register.php b/register.php index c0a31127..f0b3fc4b 100644 --- a/register.php +++ b/register.php @@ -110,7 +110,7 @@ switch ($_REQUEST['action']) { $attempt++; } - if ($validate_results[0]) { + if ($validate_results[0] OR strstr($validate_results[1],"greylist")) { $mmsg = "MAILOK"; } else { @@ -164,15 +164,8 @@ switch ($_REQUEST['action']) { $validation = md5(uniqid(rand(), true)); $client->update_validation($validation); - $message = 'Your account has been created. However, this application requires account activation.' . - ' An activation key has been sent to the e-mail address you provided. ' . - 'Please check your e-mail for further information'; - Registration::send_confirmation($username, $fullname, $email, $pass1, $validation); - ?> - <link rel="stylesheet" href="<?php echo $web_path; ?><?php echo conf('theme_path'); ?>/templates/default.css" type="text/css" /> - <?php - show_confirmation(_('Registration Complete'),$message,'/login.php'); + require_once Config::get('prefix') . '/templates/show_registration_confirmation.inc.php'; break; case 'show_add_user': default: |