make it a bit easier

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@505 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
cweiske 2009-11-02 09:41:51 +00:00
parent fee364b94e
commit 53319932bd

View file

@ -31,55 +31,59 @@ isset($_GET['sort']) ? define('GET_SORT', $_GET['sort']): define('GET_SORT', '')
// POST // POST
if (POST_TERMS != '') { if (POST_TERMS != '') {
// Redirect to GET // Redirect to GET
header('Location: '. createURL('search', POST_RANGE .'/'. filter(POST_TERMS, 'url'))); header(
'Location: '
. createURL('search', POST_RANGE .'/'. filter(POST_TERMS, 'url'))
);
exit();
// GET }
} else {
/* Service creation: only useful services are created */
$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
$searchhistoryservice =SemanticScuttle_Service_Factory::get('SearchHistory');
/* Managing current logged user */ /* Service creation: only useful services are created */
$currentUserId = $userservice->getCurrentUserId(); $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
$searchhistoryservice =SemanticScuttle_Service_Factory::get('SearchHistory');
/* Managing current logged user */
$currentUserId = $userservice->getCurrentUserId();
$exploded = isset($_SERVER['PATH_INFO']) $exploded = isset($_SERVER['PATH_INFO'])
? explode('/', $_SERVER['PATH_INFO']) : null; ? explode('/', $_SERVER['PATH_INFO']) : null;
if(count($exploded) == 4) { if(count($exploded) == 4) {
list($url, $range, $terms, $page) = $exploded; list($url, $range, $terms, $page) = $exploded;
} else if (count($exploded) == 2) { } else if (count($exploded) == 2) {
list($url, $range) = $exploded; list($url, $range) = $exploded;
$terms = $page= NULL; $terms = $page= NULL;
} else { } else {
list($url, $range, $terms) = $exploded; list($url, $range, $terms) = $exploded;
$page= NULL; $page= NULL;
} }
$tplVars['loadjs'] = true; $tplVars['loadjs'] = true;
// Pagination // Pagination
$perpage = getPerPageCount($currentUser); $perpage = getPerPageCount($currentUser);
if (intval(GET_PAGE) > 1) { if (intval(GET_PAGE) > 1) {
$page = intval(GET_PAGE); $page = intval(GET_PAGE);
$start = ($page - 1) * $perpage; $start = ($page - 1) * $perpage;
} else { } else {
$page = 0; $page = 0;
$start = 0; $start = 0;
} }
$s_user = NULL; $s_user = NULL;
$s_start = NULL; $s_start = NULL;
$s_end = NULL; $s_end = NULL;
$s_watchlist = NULL; $s_watchlist = NULL;
// No search terms // No search terms
if (is_null($terms)) { if (is_null($terms)) {
$tplVars['subtitle'] = T_('Search Bookmarks'); $tplVars['subtitle'] = T_('Search Bookmarks');
$s_end = date('Y-m-d H:i:s', strtotime('tomorrow')); $s_end = date('Y-m-d H:i:s', strtotime('tomorrow'));
$s_start = date('Y-m-d H:i:s', strtotime($s_end .' -'. $defaultRecentDays .' days')); $s_start = date('Y-m-d H:i:s', strtotime($s_end .' -'. $defaultRecentDays .' days'));
// Search terms // Search terms
} else { } else {
$tplVars['subtitle'] = T_('Search Results'); $tplVars['subtitle'] = T_('Search Results');
$selected = ' selected="selected"'; $selected = ' selected="selected"';
@ -108,29 +112,29 @@ if (POST_TERMS != '') {
} }
} }
}
$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, $s_user, NULL, $terms, getSortOrder(), $s_watchlist, $s_start, $s_end);
// Save search
$searchhistoryservice->addSearch($terms, $range, $bookmarks['total'], $currentUserId);
if($GLOBALS['enableGoogleCustomSearch']) {
$tplVars['tipMsg'] = T_('Unsatisfied? You can also try our ').'<a href="'.createUrl('gsearch/index').'">Google Custom Search page</a>.';
}
$tplVars['rsschannels'] = array();
$tplVars['page'] = $page;
$tplVars['start'] = $start;
$tplVars['popCount'] = 25;
$tplVars['sidebar_blocks'] = array('search', 'recent', 'menu2');
$tplVars['range'] = $range;
$tplVars['terms'] = $terms;
$tplVars['pagetitle'] = T_('Search Bookmarks');
$tplVars['bookmarkCount'] = $start + 1;
$tplVars['total'] = $bookmarks['total'];
$tplVars['bookmarks'] =& $bookmarks['bookmarks'];
$tplVars['cat_url'] = createURL('tags', '%2$s');
$tplVars['nav_url'] = createURL('search', $range .'/'. $terms .'/%3$s');
$templateservice->loadTemplate('bookmarks.tpl', $tplVars);
} }
$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, $s_user, NULL, $terms, getSortOrder(), $s_watchlist, $s_start, $s_end);
// Save search
$searchhistoryservice->addSearch($terms, $range, $bookmarks['total'], $currentUserId);
if ($GLOBALS['enableGoogleCustomSearch']) {
$tplVars['tipMsg'] = T_('Unsatisfied? You can also try our ')
. '<a href="' . createUrl('gsearch/index') . '">Google Custom Search page</a>.';
}
$tplVars['rsschannels'] = array();
$tplVars['page'] = $page;
$tplVars['start'] = $start;
$tplVars['popCount'] = 25;
$tplVars['sidebar_blocks'] = array('search', 'recent', 'menu2');
$tplVars['range'] = $range;
$tplVars['terms'] = $terms;
$tplVars['pagetitle'] = T_('Search Bookmarks');
$tplVars['bookmarkCount'] = $start + 1;
$tplVars['total'] = $bookmarks['total'];
$tplVars['bookmarks'] =& $bookmarks['bookmarks'];
$tplVars['cat_url'] = createURL('tags', '%2$s');
$tplVars['nav_url'] = createURL('search', $range .'/'. $terms .'/%3$s');
$templateservice->loadTemplate('bookmarks.tpl', $tplVars);
?> ?>