aliens/SemanticScuttle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '0.98'

Browse source 
Conflicts:
	doc/ChangeLog
This commit is contained in:
Christian Weiske 2011-08-01 19:58:39 +02:00
commit 8216ae476c
3 changed files with 42 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/ChangeLog
View file

@ -8,6 +8,7 @@ ChangeLog for SemantiScuttle
- Fix bug #3375635: XML parsing problem in top.inc.php
- Fix bug #3375428: Forgot to remove some old dojo files
- Fix bug #3160512: Make SemanticScuttle work with FastCGI
- Fix bug #3376618: Broken tag completion for private bookmarks
0.98.0 - 2011-07-21

27
src/SemanticScuttle/Service/Bookmark2Tag.php
View file

@ -552,13 +552,6 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService
$user = null, $limit = 30, $logged_on_user = null, $days = null,
$beginsWith = null
) {
// Only count the tags that are visible to the current user.
if (($user != $logged_on_user) || is_null($user) || ($user === false)) {
$privacy = ' AND B.bStatus = 0';
} else {
$privacy = '';
}
$query = 'SELECT'
. ' T.tag, COUNT(T.bId) AS bCount'
. ' FROM '
@ -566,20 +559,30 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService
. ', ' . $GLOBALS['tableprefix'] . 'bookmarks AS B'
. ' WHERE';
if (is_null($user) || ($user === false)) {
if (is_null($user) || $user === false) {
$query .= ' B.bId = T.bId AND B.bStatus = 0';
} else if (is_array($user)) {
$query .= ' (1 = 0'; //tricks
foreach ($user as $u) {
if (is_numeric($u)) {
$query .= ' OR B.uId = ' . $this->db->sql_escape($u)
if (!is_numeric($u)) {
continue;
}
$query .= ' OR ('
. ' B.uId = ' . $this->db->sql_escape($u)
. ' AND B.bId = T.bId';
if ($u !== $logged_on_user) {
//public bookmarks of others
$query .= ' AND B.bStatus = 0';
}
$query .= ')';
}
$query .= ' )' . $privacy;
$query .= ' )';
} else {
$query .= ' B.uId = ' . $this->db->sql_escape($user)
. ' AND B.bId = T.bId' . $privacy;
. ' AND B.bId = T.bId';
if ($user !== $logged_on_user) {
$query .= ' AND B.bStatus = 0';
}
}
if (is_int($days)) {

25
tests/Bookmark2TagTest.php
View file

@ -500,6 +500,31 @@ class Bookmark2TagTest extends TestBase
$this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags);
}
/**
* Should return the logged on user's public, protected and private tags
* as well as public ones of other specified users.
*
* @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags
*/
public function testGetPopularTagsUserPrivatesAndOthersWhenLoggedIn()
{
$user1 = $this->addUser();
$user2 = $this->addUser();
$this->addBookmark($user1, null, 0, array('one'));
$this->addBookmark($user1, null, 1, array('one', 'two'));
$this->addBookmark($user1, null, 2, array('thr'));
$this->addBookmark($user2, null, 0, array('fou'));
$this->addBookmark($user2, null, 1, array('fiv'));
$this->addBookmark($user2, null, 2, array('six'));
$arTags = $this->b2ts->getPopularTags(array($user2, $user1), 10, $user1);
$this->assertContains(array('tag' => 'one', 'bCount' => '2'), $arTags);
$this->assertContains(array('tag' => 'two', 'bCount' => '1'), $arTags);
$this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags);
$this->assertContains(array('tag' => 'fou', 'bCount' => '1'), $arTags);
$this->assertEquals(4, count($arTags));
}
/**
* @covers SemanticScuttle_Service_Bookmark2Tag::getAdminTags