Minor Refactoring: add getIdFromUser()

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@238 b3834d28-1941-0410-a4f8-b48e95affb8f

1 files changed, 44 insertions, 48 deletions

diff --git a/populartags.php b/populartags.php
index c20cabc..7938027 100644
--- a/populartags.php
+++ b/populartags.php
@@ -1,23 +1,23 @@
 <?php
 /***************************************************************************
-Copyright (C) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
-http://scuttle.org/
+ Copyright (C) 2004 - 2006 Scuttle project
+ http://sourceforge.net/projects/scuttle/
+ http://scuttle.org/
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-***************************************************************************/
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ***************************************************************************/
 
 require_once('header.inc.php');
 
@@ -29,50 +29,46 @@ $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
 list($url, $user) = explode('/', $_SERVER['PATH_INFO']);
 
 if ($usecache) {
-    // Generate hash for caching on
-    $hashtext = $_SERVER['REQUEST_URI'];
-    if ($userservice->isLoggedOn()) {
-        $hashtext .= $currentUser->getId();
-        if ($currentUser->getUsername() == $user) {
-            $hashtext .= $user;
-        }
-    }
-    $hash = md5($hashtext);
-
-    // Cache for an hour
-    $cacheservice->Start($hash, 3600);
+	// Generate hash for caching on
+	$hashtext = $_SERVER['REQUEST_URI'];
+	if ($userservice->isLoggedOn()) {
+		$hashtext .= $currentUser->getId();
+		if ($currentUser->getUsername() == $user) {
+			$hashtext .= $user;
+		}
+	}
+	$hash = md5($hashtext);
+
+	// Cache for an hour
+	$cacheservice->Start($hash, 3600);
 }
 
 // Header variables
 $pagetitle = T_('Popular Tags');
 
 if (isset($user) && $user != '') {
-    if (is_int($user)) {
-      $userid = intval($user);
-    } else {
-    	$userinfo = $userservice->getObjectUserByUsername($user);
-        if ($userinfo != '') {
-            $userid = $userinfo->getId();
-        } else {
-            $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
-            $templateservice->loadTemplate('error.404.tpl', $tplVars);
-            //throw a 404 error
-            exit();
-        }
-    }
-    $pagetitle .= ': '. ucfirst($user);
+
+	$userid = $userservice->getIdFromUser($user);
+	if($userid == NULL) {
+		$tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
+		$templateservice->loadTemplate('error.404.tpl', $tplVars);
+		//throw a 404 error
+		exit();
+	}
+
+	$pagetitle .= ': '. ucfirst($user);
 } else {
-    $userid = NULL;
+	$userid = NULL;
 }
 
 $tags = $b2tservice->getPopularTags($userid, 150);
-$tplVars['tags'] =& $b2tservice->tagCloud($tags, 5, 90, 225, getSortOrder('alphabet_asc')); 
+$tplVars['tags'] =& $b2tservice->tagCloud($tags, 5, 90, 225, getSortOrder('alphabet_asc'));
 $tplVars['user'] = $user;
 
 if (isset($userid)) {
-    $tplVars['cat_url'] = createURL('bookmarks', '%s/%s');
+	$tplVars['cat_url'] = createURL('bookmarks', '%s/%s');
 } else {
-    $tplVars['cat_url'] = createURL('tags', '%2$s');
+	$tplVars['cat_url'] = createURL('tags', '%2$s');
 }
 
 $tplVars['sidebar_blocks'] = array('linked');
@@ -81,8 +77,8 @@ $tplVars['loadjs'] = true;
 
 $templateservice->loadTemplate('tags.tpl', $tplVars);
 
-if ($usecache) {    
-    // Cache output if existing copy has expired
-    $cacheservice->End($hash);
+if ($usecache) {
+	// Cache output if existing copy has expired
+	$cacheservice->End($hash);
 }
 ?>