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

Revert "Updates for configurable-privacy2, hopefully without carriage returns."

Browse source 
This reverts commit 675eadd584.
This commit is contained in:
bretticvs 2011-03-31 16:17:53 -07:00
parent 675eadd584
commit f072059f2d
5 changed files with 20 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/config.php.dist
View file

@ -7,6 +7,12 @@
* See config.default.inc.php for more options. * See config.default.inc.php for more options.
*/ */
/**
* Array for defaults.
*
* @var array
*/
$defaults = array();
/** /**
* The name of this site. * The name of this site.

2
data/templates/bookmarks.tpl.php
View file

@ -256,7 +256,7 @@ if ($currenttag!= '') {
foreach ($bookmarks as $key => &$row) { foreach ($bookmarks as $key => &$row) {
switch ($row['bStatus']) { switch ($row['bStatus']) {
case 0: case 0:
$access = ''; $access = ' public';
break; break;
case 1: case 1:
$access = ' shared'; $access = ' shared';

97
tests/BookmarkTest.php
View file

@ -1352,93 +1352,18 @@ class BookmarkTest extends TestBase
*/ */
public function testDefaultPrivacy() public function testDefaultPrivacy()
{ {
//For this test, the default privacy has been set to 2 (private) in the configuration file. $GLOBALS['defaults']['privacy'] = 1;
require_once 'HTTP/Request2.php'; $uid = $this->addUser();
require_once dirname(__FILE__) . '/../data/config.php'; $this->us->setCurrentUserId($uid);
$this->bs->deleteAll(); $bid = $this->bs->addBookmark('http://www.somedomain.com', 'mybookmark1', 'descr1', 'privatenote1', $GLOBALS['defaults']['privacy'], array());
$this->us->deleteAll(); $bm = $this->bs->getBookmark($bid);
$request = new HTTP_Request2('http://localhost/api/posts_add.php', HTTP_Request2::METHOD_POST); $this->assertEquals('1', $bm['bStatus']);
$dpuid = $this->addUser('dpuser', 'dpuserpassword'); $GLOBALS['defaults']['privacy'] = 2;
$request->setAuth('dpuser', 'dpuserpassword'); $uid = $this->addUser();
$request->addPostParameter('url', 'http://www.testdefaultprivacyposts_add1.com'); $this->us->setCurrentUserId($uid);
$request->addPostParameter('description', 'Test bookmark 1 for default privacy.'); $bid = $this->bs->addBookmark('http://www.anotherdomain.com', 'mybookmark2', 'descr2', 'privatenote2', $GLOBALS['defaults']['privacy'], array());
$request->send(); $bm = $this->bs->getBookmark($bid);
$bm = $this->bs->getBookmark('1');
$this->assertEquals('2', $bm['bStatus']); $this->assertEquals('2', $bm['bStatus']);
$request->addPostParameter('url', 'http://www.testdefaultprivacyposts_add2.com');
$request->addPostParameter('description', 'Test bookmark 2 for default privacy.');
$request->addPostParameter('status', '0');
$request->send();
$request = new HTTP_Request2('http://localhost/edit.php/2', HTTP_Request2::METHOD_POST);
$testcookiekey = md5($GLOBALS['dbname'].$GLOBALS['tableprefix']).'-login';
$userinfo = $this->us->getUser('1');
$testcookiepassword = $userinfo['password'];
$testcookievalue = '1:'.md5('dpuser'.$testcookiepassword);
$request->setCookieJar(true);
$request->addCookie($testcookiekey, $testcookievalue);
$request->addPostParameter('title', 'Test bookmark 2 for default privacy.');
$request->addPostParameter('address', 'http://www.testdefaultprivacyposts_add2.com');
$request->addPostParameter('submitted', '1');
$request->send();
$bm = $this->bs->getBookmark('2');
$this->assertEquals('2', $bm['bStatus']);
$request = new HTTP_Request2('http://localhost/importNetscape.php', HTTP_Request2::METHOD_POST);
$request->setCookieJar(true);
$request->addCookie($testcookiekey, $testcookievalue);
$request->addUpload('userfile', './data/BookmarkTest_netscapebookmarks.html');
$request->send();
$bm = $this->bs->getBookmark('3');
$this->assertEquals('2', $bm['bStatus']);
$bm = $this->bs->getBookmark('4');
$this->assertEquals('2', $bm['bStatus']);
$bm = $this->bs->getBookmark('5');
$this->assertEquals('2', $bm['bStatus']);
$request = new HTTP_Request2('http://localhost/import.php', HTTP_Request2::METHOD_POST);
$request->setCookieJar(true);
$request->addCookie($testcookiekey, $testcookievalue);
$request->addUpload('userfile', './data/BookmarkTest_deliciousbookmarks.xml');
$request->send();
$bm = $this->bs->getBookmark('6');
$this->assertEquals('2', $bm['bStatus']);
$bm = $this->bs->getBookmark('7');
$this->assertEquals('2', $bm['bStatus']);
$bm = $this->bs->getBookmark('8');
$this->assertEquals('2', $bm['bStatus']);
$request = new HTTP_Request2('http://localhost/bookmarks.php/dpuser?action=get', HTTP_Request2::METHOD_POST);
$request->setCookieJar(true);
$request->addCookie($testcookiekey, $testcookievalue);
$request->addPostParameter('submitted', '1');
$response = $request->send();
$response_body = $response->getBody();
$start = strpos($response_body, 'Privacy');
$end = strpos($response_body, 'referrer');
$length = $end - $start;
$response_body = substr($response_body, $start, $length);
$start = strpos($response_body, 'selected');
$start = $start - 3;
$length = 1;
$selected_privacy = substr($response_body, $start, $length);
$this->assertEquals('2', $selected_privacy);
$request = new HTTP_Request2('http://localhost/bookmarks.php/dpuser?action=add', HTTP_Request2::METHOD_POST);
$request->setCookieJar(true);
$request->addCookie($testcookiekey, $testcookievalue);
$response = $request->send();
$response_body = $response->getBody();
$start = strpos($response_body, 'Privacy');
$end = strpos($response_body, 'referrer');
$length = $end - $start;
$response_body = substr($response_body, $start, $length);
$start = strpos($response_body, 'selected');
$start = $start - 3;
$length = 1;
$selected_privacy = substr($response_body, $start, $length);
$this->assertEquals('2', $selected_privacy);
}//end function testDefaultPrivacy }//end function testDefaultPrivacy

2
tests/data/BookmarkTest_deliciousbookmarks.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<posts user="dpuser" update="2011-03-24T21:09:22Z" tag="" total="3"> <posts user="dpuser" update="2011-03-24T21:09:22Z" tag="" total="3">
<post href="http://www.testdefaultprivacyposts_add6.com/" hash="4f8533885bb5740b98b6415140a0c8c6" description="Test bookmark 6 for default privacy." tag="tag1, tag2" time="2011-03-24T21:09:11Z" extended="" meta="5c80704730a1bf1b9eb615d4ba7a59bd" /> <post href="http://www.testdefaultprivacyposts_add6.com/" hash="4f8533885bb5740b98b6415140a0c8c6" description="Test bookmark 6 for default privacy." tag="tag1, tag2" time="2011-03-24T21:09:11Z" extended="" meta="5c80704730a1bf1b9eb615d4ba7a59bd" />
<post href="http://www.testdefaultprivacyposts_add7.com/" hash="21eee08d7945ac23c4cc2b6d08d02212" description="Test bookmark 7 for default privacy." tag="tag2, tag3" time="2011-03-24T21:08:33Z" extended="" meta="7514ab84f61ba1dd0413572f7c12348d" /> <post href="http://www.testdefaultprivacyposts_add7.com/" hash="21eee08d7945ac23c4cc2b6d08d02212" description="Test bookmark 7 for default privacy." tag="tag2, tag3" time="2011-03-24T21:08:33Z" extended="" meta="7514ab84f61ba1dd0413572f7c12348d" />
<post href="http://www.testdefaultprivacyposts_add8.com/" hash="cd64042205a083f1cf1e009344daef84" description="Test bookmark 8 for default privacy." tag="tag1, tag2, tag3" time="2011-03-24T21:07:44Z" extended="" meta="9cb24fddbc011e9634595d2f5e1a6537" /> <post href="http://www.testdefaultprivacyposts_add8.com/" hash="cd64042205a083f1cf1e009344daef84" description="Test bookmark 8 for default privacy." tag="tag1, tag2, tag3" time="2011-03-24T21:07:44Z" extended="" meta="9cb24fddbc011e9634595d2f5e1a6537" />

2
tests/data/BookmarkTest_netscapebookmarks.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE NETSCAPE-Bookmark-file-1> <!DOCTYPE NETSCAPE-Bookmark-file-1>
<!-- This is an automatically generated file. <!-- This is an automatically generated file.
It will be read and overwritten. It will be read and overwritten.
Do Not Edit! --> Do Not Edit! -->