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

diff --git a/application/views/user/register_view.php b/application/views/user/register_view.php
index 438c410..dd97e2e 100644
--- a/application/views/user/register_view.php
+++ b/application/views/user/register_view.php
@@ -10,20 +10,16 @@ function _set_value($userdata, $field, $default = '')
 		? $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): ?>
 <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 ?>
 
 <table class="form">
@@ -35,16 +31,20 @@ 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>
 		<td>
 			&nbsp;<em><?php echo $userdata['username'] ?></em>
-		</td>`
+		</td>
 	  <?php endif ?>
 	</tr>
 	<tr><td></td><td><?php echo form_error('username') ?></td></tr>
@@ -143,13 +143,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>