unactivated users CLI cleanup; user management bugs fixed; working at CAPTCHA

[living-lab-site.git] / application / views / user / register_view.php

diff --git a/application/views/user/register_view.php b/application/views/user/register_view.php
index 419353a..e038dfc 100644 (file)
--- a/application/views/user/register_view.php
+++ b/application/views/user/register_view.php
@@ -7,7 +7,7 @@ function _set_value($userdata, $field, $default = '')
                return $post_value;
 
        return ($post_value === $default 
-               ? $userdata[ str_replace('-','_',$field) ]
+               ? ''.$userdata[ str_replace('-','_',$field) ]
                : $post_value);
 }
 
@@ -17,10 +17,10 @@ else
        echo form_open_multipart("user/account/$redirect");
 ?>
 
-<?php if ($userdata): ?>
+<!--<?php if ($userdata): ?>
 <input type="hidden" name="user-id" value="<?php echo $userdata['id'] ?>" />
 <input type="hidden" name="username" value="<?php echo $userdata['username'] ?>" />
-<?php endif ?>
+<?php endif ?>-->
 
 <table class="form">
        <tr>
@@ -31,16 +31,21 @@ else
        <tr><td></td><td>&nbsp;</td></tr>
 
        <tr>
-         <?php if (! $userdata): ?>
+         <?php if (! $userdata || ! empty($userdata['autogen_username'])): ?>
                <th><?php echo $this->lang->line('user_username'). ' <span class="required">*</span> : ' ?></th>
                <td>
+                 <?php if (empty($userdata['autogen_username'])): ?>
                        <input type="text" name="username" size="16" value="<?php echo _set_value($userdata, 'username') ?>" />
+                 <?php else: ?>
+                       <input type="text" name="username" size="16" value="<?php echo $userdata['autogen_username'] ?>" />
+                 <?php endif ?>
                </td>
          <?php else: ?>
                <th><?php echo $this->lang->line('user_username'). ' : ' ?></th>
                <td>
                        &nbsp;<em><?php echo $userdata['username'] ?></em>
-               </td>`
+                       <!--<input type="hidden" name="username" value="<?php echo $userdata['username'] ?>" />-->
+               </td>
          <?php endif ?>
        </tr>
        <tr><td></td><td><?php echo form_error('username') ?></td></tr>
@@ -115,6 +120,19 @@ else
        </tr>
        <tr><td></td><td><?php echo form_error('last-name') ?></td></tr>
        
+       <tr>
+               <th><?php echo $this->lang->line('user_sex'). ' <span class="required">*</span> : ' ?></th>
+               <td>
+                       <?php echo form_dropdown('sex', 
+                               array(
+                                       '0'=> $this->lang->line('user_sex_male'),
+                                       '1'=> $this->lang->line('user_sex_female')),
+                               _set_value($userdata, 'sex', '0')
+                       ) ?>
+               </td>
+       </tr>
+       <tr><td></td><td><?php echo form_error('sex') ?></td></tr>
+       
        <tr>
                <th><?php echo $this->lang->line('user_birth_date'). ' : ' ?></th>
                <td>
@@ -143,7 +161,7 @@ else
        <tr>
                <th><?php echo $this->lang->line('user_picture'). ' : ' ?></th>
                <td>
-                       <img src="<?php echo site_url("data/user_pictures/{$userdata['picture']}") ?>" alt="<?php echo $userdata['username'] ?>" />
+                       <a href="<?php echo $userdata['picture'] ?>"><img src="<?php echo $userdata['picture_thumb'] ?>" alt="<?php echo $userdata['username'] ?>" /></a>
                </td>
        </tr>
        <tr><td></td><td></td></tr>