diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-02 16:40:03 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-12-02 16:40:03 +0000 |
| commit | 552c3cedd78263ce385d0ac47b02ccd22ea474b3 (patch) | |
| tree | 7042da2e17c73afad01d7004884dd1d903cff293 /templates | |
| parent | 66e0b8ea9dd675a778a5c5777cce547887b2720c (diff) | |
| download | ampache-552c3cedd78263ce385d0ac47b02ccd22ea474b3.tar.gz ampache-552c3cedd78263ce385d0ac47b02ccd22ea474b3.tar.bz2 ampache-552c3cedd78263ce385d0ac47b02ccd22ea474b3.zip | |
fixed registration page, and simplifed its logic
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_user_activate.inc.php | 60 | ||||
| -rw-r--r-- | templates/show_user_registration.inc.php | 2 |
2 files changed, 61 insertions, 1 deletions
diff --git a/templates/show_user_activate.inc.php b/templates/show_user_activate.inc.php new file mode 100644 index 00000000..0fc03d11 --- /dev/null +++ b/templates/show_user_activate.inc.php @@ -0,0 +1,60 @@ +<?php +/* + + Copyright (c) 2001 - 2007 Ampache.org + All rights reserved. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; version 2 + of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +*/ +$htmllang = str_replace("_","-",Config::get('lang')); +$web_path = Config::get('web_path'); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=<?php echo Config::get('site_charset'); ?>" /> +<title><?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?></title> +</head> +<body bgcolor="#f0f0f0"> +<link rel="stylesheet" href="<?php echo Config::get('web_path'); ?>/templates/install.css" type="text/css" media="screen" /> +<link rel="shortcut icon" href="<?php echo Config::get('web_path'); ?>/favicon.ico" /> +<div id="header"> +<h1><?php echo Config::get('site_title'); ?></h1> +<?php echo _('Registration'); ?>... +</div> +</head> +<body> +<script src="<?php echo $web_path; ?>/lib/javascript-base.js" language="javascript" type="text/javascript"></script> +<script src="<?php echo $web_path; ?>/modules/kajax/ajax.js" language="javascript" type="text/javascript"></script> +<script src="<?php echo $web_path; ?>/modules/prototype/prototype.js" language="javascript" type="text/javascript"></script> + +<div id="maincontainer"> +<?php if ($validation == User::get_validation($username) AND strlen($validation)) { ?> +<h3><?php echo _('User Activated'); ?></h3> +<p> + <?php echo _('This User ID is activated and can be used'); ?>. <a href="<?php echo Config::get('web_path'); ?>/login.php"><?php echo _('Login'); ?></a> +</p> +<?php } else { ?> +<h3><?php echo _('Validation Failed'); ?></h3> +<p><?php echo _("The validation key used isn't correct"); ?></p> +<?php } ?> +</div><!--end <div>id="maincontainer--> +<div id="bottom"> +<p><b>Ampache</b><br /> +Pour l'Amour de la Musique.</p> +</div> +</body> +</html> diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php index 236e436d..fbddd210 100644 --- a/templates/show_user_registration.inc.php +++ b/templates/show_user_registration.inc.php @@ -57,7 +57,7 @@ if (Config::get('user_agreement')) { ?> <table cellpadding="2" cellspacing="0"> <tr> <td> - <?php show_registration_agreement(); ?> + <?php Registration::show_agreement(); ?> </td> </tr> <tr> |