aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor Refactoring: add getIdFromUser()

Browse source 
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@238 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
mensonge 2009-01-15 18:05:08 +00:00
parent eac302f225
commit 24ab0f6487
8 changed files with 197 additions and 195 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
alltags.php
View file

@ -1,23 +1,23 @@
<?php <?php
/*************************************************************************** /***************************************************************************
Copyright (C) 2004 - 2006 Scuttle project Copyright (C) 2004 - 2006 Scuttle project
http://sourceforge.net/projects/scuttle/ http://sourceforge.net/projects/scuttle/
http://scuttle.org/ http://scuttle.org/
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
@ -49,18 +49,14 @@ if ($usecache) {
$pagetitle = T_('All Tags'); $pagetitle = T_('All Tags');
if (isset($user) && $user != '') { 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); $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
$templateservice->loadTemplate('error.404.tpl', $tplVars); $templateservice->loadTemplate('error.404.tpl', $tplVars);
//throw a 404 error
exit(); exit();
} }
}
$pagetitle .= ': '. ucfirst($user); $pagetitle .= ': '. ucfirst($user);
} else { } else {
$userid = NULL; $userid = NULL;

2
password.php
View file

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

42
populartags.php
View file

@ -1,23 +1,23 @@
<?php <?php
/*************************************************************************** /***************************************************************************
Copyright (C) 2004 - 2006 Scuttle project Copyright (C) 2004 - 2006 Scuttle project
http://sourceforge.net/projects/scuttle/ http://sourceforge.net/projects/scuttle/
http://scuttle.org/ http://scuttle.org/
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
@ -47,19 +47,15 @@ if ($usecache) {
$pagetitle = T_('Popular Tags'); $pagetitle = T_('Popular Tags');
if (isset($user) && $user != '') { 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); $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
$templateservice->loadTemplate('error.404.tpl', $tplVars); $templateservice->loadTemplate('error.404.tpl', $tplVars);
//throw a 404 error //throw a 404 error
exit(); exit();
} }
}
$pagetitle .= ': '. ucfirst($user); $pagetitle .= ': '. ucfirst($user);
} else { } else {
$userid = NULL; $userid = NULL;

33
profile.php
View file

@ -1,23 +1,23 @@
<?php <?php
/*************************************************************************** /***************************************************************************
Copyright (C) 2004 - 2006 Scuttle project Copyright (C) 2004 - 2006 Scuttle project
http://sourceforge.net/projects/scuttle/ http://sourceforge.net/projects/scuttle/
http://scuttle.org/ http://scuttle.org/
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.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; @list($url, $user) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
if ($user) { if ($user) {
if (is_int($user)) { if (is_int($user)) {
$userid = intval($user); $userid = intval($user);
} else { } else {
$user = urldecode($user); $user = urldecode($user);
$userinfo = $userservice->getObjectUserByUsername($user); $userinfo = $userservice->getObjectUserByUsername($user);
if ($userinfo == '') { if ($userinfo == NULL) {
$tplVars['error'] = sprintf(T_('User with username %s was not found'), $user); $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
$templateservice->loadTemplate('error.404.tpl', $tplVars); $templateservice->loadTemplate('error.404.tpl', $tplVars);
exit(); exit();

12
search.php
View file

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

18
services/userservice.php
View file

@ -127,7 +127,25 @@ class UserService {
function getObjectUserByUsername($username) { function getObjectUserByUsername($username) {
$user = $this->_getuser($this->getFieldName('username'), $username); $user = $this->_getuser($this->getFieldName('username'), $username);
if($user != false) {
return new User($user[$this->getFieldName('primary')], $username); 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) { function getUser($id) {

11
watch.php
View file

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

2
watchlist.php
View file

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