[Fusionforge-commits] FusionForge branch master updated. 6.0.4-627-g356dd5e

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Fri Jul 1 16:36:10 CEST 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  356dd5ee9e6a854b69a136c06ffaf976402fdb7c (commit)
      from  39c3a186a3f259c9f497c3a01afee433bc1f95e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=356dd5ee9e6a854b69a136c06ffaf976402fdb7c

commit 356dd5ee9e6a854b69a136c06ffaf976402fdb7c
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Fri Jul 1 16:35:35 2016 +0200

    Use isEditable()

diff --git a/src/www/account/index.php b/src/www/account/index.php
index 9c93553..67b8d0d 100644
--- a/src/www/account/index.php
+++ b/src/www/account/index.php
@@ -155,12 +155,20 @@ echo $HTML->listTableTop(array(), array(), 'infotable');
 
 <tr class="top">
 	<td>
-	<?php echo _('Last Name').utils_requiredField()._(':'); ?>
+	<?php if ($u->isEditable('lastname')) { ?>
+		<label for="lastname">
+			<?php echo _('Last Name').utils_requiredField()._(':'); ?>
+		</label>
+	<?php } else { ?>
+			<?php echo _('Last Name')._(':'); ?>
+	<?php } ?>
 	</td>
 	<td>
-		<label for="lastname">
+	<?php if ($u->isEditable('lastname')) { ?>
 		<input id="lastname" required="required" type="text" name="lastname" value="<?php print $u->getLastName(); ?>"/>
-		</label>
+	<?php } else {
+		print $u->getLastName();
+	} ?>
 	</td>
 </tr>
 
@@ -195,8 +203,11 @@ echo $HTML->listTableTop(array(), array(), 'infotable');
 </tr>
 
 <tr class="top">
-	<td><?php echo _('Theme')._(':'); ?></td>
-	<td><?php echo html_get_theme_popup('theme_id', $u->getThemeID()); ?>
+	<td>
+	<?php echo _('Theme')._(':'); ?>
+	</td>
+	<td>
+	<?php echo html_get_theme_popup('theme_id', $u->getThemeID()); ?>
 	</td>
 </tr>
 
@@ -220,7 +231,11 @@ echo $HTML->listTableTop(array(), array(), 'infotable');
 	<?php echo _('Email Address')._(': '); ?>
 	</td>
 	<td><?php print $u->getEmail(); ?>
+	<?php
+	if ($u->isEditable('email')) {
+	?>
 	<br /><a href="change_email.php">[<?php echo _('Change Email Address'); ?>]</a>
+	<?php } ?>
 	</td>
 </tr>
 
@@ -229,9 +244,15 @@ echo $HTML->listTableTop(array(), array(), 'infotable');
 	<?php echo _('Address')._(':'); ?>
 	</td>
 	<td>
+	<?php
+	if ($u->isEditable('address')) {
+	?>
 		<label for="address">
 			<input id="address" type="text" name="address" value="<?php echo $u->getAddress(); ?>" size="80"/>
 		</label>
+	<?php } else {
+		print $u->getAddress();
+	} ?>
 	</td>
 </tr>
 
@@ -240,9 +261,15 @@ echo $HTML->listTableTop(array(), array(), 'infotable');
 	<?php echo _('Address (continued)')._(':'); ?>
 	</td>
 	<td>
+	<?php
+	if ($u->isEditable('address2')) {
+	?>
 		<label for="address2">
 			<input id="address2" type="text" name="address2" value="<?php echo $u->getAddress2(); ?>" size="80"/>
 		</label>
+	<?php } else {
+		print $u->getAddress2();
+	} ?>
 	</td>
 </tr>
 
@@ -251,9 +278,15 @@ echo $HTML->listTableTop(array(), array(), 'infotable');
 	<?php echo _('Phone')._(':'); ?>
 	</td>
 	<td>
+	<?php
+	if ($u->isEditable('phone')) {
+	?>
 		<label for="phone">
 			<input id="phone" type="text" name="phone" value="<?php echo $u->getPhone(); ?>" size="20"/>
 		</label>
+	<?php } else {
+		print $u->getPhone();
+	} ?>
 	</td>
 </tr>
 
@@ -262,9 +295,15 @@ echo $HTML->listTableTop(array(), array(), 'infotable');
 	<?php echo _('Fax')._(':'); ?>
 	</td>
 	<td>
+	<?php
+	if ($u->isEditable('fax')) {
+	?>
 		<label for="fax">
 			<input id="fax" type="text" name="fax" value="<?php echo $u->getFax(); ?>" size="20"/>
 		</label>
+	<?php } else {
+		print $u->getFax();
+	} ?>
 	</td>
 </tr>
 
@@ -273,9 +312,15 @@ echo $HTML->listTableTop(array(), array(), 'infotable');
 	<?php echo _('Title')._(':'); ?>
 	</td>
 	<td>
+	<?php
+	if ($u->isEditable('title')) {
+	?>
 		<label for="title">
 			<input id="title" type="text" name="title" value="<?php echo $u->getTitle(); ?>" size="10"/>
 		</label>
+	<?php } else {
+		print $u->getTitle();
+	} ?>
 	</td>
 </tr>
 <?php

-----------------------------------------------------------------------

Summary of changes:
 src/www/account/index.php | 55 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list