X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fviews%2Fuser%2Fregister_view.php;h=e038dfc2aabb89d421a5d9990d8860a7b7ad5273;hb=8889adf32898adeff7a85cc040f5f409d3bce36c;hp=42159c202622cf3e1a2b3707a18bf10037a8b4ba;hpb=37fe2e29a60066614f4155c292e2a2bd99b71b49;p=living-lab-site.git

diff --git a/application/views/user/register_view.php b/application/views/user/register_view.php
index 42159c2..e038dfc 100644
--- a/application/views/user/register_view.php
+++ b/application/views/user/register_view.php
@@ -7,24 +7,20 @@ 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;
+
+if (!$userdata)
+	echo form_open_multipart("user/register/$redirect");
+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'] ?>" />
-<!--<input type="hidden" name="password" value="12345" />
-<input type="hidden" name="password-confirmation" value="12345" />-->
-<?php endif ?>
+<?php endif ?>-->
 
 <table class="form">
 	<tr>
@@ -35,16 +31,21 @@ endif;
 	<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>
+		<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>
@@ -119,6 +120,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,6 +157,30 @@ 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 $error_upload ?></td></tr>
+	
 	<tr><td></td><td>&nbsp;</td></tr>
 	
 	<tr>