openrat-cms

commit 0a61606b6088c26c3340bff3d9fb486a9b3ce261
parent 9f1a1443575779bf23a26faa8417acbc0ab99a5d
Author: dankert <devnull@localhost>
Date:   Tue,  3 Mar 2009 00:36:46 +0100

E-Mail nur anzeigen, wenn in Konfiguration erlaubt.

Diffstat:
actionClasses/UserAction.class.php
 | 
14
++++----------
actionClasses/UserAction.ini.php
 | 
3
---
themes/default/include/html/user.inc.php
 | 
2
+-

3 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/actionClasses/UserAction.class.php b/actionClasses/UserAction.class.php
@@ -57,7 +57,10 @@ class UserAction extends Action
 			$this->user->ldap_dn  = $this->getRequestVar('ldap_dn' );
 			$this->user->tel      = $this->getRequestVar('tel'     );
 			$this->user->desc     = $this->getRequestVar('desc'    );
-			$this->user->mail     = $this->getRequestVar('mail'    );
+			
+			if	( @$conf['security']['user']['show_mail'] )
+				$this->user->mail = $this->getRequestVar('mail'    );
+				
 			$this->user->style    = $this->getRequestVar('style'   );
 	
 			$this->user->save();
@@ -228,15 +231,6 @@ class UserAction extends Action
 	}
 
 
-	/**
-	 * Eigenschaften des Benutzers anzeigen
-	 */
-	function show()
-	{
-		$this->setTemplateVars( $this->user->getProperties() );
-	}
-
-
 	function memberships()
 	{
 		
diff --git a/actionClasses/UserAction.ini.php b/actionClasses/UserAction.ini.php
@@ -19,9 +19,6 @@ menu=edit
 target=save
 editable=true
 
-;[show]
-;menu=info
-
 [save]
 goto=listing
 
diff --git a/themes/default/include/html/user.inc.php b/themes/default/include/html/user.inc.php
@@ -9,7 +9,7 @@
 		if	( empty($user->fullname) )
 			$user->fullname = lang('GLOBAL_NO_DESCRIPTION_AVAILABLE');
 
-		if	( !empty($user->mail) )
+		if	( !empty($user->mail) && $conf['security']['user']['show_mail'] )
 			echo '<a href="mailto:'.$user->mail.'" title="'.$user->fullname.'">'.$user->name.'</a>';
 		else
 			echo '<span title="'.$user->fullname.'">'.$user->name.'</span>';