- [#22073] Remove realname vs username display setting and leverage K…

…unena and its own config

git-svn-id: http://joomlacode.org/svn/kunena/trunk/1.6-addons/mod_kunenalogin@3310 daf2aa89-cb5b-0410-b8ee-fe93ebc9b27d

CHANGELOG.php

@@ -31,6 +31,7 @@
 26-Aug-2010 fxstein
 + [#22073] Load Kunena language file during init to allow full access to API and language strings
 # [#22073] Updated language strings
+- [#22073] Remove realname vs username display setting and leverage Kunena and its own config
 
 26-Aug-2010 Matias
 ^ [#22073] Fix fatal error when module is loaded twice (mode code into ModKunenaLogin class)

build/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Thu Aug 26 06:59:12 PDT 2010
-build.number=170
+#Thu Aug 26 08:31:03 PDT 2010
+build.number=172

class.php

@@ -75,7 +75,8 @@ function loadCSS($name) {
 
 	function kunenaAvatar($userid) {
 		$kunena_user = KunenaFactory::getUser ( ( int ) $userid );
+		$username = $kunena_user->getName(); // Takes care of realname vs username setting
 		$avatarlink = $kunena_user->getAvatarLink ( '', $this->params->get ( 'avatar_w' ), $this->params->get ( 'avatar_h' ) );
-		return CKunenaLink::GetProfileLink ( $userid, $avatarlink, $kunena_user->name );
+		return CKunenaLink::GetProfileLink ( $userid, $avatarlink, $username );
 	}
 }

languages/en-GB.mod_kunenalogin.ini

@@ -43,9 +43,6 @@ MOD_KUNENALOGIN_YES="Yes"
 MOD_KUNENALOGIN_NO="No"
 MOD_KUNENALOGIN_NEVER="Never"
 MOD_KUNENALOGIN_NAME="Name"
-MOD_KUNENALOGIN_USERNAME="Username"
-MOD_KUNENALOGIN_NAME_USERNAME="Name/Username"
-MOD_KUNENALOGIN_NAME_USERNAME_DESC="Show Name or Username of user"
 MOD_KUNENALOGIN_LASTVISIT="Last Visit"
 MOD_KUNENALOGIN_LASTVISIT_DESC="Last visit time"
 MOD_KUNENALOGIN_SHOW_AVATAR="Avatar"

mod_kunenalogin.xml

@@ -41,11 +41,6 @@
 			<option value="0">MOD_KUNENALOGIN_HIDE</option>
 			<option value="1">MOD_KUNENALOGIN_SHOW</option>
 		</param>
-		<param name="name" type="list" default="0"
-			label="MOD_KUNENALOGIN_NAME_USERNAME" description="MOD_KUNENALOGIN_NAME_USERNAME_DESC">
-			<option value="0">MOD_KUNENALOGIN_USERNAME</option>
-			<option value="1">MOD_KUNENALOGIN_NAME</option>
-		</param>
 		<param name="lastlog" type="radio" default="1"
 			label="MOD_KUNENALOGIN_LASTVISIT" description="MOD_KUNENALOGIN_LASTVISIT_DESC">
 			<option value="0">MOD_KUNENALOGIN_HIDE</option>

tmpl/vertical.php

@@ -15,11 +15,7 @@
 		<form action="index.php" method="post" name="login">
 		<?php if ($this->params->get('greeting')) : ?>
 			<div class="k_hiname">
-			<?php if ($this->params->get('name')) :
-				echo JText::sprintf('MOD_KUNENALOGIN_HINAME','<strong>'.CKunenaLink::GetProfileLink ( $this->my->id, $this->my->name).'</strong>' );
-			else :
-				echo JText::sprintf('MOD_KUNENALOGIN_HINAME','<strong>'.CKunenaLink::GetProfileLink ( $this->my->id, $this->my->username).'</strong>' );
-			endif; ?>
+			<?php echo JText::sprintf('MOD_KUNENALOGIN_HINAME','<strong>'.CKunenaLink::GetProfileLink ( $this->my->id, $this->my->getName()).'</strong>' ); ?>
 			</div>
 		<?php endif; ?>
 	<div class="avatar">