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

Major refactoring: transform user into object, define parameters used into each file, ...

Browse source 
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@173 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
mensonge 2008-11-25 15:57:29 +00:00
parent 9aafe7551e
commit 15b91c7e66
51 changed files with 2247 additions and 1820 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
about.php
View file

@ -19,6 +19,8 @@
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$tplVars = array(); $tplVars = array();

15
admin.php
View file

@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
$bookmark2tagservice = & ServiceFactory :: getServiceInstance('Bookmark2Tagservice'); $bookmark2tagservice = & ServiceFactory :: getServiceInstance('Bookmark2Tagservice');
$bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService'); $bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService');
@ -28,18 +29,20 @@ $templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
// Header variables // Header variables
$tplVars['subtitle'] = T_('Manage users'); $tplVars['subtitle'] = T_('Manage users');
$tplVars['loadjs'] = true; $tplVars['loadjs'] = true;
$tplVars['sidebar_blocks'] = array('users' );
if ( !$userservice->isLoggedOn() ) { if ( !$userservice->isLoggedOn() ) {
header('Location: '. createURL('login', '')); header('Location: '. createURL('login', ''));
exit(); exit();
} }
$currentUser = $userservice->getCurrentUser(); //$currentUser = $userservice->getCurrentUser();
$currentUserID = $userservice->getCurrentUserId(); //$currentUserID = $userservice->getCurrentUserId();
$currentUsername = $currentUser[$userservice->getFieldName('username')]; //$currentUsername = $currentUser[$userservice->getFieldName('username')];
$currentObjectUser = $userservice->getCurrentObjectUser();
if ( !$userservice->isAdmin($currentUserID) ) { if ( !$currentObjectUser->isAdmin() ) {
header('Location: '. createURL('bookmarks', $currentUsername)); header('Location: '. createURL('bookmarks', $currentObjectUser->getUsername()));
exit(); exit();
} }
@ -66,7 +69,7 @@ if ( $action ) {
} }
$templatename = 'userlist.tpl'; $templatename = 'userlist.tpl';
$users =& $userservice->getAllUsers(); $users =& $userservice->getObjectUsers();
if ( !is_array($users) ) { if ( !is_array($users) ) {
$users = array(); $users = array();

9
ajaxDelete.php
View file

@ -24,8 +24,15 @@ header('Last-Modified: '. gmdate("D, d M Y H:i:s") .' GMT');
header('Cache-Control: no-cache, must-revalidate'); header('Cache-Control: no-cache, must-revalidate');
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService'); $bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService');
$bookmark = intval($_GET['id']);
/* Managing all possible inputs */
isset($_GET['id']) ? define('GET_ID', $_GET['id']): define('GET_ID', '');
$bookmark = intval(GET_ID);
if (!$bookmarkservice->editAllowed($bookmark)) { if (!$bookmarkservice->editAllowed($bookmark)) {
$result = T_('You are not allowed to delete this bookmark'); $result = T_('You are not allowed to delete this bookmark');
} elseif ($bookmarkservice->deleteBookmark($bookmark)) { } elseif ($bookmarkservice->deleteBookmark($bookmark)) {

5
ajaxGetTitle.php
View file

@ -25,6 +25,9 @@ header("Cache-Control: no-cache, must-revalidate");
require_once('header.inc.php'); require_once('header.inc.php');
/* Managing all possible inputs */
isset($_GET['url']) ? define('GET_URL', $_GET['url']): define('GET_URL', '');
function getTitle($url) { function getTitle($url) {
$fd = @fopen($url, 'r'); $fd = @fopen($url, 'r');
if ($fd) { if ($fd) {
@ -65,6 +68,6 @@ echo '<?xml version="1.0" encoding="utf-8"?>';
getTitle getTitle
</method> </method>
<result> <result>
<?php echo getTitle($_GET['url']); ?> <?php echo getTitle(GET_URL); ?>
</result> </result>
</response> </response>

11
ajaxIsAvailable.php
View file

@ -24,11 +24,18 @@ header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
header("Cache-Control: no-cache, must-revalidate"); header("Cache-Control: no-cache, must-revalidate");
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
if ($userservice->isReserved($_GET['username'])) {
/* Managing all possible inputs */
isset($_GET['username']) ? define('GET_USERNAME', $_GET['username']): define('GET_USERNAME', '');
if ($userservice->isReserved(GET_USERNAME)) {
$result = 'false'; $result = 'false';
} else { } else {
$result = $userservice->getUserByUsername($_GET['username']) ? 'false' : 'true'; $result = $userservice->getUserByUsername(GET_USERNAME) ? 'false' : 'true';
} }
?> ?>
<response> <response>

8
alltags.php
View file

@ -20,11 +20,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService'); $b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$cacheservice =& ServiceFactory::getServiceInstance('CacheService'); $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'));
@ -51,8 +55,8 @@ if (isset($user) && $user != '') {
if (is_int($user)) { if (is_int($user)) {
$userid = intval($user); $userid = intval($user);
} else { } else {
if ($userinfo = $userservice->getUserByUsername($user)) { if ($userinfo = $userservice->getObjectUserByUsername($user)) {
$userid =& $userinfo[$userservice->getFieldName('primary')]; $userid = $userinfo->getId();
} else { } 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);

58
bookmarkcommondescriptionedit.php
View file

@ -1,56 +1,68 @@
<?php <?php
/*************************************************************************** /***************************************************************************
Copyright (C) 2006 - 2007 Scuttle project Copyright (C) 2006 - 2007 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');
/* Service creation: only useful services are created */
$bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService'); $bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService');
$templateservice = & ServiceFactory :: getServiceInstance('TemplateService'); $templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
$cdservice = & ServiceFactory :: getServiceInstance('CommonDescriptionService'); $cdservice = & ServiceFactory :: getServiceInstance('CommonDescriptionService');
/* Managing all possible inputs */
isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
isset($_POST['cancel']) ? define('POST_CANCEL', $_POST['cancel']): define('POST_CANCEL', '');
isset($_POST['hash']) ? define('POST_HASH', $_POST['hash']): define('POST_HASH', '');
isset($_POST['title']) ? define('POST_TITLE', $_POST['title']): define('POST_TITLE', '');
isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']): define('POST_DESCRIPTION', '');
isset($_POST['referrer']) ? define('POST_REFERRER', $_POST['referrer']): define('POST_REFERRER', '');
list ($url, $hash) = explode('/', $_SERVER['PATH_INFO']); list ($url, $hash) = explode('/', $_SERVER['PATH_INFO']);
$template = 'bookmarkcommondescriptionedit.tpl'; $template = 'bookmarkcommondescriptionedit.tpl';
$logged_on_user = $userservice->getCurrentUser(); //$logged_on_user = $userservice->getCurrentUser();
$currentObjectUser = $userservice->getCurrentObjectUser();
//permissions //permissions
if($logged_on_user == null) { if(is_null($currentObjectUser)) {
$tplVars['error'] = T_('Permission denied.'); $tplVars['error'] = T_('Permission denied.');
$templateservice->loadTemplate('error.500.tpl', $tplVars); $templateservice->loadTemplate('error.500.tpl', $tplVars);
exit(); exit();
} }
if ($_POST['confirm']) { if (POST_CONFIRM) {
if (strlen($hash)>0 && if (strlen($hash)>0 &&
$cdservice->addBookmarkDescription($_POST['hash'], stripslashes($_POST['title']), stripslashes($_POST['description']), $logged_on_user['uId'], time()) $cdservice->addBookmarkDescription(POST_HASH, stripslashes(POST_TITLE), stripslashes(POST_DESCRIPTION), $currentObjectUser->getId(), time())
) { ) {
$tplVars['msg'] = T_('Bookmark common description updated'); $tplVars['msg'] = T_('Bookmark common description updated');
header('Location: '. $_POST['referrer']); header('Location: '. POST_REFERRER);
} else { } else {
$tplVars['error'] = T_('Failed to update the bookmark common description'); $tplVars['error'] = T_('Failed to update the bookmark common description');
$template = 'error.500.tpl'; $template = 'error.500.tpl';
} }
} elseif ($_POST['cancel']) { } elseif (POST_CANCEL) {
$logged_on_user = $userservice->getCurrentUser(); $logged_on_user = $userservice->getCurrentUser();
header('Location: '. $_POST['referrer']); header('Location: '. POST_REFERRER);
} else { } else {
$bkm = $bookmarkservice->getBookmarkByHash($hash); $bkm = $bookmarkservice->getBookmarkByHash($hash);

131
bookmarks.php
View file

@ -1,26 +1,27 @@
<?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');
/* Service creation: only useful services are created */
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService'); $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
@ -28,21 +29,47 @@ $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
$tplVars = array(); $tplVars = array();
if (isset($_GET['action']) && ($_GET['action'] == "add") && !$userservice->isLoggedOn()) { /* Managing all possible inputs */
isset($_GET['action']) ? define('GET_ACTION', $_GET['action']): define('GET_ACTION', '');
isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
isset($_GET['title']) ? define('GET_TITLE', $_GET['title']): define('GET_TITLE', '');
isset($_GET['address']) ? define('GET_ADDRESS', $_GET['address']): define('GET_ADDRESS', '');
isset($_GET['description']) ? define('GET_DESCRIPTION', $_GET['description']): define('GET_DESCRIPTION', '');
isset($_GET['tags']) ? define('GET_TAGS', $_GET['tags']): define('GET_TAGS', '');
isset($_POST['title']) ? define('POST_TITLE', $_POST['title']): define('POST_TITLE', '');
isset($_POST['address']) ? define('POST_ADDRESS', $_POST['address']): define('POST_ADDRESS', '');
isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']): define('POST_DESCRIPTION', '');
isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', '');
isset($_POST['tags']) ? define('POST_TAGS', $_POST['tags']): define('POST_TAGS', '');
isset($_GET['popup']) ? define('GET_POPUP', $_GET['popup']): define('GET_POPUP', '');
isset($_POST['popup']) ? define('POST_POPUP', $_POST['popup']): define('POST_POPUP', '');
isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0);
isset($_GET['sort']) ? define('GET_SORT', $_GET['sort']): define('GET_SORT', '');
if ((GET_ACTION == "add") && !$userservice->isLoggedOn()) {
$loginqry = str_replace("'", '%27', stripslashes($_SERVER['QUERY_STRING'])); $loginqry = str_replace("'", '%27', stripslashes($_SERVER['QUERY_STRING']));
header('Location: '. createURL('login', '?'. $loginqry)); header('Location: '. createURL('login', '?'. $loginqry));
exit(); exit();
} }
if ($userservice->isLoggedOn()) {
//$currentUser = $userservice->getCurrentUser();
//$currentUserID = $userservice->getCurrentUserId();
//$currentUsername = $currentUser[$userservice->getFieldName('username')];
$currentObjectUser = $userservice->getCurrentObjectUser();
$currentUserID = $currentObjectUser->getId();
$currentUsername = $currentObjectUser->getUsername();
}
@list($url, $user, $cat) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL; @list($url, $user, $cat) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
$loggedon = false;
if ($userservice->isLoggedOn()) {
$loggedon = true;
$currentUser = $userservice->getCurrentUser();
$currentUserID = $userservice->getCurrentUserId();
$currentUsername = $currentUser[$userservice->getFieldName('username')];
}
$endcache = false; $endcache = false;
if ($usecache) { if ($usecache) {
@ -50,7 +77,7 @@ if ($usecache) {
$hash = md5($_SERVER['REQUEST_URI'] . $user); $hash = md5($_SERVER['REQUEST_URI'] . $user);
// Don't cache if its users' own bookmarks // Don't cache if its users' own bookmarks
if ($loggedon) { if ($userservice->isLoggedOn()) {
if ($currentUsername != $user) { if ($currentUsername != $user) {
// Cache for 5 minutes // Cache for 5 minutes
$cacheservice->Start($hash); $cacheservice->Start($hash);
@ -90,12 +117,12 @@ $tplVars['loadjs'] = true;
// ADD A BOOKMARK // ADD A BOOKMARK
$saved = false; $saved = false;
$templatename = 'bookmarks.tpl'; $templatename = 'bookmarks.tpl';
if ($loggedon && isset($_POST['submitted'])) { if ($userservice->isLoggedOn() && POST_SUBMITTED != '') {
if (!$_POST['title'] || !$_POST['address']) { if (!POST_TITLE || !POST_ADDRESS) {
$tplVars['error'] = T_('Your bookmark must have a title and an address'); $tplVars['error'] = T_('Your bookmark must have a title and an address');
$templatename = 'editbookmark.tpl'; $templatename = 'editbookmark.tpl';
} else { } else {
$address = trim($_POST['address']); $address = trim(POST_ADDRESS);
// If the bookmark exists already, edit the original // If the bookmark exists already, edit the original
if ($bookmarkservice->bookmarkExists($address, $currentUserID)) { if ($bookmarkservice->bookmarkExists($address, $currentUserID)) {
$bookmark =& $bookmarkservice->getBookmarkByAddress($address); $bookmark =& $bookmarkservice->getBookmarkByAddress($address);
@ -103,13 +130,13 @@ if ($loggedon && isset($_POST['submitted'])) {
exit(); exit();
// If it's new, save it // If it's new, save it
} else { } else {
$title = trim($_POST['title']); $title = trim(POST_TITLE);
$description = trim($_POST['description']); $description = trim(POST_DESCRIPTION);
$status = intval($_POST['status']); $status = intval(POST_STATUS);
$categories = trim($_POST['tags']); $categories = trim(POST_TAGS);
$saved = true; $saved = true;
if ($bookmarkservice->addBookmark($address, $title, $description, $status, $categories)) { if ($bookmarkservice->addBookmark($address, $title, $description, $status, $categories)) {
if (isset($_POST['popup'])) { if (POST_POPUP != '') {
$tplVars['msg'] = '<script type="text/javascript">window.close();</script>'; $tplVars['msg'] = '<script type="text/javascript">window.close();</script>';
} else { } else {
$tplVars['msg'] = T_('Bookmark saved'); $tplVars['msg'] = T_('Bookmark saved');
@ -128,11 +155,11 @@ if ($loggedon && isset($_POST['submitted'])) {
} }
} }
if (isset($_GET['action']) && ($_GET['action'] == "add")) { if (GET_ACTION == "add") {
// If the bookmark exists already, edit the original // If the bookmark exists already, edit the original
if ($bookmarkservice->bookmarkExists(stripslashes($_GET['address']), $currentUserID)) { if ($bookmarkservice->bookmarkExists(stripslashes(GET_ADDRESS), $currentUserID)) {
$bookmark =& $bookmarkservice->getBookmarks(0, NULL, $currentUserID, NULL, NULL, NULL, NULL, NULL, NULL, md5(stripslashes($_GET['address']))); $bookmark =& $bookmarkservice->getBookmarks(0, NULL, $currentUserID, NULL, NULL, NULL, NULL, NULL, NULL, md5(stripslashes(GET_ADDRESS)));
$popup = (isset($_GET['popup'])) ? '?popup=1' : ''; $popup = (GET_POPUP!='') ? '?popup=1' : '';
header('Location: '. createURL('edit', $bookmark['bookmarks'][0]['bId'] . $popup)); header('Location: '. createURL('edit', $bookmark['bookmarks'][0]['bId'] . $popup));
exit(); exit();
} }
@ -140,33 +167,35 @@ if (isset($_GET['action']) && ($_GET['action'] == "add")) {
} }
if ($templatename == 'editbookmark.tpl') { if ($templatename == 'editbookmark.tpl') {
if ($loggedon) { if ($userservice->isLoggedOn()) {
$tplVars['formaction'] = createURL('bookmarks', $currentUsername); $tplVars['formaction'] = createURL('bookmarks', $currentUsername);
if (isset($_POST['submitted'])) { if (POST_SUBMITTED != '') {
$tplVars['row'] = array( $tplVars['row'] = array(
'bTitle' => stripslashes($_POST['title']), 'bTitle' => stripslashes(POST_TITLE),
'bAddress' => stripslashes($_POST['address']), 'bAddress' => stripslashes(POST_ADDRESS),
'bDescription' => stripslashes($_POST['description']), 'bDescription' => stripslashes(POST_DESCRIPTION),
'tags' => ($_POST['tags'] ? explode(',', stripslashes($_POST['tags'])) : array()) 'tags' => (POST_TAGS ? explode(',', stripslashes(POST_TAGS)) : array()),
'bStatus' => 0,
); );
$tplVars['tags'] = $_POST['tags']; $tplVars['tags'] = POST_TAGS;
} else { } else {
$tplVars['row'] = array( $tplVars['row'] = array(
'bTitle' => stripslashes($_GET['title']), 'bTitle' => stripslashes(GET_TITLE),
'bAddress' => stripslashes($_GET['address']), 'bAddress' => stripslashes(GET_ADDRESS),
'bDescription' => stripslashes($_GET['description']), 'bDescription' => stripslashes(GET_DESCRIPTION),
'tags' => ($_GET['tags'] ? explode(',', stripslashes($_GET['tags'])) : array()) 'tags' => (GET_TAGS ? explode(',', stripslashes(GET_TAGS)) : array()),
'bStatus' => 0
); );
} }
$title = T_('Add a Bookmark'); $title = T_('Add a Bookmark');
$tplVars['pagetitle'] = $title; $tplVars['pagetitle'] = $title;
$tplVars['subtitle'] = $title; $tplVars['subtitle'] = $title;
$tplVars['btnsubmit'] = T_('Add Bookmark'); $tplVars['btnsubmit'] = T_('Add Bookmark');
$tplVars['popup'] = (isset($_GET['popup'])) ? $_GET['popup'] : null; $tplVars['popup'] = (GET_POPUP!='') ? GET_POPUP : null;
} else { } else {
$tplVars['error'] = T_('You must be logged in before you can add bookmarks.'); $tplVars['error'] = T_('You must be logged in before you can add bookmarks.');
} }
} else if ($user && !isset($_GET['popup'])) { } else if ($user && GET_POPUP == '') {
$tplVars['sidebar_blocks'] = array('profile', 'watchstatus'); $tplVars['sidebar_blocks'] = array('profile', 'watchstatus');
@ -192,8 +221,8 @@ if ($templatename == 'editbookmark.tpl') {
// Pagination // Pagination
$perpage = getPerPageCount(); $perpage = getPerPageCount();
if (isset($_GET['page']) && intval($_GET['page']) > 1) { if (intval(GET_PAGE) > 1) {
$page = $_GET['page']; $page = GET_PAGE;
$start = ($page - 1) * $perpage; $start = ($page - 1) * $perpage;
} else { } else {
$page = 0; $page = 0;

2
constants.inc.php
View file

@ -1,6 +1,6 @@
<?php <?php
/* /*
* Define constants use in all the application. * Define constants used in all the application.
* Some constants are based on variables from configuration file. * Some constants are based on variables from configuration file.
*/ */

59
edit.php
View file

@ -21,10 +21,29 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService'); $bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService');
$templateservice = & ServiceFactory :: getServiceInstance('TemplateService'); $templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
/* Managing all possible inputs */
isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
isset($_POST['delete']) ? define('POST_DELETE', $_POST['delete']): define('POST_DELETE', '');
isset($_POST['title']) ? define('POST_TITLE', $_POST['title']): define('POST_TITLE', '');
isset($_POST['address']) ? define('POST_ADDRESS', $_POST['address']): define('POST_ADDRESS', '');
isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']): define('POST_DESCRIPTION', '');
isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', '');
isset($_POST['tags']) ? define('POST_TAGS', $_POST['tags']): define('POST_TAGS', '');
isset($_GET['popup']) ? define('GET_POPUP', $_GET['popup']): define('GET_POPUP', '');
isset($_POST['popup']) ? define('POST_POPUP', $_POST['popup']): define('POST_POPUP', '');
isset($_POST['referrer']) ? define('POST_REFERRER', $_POST['referrer']): define('POST_REFERRER', '');
/* Managing current logged user */
$currentObjectUser = $userservice->getCurrentObjectUser();
// Header variables // Header variables
$tplVars['subtitle'] = T_('Edit Bookmark'); $tplVars['subtitle'] = T_('Edit Bookmark');
$tplVars['loadjs'] = true; $tplVars['loadjs'] = true;
@ -39,39 +58,41 @@ if (!($row = $bookmarkservice->getBookmark(intval($bookmark), true))) {
$tplVars['error'] = T_('You are not allowed to edit this bookmark'); $tplVars['error'] = T_('You are not allowed to edit this bookmark');
$templateservice->loadTemplate('error.500.tpl', $tplVars); $templateservice->loadTemplate('error.500.tpl', $tplVars);
exit(); exit();
} else if ($_POST['submitted']) { } else if (POST_SUBMITTED != '') {
if (!$_POST['title'] || !$_POST['address']) { if (!POST_TITLE || !POST_ADDRESS) {
$tplVars['error'] = T_('Your bookmark must have a title and an address'); $tplVars['error'] = T_('Your bookmark must have a title and an address');
} else { } else {
// Update bookmark // Update bookmark
$bId = intval($bookmark); $bId = intval($bookmark);
$address = trim($_POST['address']); $address = trim(POST_ADDRESS);
$title = trim($_POST['title']); $title = trim(POST_TITLE);
$description = trim($_POST['description']); $description = trim(POST_DESCRIPTION);
$status = intval($_POST['status']); $status = intval(POST_STATUS);
$tags = trim($_POST['tags']); $tags = trim(POST_TAGS);
$logged_on_user = $userservice->getCurrentUser();
if (!$bookmarkservice->updateBookmark($bId, $address, $title, $description, $status, $tags)) { if (!$bookmarkservice->updateBookmark($bId, $address, $title, $description, $status, $tags)) {
$tplvars['error'] = T_('Error while saving your bookmark'); $tplvars['error'] = T_('Error while saving your bookmark');
} else { } else {
if (isset($_POST['popup'])) { if (POST_POPUP != '') {
$tplVars['msg'] = (isset($_POST['popup'])) ? '<script type="text/javascript">window.close();</script>' : T_('Bookmark saved'); //$tplVars['msg'] = (POST_POPUP != '') ? '<script type="text/javascript">window.close();</script>' : T_('Bookmark saved');
} elseif (isset($_POST['referrer'])) { $tplVars['msg'] = '<script type="text/javascript">window.close();</script>';
header('Location: '. $_POST['referrer']); } elseif (POST_REFERRER != '') {
$tplVars['msg'] = T_('Bookmark saved');
header('Location: '. POST_REFERRER);
} else { } else {
header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')])); $tplVars['msg'] = T_('Bookmark saved');
header('Location: '. createURL('bookmarks', $currentObjectUser->getUsername()));
} }
} }
} }
} else { } else {
if ($_POST['delete']) { if (POST_DELETE != '') {
// Delete bookmark // Delete bookmark
if ($bookmarkservice->deleteBookmark($bookmark)) { if ($bookmarkservice->deleteBookmark($bookmark)) {
$logged_on_user = $userservice->getCurrentUser(); if (POST_REFERRER != '') {
if (isset($_POST['referrer'])) { header('Location: '. POST_REFERRER);
header('Location: '. $_POST['referrer']);
} else { } else {
header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')])); header('Location: '. createURL('bookmarks', $currentObjectUser->getUsername()));
} }
exit(); exit();
} else { } else {
@ -82,7 +103,7 @@ if (!($row = $bookmarkservice->getBookmark(intval($bookmark), true))) {
} }
} }
$tplVars['popup'] = (isset($_GET['popup'])) ? $_GET['popup'] : null; $tplVars['popup'] = (GET_POPUP) ? GET_POPUP : null;
$tplVars['row'] =& $row; $tplVars['row'] =& $row;
$tplVars['formaction'] = createURL('edit', $bookmark); $tplVars['formaction'] = createURL('edit', $bookmark);
$tplVars['btnsubmit'] = T_('Save Changes'); $tplVars['btnsubmit'] = T_('Save Changes');

23
history.php
View file

@ -21,27 +21,34 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService'); $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$cacheservice =& ServiceFactory::getServiceInstance('CacheService'); $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
/* Managing all possible inputs */
isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0);
isset($_GET['sort']) ? define('GET_SORT', $_GET['sort']): define('GET_SORT', '');
$tplVars = array(); $tplVars = array();
@list($url, $hash) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL; @list($url, $hash) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
$loggedon = false; $currentObjectUser = $userservice->getCurrentObjectUser();
/*$loggedon = false;
if ($userservice->isLoggedOn()) { if ($userservice->isLoggedOn()) {
$loggedon = true; $loggedon = true;
$currentUser = $userservice->getCurrentUser(); $currentUser = $userservice->getCurrentUser();
$currentUsername = $currentUser[$userservice->getFieldName('username')]; $currentUsername = $currentUser[$userservice->getFieldName('username')];
} }*/
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 .= $currentUsername; $hashtext .= $currentObjectUser->getUsername();
} }
$cachehash = md5($hashtext); $cachehash = md5($hashtext);
@ -51,8 +58,8 @@ if ($usecache) {
// Pagination // Pagination
$perpage = getPerPageCount(); $perpage = getPerPageCount();
if (isset($_GET['page']) && intval($_GET['page']) > 1) { if (intval(GET_PAGE) > 1) {
$page = $_GET['page']; $page = GET_PAGE;
$start = ($page - 1) * $perpage; $start = ($page - 1) * $perpage;
} else { } else {
$page = 0; $page = 0;
@ -76,6 +83,12 @@ if ($bookmark =& $bookmarkservice->getBookmarkByHash($hash)) {
//$tplVars['cat_url'] = createURL('tags', '%2$s'); //$tplVars['cat_url'] = createURL('tags', '%2$s');
$tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s'); $tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s');
$tplVars['nav_url'] = createURL('history', $hash .'/%3$s'); $tplVars['nav_url'] = createURL('history', $hash .'/%3$s');
$tplVars['rsschannels'] = array();
if($userservice->isLoggedOn()) {
$tplVars['user'] = $currentObjectUser->getUsername();
} else {
$tplVars['user'] = '';
}
$templateservice->loadTemplate('bookmarks.tpl', $tplVars); $templateservice->loadTemplate('bookmarks.tpl', $tplVars);
} else { } else {
// Throw a 404 error // Throw a 404 error

50
import.php
View file

@ -1,34 +1,44 @@
<? <?
/*************************************************************************** /***************************************************************************
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');
/* Service creation: only useful services are created */
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
/* Managing all possible inputs */
// First input is $_FILES
// Other inputs
isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', '');
$tplVars = array(); $tplVars = array();
if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['size'] > 0) { if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['size'] > 0) {
$userinfo = $userservice->getCurrentUser(); $userinfo = $userservice->getCurrentObjectUser();
if (isset($_POST['status']) && is_numeric($_POST['status'])) { if (is_numeric(POST_STATUS)) {
$status = intval($_POST['status']); $status = intval(POST_STATUS);
} else { } else {
$status = 2; $status = 2;
} }
@ -48,7 +58,7 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
} }
} }
xml_parser_free($xml_parser); xml_parser_free($xml_parser);
header('Location: '. createURL('bookmarks', $userinfo[$userservice->getFieldName('username')])); header('Location: '. createURL('bookmarks', $userinfo->getUsername()));
} else { } else {
$templatename = 'importDelicious.tpl'; $templatename = 'importDelicious.tpl';
$tplVars['subtitle'] = T_('Import Bookmarks from del.icio.us'); $tplVars['subtitle'] = T_('Import Bookmarks from del.icio.us');
@ -56,6 +66,8 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
$templateservice->loadTemplate($templatename, $tplVars); $templateservice->loadTemplate($templatename, $tplVars);
} }
function startElement($parser, $name, $attrs) { function startElement($parser, $name, $attrs) {
global $depth, $status, $tplVars, $userservice; global $depth, $status, $tplVars, $userservice;

18
importNetscape.php
View file

@ -20,16 +20,26 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService'); $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
/* Managing all possible inputs */
// First input is $_FILES
// Other inputs
isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', '');
$tplVars = array(); $tplVars = array();
if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['size'] > 0) { if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['size'] > 0) {
$userinfo = $userservice->getCurrentUser(); $userinfo = $userservice->getCurrentObjectUser();
if (isset($_POST['status']) && is_numeric($_POST['status'])) { if (is_numeric(POST_STATUS)) {
$status = intval($_POST['status']); $status = intval(POST_STATUS);
} else { } else {
$status = 2; $status = 2;
} }
@ -79,7 +89,7 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
} }
} }
} }
header('Location: '. createURL('bookmarks', $userinfo[$userservice->getFieldName('username')])); header('Location: '. createURL('bookmarks', $userinfo->getUsername()));
} else { } else {
$templatename = 'importNetscape.tpl'; $templatename = 'importNetscape.tpl';
$tplVars['subtitle'] = T_('Import Bookmarks from Browser File'); $tplVars['subtitle'] = T_('Import Bookmarks from Browser File');

5
index.php
View file

@ -28,11 +28,10 @@ $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$cacheservice =& ServiceFactory::getServiceInstance('CacheService'); $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
/* Managing possible inputs */ /* Managing all possible inputs */
isset($_GET['action']) ? define('GET_ACTION', $_GET['action']): define('GET_ACTION', ''); isset($_GET['action']) ? define('GET_ACTION', $_GET['action']): define('GET_ACTION', '');
isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0); isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0);
isset($_GET['sort']) ? define('GET_SORT', $_GET['sort']): define('GET_SORT', ''); isset($_GET['sort']) ? define('GET_SORT', $_GET['sort']): define('GET_SORT', '');
//isset($_GET['popup']) ? define('GET_POPUP', $_GET['popup']): define('GET_SORT', '');
// Logout action // Logout action
@ -91,6 +90,8 @@ $tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s');
$tplVars['nav_url'] = createURL('index', '%3$s'); $tplVars['nav_url'] = createURL('index', '%3$s');
$tplVars['summarizeLinkedTags'] = true; $tplVars['summarizeLinkedTags'] = true;
$tplVars['pageName'] = PAGE_INDEX; $tplVars['pageName'] = PAGE_INDEX;
$tplVars['user'] = '';
$tplVars['currenttag'] = '';
$templateservice->loadTemplate('bookmarks.tpl', $tplVars); $templateservice->loadTemplate('bookmarks.tpl', $tplVars);

29
login.php
View file

@ -20,20 +20,32 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
/* Managing all possible inputs */
isset($_POST['keeppass']) ? define('POST_KEEPPASS', $_POST['keeppass']): define('POST_KEEPPASS', '');
isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
isset($_POST['username']) ? define('POST_USERNAME', $_POST['username']): define('POST_USERNAME', '');
isset($_POST['password']) ? define('POST_PASSWORD', $_POST['password']): define('POST_PASSWORD', '');
isset($_POST['query']) ? define('POST_QUERY', $_POST['query']): define('POST_QUERY', '');
$tplVars = array(); $tplVars = array();
$keeppass = isset($_POST['keeppass'])&&($_POST['keeppass']=='yes')?true:false; $keeppass = (POST_KEEPPASS=='yes')?true:false;
$login = false; $login = false;
if (isset($_POST['submitted']) && isset($_POST['username']) && isset($_POST['password'])) { if (POST_SUBMITTED!='' && POST_USERNAME!='' && POST_PASSWORD!='') {
$posteduser = trim(utf8_strtolower($_POST['username'])); $posteduser = trim(utf8_strtolower(POST_USERNAME));
$login = $userservice->login($posteduser, $_POST['password'], $keeppass); $login = $userservice->login($posteduser, POST_PASSWORD, $keeppass);
if ($login) { if ($login) {
if ($_POST['query']) if (POST_QUERY)
header('Location: '. createURL('bookmarks', $posteduser .'?'. $_POST['query'])); header('Location: '. createURL('bookmarks', $posteduser .'?'. POST_QUERY));
else else
header('Location: '. createURL('bookmarks', $posteduser)); header('Location: '. createURL('bookmarks', $posteduser));
} else { } else {
@ -42,9 +54,8 @@ if (isset($_POST['submitted']) && isset($_POST['username']) && isset($_POST['pas
} }
if (!$login) { if (!$login) {
if ($userservice->isLoggedOn()) { if ($userservice->isLoggedOn()) {
$cUser = $userservice->getCurrentUser(); $cUser = $userservice->getCurrentObjectUser();
$cUsername = strtolower($cUser[$userservice->getFieldName('username')]); header('Location: '. createURL('bookmarks', strtolower($cUser->getUsername())));
header('Location: '. createURL('bookmarks', $cUsername));
} }
$tplVars['subtitle'] = T_('Log In'); $tplVars['subtitle'] = T_('Log In');

56
password.php
View file

@ -1,55 +1,65 @@
<? <?
/*************************************************************************** /***************************************************************************
Copyright (C) 2005 Scuttle project Copyright (C) 2005 Scuttle project
https://sourceforge.net/projects/scuttle/ https://sourceforge.net/projects/scuttle/
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');
/* Service creation: only useful services are created */
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
/* Managing all possible inputs */
isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
isset($_POST['username']) ? define('POST_USERNAME', $_POST['username']): define('POST_USERNAME', '');
isset($_POST['email']) ? define('POST_EMAIL', $_POST['email']): define('POST_EMAIL', '');
$tplVars = array(); $tplVars = array();
// IF SUBMITTED // IF SUBMITTED
if (isset($_POST['submitted'])) { if (POST_SUBMITTED != '') {
// NO USERNAME // NO USERNAME
if (!$_POST['username']) { if (!POST_USERNAME) {
$tplVars['error'] = T_('You must enter your username.'); $tplVars['error'] = T_('You must enter your username.');
// NO E-MAIL // NO E-MAIL
} elseif (!$_POST['email']) { } elseif (!POST_EMAIL) {
$tplVars['error'] = T_('You must enter your <abbr title="electronic mail">e-mail</abbr> address.'); $tplVars['error'] = T_('You must enter your <abbr title="electronic mail">e-mail</abbr> address.');
// USERNAME AND E-MAIL // USERNAME AND E-MAIL
} else { } else {
// NO MATCH // NO MATCH
if (!($userinfo = $userservice->getUserByUsername($_POST['username']))) { $userinfo = $userservice->getObjectUserByUsername(POST_USERNAME);
if ($userinfo == '') {
$tplVars['error'] = T_('No matches found for that username.'); $tplVars['error'] = T_('No matches found for that username.');
} elseif ($_POST['email'] != $userinfo['email']) { } elseif (POST_EMAIL != $userinfo->getEmail()) {
$tplVars['error'] = T_('No matches found for that combination of username and <abbr title="electronic mail">e-mail</abbr> address.'); $tplVars['error'] = T_('No matches found for that combination of username and <abbr title="electronic mail">e-mail</abbr> address.');
// MATCH // MATCH
} else { } else {
// GENERATE AND STORE PASSWORD // GENERATE AND STORE PASSWORD
$password = $userservice->generatePassword($userinfo['uId']); $password = $userservice->generatePassword($userinfo->getId());
if (!($password = $userservice->generatePassword($userinfo['uId']))) { if (!($password = $userservice->generatePassword($userinfo->getId()))) {
$tplVars['error'] = T_('There was an error while generating your new password. Please try again.'); $tplVars['error'] = T_('There was an error while generating your new password. Please try again.');
} else { } else {
@ -57,9 +67,9 @@ if (isset($_POST['submitted'])) {
$message = T_('Your new password is:') ."\n". $password ."\n\n". T_('To keep your bookmarks secure, you should change this password in your profile the next time you log in.'); $message = T_('Your new password is:') ."\n". $password ."\n\n". T_('To keep your bookmarks secure, you should change this password in your profile the next time you log in.');
$message = wordwrap($message, 70); $message = wordwrap($message, 70);
$headers = 'From: '. $adminemail; $headers = 'From: '. $adminemail;
$mail = mail($_POST['email'], sprintf(T_('%s Account Information'), $sitename), $message); $mail = mail(POST_EMAIL, sprintf(T_('%s Account Information'), $sitename), $message);
$tplVars['msg'] = sprintf(T_('New password generated and sent to %s'), $_POST['email']); $tplVars['msg'] = sprintf(T_('New password generated and sent to %s'), POST_EMAIL);
} }
} }
} }

19
populartags.php
View file

@ -20,21 +20,25 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService'); $b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$cacheservice =& ServiceFactory::getServiceInstance('CacheService'); $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
/* Managing current logged user */
$currentObjectUser = $userservice->getCurrentObjectUser();
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 .= $userservice->getCurrentUserID(); $hashtext .= $currentObjectUser->getId();
$currentUser = $userservice->getCurrentUser(); if ($currentObjectUser->getUsername() == $user) {
$currentUsername = $currentUser[$userservice->getFieldName('username')];
if ($currentUsername == $user) {
$hashtext .= $user; $hashtext .= $user;
} }
} }
@ -52,8 +56,9 @@ if (isset($user) && $user != '') {
if (is_int($user)) { if (is_int($user)) {
$userid = intval($user); $userid = intval($user);
} else { } else {
if ($userinfo = $userservice->getUserByUsername($user)) { $userinfo = $userservice->getObjectUserByUsername($user);
$userid =& $userinfo[$userservice->getFieldName('primary')]; if ($userinfo != '') {
$userid = $userinfo->getId();
} else { } 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);
@ -77,8 +82,8 @@ if (isset($userid)) {
} }
$tplVars['sidebar_blocks'] = array('linked'); $tplVars['sidebar_blocks'] = array('linked');
$tplVars['subtitle'] = $pagetitle; $tplVars['subtitle'] = $pagetitle;
$templateservice->loadTemplate('tags.tpl', $tplVars); $templateservice->loadTemplate('tags.tpl', $tplVars);
if ($usecache) { if ($usecache) {

61
profile.php
View file

@ -20,32 +20,45 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
/* Managing all possible inputs */
isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
isset($_POST['pPass']) ? define('POST_PASS', $_POST['pPass']): define('POST_PASS', '');
isset($_POST['pPassConf']) ? define('POST_PASSCONF', $_POST['pPassConf']): define('POST_PASSCONF', '');
isset($_POST['pName']) ? define('POST_NAME', $_POST['pName']): define('POST_NAME', '');
isset($_POST['pMail']) ? define('POST_MAIL', $_POST['pMail']): define('POST_MAIL', '');
isset($_POST['pPage']) ? define('POST_PAGE', $_POST['pPage']): define('POST_PAGE', '');
isset($_POST['pDesc']) ? define('POST_DESC', $_POST['pDesc']): define('POST_DESC', '');
isset($_POST['token']) ? define('POST_TOKEN', $_POST['token']): define('POST_TOKEN', '');
isset($_SESSION['token']) ? define('SESSION_TOKEN', $_SESSION['token']): define('SESSION_TOKEN', '');
isset($_SESSION['token_stamp']) ? define('SESSION_TOKENSTAMP', $_SESSION['token_stamp']): define('SESSION_TOKENSTAMP', '');
/* Managing current logged user */
$currentObjectUser = $userservice->getCurrentObjectUser();
$tplVars = array(); $tplVars = array();
@list($url, $user) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL; @list($url, $user) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
$loggedon = false;
if ($userservice->isLoggedOn()) {
$loggedon = true;
$currentUser = $userservice->getCurrentUser();
$currentUserID = $userservice->getCurrentUserId();
$currentUsername = $currentUser[$userservice->getFieldName('username')];
}
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);
if (!($userinfo = $userservice->getUserByUsername($user))) { $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 { } else {
$userid =& $userinfo['uId']; $userid =& $userinfo->getId();
} }
} }
} else { } else {
@ -54,7 +67,7 @@ if ($user) {
exit(); exit();
} }
if ($user == $currentUsername) { if ($userservice->isLoggedOn() && $user == $currentObjectUser->getUsername()) {
$title = T_('My Profile'); $title = T_('My Profile');
} else { } else {
$title = T_('Profile') .': '. $user; $title = T_('Profile') .': '. $user;
@ -65,19 +78,19 @@ $tplVars['subtitle'] = $title;
$tplVars['user'] = $user; $tplVars['user'] = $user;
$tplVars['userid'] = $userid; $tplVars['userid'] = $userid;
if (isset($_POST['submitted']) && $currentUserID == $userid) { if (POST_SUBMITTED!='' && $currentObjectUser->getId() == $userid) {
$error = false; $error = false;
$detPass = trim($_POST['pPass']); $detPass = trim(POST_PASS);
$detPassConf = trim($_POST['pPassConf']); $detPassConf = trim(POST_PASSCONF);
$detName = trim($_POST['pName']); $detName = trim(POST_NAME);
$detMail = trim($_POST['pMail']); $detMail = trim(POST_MAIL);
$detPage = trim($_POST['pPage']); $detPage = trim(POST_PAGE);
$detDesc = filter($_POST['pDesc']); $detDesc = filter(POST_DESC);
// manage token preventing from CSRF vulnaribilities // manage token preventing from CSRF vulnaribilities
if ( !isset($_SESSION['token'], $_SESSION['token_stamp']) if ( SESSION_TOKEN == ''
|| time() - $_SESSION['token_stamp'] > 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');
} }
@ -101,10 +114,10 @@ if (isset($_POST['submitted']) && $currentUserID == $userid) {
$tplVars['msg'] = T_('Changes saved.'); $tplVars['msg'] = T_('Changes saved.');
} }
} }
$userinfo = $userservice->getUserByUsername($user); $userinfo = $userservice->getObjectUserByUsername($user);
} }
if ($currentUserID != $userid) { if (!$userservice->isLoggedOn() || $currentObjectUser->getId() != $userid) {
$templatename = 'profile.tpl.php'; $templatename = 'profile.tpl.php';
} else { } else {
//Token Init //Token Init
@ -117,6 +130,6 @@ if ($currentUserID != $userid) {
} }
$tplVars['row'] = $userinfo; $tplVars['objectUser'] = $userinfo;
$templateservice->loadTemplate($templatename, $tplVars); $templateservice->loadTemplate($templatename, $tplVars);
?> ?>

24
register.php
View file

@ -20,16 +20,26 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
/* Managing all possible inputs */
isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
isset($_POST['username']) ? define('POST_USERNAME', $_POST['username']): define('POST_USERNAME', '');
isset($_POST['password']) ? define('POST_PASS', $_POST['password']): define('POST_PASS', '');
isset($_POST['email']) ? define('POST_MAIL', $_POST['email']): define('POST_MAIL', '');
isset($_POST['antispamAnswer']) ? define('POST_ANTISPAMANSWER', $_POST['antispamAnswer']): define('POST_ANTISPAMANSWER', '');
$tplVars = array(); $tplVars = array();
if (isset($_POST['submitted'])) { if (POST_SUBMITTED != '') {
$posteduser = trim(utf8_strtolower($_POST['username'])); $posteduser = trim(utf8_strtolower(POST_USERNAME));
// Check if form is incomplete // Check if form is incomplete
if (!($posteduser) || !($_POST['password']) || !($_POST['email'])) { if (!($posteduser) || POST_PASS == '' || POST_MAIL == '') {
$tplVars['error'] = T_('You <em>must</em> enter a username, password and e-mail address.'); $tplVars['error'] = T_('You <em>must</em> enter a username, password and e-mail address.');
// Check if username is reserved // Check if username is reserved
@ -45,17 +55,17 @@ if (isset($_POST['submitted'])) {
$tplVars['error'] = T_('This username is not valid (too long, forbidden characters...), please make another choice.'); $tplVars['error'] = T_('This username is not valid (too long, forbidden characters...), please make another choice.');
// Check if e-mail address is valid // Check if e-mail address is valid
} elseif (!$userservice->isValidEmail($_POST['email'])) { } elseif (!$userservice->isValidEmail(POST_MAIL)) {
$tplVars['error'] = T_('E-mail address is not valid. Please try again.'); $tplVars['error'] = T_('E-mail address is not valid. Please try again.');
// Check if antispam answer is valid // Check if antispam answer is valid
} elseif (strcmp($_POST['antispamAnswer'], $GLOBALS['antispamAnswer']) != 0) { } elseif (strcmp(POST_ANTISPAMANSWER, $GLOBALS['antispamAnswer']) != 0) {
$tplVars['error'] = T_('Antispam answer is not valid. Please try again.'); $tplVars['error'] = T_('Antispam answer is not valid. Please try again.');
// Register details // Register details
} elseif ($userservice->addUser($posteduser, $_POST['password'], $_POST['email'])) { } elseif ($userservice->addUser($posteduser, POST_PASS, POST_MAIL)) {
// Log in with new username // Log in with new username
$login = $userservice->login($posteduser, $_POST['password']); $login = $userservice->login($posteduser, POST_PASS);
if ($login) { if ($login) {
header('Location: '. createURL('bookmarks', $posteduser)); header('Location: '. createURL('bookmarks', $posteduser));
} }

44
rss.php
View file

@ -1,33 +1,43 @@
<?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');
/* Service creation: only useful services are created */
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService'); $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
$cacheservice =& ServiceFactory::getServiceInstance('CacheService'); $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$tplVars = array(); $tplVars = array();
header('Content-Type: application/xml'); header('Content-Type: application/xml');
list($url, $user, $cat) = explode('/', $_SERVER['PATH_INFO']); if(isset($_SERVER['PATH_INFO']) && strlen($_SERVER['PATH_INFO']) >1) {
list($url, $user, $cat) = explode('/', $_SERVER['PATH_INFO']);
} else {
$url = '';
$user = '';
$cat = NULL;
}
if ($usecache) { if ($usecache) {
// Generate hash for caching on // Generate hash for caching on
@ -47,6 +57,7 @@ if ($usecache) {
} }
$watchlist = null; $watchlist = null;
$pagetitle = '';
if ($user && $user != 'all') { if ($user && $user != 'all') {
if ($user == 'watchlist') { if ($user == 'watchlist') {
$user = $cat; $user = $cat;
@ -79,6 +90,7 @@ $tplVars['feedlink'] = ROOT;
$tplVars['feeddescription'] = sprintf(T_('Recent bookmarks posted to %s'), $GLOBALS['sitename']); $tplVars['feeddescription'] = sprintf(T_('Recent bookmarks posted to %s'), $GLOBALS['sitename']);
$bookmarks =& $bookmarkservice->getBookmarks(0, 15, $userid, $cat, NULL, getSortOrder(), $watchlist); $bookmarks =& $bookmarkservice->getBookmarks(0, 15, $userid, $cat, NULL, getSortOrder(), $watchlist);
$bookmarks_tmp =& filter($bookmarks['bookmarks']); $bookmarks_tmp =& filter($bookmarks['bookmarks']);
$bookmarks_tpl = array(); $bookmarks_tpl = array();

14
search.inc.php
View file

@ -1,5 +1,7 @@
<?php <?php
/* Manage input */
/* Managing all possible inputs */
$select_watchlist = isset($select_watchlist)?$select_watchlist:''; $select_watchlist = isset($select_watchlist)?$select_watchlist:'';
$select_all = isset($select_all)?$select_all:''; $select_all = isset($select_all)?$select_all:'';
?> ?>
@ -9,13 +11,11 @@ $select_all = isset($select_all)?$select_all:'';
<table> <table>
<tr> <tr>
<?php <?php
$logged_on = false;
if ($userservice->isLoggedOn()) { if ($userservice->isLoggedOn()) {
$currentUser = $userservice->getCurrentUser(); $currentUser = $userservice->getCurrentObjectUser();
$currentUsername = $currentUser[$userservice->getFieldName('username')]; $currentUsername = $currentUser->getUsername();
$logged_on = true;
} }
if ($logged_on || isset($user)) { if ($userservice->isLoggedOn() || isset($user)) {
?> ?>
<td><?php echo T_('Search' /* Search ... for */); ?></td> <td><?php echo T_('Search' /* Search ... for */); ?></td>
<td> <td>
@ -26,7 +26,7 @@ $select_all = isset($select_all)?$select_all:'';
<option value="<?php echo $user ?>"<?php //echo $selectUser; ?>><?php echo T_("this user's bookmarks"); ?></option> <option value="<?php echo $user ?>"<?php //echo $selectUser; ?>><?php echo T_("this user's bookmarks"); ?></option>
<?php <?php
} }
if ($logged_on) { if ($userservice->isLoggedOn()) {
?> ?>
<option value="<?php echo $currentUsername; ?>"<?php //echo $selectMy; ?>><?php echo T_('my bookmarks'); ?></option> <option value="<?php echo $currentUsername; ?>"<?php //echo $selectMy; ?>><?php echo T_('my bookmarks'); ?></option>
<option value="watchlist"<?php echo $select_watchlist; ?>><?php echo T_('my watchlist'); ?></option> <option value="watchlist"<?php echo $select_watchlist; ?>><?php echo T_('my watchlist'); ?></option>

75
search.php
View file

@ -1,48 +1,65 @@
<?php <?php
/*************************************************************************** /***************************************************************************
Copyright (C) 2005 - 2006 Scuttle project Copyright (C) 2005 - 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');
// POST /* Managing all possible inputs */
if (isset($_POST['terms'])) { isset($_POST['terms']) ? define('POST_TERMS', $_POST['terms']): define('POST_TERMS', '');
// Redirect to GET isset($_POST['range']) ? define('POST_RANGE', $_POST['range']): define('POST_RANGE', '');
header('Location: '. createURL('search', $_POST['range'] .'/'. filter($_POST['terms'], 'url'))); isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0);
isset($_GET['sort']) ? define('GET_SORT', $_GET['sort']): define('GET_SORT', '');
// GET
// POST
if (POST_TERMS != '') {
// Redirect to GET
header('Location: '. createURL('search', POST_RANGE .'/'. filter(POST_TERMS, 'url')));
// GET
} else { } else {
/* Service creation: only useful services are created */
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService'); $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$searchhistoryservice =& ServiceFactory::getServiceInstance('SearchHistoryService'); $searchhistoryservice =& ServiceFactory::getServiceInstance('SearchHistoryService');
$logged_on_userid = $userservice->getCurrentUserId(); /* Managing current logged user */
list($url, $range, $terms, $page) = explode('/', $_SERVER['PATH_INFO']); $currentUserId = $userservice->getCurrentUserId();
$exploded = explode('/', $_SERVER['PATH_INFO']);
if(count($exploded) == 4) {
list($url, $range, $terms, $page) = $exploded;
} else {
list($url, $range, $terms) = $exploded;
$page= NULL;
}
$tplvars = array(); $tplvars = array();
$tplVars['loadjs'] = true; $tplVars['loadjs'] = true;
// Pagination // Pagination
$perpage = getPerPageCount(); $perpage = getPerPageCount();
if (isset($_GET['page']) && intval($_GET['page']) > 1) { if (intval(GET_PAGE) > 1) {
$page = $_GET['page']; $page = GET_PAGE;
$start = ($page - 1) * $perpage; $start = ($page - 1) * $perpage;
} else { } else {
$page = 0; $page = 0;
@ -72,7 +89,7 @@ if (isset($_POST['terms'])) {
break; break;
case 'watchlist': case 'watchlist':
$tplVars['select_watchlist'] = $selected; $tplVars['select_watchlist'] = $selected;
$s_user = $logged_on_userid; $s_user = $currentUserId;
$s_watchlist = true; $s_watchlist = true;
break; break;
default: default:
@ -84,12 +101,13 @@ if (isset($_POST['terms'])) {
if (is_numeric($s_user)) { if (is_numeric($s_user)) {
$s_user = intval($s_user); $s_user = intval($s_user);
} else { } else {
if (!($userinfo = $userservice->getUserByUsername($s_user) ) ) { $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 { } else {
$s_user =& $userinfo[$userservice->getFieldName('primary')]; $s_user =& $userinfo->getId();
} }
} }
} }
@ -97,8 +115,9 @@ if (isset($_POST['terms'])) {
$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);
// Save search // Save search
$searchhistoryservice->addSearch($terms, $range, $bookmarks['total'], $logged_on_userid); $searchhistoryservice->addSearch($terms, $range, $bookmarks['total'], $currentUserId);
$tplVars['rsschannels'] = array();
$tplVars['page'] = $page; $tplVars['page'] = $page;
$tplVars['start'] = $start; $tplVars['start'] = $start;
$tplVars['popCount'] = 25; $tplVars['popCount'] = 25;

6
services/bookmark2tagservice.php
View file

@ -45,7 +45,8 @@ class Bookmark2TagService {
$tags = str_replace(array('"', '\''), "_", $tags); $tags = str_replace(array('"', '\''), "_", $tags);
$tags_count = count($tags); $tags_count = is_array($tags)?count($tags):0;
for ($i = 0; $i < $tags_count; $i++) { for ($i = 0; $i < $tags_count; $i++) {
$tags[$i] = trim(strtolower($tags[$i])); $tags[$i] = trim(strtolower($tags[$i]));
if ($fromApi) { if ($fromApi) {
@ -317,7 +318,8 @@ class Bookmark2TagService {
message_die(GENERAL_ERROR, 'Could not get related tags for this hash', '', __LINE__, __FILE__, $query, $this->db); message_die(GENERAL_ERROR, 'Could not get related tags for this hash', '', __LINE__, __FILE__, $query, $this->db);
return false; return false;
} }
return $this->db->sql_fetchrowset($dbresult); $output = $this->db->sql_fetchrowset($dbresult);
return $output;
} }
function &getPopularTags($user = NULL, $limit = 30, $logged_on_user = NULL, $days = NULL) { function &getPopularTags($user = NULL, $limit = 30, $logged_on_user = NULL, $days = NULL) {

3
services/bookmarkservice.php
View file

@ -20,6 +20,8 @@ class BookmarkService {
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
$sId = $userservice->getCurrentUserId(); $sId = $userservice->getCurrentUserId();
$range = ' AND uId = '. $sId; $range = ' AND uId = '. $sId;
} else {
$range = '';
} }
$query = 'SELECT * FROM '. $this->getTableName() .' WHERE '. $fieldname .' = "'. $this->db->sql_escape($value) .'"'. $range; $query = 'SELECT * FROM '. $this->getTableName() .' WHERE '. $fieldname .' = "'. $this->db->sql_escape($value) .'"'. $range;
@ -271,6 +273,7 @@ class BookmarkService {
} else { } else {
$arrWatch = $userservice->getWatchlist($user); $arrWatch = $userservice->getWatchlist($user);
if (count($arrWatch) > 0) { if (count($arrWatch) > 0) {
$query_3_1 = '';
foreach($arrWatch as $row) { foreach($arrWatch as $row) {
$query_3_1 .= 'B.uId = '. intval($row) .' OR '; $query_3_1 .= 'B.uId = '. intval($row) .' OR ';
} }

6
services/tag2tagservice.php
View file

@ -23,7 +23,7 @@ class Tag2TagService {
} }
$values = array('tag1' => $tag1, 'tag2' => $tag2, 'relationType'=> $relationType, 'uId'=> $uId); $values = array('tag1' => $tag1, 'tag2' => $tag2, 'relationType'=> $relationType, 'uId'=> $uId);
$query = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values); $query = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values);
//die($query); //die($query);
if (!($dbresult =& $this->db->sql_query($query))) { if (!($dbresult =& $this->db->sql_query($query))) {
$this->db->sql_transaction('rollback'); $this->db->sql_transaction('rollback');
message_die(GENERAL_ERROR, 'Could not attach tag to tag', '', __LINE__, __FILE__, $query, $this->db); message_die(GENERAL_ERROR, 'Could not attach tag to tag', '', __LINE__, __FILE__, $query, $this->db);
@ -61,7 +61,7 @@ class Tag2TagService {
if($uId != null) { if($uId != null) {
$query.= " AND uId = '".$uId."'"; $query.= " AND uId = '".$uId."'";
} }
//die($query); //die($query);
if (! ($dbresult =& $this->db->sql_query($query)) ){ if (! ($dbresult =& $this->db->sql_query($query)) ){
message_die(GENERAL_ERROR, 'Could not get related tags', '', __LINE__, __FILE__, $query, $this->db); message_die(GENERAL_ERROR, 'Could not get related tags', '', __LINE__, __FILE__, $query, $this->db);
return false; return false;
@ -91,7 +91,7 @@ class Tag2TagService {
function getAllLinkedTags($tag1, $relationType, $uId, $asFlatList=true, $stopList=array()) { function getAllLinkedTags($tag1, $relationType, $uId, $asFlatList=true, $stopList=array()) {
$asFlatList = true; //we disable the tree list parameter for the moment $asFlatList = true; //we disable the tree list parameter for the moment
if(in_array($tag1, $stopList)) { if(in_array($tag1, $stopList) || $tag1 == '') {
return array(); return array();
} }

5
services/tagservice.php
View file

@ -29,7 +29,7 @@ class TagService {
if ($row =& $this->db->sql_fetchrow($dbresult)) { if ($row =& $this->db->sql_fetchrow($dbresult)) {
return $row; return $row;
} else { } else {
return array(); return array('tDescription'=>'');
} }
} }
@ -47,7 +47,8 @@ class TagService {
} }
function updateDescription($tag, $uId, $desc) { function updateDescription($tag, $uId, $desc) {
if(count($this->getDescription($tag, $uId))>0) { $objectTag = $this->getDescription($tag, $uId);
if(count($objectTag)>0 && $objectTag['tDescription'] != '') {
$query = 'UPDATE '.$this->getTableName(); $query = 'UPDATE '.$this->getTableName();
$query.= ' SET tDescription="'.$this->db->sql_escape($desc).'"'; $query.= ' SET tDescription="'.$this->db->sql_escape($desc).'"';
$query.= ' WHERE tag="'.$tag.'" AND uId="'.$uId.'"'; $query.= ' WHERE tag="'.$tag.'" AND uId="'.$uId.'"';

96
services/userservice.php
View file

@ -76,6 +76,22 @@ class UserService {
return $users; return $users;
} }
function & getObjectUsers($nb=0) {
$query = 'SELECT * FROM '. $this->getTableName() .' ORDER BY `uId` DESC';
if($nb>0) {
$query .= ' LIMIT 0, '.$nb;
}
if (! ($dbresult =& $this->db->sql_query($query)) ) {
message_die(GENERAL_ERROR, 'Could not get user', '', __LINE__, __FILE__, $query, $this->db);
return false;
}
while ($row = & $this->db->sql_fetchrow($dbresult)) {
$users[] = new User($row[$this->getFieldName('primary')], $row[$this->getFieldName('username')]);
}
return $users;
}
function _randompassword() { function _randompassword() {
$seed = (integer) md5(microtime()); $seed = (integer) md5(microtime());
mt_srand($seed); mt_srand($seed);
@ -109,6 +125,11 @@ class UserService {
return $this->_getuser($this->getFieldName('username'), $username); return $this->_getuser($this->getFieldName('username'), $username);
} }
function getObjectUserByUsername($username) {
$user = $this->_getuser($this->getFieldName('username'), $username);
return new User($user[$this->getFieldName('primary')], $username);
}
function getUser($id) { function getUser($id) {
return $this->_getuser($this->getFieldName('primary'), $id); return $this->_getuser($this->getFieldName('primary'), $id);
} }
@ -152,6 +173,22 @@ class UserService {
return $currentObjectUser; return $currentObjectUser;
} }
function existsUserWithUsername($username) {
if($this->getUserByUsername($username) != '') {
return true;
} else {
return false;
}
}
function existsUser($id) {
if($this->getUser($id) != '') {
return true;
} else {
return false;
}
}
function isAdmin($userid) { function isAdmin($userid) {
$user = $this->getUser($userid); $user = $this->getUser($userid);
@ -446,10 +483,17 @@ class UserService {
function setCookieKey($value) { $this->cookiekey = $value; } function setCookieKey($value) { $this->cookiekey = $value; }
} }
/* Defines a user. Rare fields are filled if required. */
class User { class User {
var $id; var $id;
var $username; var $username;
var $name;
var $email;
var $homepage;
var $content;
var $datetime;
var $isAdmin; var $isAdmin;
function User($id, $username) { function User($id, $username) {
@ -465,8 +509,58 @@ class User {
return $this->username; return $this->username;
} }
function getName() {
// Look for value only if not already set
if(!isset($this->name)) {
$userservice =& ServiceFactory::getServiceInstance('UserService');
$user = $userservice->getUser($this->id);
$this->name = $user['name'];
}
return $this->name;
}
function getEmail() {
// Look for value only if not already set
if(!isset($this->email)) {
$userservice =& ServiceFactory::getServiceInstance('UserService');
$user = $userservice->getUser($this->id);
$this->email = $user['email'];
}
return $this->email;
}
function getHomepage() {
// Look for value only if not already set
if(!isset($this->homepage)) {
$userservice =& ServiceFactory::getServiceInstance('UserService');
$user = $userservice->getUser($this->id);
$this->homepage = $user['homepage'];
}
return $this->homepage;
}
function getContent() {
// Look for value only if not already set
if(!isset($this->content)) {
$userservice =& ServiceFactory::getServiceInstance('UserService');
$user = $userservice->getUser($this->id);
$this->content = $user['uContent'];
}
return $this->content;
}
function getDatetime() {
// Look for value only if not already set
if(!isset($this->content)) {
$userservice =& ServiceFactory::getServiceInstance('UserService');
$user = $userservice->getUser($this->id);
$this->datetime = $user['uDatetime'];
}
return $this->datetime;
}
function isAdmin() { function isAdmin() {
// Look for value if not already set // Look for value only if not already set
if(!isset($this->isAdmin)) { if(!isset($this->isAdmin)) {
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$this->isAdmin = $userservice->isAdmin($this->id); $this->isAdmin = $userservice->isAdmin($this->id);

35
tag2tagadd.php
View file

@ -20,43 +20,52 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2TagService'); $tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2TagService');
$templateservice = & ServiceFactory :: getServiceInstance('TemplateService'); $templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
/* Managing all possible inputs */
isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
isset($_POST['cancel']) ? define('POST_CANCEL', $_POST['cancel']): define('POST_CANCEL', '');
isset($_POST['tag1']) ? define('POST_TAG1', $_POST['tag1']): define('POST_TAG1', '');
isset($_POST['linkType']) ? define('POST_LINKTYPE', $_POST['linkType']): define('POST_LINKTYPE', '');
isset($_POST['tag2']) ? define('POST_TAG2', $_POST['tag2']): define('POST_TAG2', '');
/* Managing current logged user */
$logged_on_user = $userservice->getCurrentUser(); $currentObjectUser = $userservice->getCurrentObjectUser();
//permissions //permissions
if($logged_on_user == null) { if(!$userservice->isLoggedOn()) {
$tplVars['error'] = T_('Permission denied.'); $tplVars['error'] = T_('Permission denied.');
$templateservice->loadTemplate('error.500.tpl', $tplVars); $templateservice->loadTemplate('error.500.tpl', $tplVars);
exit(); exit();
} }
/* Managing path info */
list ($url, $tag1) = explode('/', $_SERVER['PATH_INFO']); list ($url, $tag1) = explode('/', $_SERVER['PATH_INFO']);
if ($_POST['confirm']) { if (POST_CONFIRM != '') {
$tag1 = $_POST['tag1']; $tag1 = POST_TAG1;
$linkType = $_POST['linkType']; $linkType = POST_LINKTYPE;
$tag2 = $_POST['tag2']; $tag2 = POST_TAG2;
if ($tag2tagservice->addLinkedTags($tag1, $tag2, $linkType, $userservice->getCurrentUserId())) { if ($tag2tagservice->addLinkedTags($tag1, $tag2, $linkType, $currentObjectUser->getId())) {
$tplVars['msg'] = T_('Tag link created'); $tplVars['msg'] = T_('Tag link created');
header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')])); header('Location: '. createURL('bookmarks', $currentObjectUser->getUsername()));
} else { } else {
$tplVars['error'] = T_('Failed to create the link'); $tplVars['error'] = T_('Failed to create the link');
$templateservice->loadTemplate('error.500.tpl', $tplVars); $templateservice->loadTemplate('error.500.tpl', $tplVars);
exit(); exit();
} }
} elseif ($_POST['cancel']) { } elseif (POST_CANCEL) {
header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')] .'/'. $tags)); header('Location: '. createURL('bookmarks', $currentObjectUser->getUsername() .'/'. $tags));
} }
$tplVars['links'] = $tag2tagservice->getLinks($userservice->getCurrentUserId()); $tplVars['links'] = $tag2tagservice->getLinks($currentObjectUser->getId());
$tplVars['tag1'] = $tag1; $tplVars['tag1'] = $tag1;
$tplVars['tag2'] = '';
$tplVars['subtitle'] = T_('Add Tag Link') .': '. $tag1; $tplVars['subtitle'] = T_('Add Tag Link') .': '. $tag1;
$tplVars['formaction'] = $_SERVER['SCRIPT_NAME'] .'/'. $tag1; $tplVars['formaction'] = $_SERVER['SCRIPT_NAME'] .'/'. $tag1;
$tplVars['referrer'] = $_SERVER['HTTP_REFERER']; $tplVars['referrer'] = $_SERVER['HTTP_REFERER'];

83
tag2tagdelete.php
View file

@ -1,62 +1,87 @@
<?php <?php
/*************************************************************************** /***************************************************************************
Copyright (C) 2006 Scuttle project Copyright (C) 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');
/* Service creation: only useful services are created */
$tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2TagService'); $tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2TagService');
$templateservice = & ServiceFactory :: getServiceInstance('TemplateService'); $templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
$logged_on_user = $userservice->getCurrentUser(); /* Managing all possible inputs */
isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
isset($_POST['cancel']) ? define('POST_CANCEL', $_POST['cancel']): define('POST_CANCEL', '');
isset($_POST['tag1']) ? define('POST_TAG1', $_POST['tag1']): define('POST_TAG1', '');
isset($_POST['linkType']) ? define('POST_LINKTYPE', $_POST['linkType']): define('POST_LINKTYPE', '');
isset($_POST['tag2']) ? define('POST_TAG2', $_POST['tag2']): define('POST_TAG2', '');
isset($_SERVER['HTTP_REFERER']) ? define('HTTP_REFERER', $_SERVER['HTTP_REFERER']): define('HTTP_REFERER', '');
/* Managing current logged user */
$currentUser = $userservice->getCurrentObjectUser();
//permissions //permissions
if($logged_on_user == null) { if(!$userservice->isloggedOn()) {
$tplVars['error'] = T_('Permission denied.'); $tplVars['error'] = T_('Permission denied.');
$templateservice->loadTemplate('error.500.tpl', $tplVars); $templateservice->loadTemplate('error.500.tpl', $tplVars);
exit(); exit();
} }
list ($url, $tag1, $tag2) = explode('/', $_SERVER['PATH_INFO']); /* Managing path info */
if(isset($_SERVER['PATH_INFO'])) {
$exploded = explode('/', $_SERVER['PATH_INFO']);
if(count($exploded) == 3) {
list ($url, $tag1, $tag2) = explode('/', $_SERVER['PATH_INFO']);
} else {
list ($url, $tag1) = explode('/', $_SERVER['PATH_INFO']);
$tag2 = '';
}
} else {
$url = $tag1 = $tag2 = '';
}
if ($_POST['confirm']) {
$tag = $_POST['tag1'];
$linkType = $_POST['linkType']; if (POST_CONFIRM) {
$newTag = $_POST['tag2']; $tag = POST_TAG1;
if ($tag2tagservice->removeLinkedTags($_POST['tag1'], $_POST['tag2'], $linkType, $userservice->getCurrentUserId())) { $linkType = POST_LINKTYPE;
$newTag = POST_TAG2;
if ($tag2tagservice->removeLinkedTags(POST_TAG1, POST_TAG2, POST_LINKTYPE, $currentUser->getId())) {
$tplVars['msg'] = T_('Tag link deleted'); $tplVars['msg'] = T_('Tag link deleted');
header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')].'/'.$tag)); header('Location: '. createURL('bookmarks', $currentUser->getUsername().'/'.$tag));
} else { } else {
$tplVars['error'] = T_('Failed to delete the link'); $tplVars['error'] = T_('Failed to delete the link');
$templateservice->loadTemplate('error.500.tpl', $tplVars); $templateservice->loadTemplate('error.500.tpl', $tplVars);
exit(); exit();
} }
} elseif ($_POST['cancel']) { } elseif (POST_CANCEL) {
header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')] .'/'. $tags)); header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags));
} }
$tplVars['links'] = $tag2tagservice->getLinks($userservice->getCurrentUserId()); $tplVars['links'] = $tag2tagservice->getLinks($currentUser->getId());
$tplVars['tag1'] = $tag1; $tplVars['tag1'] = $tag1;
$tplVars['tag2'] = $tag2; $tplVars['tag2'] = $tag2;
$tplVars['subtitle'] = T_('Delete Link Between Tags') .': '. $tag1.' > '.$tag2; $tplVars['subtitle'] = T_('Delete Link Between Tags') .': '. $tag1.' > '.$tag2;
$tplVars['formaction'] = $_SERVER['SCRIPT_NAME'] .'/'. $tag; $tplVars['formaction'] = $_SERVER['SCRIPT_NAME'];
$tplVars['referrer'] = $_SERVER['HTTP_REFERER']; $tplVars['referrer'] = HTTP_REFERER;
$templateservice->loadTemplate('tag2tagdelete.tpl', $tplVars); $templateservice->loadTemplate('tag2tagdelete.tpl', $tplVars);
?> ?>

34
tag2tagedit.php
View file

@ -20,12 +20,19 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2TagService'); $tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2TagService');
$templateservice = & ServiceFactory :: getServiceInstance('TemplateService'); $templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
/* Managing all possible inputs */
isset($_SERVER['HTTP_REFERER']) ? define('HTTP_REFERER', $_SERVER['HTTP_REFERER']): define('HTTP_REFERER', '');
/* Managing current logged user */
$logged_on_user = $userservice->getCurrentUser(); $logged_on_user = $userservice->getCurrentUser();
//permissions //permissions
if($logged_on_user == null) { if($logged_on_user == null) {
$tplVars['error'] = T_('Permission denied.'); $tplVars['error'] = T_('Permission denied.');
@ -33,23 +40,18 @@ if($logged_on_user == null) {
exit(); exit();
} }
list ($url, $tag1, $tag2) = explode('/', $_SERVER['PATH_INFO']); /* Managing path info */
if(isset($_SERVER['PATH_INFO'])) {
/*if ($_POST['confirm']) { $exploded = explode('/', $_SERVER['PATH_INFO']);
$tag = $_POST['tag1']; if(count($exploded) == 3) {
$linkType = $_POST['linkType']; list ($url, $tag1, $tag2) = explode('/', $_SERVER['PATH_INFO']);
$newTag = $_POST['tag2'];
if ($tag2tagservice->removeLinkedTags($_POST['tag1'], $_POST['tag2'], $linkType, $userservice->getCurrentUserId())) {
$tplVars['msg'] = T_('Tag link deleted');
header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')]));
} else { } else {
$tplVars['error'] = T_('Failed to delete the link'); list ($url, $tag1) = explode('/', $_SERVER['PATH_INFO']);
$templateservice->loadTemplate('error.500.tpl', $tplVars); $tag2 = '';
exit();
} }
} elseif ($_POST['cancel']) { } else {
header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')] .'/'. $tags)); $url = $tag1 = $tag2 = '';
}*/ }
$tplVars['links'] = $tag2tagservice->getLinks($userservice->getCurrentUserId()); $tplVars['links'] = $tag2tagservice->getLinks($userservice->getCurrentUserId());
@ -58,6 +60,6 @@ $tplVars['tag2'] = $tag2;
$tplVars['subtitle'] = T_('Edit Link Between Tags') .': '. $tag1.' > '.$tag2; $tplVars['subtitle'] = T_('Edit Link Between Tags') .': '. $tag1.' > '.$tag2;
$tplVars['formaddaction'] = createUrl('tag2tagadd'); $tplVars['formaddaction'] = createUrl('tag2tagadd');
$tplVars['formdeleteaction'] = createUrl('tag2tagdelete'); $tplVars['formdeleteaction'] = createUrl('tag2tagdelete');
$tplVars['referrer'] = $_SERVER['HTTP_REFERER']; $tplVars['referrer'] = HTTP_REFERER;
$templateservice->loadTemplate('tag2tagedit.tpl', $tplVars); $templateservice->loadTemplate('tag2tagedit.tpl', $tplVars);
?> ?>

61
tagcommondescriptionedit.php
View file

@ -1,56 +1,67 @@
<?php <?php
/*************************************************************************** /***************************************************************************
Copyright (C) 2006 - 2007 Scuttle project Copyright (C) 2006 - 2007 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');
/* Service creation: only useful services are created */
$b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService'); $b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService');
$templateservice = & ServiceFactory :: getServiceInstance('TemplateService'); $templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
$cdservice = & ServiceFactory :: getServiceInstance('CommonDescriptionService'); $cdservice = & ServiceFactory :: getServiceInstance('CommonDescriptionService');
list ($url, $tag) = explode('/', $_SERVER['PATH_INFO']); /* Managing all possible inputs */
$template = 'tagcommondescriptionedit.tpl'; isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
isset($_POST['cancel']) ? define('POST_CANCEL', $_POST['cancel']): define('POST_CANCEL', '');
isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']): define('POST_DESCRIPTION', '');
isset($_POST['referrer']) ? define('POST_REFERRER', $_POST['referrer']): define('POST_REFERRER', '');
$logged_on_user = $userservice->getCurrentUser();
/* Managing current logged user */
$currentUser = $userservice->getCurrentObjectUser();
/* Managing path info */
list ($url, $tag) = explode('/', $_SERVER['PATH_INFO']);
//permissions //permissions
if($logged_on_user == null) { if(!$userservice->isLoggedOn()) {
$tplVars['error'] = T_('Permission denied.'); $tplVars['error'] = T_('Permission denied.');
$templateservice->loadTemplate('error.500.tpl', $tplVars); $templateservice->loadTemplate('error.500.tpl', $tplVars);
exit(); exit();
} }
if ($_POST['confirm']) { $template = 'tagcommondescriptionedit.tpl';
if (POST_CONFIRM) {
if ( strlen($tag)>0 && if ( strlen($tag)>0 &&
$cdservice->addTagDescription($tag, stripslashes($_POST['description']), $logged_on_user['uId'], time()) $cdservice->addTagDescription($tag, stripslashes(POST_DESCRIPTION), $currentUser->getId(), time())
) { ) {
$tplVars['msg'] = T_('Tag common description updated'); $tplVars['msg'] = T_('Tag common description updated');
header('Location: '. $_POST['referrer']); header('Location: '. POST_REFERRER);
} else { } else {
$tplVars['error'] = T_('Failed to update the tag common description'); $tplVars['error'] = T_('Failed to update the tag common description');
$template = 'error.500.tpl'; $template = 'error.500.tpl';
} }
} elseif ($_POST['cancel']) { } elseif (POST_CANCEL) {
$logged_on_user = $userservice->getCurrentUser(); header('Location: '. POST_REFERRER);
header('Location: '. $_POST['referrer']);
} else { } else {
$tplVars['subtitle'] = T_('Edit Tag Common Description') .': '. $tag; $tplVars['subtitle'] = T_('Edit Tag Common Description') .': '. $tag;
$tplVars['formaction'] = $_SERVER['SCRIPT_NAME'] .'/'. $tag; $tplVars['formaction'] = $_SERVER['SCRIPT_NAME'] .'/'. $tag;

23
tagdelete.php
View file

@ -20,25 +20,36 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService'); $b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService');
$templateservice = & ServiceFactory :: getServiceInstance('TemplateService'); $templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
$logged_on_user = $userservice->getCurrentUser(); /* Managing all possible inputs */
isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
isset($_POST['cancel']) ? define('POST_CANCEL', $_POST['cancel']): define('POST_CANCEL', '');
isset($_POST['referrer']) ? define('POST_REFERRER', $_POST['referrer']): define('POST_REFERRER', '');
/* Managing current logged user */
$currentUser = $userservice->getCurrentObjectUser();
/* Managing path info */
list ($url, $tag) = explode('/', $_SERVER['PATH_INFO']); list ($url, $tag) = explode('/', $_SERVER['PATH_INFO']);
if ($_POST['confirm']) {
if ($b2tservice->deleteTag($logged_on_user['uId'], $tag)) {
if (POST_CONFIRM) {
if ($b2tservice->deleteTag($currentUser->getId(), $tag)) {
$tplVars['msg'] = T_('Tag deleted'); $tplVars['msg'] = T_('Tag deleted');
header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')])); header('Location: '. createURL('bookmarks', $currentUser->getUsername()));
} else { } else {
$tplVars['error'] = T_('Failed to delete the tag'); $tplVars['error'] = T_('Failed to delete the tag');
$templateservice->loadTemplate('error.500.tpl', $tplVars); $templateservice->loadTemplate('error.500.tpl', $tplVars);
exit(); exit();
} }
} elseif ($_POST['cancel']) { } elseif (POST_CANCEL) {
header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')] .'/'. $tags)); header('Location: '. POST_REFERRER);
} }
$tplVars['subtitle'] = T_('Delete Tag') .': '. $tag; $tplVars['subtitle'] = T_('Delete Tag') .': '. $tag;

61
tagedit.php
View file

@ -1,61 +1,70 @@
<?php <?php
/*************************************************************************** /***************************************************************************
Copyright (C) 2006 - 2007 Scuttle project Copyright (C) 2006 - 2007 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');
/* Service creation: only useful services are created */
$tagservice = & ServiceFactory :: getServiceInstance('TagService'); $tagservice = & ServiceFactory :: getServiceInstance('TagService');
$templateservice = & ServiceFactory :: getServiceInstance('TemplateService'); $templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
/* Managing all possible inputs */
isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
isset($_POST['cancel']) ? define('POST_CANCEL', $_POST['cancel']): define('POST_CANCEL', '');
isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']): define('POST_DESCRIPTION', '');
isset($_POST['referrer']) ? define('POST_REFERRER', $_POST['referrer']): define('POST_REFERRER', '');
/* Managing current logged user */
$currentUser = $userservice->getCurrentObjectUser();
/* Managing path info */
list ($url, $tag) = explode('/', $_SERVER['PATH_INFO']); list ($url, $tag) = explode('/', $_SERVER['PATH_INFO']);
$template = 'tagedit.tpl'; $template = 'tagedit.tpl';
$logged_on_user = $userservice->getCurrentUser();
//permissions //permissions
if($logged_on_user == null) { if(!$userservice->isLoggedOn()) {
$tplVars['error'] = T_('Permission denied.'); $tplVars['error'] = T_('Permission denied.');
$templateservice->loadTemplate('error.500.tpl', $tplVars); $templateservice->loadTemplate('error.500.tpl', $tplVars);
exit(); exit();
} }
if ($_POST['confirm']) { if (POST_CONFIRM) {
if ( strlen($tag)>0 && if ( strlen($tag)>0 &&
$tagservice->updateDescription($tag, $logged_on_user['uId'], $_POST['description']) $tagservice->updateDescription($tag, $currentUser->getId(), POST_DESCRIPTION)
) { ) {
$tplVars['msg'] = T_('Tag description updated'); $tplVars['msg'] = T_('Tag description updated');
header('Location: '. $_POST['referrer']); header('Location: '. POST_REFERRER);
} else { } else {
$tplVars['error'] = T_('Failed to update the tag description'); $tplVars['error'] = T_('Failed to update the tag description');
$template = 'error.500.tpl'; $template = 'error.500.tpl';
} }
} elseif ($_POST['cancel']) { } elseif (POST_CANCEL) {
$logged_on_user = $userservice->getCurrentUser(); header('Location: '. POST_REFERRER);
header('Location: '. $_POST['referrer']);
} else { } else {
$tplVars['subtitle'] = T_('Edit Tag Description') .': '. $tag; $tplVars['subtitle'] = T_('Edit Tag Description') .': '. $tag;
$tplVars['formaction'] = $_SERVER['SCRIPT_NAME'] .'/'. $tag; $tplVars['formaction'] = $_SERVER['SCRIPT_NAME'] .'/'. $tag;
$tplVars['referrer'] = $_SERVER['HTTP_REFERER']; $tplVars['referrer'] = $_SERVER['HTTP_REFERER'];
$tplVars['tag'] = $tag; $tplVars['tag'] = $tag;
$tplVars['description'] = $tagservice->getDescription($tag, $logged_on_user['uId']); $tplVars['description'] = $tagservice->getDescription($tag, $currentUser->getId());
} }
$templateservice->loadTemplate($template, $tplVars); $templateservice->loadTemplate($template, $tplVars);
?> ?>

72
tagrename.php
View file

@ -1,63 +1,75 @@
<?php <?php
/*************************************************************************** /***************************************************************************
Copyright (C) 2006 - 2007 Scuttle project Copyright (C) 2006 - 2007 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');
/* Service creation: only useful services are created */
$b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService'); $b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService');
$tagservice = & ServiceFactory :: getServiceInstance('TagService'); $tagservice = & ServiceFactory :: getServiceInstance('TagService');
$tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2tagService'); $tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2tagService');
$templateservice = & ServiceFactory :: getServiceInstance('TemplateService'); $templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
/* Managing all possible inputs */
isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
isset($_POST['cancel']) ? define('POST_CANCEL', $_POST['cancel']): define('POST_CANCEL', '');
isset($_POST['old']) ? define('POST_OLD', $_POST['old']): define('POST_OLD', '');
isset($_POST['new']) ? define('POST_NEW', $_POST['new']): define('POST_NEW', '');
/* Managing current logged user */
$currentUser = $userservice->getCurrentObjectUser();
/* Managing path info */
list ($url, $tag) = explode('/', $_SERVER['PATH_INFO']); list ($url, $tag) = explode('/', $_SERVER['PATH_INFO']);
//$tag = isset($_GET['query']) ? $_GET['query'] : NULL; //$tag = isset($_GET['query']) ? $_GET['query'] : NULL;
$template = 'tagrename.tpl'; $template = 'tagrename.tpl';
if ($_POST['confirm']) { if (POST_CONFIRM) {
if (isset($_POST['old']) && trim($_POST['old']) != '') if (trim(POST_OLD) != '') {
$old = trim($_REQUEST['old']); $old = trim(POST_OLD);
else } else {
$old = NULL; $old = NULL;
}
if (isset($_POST['new']) && trim($_POST['new']) != '') if (trim(POST_NEW) != '') {
$new = trim($_POST['new']); $new = trim(POST_NEW);
else } else {
$new = NULL; $new = NULL;
}
if ( if (
!is_null($old) && !is_null($old) &&
!is_null($new) && !is_null($new) &&
$tagservice->renameTag($userservice->getCurrentUserId(), $old, $new) && $tagservice->renameTag($currentUser->getId(), $old, $new) &&
$b2tservice->renameTag($userservice->getCurrentUserId(), $old, $new) && $b2tservice->renameTag($currentUser->getId(), $old, $new) &&
$tag2tagservice->renameTag($userservice->getCurrentUserId(), $old, $new) $tag2tagservice->renameTag($currentUser->getId(), $old, $new)
) { ) {
$tplVars['msg'] = T_('Tag renamed'); $tplVars['msg'] = T_('Tag renamed');
$logged_on_user = $userservice->getCurrentUser(); header('Location: '. createURL('bookmarks', $currentUser->getUsername()));
header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')]));
} else { } else {
$tplVars['error'] = T_('Failed to rename the tag'); $tplVars['error'] = T_('Failed to rename the tag');
$template = 'error.500.tpl'; $template = 'error.500.tpl';
} }
} elseif ($_POST['cancel']) { } elseif (POST_CANCEL) {
$logged_on_user = $userservice->getCurrentUser(); header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags));
header('Location: '. createURL('bookmarks', $logged_on_user[$userservice->getFieldName('username')] .'/'. $tags));
} else { } else {
$tplVars['subtitle'] = T_('Rename Tag') .': '. $tag; $tplVars['subtitle'] = T_('Rename Tag') .': '. $tag;
$tplVars['formaction'] = $_SERVER['SCRIPT_NAME'] .'/'. $tag; $tplVars['formaction'] = $_SERVER['SCRIPT_NAME'] .'/'. $tag;

51
tags.php
View file

@ -1,34 +1,45 @@
<?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');
/* Service creation: only useful services are created */
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService'); $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$cacheservice =& ServiceFactory::getServiceInstance('CacheService'); $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
/* Managing all possible inputs */
isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0);
isset($_GET['sort']) ? define('GET_SORT', $_GET['sort']): define('GET_SORT', '');
/* Managing current logged user */
$currentUser = $userservice->getCurrentObjectUser();
/* Managing path info */
list($url, $cat) = explode('/', $_SERVER['PATH_INFO']);
$tplVars = array(); $tplVars = array();
list($url, $cat) = explode('/', $_SERVER['PATH_INFO']);
if (!$cat) { if (!$cat) {
header('Location: '. createURL('populartags')); header('Location: '. createURL('populartags'));
exit; exit;
@ -40,7 +51,7 @@ $pagetitle = T_('Tags') .': '. $cattitle;
if ($usecache) { if ($usecache) {
// Generate hash for caching on // Generate hash for caching on
if ($userservice->isLoggedOn()) { if ($userservice->isLoggedOn()) {
$hash = md5($_SERVER['REQUEST_URI'] . $userservice->getCurrentUserID()); $hash = md5($_SERVER['REQUEST_URI'] . $currentUser->getId());
} else { } else {
$hash = md5($_SERVER['REQUEST_URI']); $hash = md5($_SERVER['REQUEST_URI']);
} }
@ -53,13 +64,13 @@ if ($usecache) {
$tplVars['pagetitle'] = $pagetitle; $tplVars['pagetitle'] = $pagetitle;
$tplVars['loadjs'] = true; $tplVars['loadjs'] = true;
$tplVars['rsschannels'] = array( $tplVars['rsschannels'] = array(
array(filter($sitename .': '. $pagetitle), createURL('rss', 'all/'. filter($cat, 'url')).'?sort='.getSortOrder()) array(filter($sitename .': '. $pagetitle), createURL('rss', 'all/'. filter($cat, 'url')).'?sort='.getSortOrder())
); );
// Pagination // Pagination
$perpage = getPerPageCount(); $perpage = getPerPageCount();
if (isset($_GET['page']) && intval($_GET['page']) > 1) { if (intval(GET_PAGE) > 1) {
$page = $_GET['page']; $page = GET_PAGE;
$start = ($page - 1) * $perpage; $start = ($page - 1) * $perpage;
} else { } else {
$page = 0; $page = 0;

13
templates/about.tpl.php
View file

@ -1,9 +1,13 @@
<?php <?php
$this->includeTemplate($GLOBALS['top_include']);
/* Service creation: only useful services are created */
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$currentUser = $userservice->getCurrentUser(); //$currentUser = $userservice->getCurrentUser();
$currentUserId = $userservice->getCurrentUserId(); //$currentUserId = $userservice->getCurrentUserId();
$currentObjectUser = $userservice->getCurrentObjectUser();
$this->includeTemplate($GLOBALS['top_include']);
?> ?>
<ul> <ul>
@ -20,9 +24,10 @@ $currentUserId = $userservice->getCurrentUserId();
<?php if(!is_null($currentUser) && $userservice->isAdmin($currentUserId)): ?> <?php if(!is_null($currentObjectUser) && $currentObjectUser->isAdmin()): ?>
<li>SemanticScuttle v0.91</li> <li>SemanticScuttle v0.91</li>
<?php endif ?> <?php endif ?>
</ul> </ul>
<?php <?php

7
templates/bookmarkcommondescriptionedit.tpl.php
View file

@ -1,7 +1,12 @@
<?php <?php
$this->includeTemplate($GLOBALS['top_include']); /* Service creation: only useful services are created */
$userservice = & ServiceFactory :: getServiceInstance('UserService'); $userservice = & ServiceFactory :: getServiceInstance('UserService');
$this->includeTemplate($GLOBALS['top_include']);
list ($url, $hash) = explode('/', $_SERVER['PATH_INFO']); list ($url, $hash) = explode('/', $_SERVER['PATH_INFO']);
?> ?>
<script type="text/javascript"> <script type="text/javascript">
window.onload = function() { window.onload = function() {

20
templates/bookmarks.tpl.php
View file

@ -6,8 +6,6 @@ $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
$tagservice =& ServiceFactory::getServiceInstance('TagService'); $tagservice =& ServiceFactory::getServiceInstance('TagService');
$cdservice =& ServiceFactory::getServiceInstance('CommonDescriptionService'); $cdservice =& ServiceFactory::getServiceInstance('CommonDescriptionService');
//$logged_on_userid = $userservice->getCurrentUserId(); //$logged_on_userid = $userservice->getCurrentUserId();
//$currentUser = $userservice->getCurrentUser(); //$currentUser = $userservice->getCurrentUser();
//$currentUsername = $currentUser[$userservice->getFieldName('username')]; //$currentUsername = $currentUser[$userservice->getFieldName('username')];
@ -28,10 +26,13 @@ include('search.inc.php');
<?php <?php
if((isset($currenttag) && $GLOBALS['enableCommonTagDescription']) // common tag description
if((isset($currenttag) && $currenttag!= '' && $GLOBALS['enableCommonTagDescription'])
|| (isset($hash) && $GLOBALS['enableCommonBookmarkDescription'])):?> || (isset($hash) && $GLOBALS['enableCommonBookmarkDescription'])):?>
<p class="commondescription"><?php <p class="commondescription"><?php
if(isset($currenttag) && $cdservice->getLastTagDescription($currenttag)) { if(isset($currenttag) && $currenttag!= '' && $cdservice->getLastTagDescription($currenttag)) {
$description = $cdservice->getLastTagDescription($currenttag); $description = $cdservice->getLastTagDescription($currenttag);
echo nl2br(filter($description['cdDescription'])); echo nl2br(filter($description['cdDescription']));
} elseif(isset($hash) && $cdservice->getLastBookmarkDescription($hash)) { } elseif(isset($hash) && $cdservice->getLastBookmarkDescription($hash)) {
@ -40,8 +41,9 @@ if(isset($currenttag) && $cdservice->getLastTagDescription($currenttag)) {
echo nl2br(filter($description['cdDescription'])). "<br/>"; echo nl2br(filter($description['cdDescription'])). "<br/>";
} }
//common tag description edit
if($userservice->isLoggedOn()) { if($userservice->isLoggedOn()) {
if(isset($currenttag)) { if(isset($currenttag) && $currenttag!= '') {
echo ' (<a href="'. createURL('tagcommondescriptionedit', $currenttag).'">'; echo ' (<a href="'. createURL('tagcommondescriptionedit', $currenttag).'">';
echo T_('edit common description').'</a>)'; echo T_('edit common description').'</a>)';
} elseif(isset($hash)) { } elseif(isset($hash)) {
@ -55,7 +57,7 @@ if($userservice->isLoggedOn()) {
<?php <?php
/* Private tag description */ /* Private tag description */
if(isset($currenttag) && isset($user)) { if(isset($currenttag) && $currenttag!= '' && isset($user)) {
$userObject = $userservice->getUserByUsername($user); $userObject = $userservice->getUserByUsername($user);
if($tagservice->getDescription($currenttag, $userObject['uId'])) { ?> if($tagservice->getDescription($currenttag, $userObject['uId'])) { ?>
@ -87,7 +89,7 @@ if (!isset($hash)) {
<?php <?php
} }
?> <?php ?> <?php
if(isset($currenttag)) { if(isset($currenttag) && $currenttag!= '') {
if(isset($user)) { if(isset($user)) {
echo ' - '; echo ' - ';
echo '<a href="'. createURL('tags', $currenttag) .'">'; echo '<a href="'. createURL('tags', $currenttag) .'">';
@ -216,8 +218,8 @@ if(isset($currenttag)) {
// Ordering // Ordering
$sortOrder = ''; $sortOrder = '';
if (isset($_GET['sort'])) { if (GET_SORT != '') {
$sortOrder = 'sort='. $_GET['sort']; $sortOrder = 'sort='. GET_SORT;
} }
$sortAmp = (($sortOrder) ? '&amp;'. $sortOrder : ''); $sortAmp = (($sortOrder) ? '&amp;'. $sortOrder : '');

8
templates/editbookmark.tpl.php
View file

@ -47,8 +47,6 @@ switch ($row['bStatus']) {
<input type="text" dojoType="dojox.form.MultiComboBox" id="tags" name="tags" size="75" value="<?php echo filter(implode(', ', $row['tags']), 'xml'); ?>" store="memberTagStore" delimiter="," searchAttr="tag" hasDownArrow="false"/></td> <input type="text" dojoType="dojox.form.MultiComboBox" id="tags" name="tags" size="75" value="<?php echo filter(implode(', ', $row['tags']), 'xml'); ?>" store="memberTagStore" delimiter="," searchAttr="tag" hasDownArrow="false"/></td>
<td>&larr; <?php echo T_('Comma-separated'); ?></td> <td>&larr; <?php echo T_('Comma-separated'); ?></td>
</tr> </tr>
<tr> <tr>
<th></th> <th></th>
<td align="right"><small><?php echo T_('Note: use ">" to include one tag in another. e.g.: europe>france>paris')?><small></td> <td align="right"><small><?php echo T_('Note: use ">" to include one tag in another. e.g.: europe>france>paris')?><small></td>
@ -73,7 +71,7 @@ switch ($row['bStatus']) {
<td> <td>
<input type="submit" name="submitted" value="<?php echo $btnsubmit; ?>" /> <input type="submit" name="submitted" value="<?php echo $btnsubmit; ?>" />
<?php <?php
if ($showdelete) { if (isset($showdelete) && $showdelete) {
?> ?>
<input type="submit" name="delete" value="<?php echo T_('Delete Bookmark'); ?>" /> <input type="submit" name="delete" value="<?php echo T_('Delete Bookmark'); ?>" />
<?php <?php
@ -82,7 +80,7 @@ switch ($row['bStatus']) {
?> ?>
<input type="hidden" name="popup" value="1" /> <input type="hidden" name="popup" value="1" />
<?php <?php
} elseif ($referrer) { } elseif (isset($referrer)) {
?> ?>
<input type="hidden" name="referrer" value="<?php echo $referrer; ?>" /> <input type="hidden" name="referrer" value="<?php echo $referrer; ?>" />
<?php <?php
@ -99,7 +97,7 @@ switch ($row['bStatus']) {
$this->includeTemplate('dynamictags.inc'); $this->includeTemplate('dynamictags.inc');
// Bookmarklets and import links // Bookmarklets and import links
if (empty($_REQUEST['popup']) && !$showdelete) { if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) {
?> ?>
<h3><?php echo T_('Bookmarklet'); ?></h3> <h3><?php echo T_('Bookmarklet'); ?></h3>

8
templates/editprofile.tpl.php
View file

@ -27,7 +27,7 @@ $this->includeTemplate($GLOBALS['top_include']);
</tr> </tr>
<tr> <tr>
<th align="left"><?php echo T_('E-mail'); ?></th> <th align="left"><?php echo T_('E-mail'); ?></th>
<td><input type="text" name="pMail" size="75" value="<?php echo filter($row['email'], 'xml'); ?>" /></td> <td><input type="text" name="pMail" size="75" value="<?php echo filter($objectUser->getEmail(), 'xml'); ?>" /></td>
<td>&larr; <?php echo T_('Required'); ?></td> <td>&larr; <?php echo T_('Required'); ?></td>
</tr> </tr>
</table> </table>
@ -37,15 +37,15 @@ $this->includeTemplate($GLOBALS['top_include']);
<table class="profile"> <table class="profile">
<tr> <tr>
<th align="left"><?php echo T_('Name'); ?></th> <th align="left"><?php echo T_('Name'); ?></th>
<td><input type="text" name="pName" size="75" value="<?php echo filter($row['name'], 'xml'); ?>" /></td> <td><input type="text" name="pName" size="75" value="<?php echo filter($objectUser->getName(), 'xml'); ?>" /></td>
</tr> </tr>
<tr> <tr>
<th align="left"><?php echo T_('Homepage'); ?></th> <th align="left"><?php echo T_('Homepage'); ?></th>
<td><input type="text" name="pPage" size="75" value="<?php echo filter($row['homepage']); ?>" /></td> <td><input type="text" name="pPage" size="75" value="<?php echo filter($objectUser->getHomepage()); ?>" /></td>
</tr> </tr>
<tr> <tr>
<th align="left"><?php echo T_('Description'); ?></th> <th align="left"><?php echo T_('Description'); ?></th>
<td><textarea name="pDesc" cols="75" rows="10"><?php echo $row['uContent']; ?></textarea></td> <td><textarea name="pDesc" cols="75" rows="10"><?php echo $objectUser->getContent(); ?></textarea></td>
</tr> </tr>
<tr> <tr>
<th></th> <th></th>

14
templates/profile.tpl.php
View file

@ -7,26 +7,26 @@ $this->includeTemplate($GLOBALS['top_include']);
<dt><?php echo T_('Username'); ?></dt> <dt><?php echo T_('Username'); ?></dt>
<dd><?php echo $user; ?></dd> <dd><?php echo $user; ?></dd>
<?php <?php
if ($row['name'] != "") { if ($objectUser->getName() != "") {
?> ?>
<dt><?php echo T_('Name'); ?></dt> <dt><?php echo T_('Name'); ?></dt>
<dd><?php echo filter($row['name']); ?></dd> <dd><?php echo filter($objectUser->getName()); ?></dd>
<?php <?php
} }
if ($row['homepage'] != "") { if ($objectUser->getHomepage() != "") {
?> ?>
<dt><?php echo T_('Homepage'); ?></dt> <dt><?php echo T_('Homepage'); ?></dt>
<dd><a href="<?php echo filter($row['homepage']); ?>"><?php echo filter($row['homepage']); ?></a></dd> <dd><a href="<?php echo filter($objectUser->getHomepage()); ?>"><?php echo filter($objectUser->getHomepage()); ?></a></dd>
<?php <?php
} }
?> ?>
<dt><?php echo T_('Member Since'); ?></dt> <dt><?php echo T_('Member Since'); ?></dt>
<dd><?php echo date($GLOBALS['longdate'], strtotime($row['uDatetime'])); ?></dd> <dd><?php echo date($GLOBALS['longdate'], strtotime($objectUser->getDatetime())); ?></dd>
<?php <?php
if ($row['uContent'] != "") { if ($objectUser->getContent() != "") {
?> ?>
<dt><?php echo T_('Description'); ?></dt> <dt><?php echo T_('Description'); ?></dt>
<dd><?php echo $row['uContent']; ?></dd> <dd><?php echo $objectUser->getContent(); ?></dd>
<?php <?php
} }
$watching = $userservice->getWatchNames($userid); $watching = $userservice->getWatchNames($userid);

20
templates/sidebar.block.common.php
View file

@ -4,25 +4,23 @@ $commonTags =& $b2tservice->getRelatedTagsByHash($hash);
$commonTags =& $b2tservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc'); $commonTags =& $b2tservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc');
if ($commonTags && count($commonTags) > 0) { if ($commonTags && count($commonTags) > 0) {
?> ?>
<h2><?php echo T_('Popular Tags'); ?></h2> <h2><?php echo T_('Popular Tags'); ?></h2>
<div id="common"> <div id="common">
<p class="tags"> <p class="tags"><?php
<?php $contents = '';
$contents = '';
if(strlen($user)==0) { if(strlen($user)==0) {
$cat_url = createURL('tags', '%2$s'); $cat_url = createURL('tags', '%2$s');
} }
foreach ($commonTags as $row) { foreach ($commonTags as $row) {
$entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']);
$contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> '; $contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> ';
} }
echo $contents ."\n"; echo $contents ."\n";
?> ?></p>
</p>
</div> </div>
<?php <?php

7
templates/sidebar.block.popular.php
View file

@ -2,6 +2,13 @@
$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService'); $b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
if(!isset($user)) {
$user = '';
}
if(!isset($userid)) {
$userid = NULL;
}
$logged_on_userid = $userservice->getCurrentUserId(); $logged_on_userid = $userservice->getCurrentUserId();
if ($logged_on_userid === false) { if ($logged_on_userid === false) {
$logged_on_userid = NULL; $logged_on_userid = NULL;

2
templates/sidebar.block.recent.php
View file

@ -20,7 +20,7 @@ if ($recentTags && count($recentTags) > 0) {
<?php <?php
$contents = '<p class="tags">'; $contents = '<p class="tags">';
if(!isset($user)) { if(!isset($user) || $user == '') {
$user = ''; $user = '';
$cat_url = createURL('tags', '%2$s'); $cat_url = createURL('tags', '%2$s');
} }

7
templates/sidebar.block.related.php
View file

@ -6,7 +6,12 @@ $logged_on_userid = $userservice->getCurrentUserId();
if ($logged_on_userid === false) { if ($logged_on_userid === false) {
$logged_on_userid = NULL; $logged_on_userid = NULL;
} }
if(strlen($user)==0) {
if(!isset($userid)) {
$userid = NULL;
}
if(isset($user) && strlen($user)==0) {
$cat_url = createURL('tags', '%2$s'); $cat_url = createURL('tags', '%2$s');
} }
if ($currenttag) { if ($currenttag) {

1
templates/top.inc.php
View file

@ -22,6 +22,7 @@ if(isset($rsschannels)) {
<script type="text/javascript" <script type="text/javascript"
src="<?php echo ROOT ?>jsScuttle.php"></script> src="<?php echo ROOT ?>jsScuttle.php"></script>
<link rel="stylesheet" type="text/css" <link rel="stylesheet" type="text/css"
href="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dijit/themes/nihilo/nihilo.css"> href="http://ajax.googleapis.com/ajax/libs/dojo/1.2/dijit/themes/nihilo/nihilo.css">

15
templates/userlist.tpl.php
View file

@ -1,27 +1,24 @@
<?php <?php
/* Service creation: only useful services are created */
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$currentUser = $userservice->getCurrentUser(); $currentObjectUser = $userservice->getCurrentObjectUser();
$currentUserID = $userservice->getCurrentUserId();
$currentUsername = $currentUser[$userservice->getFieldName('username')];
$this->includeTemplate($GLOBALS['top_include']); $this->includeTemplate($GLOBALS['top_include']);
echo '<ol id="bookmarks">'; echo '<ol id="bookmarks">';
foreach(array_keys($users) as $key) { foreach($users as $user) {
echo '<li class="xfolkentry">'."\n"; echo '<li class="xfolkentry">'."\n";
echo '<div class="link">'; echo '<div class="link">';
echo '<a href="'.createURL('profile', $users[$key][$userservice->getFieldname('username')]).'">'.$users[$key][$userservice->getFieldName('username')].'</a>'; echo '<a href="'.createURL('profile', $user->getUsername()).'">'.$user->getUsername().'</a>';
echo '</div>'; echo '</div>';
if($users[$key][$userservice->getFieldName('username')] != $currentUsername) { if($user->getUsername() != $currentObjectUser->getUsername()) {
echo '<div class="meta">'; echo '<div class="meta">';
echo '<a href="'.createURL('admin','delete/'.$users[$key][$userservice->getFieldname('username')]).'" onclick="return confirm(\''.T_('Are you sure?').'\');">'.T_('Delete').'</a>'; echo '<a href="'.createURL('admin','delete/'.$user->getUsername()).'" onclick="return confirm(\''.T_('Are you sure?').'\');">'.T_('Delete').'</a>';
echo '</div>'; echo '</div>';
} }

9
users.php
View file

@ -21,21 +21,26 @@
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService'); $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$cacheservice =& ServiceFactory::getServiceInstance('CacheService'); $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
$tplVars = array(); /* Managing current logged user */
$currentUser = $userservice->getCurrentObjectUser();
/* Managing path info */
list($url, $cat) = explode('/', $_SERVER['PATH_INFO']); list($url, $cat) = explode('/', $_SERVER['PATH_INFO']);
$tplVars = array();
$pagetitle = T_('Users'); $pagetitle = T_('Users');
if ($usecache) { if ($usecache) {
// Generate hash for caching on // Generate hash for caching on
if ($userservice->isLoggedOn()) { if ($userservice->isLoggedOn()) {
$hash = md5($_SERVER['REQUEST_URI'] . $userservice->getCurrentUserID()); $hash = md5($_SERVER['REQUEST_URI'] . $currentUser->getId());
} else { } else {
$hash = md5($_SERVER['REQUEST_URI']); $hash = md5($_SERVER['REQUEST_URI']);
} }

50
watch.php
View file

@ -1,28 +1,36 @@
<?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');
/* Service creation: only useful services are created */
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
/* Managing current logged user */
$currentUser = $userservice->getCurrentObjectUser();
/* Managing path info */
@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 ($userservice->isLoggedOn() && $user) { if ($userservice->isLoggedOn() && $user) {
$tplVars = array(); $tplVars = array();
$pagetitle = ''; $pagetitle = '';
@ -30,16 +38,17 @@ if ($userservice->isLoggedOn() && $user) {
if (is_int($user)) { if (is_int($user)) {
$userid = intval($user); $userid = intval($user);
} else { } else {
if (!($userinfo = $userservice->getUserByUsername($user))) { $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 { } else {
$userid =& $userinfo['uId']; $userid =& $userinfo->getId();
} }
} }
$watched = $userservice->getWatchStatus($userid, $userservice->getCurrentUserId()); $watched = $userservice->getWatchStatus($userid, $currentUser->getId());
$changed = $userservice->setWatchStatus($userid); $changed = $userservice->setWatchStatus($userid);
if ($watched) { if ($watched) {
@ -48,9 +57,6 @@ if ($userservice->isLoggedOn() && $user) {
$tplVars['msg'] = T_('User added to your watchlist'); $tplVars['msg'] = T_('User added to your watchlist');
} }
$currentUser = $userservice->getCurrentUser(); header('Location: '. createURL('watchlist', $currentUser->getUsername()));
$currentUsername = $currentUser[$userservice->getFieldName('username')];
header('Location: '. createURL('watchlist', $currentUsername));
} }
?> ?>

34
watchlist.php
View file

@ -20,27 +20,29 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/ ***************************************************************************/
require_once('header.inc.php'); require_once('header.inc.php');
/* Service creation: only useful services are created */
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService'); $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService'); $templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$userservice =& ServiceFactory::getServiceInstance('UserService'); $userservice =& ServiceFactory::getServiceInstance('UserService');
$cacheservice =& ServiceFactory::getServiceInstance('CacheService'); $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
$tplVars = array(); /* Managing all possible inputs */
isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0);
isset($_GET['sort']) ? define('GET_SORT', $_GET['sort']): define('GET_SORT', '');
/* Managing current logged user */
$currentUser = $userservice->getCurrentObjectUser();
/* Managing path info */
@list($url, $user, $page) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL; @list($url, $user, $page) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
$loggedon = false; $tplVars = array();
if ($userservice->isLoggedOn()) {
$loggedon = true;
$currentUser = $userservice->getCurrentUser();
$currentUsername = $currentUser[$userservice->getFieldName('username')];
}
if ($usecache) { if ($usecache) {
// Generate hash for caching on // Generate hash for caching on
if ($loggedon) { if ($userservice->isLoggedOn()) {
if ($currentUsername != $user) { if ($currentUser->getUsername() != $user) {
$cachehash = md5($_SERVER['REQUEST_URI'] . $currentUsername); $cachehash = md5($_SERVER['REQUEST_URI'] . $currentUser->getUsername());
// Cache for 5 minutes // Cache for 5 minutes
$cacheservice->Start($cachehash); $cacheservice->Start($cachehash);
@ -56,13 +58,14 @@ if ($user) {
if (is_int($user)) { if (is_int($user)) {
$userid = intval($user); $userid = intval($user);
} else { } else {
if (!($userinfo = $userservice->getUserByUsername($user) ) ) { $userinfo = $userservice->getObjectUserByUsername($user);
if ($userinfo == '' ) {
// 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);
exit(); exit();
} else { } else {
$userid =& $userinfo['uId']; $userid =& $userinfo->getId();
} }
} }
} }
@ -77,8 +80,8 @@ if ($user) {
// Pagination // Pagination
$perpage = getPerPageCount(); $perpage = getPerPageCount();
if (isset($_GET['page']) && intval($_GET['page']) > 1) { if (intval(GET_PAGE) > 1) {
$page = $_GET['page']; $page = GET_PAGE;
$start = ($page - 1) * $perpage; $start = ($page - 1) * $perpage;
} else { } else {
$page = 0; $page = 0;
@ -86,6 +89,7 @@ if ($user) {
} }
// Set template vars // Set template vars
$tplVars['currenttag'] = '';
$tplVars['page'] = $page; $tplVars['page'] = $page;
$tplVars['start'] = $start; $tplVars['start'] = $start;
$tplVars['bookmarkCount'] = $start + 1; $tplVars['bookmarkCount'] = $start + 1;
@ -99,7 +103,7 @@ if ($user) {
$tplVars['cat_url'] = createURL('tags', '%2$s'); $tplVars['cat_url'] = createURL('tags', '%2$s');
$tplVars['nav_url'] = createURL('watchlist', '%s/%s%s'); $tplVars['nav_url'] = createURL('watchlist', '%s/%s%s');
if ($user == $currentUsername) { if ($userservice->isLoggedOn() && $user == $currentUser->getUsername()) {
$title = T_('My Watchlist'); $title = T_('My Watchlist');
} else { } else {
$title = T_('Watchlist') .': '. $user; $title = T_('Watchlist') .': '. $user;