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

84
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');
@ -29,51 +29,47 @@ $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
list($url, $user) = explode('/', $_SERVER['PATH_INFO']); list($url, $user) = explode('/', $_SERVER['PATH_INFO']);
if (!$user) { if (!$user) {
header('Location: '. createURL('populartags')); header('Location: '. createURL('populartags'));
exit; exit;
} }
if ($usecache) { if ($usecache) {
// Generate hash for caching on // Generate hash for caching on
$hashtext = $_SERVER['REQUEST_URI']; $hashtext = $_SERVER['REQUEST_URI'];
if ($userservice->isLoggedOn()) { if ($userservice->isLoggedOn()) {
$hashtext .= $userservice->getCurrentUserID(); $hashtext .= $userservice->getCurrentUserID();
} }
$hash = md5($hashtext); $hash = md5($hashtext);
// Cache for an hour // Cache for an hour
$cacheservice->Start($hash, 3600); $cacheservice->Start($hash, 3600);
} }
// Header variables // Header variables
$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)) { $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
$userid = $userinfo->getId(); $templateservice->loadTemplate('error.404.tpl', $tplVars);
} else { exit();
$tplVars['error'] = sprintf(T_('User with username %s was not found'), $user); }
$templateservice->loadTemplate('error.404.tpl', $tplVars);
//throw a 404 error $pagetitle .= ': '. ucfirst($user);
exit();
}
}
$pagetitle .= ': '. ucfirst($user);
} else { } else {
$userid = NULL; $userid = NULL;
} }
$tags =& $b2tservice->getTags($userid); $tags =& $b2tservice->getTags($userid);
$tplVars['tags'] =& $b2tservice->tagCloud($tags, 5, 90, 225, getSortOrder()); $tplVars['tags'] =& $b2tservice->tagCloud($tags, 5, 90, 225, getSortOrder());
$tplVars['user'] = $user; $tplVars['user'] = $user;
if (isset($userid)) { if (isset($userid)) {
$tplVars['cat_url'] = createURL('bookmarks', '%s/%s'); $tplVars['cat_url'] = createURL('bookmarks', '%s/%s');
} else { } else {
$tplVars['cat_url'] = createURL('tags', '%2$s'); $tplVars['cat_url'] = createURL('tags', '%2$s');
} }
$tplVars['sidebar_blocks'] = array('linked'); $tplVars['sidebar_blocks'] = array('linked');
@ -84,7 +80,7 @@ $tplVars['subtitle'] = $pagetitle;
$templateservice->loadTemplate('tags.tpl', $tplVars); $templateservice->loadTemplate('tags.tpl', $tplVars);
if ($usecache) { if ($usecache) {
// Cache output if existing copy has expired // Cache output if existing copy has expired
$cacheservice->End($hash); $cacheservice->End($hash);
} }
?> ?>

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()) {

90
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');
@ -29,50 +29,46 @@ $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
list($url, $user) = explode('/', $_SERVER['PATH_INFO']); list($url, $user) = explode('/', $_SERVER['PATH_INFO']);
if ($usecache) { if ($usecache) {
// Generate hash for caching on // Generate hash for caching on
$hashtext = $_SERVER['REQUEST_URI']; $hashtext = $_SERVER['REQUEST_URI'];
if ($userservice->isLoggedOn()) { if ($userservice->isLoggedOn()) {
$hashtext .= $currentUser->getId(); $hashtext .= $currentUser->getId();
if ($currentUser->getUsername() == $user) { if ($currentUser->getUsername() == $user) {
$hashtext .= $user; $hashtext .= $user;
} }
} }
$hash = md5($hashtext); $hash = md5($hashtext);
// Cache for an hour // Cache for an hour
$cacheservice->Start($hash, 3600); $cacheservice->Start($hash, 3600);
} }
// Header variables // Header variables
$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); $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
if ($userinfo != '') { $templateservice->loadTemplate('error.404.tpl', $tplVars);
$userid = $userinfo->getId(); //throw a 404 error
} else { exit();
$tplVars['error'] = sprintf(T_('User with username %s was not found'), $user); }
$templateservice->loadTemplate('error.404.tpl', $tplVars);
//throw a 404 error $pagetitle .= ': '. ucfirst($user);
exit();
}
}
$pagetitle .= ': '. ucfirst($user);
} else { } else {
$userid = NULL; $userid = NULL;
} }
$tags = $b2tservice->getPopularTags($userid, 150); $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; $tplVars['user'] = $user;
if (isset($userid)) { if (isset($userid)) {
$tplVars['cat_url'] = createURL('bookmarks', '%s/%s'); $tplVars['cat_url'] = createURL('bookmarks', '%s/%s');
} else { } else {
$tplVars['cat_url'] = createURL('tags', '%2$s'); $tplVars['cat_url'] = createURL('tags', '%2$s');
} }
$tplVars['sidebar_blocks'] = array('linked'); $tplVars['sidebar_blocks'] = array('linked');
@ -81,8 +77,8 @@ $tplVars['loadjs'] = true;
$templateservice->loadTemplate('tags.tpl', $tplVars); $templateservice->loadTemplate('tags.tpl', $tplVars);
if ($usecache) { if ($usecache) {
// Cache output if existing copy has expired // Cache output if existing copy has expired
$cacheservice->End($hash); $cacheservice->End($hash);
} }
?> ?>

