openrat-cms

commit 1cb40df54570a0b9bca0927b8d517d61f747b976
parent 5057c94920ca6fcc584c7497736509a9ed323256
Author: dankert <devnull@localhost>
Date:   Tue, 23 Feb 2010 22:50:42 +0100

Neue Einstellung \"show_admin_mail\", um E-Mail-Anzeige für Administratoren zu ermöglichen, für normale Benutzer aber unterdrücken zu können.

Diffstat:
actionClasses/UserAction.class.php
 | 
2
+-
config/security.ini.php
 | 
6
+++++-
themes/default/pages/html/user/edit.tpl.php
 | 
2
+-
themes/default/templates/user/edit.tpl.src.php
 | 
2
+-

4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/actionClasses/UserAction.class.php b/actionClasses/UserAction.class.php
@@ -59,7 +59,7 @@ class UserAction extends Action
 			$this->user->desc     = $this->getRequestVar('desc'    );
 			
 			global $conf;
-			if	( @$conf['security']['user']['show_mail'] )
+			if	( @$conf['security']['user']['show_admin_mail'] )
 				$this->user->mail = $this->getRequestVar('mail'    );
 				
 			$this->user->style    = $this->getRequestVar('style'   );
diff --git a/config/security.ini.php b/config/security.ini.php
@@ -277,7 +277,11 @@ redirect_url=
 
 ; Show E-Mail-Adress in Administration-Interface.
 ; Default=true. If admin users should not know the mail adresses, set this to false.
-; Useful for Demo-Installations where a lot of users have adminitration right. 
+; Useful for Demo-Installations where a lot of users may have administration rights. 
+show_admin_mail=true
+
+; Show users e-mail-address to other users.
+; Default=true. 
 show_mail=true
 
 ; Users are able to send mesages to another users via e-mail
diff --git a/themes/default/pages/html/user/edit.tpl.php b/themes/default/pages/html/user/edit.tpl.php
@@ -309,7 +309,7 @@ if	($a6_readonly) {
 ?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php
 if	($a6_readonly) {
 ?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php
- } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $a4_true=@$conf['security']['user']['show_mail']; ?><?php 
+ } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $a4_true=@$conf['security']['user']['show_admin_mail']; ?><?php 
 	if	(gettype($a4_true) === '' && gettype($a4_true) === '1')
 		$a4_tmp_exec = $$a4_true == true;
 	else
diff --git a/themes/default/templates/user/edit.tpl.src.php b/themes/default/templates/user/edit.tpl.src.php
@@ -23,7 +23,7 @@ page
 					text text:user_fullname
 				cell
 					input name:fullname
-			if true:config:security/user/show_mail
+			if true:config:security/user/show_admin_mail
 				row
 					cell
 						text text:user_mail