Minor Refactoring: add getIdFromUser()

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

alltags.php

@@ -49,18 +49,14 @@ if ($usecache) {
 $pagetitle = T_('All Tags');
 
 if (isset($user) && $user != '') {
-    if (is_int($user)) {
+
-      $userid = intval($user);
+	$userid = $userservice->getIdFromUser($user);
-    } else {
+	if($userid == NULL) {
-        if ($userinfo = $userservice->getObjectUserByUsername($user)) {
-            $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);
 } else {
 	$userid = NULL;

password.php

@@ -44,7 +44,7 @@ if (POST_SUBMITTED != '') {
 
 		// NO MATCH
 		$userinfo = $userservice->getObjectUserByUsername(POST_USERNAME);
-		if ($userinfo == '') {
+		if ($userinfo == NULL) {
 			$tplVars['error'] = T_('No matches found for that username.');
 
 		} elseif (POST_EMAIL != $userinfo->getEmail()) {

populartags.php

@@ -47,19 +47,15 @@ if ($usecache) {
 $pagetitle = T_('Popular Tags');
 
 if (isset($user) && $user != '') {
-    if (is_int($user)) {
+
-      $userid = intval($user);
+	$userid = $userservice->getIdFromUser($user);
-    } else {
+	if($userid == NULL) {
-    	$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);
 } else {
 	$userid = NULL;

profile.php

@@ -41,12 +41,13 @@ isset($_SESSION['token_stamp']) ? define('SESSION_TOKENSTAMP', $_SESSION['token_
 @list($url, $user) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
 
 if ($user) {
+	
 	if (is_int($user)) {
 		$userid = intval($user);
 	} else {
 		$user = urldecode($user);
 		$userinfo = $userservice->getObjectUserByUsername($user);
-        if ($userinfo == '') {
+		if ($userinfo == NULL) {
 			$tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
 			$templateservice->loadTemplate('error.404.tpl', $tplVars);
 			exit();

search.php

@@ -95,18 +95,14 @@ if (POST_TERMS != '') {
 		}
 
 		if (isset($s_user)) {
-			if (is_numeric($s_user)) {
+			
-				$s_user = intval($s_user);
+			$s_user = $userservice->getIdFromUser($s_user);
-			} else {
+			if($s_user == NULL) {
-				$userinfo = $userservice->getObjectUserByUsername($s_user);
-				if ($userinfo == '' ) {
 				$tplVars['error'] = sprintf(T_('User with username %s was not found'), $s_user);
 				$templateservice->loadTemplate('error.404.tpl', $tplVars);
 				exit();
-				} else {
-					$s_user =& $userinfo->getId();
-				}
 			}
+			
 		}
 	}
 	$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, $s_user, NULL, $terms, getSortOrder(), $s_watchlist, $s_start, $s_end);

services/userservice.php

@@ -127,7 +127,25 @@ class UserService {
 
 	function getObjectUserByUsername($username) {
 		$user = $this->_getuser($this->getFieldName('username'), $username);
+		if($user != false) {
 			return new User($user[$this->getFieldName('primary')], $username);
+		} else {
+			return NULL;
+		}
+	}
+
+	/* Takes an numerical "id" or a string "username"
+	 and returns the numerical "id" if the user exists else returns NULL */
+	function getIdFromUser($user) {
+		if (is_int($user)) {
+			return intval($user);
+		} else {
+			$objectUser = $this->getObjectUserByUsername($user);
+			if($objectUser != NULL) {
+				return $objectUser->getId();
+			}
+		}
+		return NULL;
 	}
 
 	function getUser($id) {

watch.php

@@ -34,17 +34,12 @@ $currentUser = $userservice->getCurrentObjectUser();
 if ($userservice->isLoggedOn() && $user) {
 	$pagetitle = '';
 
-	if (is_int($user)) {
+	$userid = $userservice->getIdFromUser($user);
-		$userid = intval($user);
+	
-	} else {
+	if($userid == NULL) {
-		$userinfo = $userservice->getObjectUserByUsername($user);
-		if ($userinfo == '') {
 		$tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
 		$templateservice->loadTemplate('error.404.tpl', $tplVars);
 		exit();
-		} else {
-			$userid =& $userinfo->getId();
-		}
 	}
 
 	$watched = $userservice->getWatchStatus($userid, $currentUser->getId());

watchlist.php

@@ -56,7 +56,7 @@ if ($user) {
         $userid = intval($user);
     } else {
     	$userinfo = $userservice->getObjectUserByUsername($user);
-        if ($userinfo == '' ) {
+        if ($userinfo == NULL ) {
             // Throw a 404 error
             $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
             $templateservice->loadTemplate('error.404.tpl', $tplVars);