X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?p=living-lab-site.git;a=blobdiff_plain;f=application%2Fviews%2Fuser%2Fregister_view.php;h=eedc199e2292f8dd819f841104877bc89ecaa18e;hp=438c4109726b7eb713549743c439f20e8205a8aa;hb=080b37a97e93691b3ba1c4aa3982a143167115a7;hpb=9cc2a6602b47ac97d72efa51ec654418b252b4e4

diff --git a/application/views/user/register_view.php b/application/views/user/register_view.php
index 438c410..eedc199 100644
--- a/application/views/user/register_view.php
+++ b/application/views/user/register_view.php
@@ -7,44 +7,39 @@ function _set_value($userdata, $field, $default = '')
 		return $post_value;
 
 	return ($post_value === $default 
-		? $userdata[ str_replace('-','_',$field) ]
+		? ''.$userdata[ str_replace('-','_',$field) ]
 		: $post_value);
 }
-?>
-<?php 
-if (!$userdata):
-	echo form_open("user/register/$redirect");
-else:
-	echo form_open("user/account/$redirect");
-endif;
-?>
 
-<?php if ($userdata): ?>
-<input type="hidden" name="user-id" value="<?php echo $userdata['id'] ?>" />
-<input type="hidden" name="username" value="<?php echo $userdata['username'] ?>" />
-<!--<input type="hidden" name="password" value="12345" />
-<input type="hidden" name="password-confirmation" value="12345" />-->
-<?php endif ?>
+if (!$userdata)
+	echo form_open_multipart("user/register/$redirect");
+else
+	echo form_open_multipart("user/account/$redirect");
+?>
 
 <table class="form">
 	<tr>
 		<td></td>
-		<td><span class="required"><?php echo $this->lang->line('user_note_required_fields') ?></span></td>
+		<td><span class="required"><?php echo $this->lang->line('ui_required_fields') ?></span></td>
 	</tr>
 	
 	<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>
@@ -119,6 +114,19 @@ endif;
 	</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,13 +151,29 @@ endif;
 	</tr>
 	<tr><td></td><td><?php echo form_error('locality') ?></td></tr>
 	
+  <?php if ($userdata && $userdata['picture']): ?>
 	<tr>
 		<th><?php echo $this->lang->line('user_picture'). ' : ' ?></th>
+		<td>
+			<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>
+  <?php endif ?>
+	
+	<tr>
+		<th>
+		  <?php if (! $userdata || ($userdata && ! $userdata['picture'])): ?>
+			<?php echo $this->lang->line('user_picture'). ' : ' ?>
+		  <?php else: ?>
+			<?php echo $this->lang->line('user_change_picture'). ' : ' ?>
+		  <?php endif ?>
+		</th>
 		<td>
 			<input type="file" name="picture" size="16" />
 		</td>
 	</tr>
-	<tr><td></td><td><?php echo form_error('locality') ?></td></tr>
+	<tr><td></td><td><?php echo $error_upload ?></td></tr>
 	
 	<tr><td></td><td>&nbsp;</td></tr>
 	
@@ -171,6 +195,23 @@ endif;
 	
 	<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>
@@ -195,5 +236,11 @@ endif;
 			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