move files to new locations

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

1 files changed, 0 insertions, 292 deletions

diff --git a/bookmarks.php b/bookmarks.php
deleted file mode 100644
index 91d0999..0000000
--- a/bookmarks.php
+++ /dev/null
@@ -1,292 +0,0 @@
-<?php
-/***************************************************************************
- 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 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
- ***************************************************************************/
-
-require_once('header.inc.php');
-
-/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
-
-/* 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['privateNote']) ? define('GET_PRIVATENOTE', $_GET['privateNote']): define('GET_PRIVATENOTE', '');
-isset($_GET['tags']) ? define('GET_TAGS', $_GET['tags']): define('GET_TAGS', '');
-isset($_GET['copyOf']) ? define('GET_COPYOF', $_GET['copyOf']): define('GET_COPYOF', '');
-
-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['privateNote']) ? define('POST_PRIVATENOTE', $_POST['privateNote']): define('POST_PRIVATENOTE', '');
-isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', '');
-isset($_POST['tags']) ? define('POST_TAGS', $_POST['tags']): define('POST_TAGS', '');
-isset($_POST['referrer']) ? define('POST_REFERRER', $_POST['referrer']): define('POST_REFERRER', '');
-
-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']));
-	header('Location: '. createURL('login', '?'. $loginqry));
-	exit();
-}
-
-if ($userservice->isLoggedOn()) {
-	$currentUser = $userservice->getCurrentObjectUser();
-	$currentUserID = $currentUser->getId();
-	$currentUsername = $currentUser->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 ($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 ($cat) {
-	$catTitle = ': '. str_replace('+', ' + ', $cat);
-
-	$catTitleWithUrls = ': ';
-	$titleTags = explode('+', filter($cat));
-	for($i = 0; $i<count($titleTags);$i++) {
-		$catTitleWithUrls.= $titleTags[$i].'<a href="'.createUrl('bookmarks', $user.'/'.aggregateTags($titleTags, '+', $titleTags[$i])).'" title="'.T_('Remove the tag from the selection').'">*</a> + ';
-	}
-	$catTitleWithUrls = substr($catTitleWithUrls, 0, strlen($catTitleWithUrls) - strlen(' + '));
-
-	$pagetitle .= $catTitleWithUrls;
-}
-else
-{
-	$catTitleWithUrls = '';
-}
-$pagetitle = substr($pagetitle, 2);
-
-// Header variables
-$tplVars['loadjs'] = true;
-
-// ADD A BOOKMARK
-$saved = false;
-$templatename = 'bookmarks.tpl';
-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);
-			$privateNote = trim(POST_PRIVATENOTE);
-			$status = intval(POST_STATUS);
-			$categories = trim(POST_TAGS);
-			$saved = true;
-			if ($bookmarkservice->addBookmark($address, $title, $description, $privateNote, $status, $categories)) {
-				if (POST_POPUP != '') {
-					$tplVars['msg'] = '<script type="text/javascript">window.close();</script>';
-				} else {
-					$tplVars['msg'] = T_('Bookmark saved') . ' <a href="javascript:history.go(-2)">'.T_('(Come back to previous page.)').'</a>';
-					// Redirection option
-					if ($GLOBALS['useredir']) {
-						$address = $GLOBALS['url_redir'] . $address;
-					}
-				}
-			} else {
-				$tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.');
-				$templatename = 'editbookmark.tpl';
-				$saved = false;
-			}
-		}
-	}
-}
-
-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($bookmarkservice->normalize(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 ($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),
-			    'bPrivateNote' => stripslashes(POST_PRIVATENOTE),
-                'tags' => (POST_TAGS ? explode(',', stripslashes(POST_TAGS)) : array()),
-				'bStatus' => 0,
-			);
-			$tplVars['tags'] = POST_TAGS;
-		} else {
-			if(GET_COPYOF != '') {  //copy from bookmarks page
-				$tplVars['row'] = $bookmarkservice->getBookmark(GET_COPYOF, true);
-				if(!$currentUser->isAdmin()) {
-					$tplVars['row']['bPrivateNote'] = ''; //only admin can copy private note
-				}
-			}else {  //copy from pop-up bookmarklet
-			 $tplVars['row'] = array(
-			 	'bTitle' => stripslashes(GET_TITLE),
-                'bAddress' => stripslashes(GET_ADDRESS),
-                'bDescription' => stripslashes(GET_DESCRIPTION),
-                'bPrivateNote' => stripslashes(GET_PRIVATENOTE),
-                'tags' => (GET_TAGS ? explode(',', stripslashes(GET_TAGS)) : array()),
-                'bStatus' => 0
-			 );
-			}
-				
-		}
-		$title = T_('Add a Bookmark');
-		$tplVars['referrer'] = '';;
-		if (isset($_SERVER['HTTP_REFERER'])) {
-			$tplVars['referrer'] = $_SERVER['HTTP_REFERER'];
-		}
-		$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('watchstatus');
-
-	if (!$cat) { //user page without tags
-		$cat = NULL;
-		$tplVars['currenttag'] = NULL;
-		//$tplVars['sidebar_blocks'][] = 'menu2';
-		$tplVars['sidebar_blocks'][] = 'linked';
-		$tplVars['sidebar_blocks'][] = 'popular';
-	} else { //pages with tags
-		$rssCat = '/'. filter($cat, 'url');
-		$tplVars['currenttag'] = $cat;
-		$tplVars['sidebar_blocks'][] = 'tagactions';
-		//$tplVars['sidebar_blocks'][] = 'menu2';
-		$tplVars['sidebar_blocks'][] = 'linked';
-		$tplVars['sidebar_blocks'][] = 'related';
-		/*$tplVars['sidebar_blocks'][] = 'menu';*/
-	}
-	$tplVars['sidebar_blocks'][] = 'menu2';
-	$tplVars['popCount'] = 30;
-	//$tplVars['sidebar_blocks'][] = 'popular';
-
-	$tplVars['userid'] = $userid;
-	$tplVars['userinfo'] =& $userinfo;
-	$tplVars['user'] = $user;
-	$tplVars['range'] = 'user';
-
-	// Pagination
-	$perpage = getPerPageCount($currentUser);
-	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) {
-		$tplVars['pagetitle'] = T_('My Bookmarks') . $catTitle;
-		$tplVars['subtitle'] =  T_('My Bookmarks') . $catTitleWithUrls;
-	} else {
-		$tplVars['pagetitle'] = $user.': '.$cat;
-		$tplVars['subtitle'] = $pagetitle;
-	}
-}
-
-$tplVars['summarizeLinkedTags'] = true;
-$tplVars['pageName'] = PAGE_BOOKMARKS;
-
-
-$templateservice->loadTemplate($templatename, $tplVars);
-
-if ($usecache && $endcache) {
-	// Cache output if existing copy has expired
-	$cacheservice->End($hash);
-}
-?>