summaryrefslogtreecommitdiffstats
path: root/templates/show_user_registration.inc.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-02 00:34:09 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-12-02 00:34:09 +0000
commit0f4a9e4823d6aa92c3974c33f560a4897140dfbd (patch)
tree14fe5d32d8bfd510e450dd51195ee300edcc7ec1 /templates/show_user_registration.inc.php
parent6a335845ccd2650e2444080a5faa5dc6151ab993 (diff)
downloadampache-0f4a9e4823d6aa92c3974c33f560a4897140dfbd.tar.gz
ampache-0f4a9e4823d6aa92c3974c33f560a4897140dfbd.tar.bz2
ampache-0f4a9e4823d6aa92c3974c33f560a4897140dfbd.zip
corrected some display problems with the capatcha and agreements enabled on user registration
Diffstat (limited to 'templates/show_user_registration.inc.php')
-rw-r--r--templates/show_user_registration.inc.php19
1 files changed, 10 insertions, 9 deletions
diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php
index 29cf8f9f..236e436d 100644
--- a/templates/show_user_registration.inc.php
+++ b/templates/show_user_registration.inc.php
@@ -63,7 +63,7 @@ if (Config::get('user_agreement')) { ?>
<tr>
<td>
<input type='checkbox' name='accept_agreement'> <?php echo _('I Accept'); ?>
- <?php $GLOBALS['error']->print_error('user_agreement'); ?>
+ <?php Error::display('user_agreement'); ?>
</td>
</tr>
</table>
@@ -115,19 +115,20 @@ if (Config::get('user_agreement')) { ?>
<font color='red'>*</font> <input type='password' name='password_2' id='password_2' />
</td>
</tr>
-<?php if (Config::get('captcha_public_reg')) { ?>
- <tr>
- <?php echo captcha::form(); ?>
- <?php Error::display('captcha'); ?>
- </tr>
-<?php } ?>
<tr>
- <td colspan='2' align='center' height='20'>
+ <td align='center' height='20'>
<span style="color:red;">* Required fields</span>
</td>
+ <td>&nbsp;</td>
</tr>
+</table>
+<?php if (Config::get('captcha_public_reg')) { ?>
+ <?php echo captcha::form(); ?>
+ <?php Error::display('captcha'); ?>
+<?php } ?>
+<table>
<tr>
- <td colspan='2' align='center' height='50'>
+ <td align='center' height='50'>
<input type="hidden" name="action" value="add_user" />
<input type='submit' name='submit_registration' id='submit_registration' value='<?php echo _('Register User'); ?>' />
</td>