introduce voting config value and provide current user voting status in getBookmarks()

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@431 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
cweiske 2009-10-26 18:52:02 +00:00
parent 0af3f228ac
commit 44fd0e29f4
3 changed files with 25 additions and 1 deletions

View file

@ -408,6 +408,12 @@ $filetypes = array(
*/
$enableCommonBookmarkDescription = true;
/**
* Enable bookmark voting system
*
* @var boolean
*/
$enableVoting = true;
/****************************

View file

@ -432,6 +432,10 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService
* - if the $user is set and IS the logged-in user, then
* get all bookmarks.
*
* In case voting is enabled and a user is logged in,
* each bookmark array contains two additional keys:
* 'hasVoted' and 'vote'.
*
* @param integer $start Page number
* @param integer $perpage Number of bookmarks per page
* @param integer $user User ID
@ -601,6 +605,18 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService
if ($hash) {
$query_4 .= ' AND B.bHash = "'. $hash .'"';
}
//Voting system
if ($GLOBALS['enableVoting'] && $userservice->isLoggedOn()) {
$currentuser = $userservice->getCurrentUser();
$vs = SemanticScuttle_Service_Factory::get('Vote');
$query_1 .= ', !ISNULL(V.bId) as hasVoted, V.vote as vote';
$query_2 .= ' LEFT JOIN ' . $vs->getTableName() . ' AS V'
. ' ON B.bId = V.bId'
. ' AND V.uId = ' . (int)$currentuser['uId'];
}
$query = $query_1 . $query_2 . $query_3 . $query_4 . $query_5;
if (!($dbresult = & $this->db->sql_query_limit($query, intval($perpage), intval($start)))) {

View file

@ -221,7 +221,9 @@ class SemanticScuttle_Service_Vote extends SemanticScuttle_DbService
*/
public function vote($bookmark, $user, $vote = 1)
{
//FIXME: check if voting is enabled (global conf var)
if ($GLOBALS['enableVoting'] == false) {
return false;
}
if ($this->hasVoted($bookmark, $user)) {
return false;