151
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,29 +41,30 @@ 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)) {
$userid = intval($user); if (is_int($user)) {
} else { $userid = intval($user);
$user = urldecode($user); } else {
$userinfo = $userservice->getObjectUserByUsername($user); $user = urldecode($user);
if ($userinfo == '') { $userinfo = $userservice->getObjectUserByUsername($user);
$tplVars['error'] = sprintf(T_('User with username %s was not found'), $user); if ($userinfo == NULL) {
$templateservice->loadTemplate('error.404.tpl', $tplVars); $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
exit(); $templateservice->loadTemplate('error.404.tpl', $tplVars);
} else { exit();
$userid =& $userinfo->getId(); } else {
} $userid =& $userinfo->getId();
} }
}
} else { } else {
$tplVars['error'] = T_('Username was not specified'); $tplVars['error'] = T_('Username was not specified');
$templateservice->loadTemplate('error.404.tpl', $tplVars); $templateservice->loadTemplate('error.404.tpl', $tplVars);
exit(); exit();
} }
if ($userservice->isLoggedOn() && $user == $currentUser->getUsername()) { if ($userservice->isLoggedOn() && $user == $currentUser->getUsername()) {
$title = T_('My Profile'); $title = T_('My Profile');
} else { } else {
$title = T_('Profile') .': '. $user; $title = T_('Profile') .': '. $user;
} }
$tplVars['pagetitle'] = $title; $tplVars['pagetitle'] = $title;
$tplVars['subtitle'] = $title; $tplVars['subtitle'] = $title;
@ -72,55 +73,55 @@ $tplVars['user'] = $user;
$tplVars['userid'] = $userid; $tplVars['userid'] = $userid;
if (POST_SUBMITTED!='' && $currentUser->getId() == $userid) { if (POST_SUBMITTED!='' && $currentUser->getId() == $userid) {
$error = false; $error = false;
$detPass = trim(POST_PASS); $detPass = trim(POST_PASS);
$detPassConf = trim(POST_PASSCONF); $detPassConf = trim(POST_PASSCONF);
$detName = trim(POST_NAME); $detName = trim(POST_NAME);
$detMail = trim(POST_MAIL); $detMail = trim(POST_MAIL);
$detPage = trim(POST_PAGE); $detPage = trim(POST_PAGE);
$detDesc = filter(POST_DESC); $detDesc = filter(POST_DESC);
// manage token preventing from CSRF vulnaribilities // manage token preventing from CSRF vulnaribilities
if ( SESSION_TOKEN == '' if ( SESSION_TOKEN == ''
|| time() - SESSION_TOKENSTAMP > 600 //limit token lifetime, optionnal || time() - SESSION_TOKENSTAMP > 600 //limit token lifetime, optionnal
|| SESSION_TOKEN != POST_TOKEN) { || SESSION_TOKEN != POST_TOKEN) {
$error = true; $error = true;
$tplVars['error'] = T_('Invalid Token'); $tplVars['error'] = T_('Invalid Token');
} }
if ($detPass != $detPassConf) { if ($detPass != $detPassConf) {
$error = true; $error = true;
$tplVars['error'] = T_('Password and confirmation do not match.'); $tplVars['error'] = T_('Password and confirmation do not match.');
} }
if ($detPass != "" && strlen($detPass) < 6) { if ($detPass != "" && strlen($detPass) < 6) {
$error = true; $error = true;
$tplVars['error'] = T_('Password must be at least 6 characters long.'); $tplVars['error'] = T_('Password must be at least 6 characters long.');
} }
if (!$userservice->isValidEmail($detMail)) { if (!$userservice->isValidEmail($detMail)) {
$error = true; $error = true;
$tplVars['error'] = T_('E-mail address is not valid.'); $tplVars['error'] = T_('E-mail address is not valid.');
} }
if (!$error) { if (!$error) {
if (!$userservice->updateUser($userid, $detPass, $detName, $detMail, $detPage, $detDesc)) { if (!$userservice->updateUser($userid, $detPass, $detName, $detMail, $detPage, $detDesc)) {
$tplvars['error'] = T_('An error occurred while saving your changes.'); $tplvars['error'] = T_('An error occurred while saving your changes.');
} else { } else {
$tplVars['msg'] = T_('Changes saved.'); $tplVars['msg'] = T_('Changes saved.');
} }
} }
$userinfo = $userservice->getObjectUserByUsername($user); $userinfo = $userservice->getObjectUserByUsername($user);
} }
if (!$userservice->isLoggedOn() || $currentUser->getId() != $userid) { if (!$userservice->isLoggedOn() || $currentUser->getId() != $userid) {
$templatename = 'profile.tpl.php'; $templatename = 'profile.tpl.php';
} else { } else {
//Token Init //Token Init
$_SESSION['token'] = md5(uniqid(rand(), true)); $_SESSION['token'] = md5(uniqid(rand(), true));
$_SESSION['token_stamp'] = time(); $_SESSION['token_stamp'] = time();
$templatename = 'editprofile.tpl.php'; $templatename = 'editprofile.tpl.php';
$tplVars['formaction'] = createURL('profile', $user); $tplVars['formaction'] = createURL('profile', $user);
$tplVars['token'] = $_SESSION['token']; $tplVars['token'] = $_SESSION['token'];
} }
$tplVars['objectUser'] = $userinfo; $tplVars['objectUser'] = $userinfo;

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

