aboutsummaryrefslogtreecommitdiff
path: root/bookmarks.php
diff options
context:
space:
mode:
authormensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>2008-11-25 15:57:29 +0000
committermensonge <mensonge@b3834d28-1941-0410-a4f8-b48e95affb8f>2008-11-25 15:57:29 +0000
commit15b91c7e661d928d8b125ec9cfbda1702319c8b4 (patch)
tree092d474c05e414bb04a8c428b8ff6cb9ccab765d /bookmarks.php
parent9aafe7551eb5a73739709e72465031db7a1531b4 (diff)
downloadsemanticscuttle-15b91c7e661d928d8b125ec9cfbda1702319c8b4.tar.gz
semanticscuttle-15b91c7e661d928d8b125ec9cfbda1702319c8b4.tar.bz2
Major refactoring: transform user into object, define parameters used into each file, ...
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@173 b3834d28-1941-0410-a4f8-b48e95affb8f
Diffstat (limited to 'bookmarks.php')
-rw-r--r--bookmarks.php397
1 files changed, 213 insertions, 184 deletions
diff --git a/bookmarks.php b/bookmarks.php
index 232249f..f222202 100644
--- a/bookmarks.php
+++ b/bookmarks.php
@@ -1,26 +1,27 @@
<?php
/***************************************************************************
-Copyright (C) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
-http://scuttle.org/
+ Copyright (C) 2004 - 2006 Scuttle project
+ http://sourceforge.net/projects/scuttle/
+ http://scuttle.org/
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-***************************************************************************/
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ ***************************************************************************/
require_once('header.inc.php');
+/* Service creation: only useful services are created */
$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
$templateservice =& ServiceFactory::getServiceInstance('TemplateService');
$userservice =& ServiceFactory::getServiceInstance('UserService');
@@ -28,59 +29,85 @@ $cacheservice =& ServiceFactory::getServiceInstance('CacheService');
$tplVars = array();
-if (isset($_GET['action']) && ($_GET['action'] == "add") && !$userservice->isLoggedOn()) {
- $loginqry = str_replace("'", '%27', stripslashes($_SERVER['QUERY_STRING']));
- header('Location: '. createURL('login', '?'. $loginqry));
- exit();
-}
+/* 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', '');
-@list($url, $user, $cat) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
-$loggedon = false;
+
+if ((GET_ACTION == "add") && !$userservice->isLoggedOn()) {
+ $loginqry = str_replace("'", '%27', stripslashes($_SERVER['QUERY_STRING']));
+ header('Location: '. createURL('login', '?'. $loginqry));
+ exit();
+}
+
if ($userservice->isLoggedOn()) {
- $loggedon = true;
- $currentUser = $userservice->getCurrentUser();
- $currentUserID = $userservice->getCurrentUserId();
- $currentUsername = $currentUser[$userservice->getFieldName('username')];
+ //$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;
+
+
$endcache = false;
if ($usecache) {
- // Generate hash for caching on
- $hash = md5($_SERVER['REQUEST_URI'] . $user);
-
- // Don't cache if its users' own bookmarks
- if ($loggedon) {
- if ($currentUsername != $user) {
- // Cache for 5 minutes
- $cacheservice->Start($hash);
- $endcache = true;
- }
- } else {
- // Cache for 30 minutes
- $cacheservice->Start($hash, 1800);
- $endcache = true;
- }
+ // Generate hash for caching on
+ $hash = md5($_SERVER['REQUEST_URI'] . $user);
+
+ // Don't cache if its users' own bookmarks
+ if ($userservice->isLoggedOn()) {
+ if ($currentUsername != $user) {
+ // Cache for 5 minutes
+ $cacheservice->Start($hash);
+ $endcache = true;
+ }
+ } else {
+ // Cache for 30 minutes
+ $cacheservice->Start($hash, 1800);
+ $endcache = true;
+ }
}
$pagetitle = $rssCat = $catTitle = '';
if ($user) {
- if (is_int($user)) {
- $userid = intval($user);
- } else {
- if (!($userinfo = $userservice->getUserByUsername($user))) {
- $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
- $templateservice->loadTemplate('error.404.tpl', $tplVars);
- exit();
- } else {
- $userid =& $userinfo['uId'];
- }
- }
- $pagetitle .= ': '. $user;
+ if (is_int($user)) {
+ $userid = intval($user);
+ } else {
+ if (!($userinfo = $userservice->getUserByUsername($user))) {
+ $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
+ $templateservice->loadTemplate('error.404.tpl', $tplVars);
+ exit();
+ } else {
+ $userid =& $userinfo['uId'];
+ }
+ }
+ $pagetitle .= ': '. $user;
}
if ($cat) {
- $catTitle = ': '. str_replace('+', ' + ', $cat);
- $pagetitle .= $catTitle;
+ $catTitle = ': '. str_replace('+', ' + ', $cat);
+ $pagetitle .= $catTitle;
}
$pagetitle = substr($pagetitle, 2);
@@ -90,137 +117,139 @@ $tplVars['loadjs'] = true;
// ADD A BOOKMARK
$saved = false;
$templatename = 'bookmarks.tpl';
-if ($loggedon && isset($_POST['submitted'])) {
- if (!$_POST['title'] || !$_POST['address']) {
- $tplVars['error'] = T_('Your bookmark must have a title and an address');
- $templatename = 'editbookmark.tpl';
- } else {
- $address = trim($_POST['address']);
- // If the bookmark exists already, edit the original
- if ($bookmarkservice->bookmarkExists($address, $currentUserID)) {
- $bookmark =& $bookmarkservice->getBookmarkByAddress($address);
- header('Location: '. createURL('edit', $bookmark['bId']));
- exit();
- // If it's new, save it
- } else {
- $title = trim($_POST['title']);
- $description = trim($_POST['description']);
- $status = intval($_POST['status']);
- $categories = trim($_POST['tags']);
- $saved = true;
- if ($bookmarkservice->addBookmark($address, $title, $description, $status, $categories)) {
- if (isset($_POST['popup'])) {
- $tplVars['msg'] = '<script type="text/javascript">window.close();</script>';
- } else {
- $tplVars['msg'] = T_('Bookmark saved');
- // Redirection option
- if ($GLOBALS['useredir']) {
- $address = $GLOBALS['url_redir'] . $address;
- }
- //header('Location: '. $address); // not useful
- }
- } else {
- $tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.');
- $templatename = 'editbookmark.tpl';
- $saved = false;
- }
- }
- }
+if ($userservice->isLoggedOn() && POST_SUBMITTED != '') {
+ if (!POST_TITLE || !POST_ADDRESS) {
+ $tplVars['error'] = T_('Your bookmark must have a title and an address');
+ $templatename = 'editbookmark.tpl';
+ } else {
+ $address = trim(POST_ADDRESS);
+ // If the bookmark exists already, edit the original
+ if ($bookmarkservice->bookmarkExists($address, $currentUserID)) {
+ $bookmark =& $bookmarkservice->getBookmarkByAddress($address);
+ header('Location: '. createURL('edit', $bookmark['bId']));
+ exit();
+ // If it's new, save it
+ } else {
+ $title = trim(POST_TITLE);
+ $description = trim(POST_DESCRIPTION);
+ $status = intval(POST_STATUS);
+ $categories = trim(POST_TAGS);
+ $saved = true;
+ if ($bookmarkservice->addBookmark($address, $title, $description, $status, $categories)) {
+ if (POST_POPUP != '') {
+ $tplVars['msg'] = '<script type="text/javascript">window.close();</script>';
+ } else {
+ $tplVars['msg'] = T_('Bookmark saved');
+ // Redirection option
+ if ($GLOBALS['useredir']) {
+ $address = $GLOBALS['url_redir'] . $address;
+ }
+ //header('Location: '. $address); // not useful
+ }
+ } else {
+ $tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.');
+ $templatename = 'editbookmark.tpl';
+ $saved = false;
+ }
+ }
+ }
}
-if (isset($_GET['action']) && ($_GET['action'] == "add")) {
- // If the bookmark exists already, edit the original
- if ($bookmarkservice->bookmarkExists(stripslashes($_GET['address']), $currentUserID)) {
- $bookmark =& $bookmarkservice->getBookmarks(0, NULL, $currentUserID, NULL, NULL, NULL, NULL, NULL, NULL, md5(stripslashes($_GET['address'])));
- $popup = (isset($_GET['popup'])) ? '?popup=1' : '';
- header('Location: '. createURL('edit', $bookmark['bookmarks'][0]['bId'] . $popup));
- exit();
- }
- $templatename = 'editbookmark.tpl';
+if (GET_ACTION == "add") {
+ // If the bookmark exists already, edit the original
+ if ($bookmarkservice->bookmarkExists(stripslashes(GET_ADDRESS), $currentUserID)) {
+ $bookmark =& $bookmarkservice->getBookmarks(0, NULL, $currentUserID, NULL, NULL, NULL, NULL, NULL, NULL, md5(stripslashes(GET_ADDRESS)));
+ $popup = (GET_POPUP!='') ? '?popup=1' : '';
+ header('Location: '. createURL('edit', $bookmark['bookmarks'][0]['bId'] . $popup));
+ exit();
+ }
+ $templatename = 'editbookmark.tpl';
}
-
+
if ($templatename == 'editbookmark.tpl') {
- if ($loggedon) {
- $tplVars['formaction'] = createURL('bookmarks', $currentUsername);
- if (isset($_POST['submitted'])) {
- $tplVars['row'] = array(
- 'bTitle' => stripslashes($_POST['title']),
- 'bAddress' => stripslashes($_POST['address']),
- 'bDescription' => stripslashes($_POST['description']),
- 'tags' => ($_POST['tags'] ? explode(',', stripslashes($_POST['tags'])) : array())
- );
- $tplVars['tags'] = $_POST['tags'];
- } else {
- $tplVars['row'] = array(
- 'bTitle' => stripslashes($_GET['title']),
- 'bAddress' => stripslashes($_GET['address']),
- 'bDescription' => stripslashes($_GET['description']),
- 'tags' => ($_GET['tags'] ? explode(',', stripslashes($_GET['tags'])) : array())
- );
- }
- $title = T_('Add a Bookmark');
- $tplVars['pagetitle'] = $title;
- $tplVars['subtitle'] = $title;
- $tplVars['btnsubmit'] = T_('Add Bookmark');
- $tplVars['popup'] = (isset($_GET['popup'])) ? $_GET['popup'] : null;
- } else {
- $tplVars['error'] = T_('You must be logged in before you can add bookmarks.');
- }
-} else if ($user && !isset($_GET['popup'])) {
-
- $tplVars['sidebar_blocks'] = array('profile', 'watchstatus');
-
- if (!$cat) {
- $cat = NULL;
- $tplVars['currenttag'] = NULL;
- $tplVars['sidebar_blocks'][] = 'menu';
- } else {
- $rssCat = '/'. filter($cat, 'url');
- $tplVars['currenttag'] = $cat;
- $tplVars['sidebar_blocks'][] = 'tagactions';
- $tplVars['sidebar_blocks'][] = 'linked';
- $tplVars['sidebar_blocks'][] = 'related';
- $tplVars['sidebar_blocks'][] = 'menu';
- }
- $tplVars['popCount'] = 30;
- $tplVars['sidebar_blocks'][] = 'popular';
-
- $tplVars['userid'] = $userid;
- $tplVars['userinfo'] =& $userinfo;
- $tplVars['user'] = $user;
- $tplVars['range'] = 'user';
-
- // Pagination
- $perpage = getPerPageCount();
- if (isset($_GET['page']) && intval($_GET['page']) > 1) {
- $page = $_GET['page'];
- $start = ($page - 1) * $perpage;
- } else {
- $page = 0;
- $start = 0;
- }
-
- // Set template vars
- $tplVars['rsschannels'] = array(
- array(filter($sitename .': '. $pagetitle), createURL('rss', filter($user, 'url') . $rssCat.'?sort='.getSortOrder()))
- );
-
- $tplVars['page'] = $page;
- $tplVars['start'] = $start;
- $tplVars['bookmarkCount'] = $start + 1;
-
- $bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, $userid, $cat, null, getSortOrder());
- $tplVars['total'] = $bookmarks['total'];
- $tplVars['bookmarks'] =& $bookmarks['bookmarks'];
- $tplVars['cat_url'] = createURL('bookmarks', '%s/%s');
- $tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s');
- if ($userservice->isLoggedOn() && $user == $currentUsername) {
- $title = T_('My Bookmarks') . filter($catTitle);
- } else {
- $title = filter($pagetitle);
- }
- $tplVars['pagetitle'] = $title;
- $tplVars['subtitle'] = $title;
+ if ($userservice->isLoggedOn()) {
+ $tplVars['formaction'] = createURL('bookmarks', $currentUsername);
+ if (POST_SUBMITTED != '') {
+ $tplVars['row'] = array(
+ 'bTitle' => stripslashes(POST_TITLE),
+ 'bAddress' => stripslashes(POST_ADDRESS),
+ 'bDescription' => stripslashes(POST_DESCRIPTION),
+ 'tags' => (POST_TAGS ? explode(',', stripslashes(POST_TAGS)) : array()),
+ 'bStatus' => 0,
+ );
+ $tplVars['tags'] = POST_TAGS;
+ } else {
+ $tplVars['row'] = array(
+ 'bTitle' => stripslashes(GET_TITLE),
+ 'bAddress' => stripslashes(GET_ADDRESS),
+ 'bDescription' => stripslashes(GET_DESCRIPTION),
+ 'tags' => (GET_TAGS ? explode(',', stripslashes(GET_TAGS)) : array()),
+ 'bStatus' => 0
+ );
+ }
+ $title = T_('Add a Bookmark');
+ $tplVars['pagetitle'] = $title;
+ $tplVars['subtitle'] = $title;
+ $tplVars['btnsubmit'] = T_('Add Bookmark');
+ $tplVars['popup'] = (GET_POPUP!='') ? GET_POPUP : null;
+ } else {
+ $tplVars['error'] = T_('You must be logged in before you can add bookmarks.');
+ }
+} else if ($user && GET_POPUP == '') {
+
+ $tplVars['sidebar_blocks'] = array('profile', 'watchstatus');
+
+ if (!$cat) {
+ $cat = NULL;
+ $tplVars['currenttag'] = NULL;
+ $tplVars['sidebar_blocks'][] = 'menu';
+ } else {
+ $rssCat = '/'. filter($cat, 'url');
+ $tplVars['currenttag'] = $cat;
+ $tplVars['sidebar_blocks'][] = 'tagactions';
+ $tplVars['sidebar_blocks'][] = 'linked';
+ $tplVars['sidebar_blocks'][] = 'related';
+ $tplVars['sidebar_blocks'][] = 'menu';
+ }
+ $tplVars['popCount'] = 30;
+ $tplVars['sidebar_blocks'][] = 'popular';
+
+ $tplVars['userid'] = $userid;
+ $tplVars['userinfo'] =& $userinfo;
+ $tplVars['user'] = $user;
+ $tplVars['range'] = 'user';
+
+ // Pagination
+ $perpage = getPerPageCount();
+ if (intval(GET_PAGE) > 1) {
+ $page = GET_PAGE;
+ $start = ($page - 1) * $perpage;
+ } else {
+ $page = 0;
+ $start = 0;
+ }
+
+ // Set template vars
+ $tplVars['rsschannels'] = array(
+ array(filter($sitename .': '. $pagetitle), createURL('rss', filter($user, 'url') . $rssCat.'?sort='.getSortOrder()))
+ );
+
+ $tplVars['page'] = $page;
+ $tplVars['start'] = $start;
+ $tplVars['bookmarkCount'] = $start + 1;
+
+ $bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, $userid, $cat, null, getSortOrder());
+ $tplVars['total'] = $bookmarks['total'];
+ $tplVars['bookmarks'] =& $bookmarks['bookmarks'];
+ $tplVars['cat_url'] = createURL('bookmarks', '%s/%s');
+ $tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s');
+ if ($userservice->isLoggedOn() && $user == $currentUsername) {
+ $title = T_('My Bookmarks') . filter($catTitle);
+ } else {
+ $title = filter($pagetitle);
+ }
+ $tplVars['pagetitle'] = $title;
+ $tplVars['subtitle'] = $title;
}
$tplVars['summarizeLinkedTags'] = true;
@@ -229,7 +258,7 @@ $tplVars['pageName'] = PAGE_BOOKMARKS;
$templateservice->loadTemplate($templatename, $tplVars);
if ($usecache && $endcache) {
- // Cache output if existing copy has expired
- $cacheservice->End($hash);
+ // Cache output if existing copy has expired
+ $cacheservice->End($hash);
}
?>