X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fviews%2Fuser%2Fregister_view.php;h=aeb6dc57c3f9b44f6f520a55e4e7e18214dc0239;hb=42b8f76ab32990f2668a4e3346374de7bad91be2;hp=419353a07dcde28c98dc994d13e0e105a58b4ea8;hpb=6db375a0706b5328fbd53be4dd2e517c96560ea6;p=living-lab-site.git

diff --git a/application/views/user/register_view.php b/application/views/user/register_view.php
index 419353a..aeb6dc5 100644
--- 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,11 +17,6 @@ else
 	echo form_open_multipart("user/account/$redirect");
 ?>
 
-<?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 ?>
-
 <table class="form">
 	<tr>
 		<td></td>
@@ -31,16 +26,20 @@ 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>`
+		</td>
 	  <?php endif ?>
 	</tr>
 	<tr><td></td><td><?php echo form_error('username') ?></td></tr>
@@ -115,6 +114,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 +155,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>
@@ -183,6 +195,23 @@ else
 	
 	<tr><td></td><td>&nbsp;</td></tr>
 	
+  <?php if (! $userdata): ?>
+	<tr>
+		<th><?php echo $this->lang->line('ui_captcha'). ' <span class="required">*</span> : ' ?></th>
+		<td>
+			<div><?php echo $this->lang->line('ui_captcha_instructions') ?></div>
+			<div><span id="container-captcha"><?php echo $captcha ?></span>
+				<input type="button" id="button-change-captcha"
+					   value="<?php echo $this->lang->line('ui_change_captcha') ?>" />
+			</div>
+			<p><input type="text" name="captcha" size="16" value="" /></p>
+		</td>
+	</tr>
+	<tr><td></td><td><?php echo form_error('captcha') ?></td></tr>
+	
+	<tr><td></td><td>&nbsp;</td></tr>
+  <?php endif ?>
+	
 	<tr>
 		<td></td>
 		<td>
@@ -207,5 +236,11 @@ else
 			buttonImage: "<?php echo site_url('img/calendar.gif') ?>",
 			buttonImageOnly: true
 		});
+		
+		$('#button-change-captcha')
+			.click(function() {
+				$('#container-captcha')
+					.load('<?php echo site_url('user/ajax_get_captcha') ?>');
+			});
 	});
 </script>
\ No newline at end of file