From 15b91c7e661d928d8b125ec9cfbda1702319c8b4 Mon Sep 17 00:00:00 2001 From: mensonge Date: Tue, 25 Nov 2008 15:57:29 +0000 Subject: 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 --- rss.php | 136 +++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 74 insertions(+), 62 deletions(-) (limited to 'rss.php') diff --git a/rss.php b/rss.php index 476a28d..08b4567 100644 --- a/rss.php +++ b/rss.php @@ -1,77 +1,88 @@ 1) { + list($url, $user, $cat) = explode('/', $_SERVER['PATH_INFO']); +} else { + $url = ''; + $user = ''; + $cat = NULL; +} if ($usecache) { - // Generate hash for caching on - $hashtext = $_SERVER['REQUEST_URI']; - if ($userservice->isLoggedOn()) { - $hashtext .= $userservice->getCurrentUserID(); - $currentUser = $userservice->getCurrentUser(); - $currentUsername = $currentUser[$userservice->getFieldName('username')]; - if ($currentUsername == $user) { - $hashtext .= $user; - } - } - $hash = md5($hashtext); - - // Cache for an hour - $cacheservice->Start($hash, 3600); + // Generate hash for caching on + $hashtext = $_SERVER['REQUEST_URI']; + if ($userservice->isLoggedOn()) { + $hashtext .= $userservice->getCurrentUserID(); + $currentUser = $userservice->getCurrentUser(); + $currentUsername = $currentUser[$userservice->getFieldName('username')]; + if ($currentUsername == $user) { + $hashtext .= $user; + } + } + $hash = md5($hashtext); + + // Cache for an hour + $cacheservice->Start($hash, 3600); } $watchlist = null; +$pagetitle = ''; if ($user && $user != 'all') { - if ($user == 'watchlist') { - $user = $cat; - $cat = null; - $watchlist = true; - } - if (is_int($user)) { - $userid = intval($user); - } else { - if ($userinfo = $userservice->getUserByUsername($user)) { - $userid =& $userinfo[$userservice->getFieldName('primary')]; - } else { - $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user); - $templateservice->loadTemplate('error.404.tpl', $tplVars); - //throw a 404 error - exit(); - } - } - $pagetitle .= ": ". $user; + if ($user == 'watchlist') { + $user = $cat; + $cat = null; + $watchlist = true; + } + if (is_int($user)) { + $userid = intval($user); + } else { + if ($userinfo = $userservice->getUserByUsername($user)) { + $userid =& $userinfo[$userservice->getFieldName('primary')]; + } else { + $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user); + $templateservice->loadTemplate('error.404.tpl', $tplVars); + //throw a 404 error + exit(); + } + } + $pagetitle .= ": ". $user; } else { - $userid = NULL; + $userid = NULL; } if ($cat) { - $pagetitle .= ": ". str_replace('+', ' + ', $cat); + $pagetitle .= ": ". str_replace('+', ' + ', $cat); } $tplVars['feedtitle'] = filter($GLOBALS['sitename'] . (isset($pagetitle) ? $pagetitle : '')); @@ -79,28 +90,29 @@ $tplVars['feedlink'] = ROOT; $tplVars['feeddescription'] = sprintf(T_('Recent bookmarks posted to %s'), $GLOBALS['sitename']); $bookmarks =& $bookmarkservice->getBookmarks(0, 15, $userid, $cat, NULL, getSortOrder(), $watchlist); + $bookmarks_tmp =& filter($bookmarks['bookmarks']); $bookmarks_tpl = array(); foreach(array_keys($bookmarks_tmp) as $key) { - $row =& $bookmarks_tmp[$key]; + $row =& $bookmarks_tmp[$key]; - $_link = $row['bAddress']; - // Redirection option - if ($GLOBALS['useredir']) { - $_link = $GLOBALS['url_redir'] . $_link; - } - $_pubdate = gmdate("r", strtotime($row['bDatetime'])); - // array_walk($row['tags'], 'filter'); + $_link = $row['bAddress']; + // Redirection option + if ($GLOBALS['useredir']) { + $_link = $GLOBALS['url_redir'] . $_link; + } + $_pubdate = gmdate("r", strtotime($row['bDatetime'])); + // array_walk($row['tags'], 'filter'); - $bookmarks_tpl[] = array( + $bookmarks_tpl[] = array( 'title' => $row['bTitle'], 'link' => $_link, 'description' => $row['bDescription'], 'creator' => $row['username'], 'pubdate' => $_pubdate, 'tags' => $row['tags'] - ); + ); } unset($bookmarks_tmp); unset($bookmarks); @@ -109,7 +121,7 @@ $tplVars['bookmarks'] =& $bookmarks_tpl; $templateservice->loadTemplate('rss.tpl', $tplVars); if ($usecache) { - // Cache output if existing copy has expired - $cacheservice->End($hash); + // Cache output if existing copy has expired + $cacheservice->End($hash); } ?> -- cgit v1.2.3