28
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);
return new User($user[$this->getFieldName('primary')], $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) { function getUser($id) {
@ -465,7 +483,7 @@ class UserService {
// Check if the email domain has a DNS record // Check if the email domain has a DNS record
//if ($this->_checkdns($emailDomain)) { //if ($this->_checkdns($emailDomain)) {
return true; return true;
//} //}
} }
return false; return false;
@ -520,7 +538,7 @@ class User {
} }
return $this->name; return $this->name;
} }
function getEmail() { function getEmail() {
// Look for value only if not already set // Look for value only if not already set
if(!isset($this->email)) { if(!isset($this->email)) {
@ -540,7 +558,7 @@ class User {
} }
return $this->homepage; return $this->homepage;
} }
function getContent() { function getContent() {
// Look for value only if not already set // Look for value only if not already set
if(!isset($this->content)) { if(!isset($this->content)) {
@ -549,7 +567,7 @@ class User {
$this->content = $user['uContent']; $this->content = $user['uContent'];
} }
return $this->content; return $this->content;
} }
function getDatetime() { function getDatetime() {
// Look for value only if not already set // Look for value only if not already set

17
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); $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
if ($userinfo == '') { $templateservice->loadTemplate('error.404.tpl', $tplVars);
$tplVars['error'] = sprintf(T_('User with username %s was not found'), $user); exit();
$templateservice->loadTemplate('error.404.tpl', $tplVars);
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);