From b25290cef48251a31cb0f693a53677b566c1b1a4 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 16 Feb 2010 21:38:59 +0100 Subject: [PATCH 001/173] add package task --- build.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build.xml b/build.xml index 9cf4de9..1915115 100644 --- a/build.xml +++ b/build.xml @@ -48,6 +48,14 @@ + + + + + + From d80fcf8de6440fd31f16bb4106fe9e373fa40308 Mon Sep 17 00:00:00 2001 From: mensonge Date: Wed, 21 Jul 2010 18:44:54 +0000 Subject: [PATCH 002/173] Change "localhost" into 127.0.0.1 because it avoids a bug in Windows Seven. http://serverfault.com/questions/4689/windows-7-localhost-name-resolution-is-handled-within-dns-itself-why git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@716 b3834d28-1941-0410-a4f8-b48e95affb8f --- data/config.default.php | 2 +- data/config.php.dist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/config.default.php b/data/config.default.php index 4f45eac..bd67c7b 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -138,7 +138,7 @@ $dbtype = 'mysql4'; * * @var string */ -$dbhost = 'localhost'; +$dbhost = '127.0.0.1'; /** * Database port. diff --git a/data/config.php.dist b/data/config.php.dist index 6439478..c135e8e 100644 --- a/data/config.php.dist +++ b/data/config.php.dist @@ -88,7 +88,7 @@ $dbname = 'scuttle'; * * @var string */ -$dbhost = 'localhost'; +$dbhost = '127.0.0.1'; /*************************************************** From 95887ff823ba0470a27f0e12a6561e5969819780 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 12 Aug 2010 21:08:50 +0200 Subject: [PATCH 003/173] update readme --- doc/developers/release-new-version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/developers/release-new-version b/doc/developers/release-new-version index 69530df..4b2540a 100644 --- a/doc/developers/release-new-version +++ b/doc/developers/release-new-version @@ -4,8 +4,8 @@ How to release a new version of SemanticScuttle 0. Run unit tests and verify that all of them pass 1. Update doc/ChangeLog 2. Update doc/UPGRADE.txt -3. Update version in data/templates/about.tpl.php - and build.xml +3. Update version in data/templates/about.tpl.php, + build.xml and doc/README.txt 4. Create a release zip file via the build script: Just type "phing". 5. Make a test installation from your zip file with a fresh From 8798309bfe5619d52fd129ab3504e13563418ea4 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 12 Aug 2010 22:01:48 +0200 Subject: [PATCH 004/173] basic package.xml generation with native pearpkg2 task - does not really work since file roles are not supported --- build.xml | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/build.xml b/build.xml index 364613a..bda5641 100644 --- a/build.xml +++ b/build.xml @@ -10,6 +10,17 @@ + + @@ -52,6 +63,59 @@ description="Creates the pear package" > + + From d51768ab404c1313f6dec702550e825c80a42395 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sun, 22 Aug 2010 00:25:54 +0200 Subject: [PATCH 005/173] nearly there; using d51pearpkg2 now --- .gitignore | 1 + build.xml | 100 +++++++++++++++++++++++++++++------------------------ 2 files changed, 55 insertions(+), 46 deletions(-) diff --git a/.gitignore b/.gitignore index 3895c5b..888ac2e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ dist/ build.properties +package.xml diff --git a/build.xml b/build.xml index bda5641..0654a2b 100644 --- a/build.xml +++ b/build.xml @@ -27,6 +27,8 @@ + + @@ -63,59 +65,65 @@ description="Creates the pear package" > - - From 4d9b6950cf280e718354eb5888ae41ef04b9afb8 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sun, 22 Aug 2010 00:57:31 +0200 Subject: [PATCH 006/173] on the way making package.xml better --- build.xml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/build.xml b/build.xml index 0654a2b..6134ad7 100644 --- a/build.xml +++ b/build.xml @@ -93,12 +93,14 @@ + www data doc php test + build* dist doc/developers @@ -122,6 +124,37 @@ --> + + + + + + + + + + + + + + + + + From eaa847a93d4b9d0c77d70ef219836b9f89bd67c7 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sun, 22 Aug 2010 01:04:03 +0200 Subject: [PATCH 007/173] package.xml now looks really good --- build.xml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 6134ad7..2e1e0e8 100644 --- a/build.xml +++ b/build.xml @@ -102,9 +102,9 @@ build* - dist + dist/** doc/developers - scripts + scripts/** **/messages.po @@ -147,9 +147,25 @@ /> + + + + From aba3327b5b8beffea75687a11ccf034f5e0d0969 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sun, 22 Aug 2010 01:07:29 +0200 Subject: [PATCH 008/173] time to test the package --- build.xml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 2e1e0e8..389dfd4 100644 --- a/build.xml +++ b/build.xml @@ -100,12 +100,19 @@ php test - + + **/.gitignore + **/.svn build* + data/config.php + data/locales/messages.po + data/locales/*/LC_MESSAGES/messages.po dist/** - doc/developers + doc/developers/** scripts/** - **/messages.po + src/php-gettext/examples/** + src/php-gettext/bin/** - Many SQL optimizations - SemanticScuttle shows bookmarks 4 times faster now From f93aa6c7aceeb7ed9ea899cfe232b3bd097b2422 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sun, 22 Aug 2010 01:26:30 +0200 Subject: [PATCH 009/173] make files use pear directories --- build.xml | 17 +++++++++++++++++ src/SemanticScuttle/header.php | 17 ++++++++++++++--- tests/prepare.php | 8 +++++++- www/www-header.php | 8 +++++++- 4 files changed, 45 insertions(+), 5 deletions(-) diff --git a/build.xml b/build.xml index 389dfd4..accae3b 100644 --- a/build.xml +++ b/build.xml @@ -113,6 +113,23 @@ scripts/** src/php-gettext/examples/** src/php-gettext/bin/** + *.tgz + + + + - Many SQL optimizations - SemanticScuttle shows bookmarks 4 times faster now diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index ef36e83..bc60088 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -14,9 +14,21 @@ * @license GPL http://www.gnu.org/licenses/gpl.html * @link http://sourceforge.net/projects/semanticscuttle */ -if (!file_exists(dirname(__FILE__) .'/../../data/config.php')) { + +if ('@data_dir@' == '@' . 'data_dir@') { + //non pear-install + $datadir = dirname(__FILE__) . '/../../data/'; +} else { + //pear installation; files are in include path + $datadir = '@data_dir@'; +} + +if (!file_exists($datadir . '/config.php')) { header('HTTP/1.0 500 Internal Server Error'); - die('Please copy "config.php.dist" to "config.php" in data/ folder.'); + die( + 'Please copy "config.php.dist" to "config.php" in data/ folder.' + . "\n" + ); } set_include_path( get_include_path() . PATH_SEPARATOR @@ -24,7 +36,6 @@ set_include_path( ); // 1 // First requirements part (before debug management) -$datadir = dirname(__FILE__) . '/../../data/'; require_once $datadir . '/config.default.php'; require_once $datadir . '/config.php'; diff --git a/tests/prepare.php b/tests/prepare.php index ce9cd1c..6afc284 100644 --- a/tests/prepare.php +++ b/tests/prepare.php @@ -19,7 +19,13 @@ $_SERVER['HTTP_HOST'] = 'http://localhost/'; define('UNIT_TEST_MODE', true); -require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php'; +if ('@data_dir@' == '@' . 'data_dir@') { + //non pear-install + require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php'; +} else { + //pear installation; files are in include path + require_once 'SemanticScuttle/header.php'; +} require_once dirname(__FILE__) . '/TestBase.php'; require_once dirname(__FILE__) . '/TestBaseApi.php'; diff --git a/www/www-header.php b/www/www-header.php index 0688b71..cc5a5ae 100644 --- a/www/www-header.php +++ b/www/www-header.php @@ -15,5 +15,11 @@ * @license GPL http://www.gnu.org/licenses/gpl.html * @link http://sourceforge.net/projects/semanticscuttle */ -require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php'; +if ('@data_dir@' == '@' . 'data_dir@') { + //non pear-install + require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php'; +} else { + //pear installation; files are in include path + require_once 'SemanticScuttle/header.php'; +} ?> \ No newline at end of file From 8fd5efb7c7fecf91ab850d2f5dfeced4b07e8562 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sun, 22 Aug 2010 01:32:14 +0200 Subject: [PATCH 010/173] make test running on installed pear package work: pear run-tests -pu __uri/semanticscuttle --- src/SemanticScuttle/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index bc60088..d1a5c29 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -20,7 +20,7 @@ if ('@data_dir@' == '@' . 'data_dir@') { $datadir = dirname(__FILE__) . '/../../data/'; } else { //pear installation; files are in include path - $datadir = '@data_dir@'; + $datadir = '@data_dir@/SemanticScuttle/'; } if (!file_exists($datadir . '/config.php')) { From b243ecd53f82b3559980ce31d84a59554eb5b8f5 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sun, 22 Aug 2010 01:33:58 +0200 Subject: [PATCH 011/173] remove unneeded code --- tests/TagsCacheTest.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/TagsCacheTest.php b/tests/TagsCacheTest.php index 9097bcb..84f4ec0 100644 --- a/tests/TagsCacheTest.php +++ b/tests/TagsCacheTest.php @@ -54,9 +54,6 @@ class TagsCacheTest extends PHPUnit_Framework_TestCase protected function setUp() { - global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix, $TEMPLATES_DIR, $debugMode; - require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php'; - $this->us =SemanticScuttle_Service_Factory::get('User'); $this->bs =SemanticScuttle_Service_Factory::get('Bookmark'); $this->bs->deleteAll(); From 25baf614b8b00bb39b9d35cf6ce5ce79f0954aeb Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sun, 22 Aug 2010 01:46:20 +0200 Subject: [PATCH 012/173] package generation is fully working now --- build.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index accae3b..1a979dd 100644 --- a/build.xml +++ b/build.xml @@ -22,6 +22,7 @@ - Fix bug #2976593: fr_FR locale is vietnamese " /> + @@ -195,13 +196,16 @@ - + + + + - From 19bcf4933f4478ab97290501fc22440a1242cb7d Mon Sep 17 00:00:00 2001 From: cweiske Date: Sun, 22 Aug 2010 11:10:15 +0000 Subject: [PATCH 013/173] make pear channel update deployment work via phing! git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@720 b3834d28-1941-0410-a4f8-b48e95affb8f --- build.properties.dist | 1 + build.xml | 55 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/build.properties.dist b/build.properties.dist index b50ad08..887f888 100644 --- a/build.properties.dist +++ b/build.properties.dist @@ -1 +1,2 @@ sfuser=FIXME +websitedir=FIXME diff --git a/build.xml b/build.xml index 1a979dd..3da2c89 100644 --- a/build.xml +++ b/build.xml @@ -21,12 +21,13 @@ - Fix bug #2960663: do not send content-type headers twice for ajax/api scripts - Fix bug #2976593: fr_FR locale is vietnamese " /> - - - - - - + + + + + + + @@ -73,7 +74,7 @@ A social bookmarking tool experimenting with new features like structured tags or collaborative descriptions of tags. - __uri + semanticscuttle.sourceforge.net GPL @@ -237,6 +238,46 @@ + + + + + + + + + + + + + + From 71aaf514b138309d71101a8f6c727beb0dd7eb65 Mon Sep 17 00:00:00 2001 From: cweiske Date: Sun, 22 Aug 2010 12:45:14 +0000 Subject: [PATCH 014/173] add sourceforge logo to pirum html file git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@721 b3834d28-1941-0410-a4f8-b48e95affb8f --- build.xml | 40 +++++++++++++++++++++++++++++++++------- html.properties | 1 + 2 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 html.properties diff --git a/build.xml b/build.xml index 3da2c89..1cd70e1 100644 --- a/build.xml +++ b/build.xml @@ -7,6 +7,7 @@ tagging a release, running unit tests etc. --> + @@ -239,7 +240,7 @@ - - + />--> + + + + + + + + + + + + + + + + - + />--> diff --git a/html.properties b/html.properties new file mode 100644 index 0000000..8e25cc4 --- /dev/null +++ b/html.properties @@ -0,0 +1 @@ +html.sflogo = Get SemanticScuttle at SourceForge.net. Fast, secure and Free Open Source software downloads From 603cb2e544caa0384166544c32a4403a5cd40d3a Mon Sep 17 00:00:00 2001 From: cweiske Date: Sun, 22 Aug 2010 12:45:32 +0000 Subject: [PATCH 015/173] use our own index file instead of pirum generated index git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@722 b3834d28-1941-0410-a4f8-b48e95affb8f --- build.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 1cd70e1..007885b 100644 --- a/build.xml +++ b/build.xml @@ -285,7 +285,10 @@ - + + + + Date: Sun, 22 Aug 2010 12:45:47 +0000 Subject: [PATCH 016/173] re-enable rsync to/from sourceforge git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@723 b3834d28-1941-0410-a4f8-b48e95affb8f --- build.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index 007885b..42999ec 100644 --- a/build.xml +++ b/build.xml @@ -256,12 +256,12 @@ 2. update channel with pirum update 3. rsync to sourceforge --> - + /> - + /> From 9b9c592774d2552fa3cc76d400164b88a1ccaa5b Mon Sep 17 00:00:00 2001 From: cweiske Date: Sun, 22 Aug 2010 12:46:13 +0000 Subject: [PATCH 017/173] add package dep git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@724 b3834d28-1941-0410-a4f8-b48e95affb8f --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 42999ec..74e5212 100644 --- a/build.xml +++ b/build.xml @@ -240,7 +240,7 @@ - Date: Sun, 22 Aug 2010 12:55:51 +0000 Subject: [PATCH 018/173] ignore property files git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@732 b3834d28-1941-0410-a4f8-b48e95affb8f --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index 74e5212..83341e0 100644 --- a/build.xml +++ b/build.xml @@ -117,6 +117,7 @@ src/php-gettext/examples/** src/php-gettext/bin/** *.tgz + *.properties Date: Tue, 14 Sep 2010 19:20:31 +0000 Subject: [PATCH 019/173] allow debugging of connection errors git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@734 b3834d28-1941-0410-a4f8-b48e95affb8f --- src/SemanticScuttle/db/mysqli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SemanticScuttle/db/mysqli.php b/src/SemanticScuttle/db/mysqli.php index 03b36ea..9a2709a 100644 --- a/src/SemanticScuttle/db/mysqli.php +++ b/src/SemanticScuttle/db/mysqli.php @@ -50,7 +50,7 @@ class sql_db } } - return $this->sql_error(''); + return $this->sql_error(mysqli_connect_error()); } // From 930cfd784a59d95d574f87f24dfcb5fc590b5e78 Mon Sep 17 00:00:00 2001 From: cweiske Date: Tue, 14 Sep 2010 19:21:19 +0000 Subject: [PATCH 020/173] changelog git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@735 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 5e24f07..b1248fd 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -4,6 +4,7 @@ ChangeLog for SemantiScuttle 0.9X.X - 2010-XX-XX ------------------- - Fix bug getTagsForBookmarks() that fetched all tags +- Show error message on mysqli connection errors 0.97.0 - 2010-06-09 From 17a1595b312e5c9d0dac6d5b33685b457647cb8d Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:30:49 +0000 Subject: [PATCH 021/173] add more countother-watchlist tests that are simpler than the previous test git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@736 b3834d28-1941-0410-a4f8-b48e95affb8f --- tests/BookmarkTest.php | 88 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 1 deletion(-) diff --git a/tests/BookmarkTest.php b/tests/BookmarkTest.php index 40869b2..40b40e3 100644 --- a/tests/BookmarkTest.php +++ b/tests/BookmarkTest.php @@ -1085,6 +1085,92 @@ class BookmarkTest extends TestBase + /** + * Test what countOther() returns when the user is logged in + * and a friend (people on the watchlist) has bookmarked + * and the same address with public status. + * + * @return void + */ + public function testCountOthersWatchlistPublic() + { + $uid = $this->addUser(); + $address = 'http://example.org'; + + //create other user and add main user to his watchlist + $friendPublic1 = $this->addUser(); + $this->us->setCurrentUserId($friendPublic1); + $this->us->setWatchStatus($uid); + + //create bookmarks for main user and other one + $this->addBookmark($uid, $address, 0); + $this->addBookmark($friendPublic1, $address, 0);//0 is public + + //log main user in + $this->us->setCurrentUserId($uid); + + $this->assertEquals(1, $this->bs->countOthers($address)); + } + + + + /** + * Test what countOther() returns when the user is logged in + * and a friend (people on the watchlist) has bookmarked + * and shared the same address for the watchlist. + * + * @return void + */ + public function testCountOthersWatchlistShared() + { + $uid = $this->addUser(); + $address = 'http://example.org'; + + //create other user and add main user to his watchlist + $friendPublic1 = $this->addUser(); + $this->us->setCurrentUserId($friendPublic1); + $this->us->setWatchStatus($uid); + + //create bookmarks for main user and other one + $this->addBookmark($uid, $address, 0); + $this->addBookmark($friendPublic1, $address, 1);//1 is shared + + //log main user in + $this->us->setCurrentUserId($uid); + + $this->assertEquals(1, $this->bs->countOthers($address)); + } + + + + /** + * Test what countOther() returns when the user is logged in + * and one friends (people on the watchlist) has bookmarked + * the same address but made it private. + * + * @return void + */ + public function testCountOthersWatchlistPrivate() + { + $uid = $this->addUser(); + $address = 'http://example.org'; + + //create other user and add main user to his watchlist + $friendPublic1 = $this->addUser(); + $this->us->setCurrentUserId($friendPublic1); + $this->us->setWatchStatus($uid); + + //create bookmarks for main user and other one + $this->addBookmark($uid, $address, 0); + $this->addBookmark($friendPublic1, $address, 2);//2 is private + + //log main user in + $this->us->setCurrentUserId($uid); + + $this->assertEquals(0, $this->bs->countOthers($address)); + } + + /** * Test what countOther() returns when the user is logged in * and friends (people on the watchlist) have bookmarked @@ -1092,7 +1178,7 @@ class BookmarkTest extends TestBase * * @return void */ - public function testCountOthersWatchlist() + public function testCountOthersWatchlistComplex() { $uid = $this->addUser(); $address = 'http://example.org'; From b5eee3e761e61fba11d01217fe1b8cdc2eeda0ac Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:31:10 +0000 Subject: [PATCH 022/173] finally fix the problem that watchlist count tests failed every second alltests run git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@737 b3834d28-1941-0410-a4f8-b48e95affb8f --- src/SemanticScuttle/Service/User.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php index 281c18c..6fc3bb7 100644 --- a/src/SemanticScuttle/Service/User.php +++ b/src/SemanticScuttle/Service/User.php @@ -668,7 +668,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService } /** - * Delete all bookmarks. + * Delete all users and their watch states. * Mainly used in unit tests. * * @return void @@ -677,6 +677,9 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService { $query = 'TRUNCATE TABLE `'. $this->getTableName() .'`'; $this->db->sql_query($query); + + $query = 'TRUNCATE TABLE `' . $GLOBALS['tableprefix'] . 'watched' . '`'; + $this->db->sql_query($query); } /** From 9807c70fb92e554f4ee3db4f11fc4df3ab2c323d Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:31:28 +0000 Subject: [PATCH 023/173] update TODO git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@738 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/developers/TODO | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/developers/TODO b/doc/developers/TODO index 127de1d..57805c3 100644 --- a/doc/developers/TODO +++ b/doc/developers/TODO @@ -1,14 +1,14 @@ - SemanticScuttle_Filter -> class with static filter functions to filter ids, usernames, passwords, sorting etc. -- find out the reasoning behind define(POST_|GET_) - when a user gets deleted from database, he should not be logged in anymore (name not shown on top right) - Make users inactive by default when registered newly - have to be activated by admins - Add RDFa to user profile page -- use recaptcha or alike +- use recaptcha or alike -> quickform - tutorial about sidebar +- update php-gettext Tracker items: From c7c94fec725444b88f76dab40226634a6ed09f15 Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:31:51 +0000 Subject: [PATCH 024/173] update main translation file from source code git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@739 b3834d28-1941-0410-a4f8-b48e95affb8f --- data/locales/messages.po | 134 +++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/data/locales/messages.po b/data/locales/messages.po index 1a142a0..2f35f64 100644 --- a/data/locales/messages.po +++ b/data/locales/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-16 20:55+0100\n" +"POT-Creation-Date: 2010-09-15 19:15+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,50 +17,50 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: src/SemanticScuttle/functions.php:163 +#: src/SemanticScuttle/functions.php:189 msgid "message_die() was called multiple times." msgstr "" -#: src/SemanticScuttle/functions.php:175 +#: src/SemanticScuttle/functions.php:201 msgid "SQL Error" msgstr "" -#: src/SemanticScuttle/functions.php:181 +#: src/SemanticScuttle/functions.php:207 msgid "Line" msgstr "" -#: src/SemanticScuttle/functions.php:181 +#: src/SemanticScuttle/functions.php:207 #: data/templates/importDelicious.tpl.php:8 #: data/templates/importNetscape.tpl.php:9 #: data/templates/importStructure.tpl.php:10 msgid "File" msgstr "" -#: src/SemanticScuttle/functions.php:189 +#: src/SemanticScuttle/functions.php:215 msgid "Information" msgstr "" -#: src/SemanticScuttle/functions.php:194 +#: src/SemanticScuttle/functions.php:220 msgid "Critical Information" msgstr "" -#: src/SemanticScuttle/functions.php:199 +#: src/SemanticScuttle/functions.php:225 msgid "An error occured" msgstr "" -#: src/SemanticScuttle/functions.php:202 +#: src/SemanticScuttle/functions.php:228 msgid "General Error" msgstr "" -#: src/SemanticScuttle/functions.php:210 +#: src/SemanticScuttle/functions.php:236 msgid "An critical error occured" msgstr "" -#: src/SemanticScuttle/functions.php:213 +#: src/SemanticScuttle/functions.php:239 msgid "Critical Error" msgstr "" -#: src/SemanticScuttle/functions.php:222 +#: src/SemanticScuttle/functions.php:248 msgid "DEBUG MODE" msgstr "" @@ -150,7 +150,7 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: data/templates/admin.tpl.php:19 data/templates/bookmarks.tpl.php:251 +#: data/templates/admin.tpl.php:19 data/templates/bookmarks.tpl.php:267 msgid "Delete" msgstr "" @@ -169,12 +169,12 @@ msgid "" msgstr "" #: data/templates/bookmarkcommondescriptionedit.tpl.php:18 -#: data/templates/bookmarks.tpl.php:137 data/templates/editbookmark.tpl.php:38 +#: data/templates/bookmarks.tpl.php:137 data/templates/editbookmark.tpl.php:43 msgid "Title" msgstr "" #: data/templates/bookmarkcommondescriptionedit.tpl.php:23 -#: data/templates/editbookmark.tpl.php:44 +#: data/templates/editbookmark.tpl.php:49 #: data/templates/editprofile.tpl.php:47 data/templates/profile.tpl.php:33 #: data/templates/tagcommondescriptionedit.tpl.php:13 #: data/templates/tagedit.tpl.php:12 @@ -193,8 +193,8 @@ msgid "Update" msgstr "" #: data/templates/bookmarkcommondescriptionedit.tpl.php:43 -#: data/templates/editbookmark.tpl.php:98 data/templates/tag2tagadd.tpl.php:24 -#: data/templates/tag2tagedit.tpl.php:38 +#: data/templates/editbookmark.tpl.php:103 +#: data/templates/tag2tagadd.tpl.php:24 data/templates/tag2tagedit.tpl.php:38 #: data/templates/tagcommondescriptionedit.tpl.php:33 #: data/templates/tagedit.tpl.php:19 data/templates/tagrename.tpl.php:25 msgid "Cancel" @@ -273,61 +273,61 @@ msgstr "" msgid "Page %d of %d" msgstr "" -#: data/templates/bookmarks.tpl.php:245 +#: data/templates/bookmarks.tpl.php:261 msgid "Tags:" msgstr "" -#: data/templates/bookmarks.tpl.php:251 +#: data/templates/bookmarks.tpl.php:267 msgid "Edit" msgstr "" -#: data/templates/bookmarks.tpl.php:255 +#: data/templates/bookmarks.tpl.php:271 msgid "Last update" msgstr "" -#: data/templates/bookmarks.tpl.php:258 +#: data/templates/bookmarks.tpl.php:274 msgid "by" msgstr "" -#: data/templates/bookmarks.tpl.php:260 +#: data/templates/bookmarks.tpl.php:276 msgid "you" msgstr "" -#: data/templates/bookmarks.tpl.php:274 +#: data/templates/bookmarks.tpl.php:290 #, php-format msgid " and %s1 other%s" msgstr "" -#: data/templates/bookmarks.tpl.php:277 +#: data/templates/bookmarks.tpl.php:293 #, php-format msgid " and %2$s%1$s others%3$s" msgstr "" -#: data/templates/bookmarks.tpl.php:288 +#: data/templates/bookmarks.tpl.php:304 msgid "Copy this bookmark to YOUR bookmarks." msgstr "" -#: data/templates/bookmarks.tpl.php:289 +#: data/templates/bookmarks.tpl.php:305 msgid "Copy" msgstr "" -#: data/templates/bookmarks.tpl.php:309 +#: data/templates/bookmarks.tpl.php:325 msgid "This bookmark is certified by an admin user." msgstr "" -#: data/templates/bookmarks.tpl.php:351 +#: data/templates/bookmarks.tpl.php:371 msgid "Private Note on this bookmark" msgstr "" -#: data/templates/bookmarks.tpl.php:363 +#: data/templates/bookmarks.tpl.php:383 msgid "Come back to the top of this page." msgstr "" -#: data/templates/bookmarks.tpl.php:363 +#: data/templates/bookmarks.tpl.php:383 msgid "Top of the page" msgstr "" -#: data/templates/bookmarks.tpl.php:369 +#: data/templates/bookmarks.tpl.php:389 msgid "No bookmarks available" msgstr "" @@ -362,133 +362,133 @@ msgstr "" msgid "Popular Tags From All Users" msgstr "" -#: data/templates/editbookmark.tpl.php:33 +#: data/templates/editbookmark.tpl.php:38 msgid "Address" msgstr "" -#: data/templates/editbookmark.tpl.php:35 #: data/templates/editbookmark.tpl.php:40 +#: data/templates/editbookmark.tpl.php:45 #: data/templates/editprofile.tpl.php:31 data/templates/tagrename.tpl.php:14 #: data/templates/tagrename.tpl.php:19 msgid "Required" msgstr "" -#: data/templates/editbookmark.tpl.php:45 +#: data/templates/editbookmark.tpl.php:50 msgid "Add Note" msgstr "" -#: data/templates/editbookmark.tpl.php:48 +#: data/templates/editbookmark.tpl.php:53 msgid "" "You can use anchors to delimite attributes. for example: [publisher]blah[/" "publisher] " msgstr "" -#: data/templates/editbookmark.tpl.php:51 +#: data/templates/editbookmark.tpl.php:56 msgid "Suggested anchors: " msgstr "" -#: data/templates/editbookmark.tpl.php:63 +#: data/templates/editbookmark.tpl.php:68 msgid "Private Note" msgstr "" -#: data/templates/editbookmark.tpl.php:65 +#: data/templates/editbookmark.tpl.php:70 msgid "Just visible by you and your contacts." msgstr "" -#: data/templates/editbookmark.tpl.php:69 data/templates/toolbar.inc.php:10 +#: data/templates/editbookmark.tpl.php:74 data/templates/toolbar.inc.php:10 #: www/tags.php:45 www/tags.php:67 msgid "Tags" msgstr "" -#: data/templates/editbookmark.tpl.php:73 +#: data/templates/editbookmark.tpl.php:78 msgid "Comma-separated" msgstr "" -#: data/templates/editbookmark.tpl.php:77 data/templates/tag2tagadd.tpl.php:9 +#: data/templates/editbookmark.tpl.php:82 data/templates/tag2tagadd.tpl.php:9 msgid "" "Note: use \">\" to include one tag in another. e.g.: europe>france>paris" msgstr "" -#: data/templates/editbookmark.tpl.php:81 data/templates/tag2tagadd.tpl.php:8 +#: data/templates/editbookmark.tpl.php:86 data/templates/tag2tagadd.tpl.php:8 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry" msgstr "" -#: data/templates/editbookmark.tpl.php:84 +#: data/templates/editbookmark.tpl.php:89 #: data/templates/importDelicious.tpl.php:15 #: data/templates/importNetscape.tpl.php:16 msgid "Privacy" msgstr "" -#: data/templates/editbookmark.tpl.php:87 +#: data/templates/editbookmark.tpl.php:92 #: data/templates/importDelicious.tpl.php:18 #: data/templates/importNetscape.tpl.php:19 msgid "Public" msgstr "" -#: data/templates/editbookmark.tpl.php:88 +#: data/templates/editbookmark.tpl.php:93 msgid "Shared with Watch List" msgstr "" -#: data/templates/editbookmark.tpl.php:89 +#: data/templates/editbookmark.tpl.php:94 #: data/templates/importDelicious.tpl.php:20 #: data/templates/importNetscape.tpl.php:21 msgid "Private" msgstr "" -#: data/templates/editbookmark.tpl.php:102 +#: data/templates/editbookmark.tpl.php:107 msgid "Delete Bookmark" msgstr "" -#: data/templates/editbookmark.tpl.php:107 +#: data/templates/editbookmark.tpl.php:112 msgid "edit common description" msgstr "" -#: data/templates/editbookmark.tpl.php:134 +#: data/templates/editbookmark.tpl.php:139 msgid "Bookmarklet" msgstr "" -#: data/templates/editbookmark.tpl.php:140 +#: data/templates/editbookmark.tpl.php:145 #, php-format msgid "" "Click one of the following bookmarklets to add a button you can click " "whenever you want to add the page you are on to %s" msgstr "" -#: data/templates/editbookmark.tpl.php:144 +#: data/templates/editbookmark.tpl.php:149 #, php-format msgid "" "Drag one of the following bookmarklets to your browser's bookmarks and click " "it whenever you want to add the page you are on to %s" msgstr "" -#: data/templates/editbookmark.tpl.php:157 #: data/templates/editbookmark.tpl.php:162 +#: data/templates/editbookmark.tpl.php:167 #, php-format msgid "Post to %s" msgstr "" -#: data/templates/editbookmark.tpl.php:158 #: data/templates/editbookmark.tpl.php:163 +#: data/templates/editbookmark.tpl.php:168 #, php-format msgid "Post to %s (Pop-up)" msgstr "" -#: data/templates/editbookmark.tpl.php:168 +#: data/templates/editbookmark.tpl.php:173 #: data/templates/importDelicious.tpl.php:26 #: data/templates/importNetscape.tpl.php:27 #: data/templates/importStructure.tpl.php:16 msgid "Import" msgstr "" -#: data/templates/editbookmark.tpl.php:170 +#: data/templates/editbookmark.tpl.php:175 msgid "Import bookmarks from bookmark file" msgstr "" -#: data/templates/editbookmark.tpl.php:170 +#: data/templates/editbookmark.tpl.php:175 msgid "Internet Explorer, Mozilla Firefox and Netscape" msgstr "" -#: data/templates/editbookmark.tpl.php:171 +#: data/templates/editbookmark.tpl.php:176 msgid "Import bookmarks from del.icio.us" msgstr "" @@ -841,7 +841,7 @@ msgid "Edit Tag Description" msgstr "" #: data/templates/sidebar.block.tagactions.php:26 -#: www/tagcommondescriptionedit.php:64 +#: www/tagcommondescriptionedit.php:76 msgid "Edit Tag Common Description" msgstr "" @@ -1028,12 +1028,12 @@ msgstr "" msgid "Failed to delete bookmark" msgstr "" -#: www/alltags.php:49 +#: www/alltags.php:50 msgid "All Tags" msgstr "" -#: www/alltags.php:55 www/bookmarks.php:96 www/populartags.php:52 -#: www/profile.php:51 www/rss.php:67 www/search.php:109 www/watch.php:45 +#: www/alltags.php:56 www/bookmarks.php:96 www/populartags.php:52 +#: www/profile.php:51 www/rss.php:76 www/search.php:109 www/watch.php:45 #: www/watchlist.php:61 #, php-format msgid "User with username %s was not found" @@ -1041,7 +1041,7 @@ msgstr "" #: www/bookmarkcommondescriptionedit.php:51 www/tag2tagadd.php:37 #: www/tag2tagdelete.php:41 www/tag2tagedit.php:33 -#: www/tagcommondescriptionedit.php:43 www/tagedit.php:43 +#: www/tagcommondescriptionedit.php:51 www/tagedit.php:43 msgid "Permission denied." msgstr "" @@ -1179,11 +1179,11 @@ msgstr "" msgid "%s: Recent bookmarks" msgstr "" -#: www/index.php:78 +#: www/index.php:75 msgid "Store, share and tag your favourite links" msgstr "" -#: www/index.php:79 +#: www/index.php:76 msgid "All Bookmarks" msgstr "" @@ -1313,7 +1313,7 @@ msgstr "" msgid "Registration failed. Please try again." msgstr "" -#: www/rss.php:84 +#: www/rss.php:93 #, php-format msgid "Recent bookmarks posted to %s" msgstr "" @@ -1358,11 +1358,11 @@ msgstr "" msgid "Edit Link Between Tags" msgstr "" -#: www/tagcommondescriptionedit.php:55 +#: www/tagcommondescriptionedit.php:62 msgid "Tag common description updated" msgstr "" -#: www/tagcommondescriptionedit.php:58 +#: www/tagcommondescriptionedit.php:67 msgid "Failed to update the tag common description" msgstr "" From 43c7481da239093ee9362ea4cd9778f8d1bf25e0 Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:32:09 +0000 Subject: [PATCH 025/173] fix typo git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@740 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/developers/translation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/developers/translation b/doc/developers/translation index 401089a..776b5d7 100644 --- a/doc/developers/translation +++ b/doc/developers/translation @@ -21,7 +21,7 @@ We keep one base translation file, data/locales/messages.po. This file is auto-generated via xgettext from all our php source files. In case you added a new string to the code that needs translation, update the base translation file by running -> php scripts/update-translation-base.php. +> php scripts/update-translation-base.php After that has been done, the changes to the base messages.po file need to be merged into the single language translation files, From 4b79fdc6a6a66eb3af98de86d60153067243c3d5 Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:32:27 +0000 Subject: [PATCH 026/173] update database optimization todo git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@741 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/developers/TODO | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/developers/TODO b/doc/developers/TODO index 57805c3..59dd655 100644 --- a/doc/developers/TODO +++ b/doc/developers/TODO @@ -9,6 +9,9 @@ - use recaptcha or alike -> quickform - tutorial about sidebar - update php-gettext +- index on bookmarks->modified, since created is not used in selects/sort + - how to optimize sorts, to prevent mysql filesort? -> index enough? + - how to optimize DISTINCT bHash Tracker items: From 4faa30a7e0232225660bef2f67a2ad7e7dee8686 Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:32:54 +0000 Subject: [PATCH 027/173] update french translations git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@742 b3834d28-1941-0410-a4f8-b48e95affb8f --- data/locales/fr_CA/LC_MESSAGES/messages.po | 1927 ++++++++++++-------- data/locales/fr_FR/LC_MESSAGES/messages.po | 596 +++--- 2 files changed, 1488 insertions(+), 1035 deletions(-) diff --git a/data/locales/fr_CA/LC_MESSAGES/messages.po b/data/locales/fr_CA/LC_MESSAGES/messages.po index 4bdb4b9..41894e8 100644 --- a/data/locales/fr_CA/LC_MESSAGES/messages.po +++ b/data/locales/fr_CA/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Scuttle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-24 19:03+0200\n" +"POT-Creation-Date: 2010-09-15 19:15+0200\n" "PO-Revision-Date: 2008-04-24 19:07+0100\n" "Last-Translator: BenjaminHKB \n" "Language-Team: fr-FR \n" @@ -19,1151 +19,1528 @@ msgstr "" "X-Poedit-Country: FRANCE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../../../about.php:25 -#: ../../../templates/toolbar.inc.php:16 -#: ../../../templates/toolbar.inc.php:25 -msgid "About" -msgstr "À propos" - -#: ../../../ajaxDelete.php:30 -msgid "You are not allowed to delete this bookmark" -msgstr "Vous n'êtes pas autorisés à supprimer ce signet" - -#: ../../../ajaxDelete.php:34 -#: ../../../edit.php:78 -msgid "Failed to delete bookmark" -msgstr "Erreur dans la suppression du signet" - -#: ../../../alltags.php:48 -msgid "All Tags" -msgstr "Tous les mots-clés" - -#: ../../../alltags.php:57 -#: ../../../bookmarks.php:72 -#: ../../../populartags.php:58 -#: ../../../profile.php:44 -#: ../../../rss.php:62 -#: ../../../search.php:88 -#: ../../../watch.php:34 -#: ../../../watchlist.php:61 -#, php-format -msgid "User with username %s was not found" -msgstr "L'utilisateur %s n'a pas été trouvé." - -#: ../../../bookmarkcommondescriptionedit.php:35 -#: ../../../tag2tagadd.php:31 -#: ../../../tag2tagdelete.php:31 -#: ../../../tag2tagedit.php:31 -#: ../../../tagcommondescriptionedit.php:35 -#: ../../../tagedit.php:34 -msgid "Permission denied." -msgstr "Permission non accordée." - -#: ../../../bookmarkcommondescriptionedit.php:45 -msgid "Bookmark common description updated" -msgstr "Description commune du signet mise à jour." - -#: ../../../bookmarkcommondescriptionedit.php:48 -msgid "Failed to update the bookmark common description" -msgstr "Erreur dans la mise à jour de la description du signet" - -#: ../../../bookmarkcommondescriptionedit.php:57 -msgid "Edit Bookmark Common Description" -msgstr "Editer la description commune du signet" - -#: ../../../bookmarks.php:95 -#: ../../../edit.php:44 -msgid "Your bookmark must have a title and an address" -msgstr "Votre signet doit avoir un titre et une adresse." - -#: ../../../bookmarks.php:115 -#: ../../../edit.php:58 -msgid "Bookmark saved" -msgstr "Signet enregistré." - -#: ../../../bookmarks.php:123 -#: ../../../import.php:99 -#: ../../../importNetscape.php:74 -msgid "There was an error saving your bookmark. Please try again or contact the administrator." -msgstr "Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou contacter votre administrateur." - -#: ../../../bookmarks.php:161 -#: ../../../templates/toolbar.inc.php:14 -msgid "Add a Bookmark" -msgstr "Ajouter un signet" - -#: ../../../bookmarks.php:164 -msgid "Add Bookmark" -msgstr "Ajouter signet" - -#: ../../../bookmarks.php:167 -msgid "You must be logged in before you can add bookmarks." -msgstr "Vous devez être authentifié avant de pouvoir ajouter des signets." - -#: ../../../bookmarks.php:218 -msgid "My Bookmarks" -msgstr "Mes signets" - -#: ../../../edit.php:29 -msgid "Edit Bookmark" -msgstr "Editer le signet" - -#: ../../../edit.php:34 -#, php-format -msgid "Bookmark with id %s not was not found" -msgstr "Signet %s non trouvé" - -#: ../../../edit.php:39 -msgid "You are not allowed to edit this bookmark" -msgstr "Vous n'êtes pas autorisé à éditer ce signet." - -#: ../../../edit.php:55 -msgid "Error while saving your bookmark" -msgstr "Erreur pendant l'enregistrement de votre signet." - -#: ../../../edit.php:88 -#: ../../../templates/editprofile.tpl.php:51 -msgid "Save Changes" -msgstr "Enregistrer les modifications" - -#: ../../../functions.inc.php:108 +#: src/SemanticScuttle/functions.php:189 msgid "message_die() was called multiple times." msgstr "message_die() was called multiple times. ?" -#: ../../../functions.inc.php:120 +#: src/SemanticScuttle/functions.php:201 msgid "SQL Error" msgstr "Erreur SQL" -#: ../../../functions.inc.php:126 +#: src/SemanticScuttle/functions.php:207 msgid "Line" msgstr "Ligne" -#: ../../../functions.inc.php:126 -#: ../../../templates/importDelicious.tpl.php:8 -#: ../../../templates/importNetscape.tpl.php:9 +#: src/SemanticScuttle/functions.php:207 +#: data/templates/importDelicious.tpl.php:8 +#: data/templates/importNetscape.tpl.php:9 +#: data/templates/importStructure.tpl.php:10 msgid "File" msgstr "Fichier" -#: ../../../functions.inc.php:132 +#: src/SemanticScuttle/functions.php:215 msgid "Information" msgstr "Information" -#: ../../../functions.inc.php:137 +#: src/SemanticScuttle/functions.php:220 msgid "Critical Information" msgstr "Information critique." -#: ../../../functions.inc.php:142 +#: src/SemanticScuttle/functions.php:225 msgid "An error occured" msgstr "Une erreur s'est produite." -#: ../../../functions.inc.php:145 +#: src/SemanticScuttle/functions.php:228 msgid "General Error" msgstr "Erreur générale." -#: ../../../functions.inc.php:153 +#: src/SemanticScuttle/functions.php:236 msgid "An critical error occured" msgstr "Une erreur critique s'est produite." -#: ../../../functions.inc.php:156 +#: src/SemanticScuttle/functions.php:239 msgid "Critical Error" msgstr "Erreur critique." -#: ../../../functions.inc.php:165 +#: src/SemanticScuttle/functions.php:248 msgid "DEBUG MODE" msgstr "Mode de débogage." -#: ../../../history.php:65 -msgid "History" -msgstr "Historique" - -#: ../../../history.php:66 -#, php-format -msgid "History for %s" -msgstr "Historique de %s" - -#: ../../../history.php:82 -msgid "Address was not found" -msgstr "L'adresse n'a pas été trouvée." - -#: ../../../import.php:41 -msgid "Could not open XML input" -msgstr "Impossible d'ouvrir le flux XML." - -#: ../../../import.php:45 -#, php-format -msgid "XML error: %s at line %d" -msgstr "Erreur XML: %s à la ligne %d" - -#: ../../../import.php:54 -msgid "Import Bookmarks from del.icio.us" -msgstr "Importer les signet depuis del.icio.us" - -#: ../../../import.php:86 -#: ../../../importNetscape.php:64 -msgid "You have already submitted this bookmark." -msgstr "Vous avez déjà enregistré ce signet." - -#: ../../../import.php:97 -#: ../../../importNetscape.php:72 -msgid "Bookmark imported." -msgstr "Signet importé." - -#: ../../../importNetscape.php:81 -msgid "Import Bookmarks from Browser File" -msgstr "Importer les signets depuis un fichier" - -#: ../../../index.php:32 -msgid "You have now logged out" -msgstr "Vous êtes maintenant déconnecté." - -#: ../../../index.php:39 -#, php-format -msgid "%s: Recent bookmarks" -msgstr "%s: Signets récents" - -#: ../../../index.php:73 -msgid "Store, share and tag your favourite links" -msgstr "Conservez, partagez et libellez vos liens favoris" - -#: ../../../index.php:74 -msgid "All Bookmarks" -msgstr "Tous les signets" - -#: ../../../jsScuttle.php:22 -#: ../../../templates/tag2tagadd.tpl.php:21 -#: ../../../templates/tag2tagdelete.tpl.php:13 -#: ../../../templates/tag2tagedit.tpl.php:14 -#: ../../../templates/tag2tagedit.tpl.php:35 -#: ../../../templates/tagdelete.tpl.php:6 -msgid "Are you sure?" -msgstr "Etes-vous sûr ?" - -#: ../../../jsScuttle.php:22 -#: ../../../templates/tag2tagdelete.tpl.php:15 -#: ../../../templates/tag2tagedit.tpl.php:16 -#: ../../../templates/tagdelete.tpl.php:8 -msgid "Yes" -msgstr "Oui" - -#: ../../../jsScuttle.php:22 -#: ../../../templates/tag2tagdelete.tpl.php:16 -#: ../../../templates/tag2tagedit.tpl.php:17 -#: ../../../templates/tagdelete.tpl.php:9 -msgid "No" -msgstr "Non" - -#: ../../../jsScuttle.php:68 -msgid "Available" -msgstr "Disponible" - -#: ../../../jsScuttle.php:71 -msgid "Not Available" -msgstr "Non Disponible" - -#: ../../../login.php:38 -msgid "The details you have entered are incorrect. Please try again." -msgstr "Les informations que vous avez entrées sont incorrectes. Veuillez recommencer." - -#: ../../../login.php:48 -#: ../../../templates/login.tpl.php:26 -#: ../../../templates/toolbar.inc.php:26 -msgid "Log In" -msgstr "Se connecter" - -#: ../../../password.php:31 -msgid "You must enter your username." -msgstr "Vous devez entrer votre nom d'utilisateur." - -#: ../../../password.php:35 -msgid "You must enter your e-mail address." -msgstr "Vous devez saisir une E-mail." - -#: ../../../password.php:42 -msgid "No matches found for that username." -msgstr "Rien de trouvé pour ce nom d'utilisateur." - -#: ../../../password.php:45 -#, fuzzy -msgid "No matches found for that combination of username and e-mail address." -msgstr "Nous n'avons rien trouvé pour cette combinaison de nom d'utilisateur et d'e-mail." - -#: ../../../password.php:53 -msgid "There was an error while generating your new password. Please try again." -msgstr "Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou contacter votre administrateur." - -#: ../../../password.php:57 -msgid "Your new password is:" -msgstr "Votre nouveau mot de passe est:" - -#: ../../../password.php:57 -msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in." -msgstr "Pour garder vos signets sûrs, vous devriez changer ce mot de passe dans votre profil lors de votre prochaine authentification." - -#: ../../../password.php:60 -#, php-format -msgid "%s Account Information" -msgstr "Informations du compte de %s" - -#: ../../../password.php:62 -#, php-format -msgid "New password generated and sent to %s" -msgstr "Nouveau mot de passe généré et envoyé à l'adresse %s" - -#: ../../../password.php:69 -msgid "Forgotten Password" -msgstr "Mot de passe oublié" - -#: ../../../populartags.php:49 -#: ../../../templates/dynamictags.inc.php:101 -#: ../../../templates/sidebar.block.common.php:9 -#: ../../../templates/sidebar.block.menu.php:68 -#: ../../../templates/sidebar.block.popular.php:15 -#: ../../../templates/sidebar.block.recent.php:30 -#: ../../../templates/toolbar.inc.php:24 -msgid "Popular Tags" -msgstr "Mots-clés populaires" - -#: ../../../profile.php:52 -#: ../../../watchlist.php:116 -msgid "Username was not specified" -msgstr "Le nom d'utilisateur n'a pas été spécifié." - -#: ../../../profile.php:58 -msgid "My Profile" -msgstr "Mon Profil" - -#: ../../../profile.php:60 -#: ../../../templates/toolbar.inc.php:13 -msgid "Profile" -msgstr "Profil" - -#: ../../../profile.php:78 -msgid "Password and confirmation do not match." -msgstr "Le mot de passe et sa vérification ne correspondent pas." - -#: ../../../profile.php:82 -msgid "Password must be at least 6 characters long." -msgstr "Le mot de passe doit avoir au moins 6 caractères." - -#: ../../../profile.php:86 -msgid "E-mail address is not valid." -msgstr "Adresse de courrier électronique invalide." - -#: ../../../profile.php:90 -msgid "An error occurred while saving your changes." -msgstr "Une erreur s'est produite pendant l'enregistrement de vos modifications." - -#: ../../../profile.php:92 -msgid "Changes saved." -msgstr "Modifications enregistrées." - -#: ../../../register.php:33 -msgid "You must enter a username, password and e-mail address." -msgstr "Vous devez saisir un nom d'utilisateur, un mot de passe, un nom et un e-mail" - -#: ../../../register.php:37 -msgid "This username has been reserved, please make another choice." -msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre." - -#: ../../../register.php:41 -msgid "This username already exists, please make another choice." -msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre." - -#: ../../../register.php:45 -msgid "E-mail address is not valid. Please try again." -msgstr "Adresse de courrier électronique invalide. Veuilez réessayer." - -#: ../../../register.php:49 -msgid "Antispam answer is not valid. Please try again." -msgstr "La réponse antispam n'est pas valide. Veuillez réessayer." - -#: ../../../register.php:58 -msgid "You have successfully registered. Enjoy!" -msgstr "Votre inscription a bien été prise en compte !" - -#: ../../../register.php:60 -msgid "Registration failed. Please try again." -msgstr "Enregistrement raté. Veuillez rééssayer." - -#: ../../../register.php:66 -#: ../../../templates/register.tpl.php:41 -#: ../../../templates/toolbar.inc.php:27 -msgid "Register" -msgstr "S'enregistrer" - -#: ../../../rss.php:79 -#, php-format -msgid "Recent bookmarks posted to %s" -msgstr "Signets ajoutés récemment à %s" - -#: ../../../search.inc.php:13 -#: ../../../search.inc.php:41 -msgid "Search" -msgstr "Chercher dans" - -#: ../../../search.inc.php:19 -msgid "this user's bookmarks" -msgstr "les signets de cet utilisateur" - -#: ../../../search.inc.php:24 -msgid "my bookmarks" -msgstr "mes signets" - -#: ../../../search.inc.php:25 -msgid "my watchlist" -msgstr "ma liste des consultés" - -#: ../../../search.inc.php:29 -msgid "all bookmarks" -msgstr "tous les signets" - -#: ../../../search.inc.php:32 -msgid "for" -msgstr "pour" - -#: ../../../search.php:59 -#: ../../../search.php:108 -msgid "Search Bookmarks" -msgstr "Recherche de signets" - -#: ../../../search.php:65 -msgid "Search Results" -msgstr "Résultats de recherche" - -#: ../../../tag2tagadd.php:44 -msgid "Tag link created" -msgstr "Lien entre mot-clé créé." - -#: ../../../tag2tagadd.php:47 -msgid "Failed to create the link" -msgstr "Impossible de créer le lien" - -#: ../../../tag2tagadd.php:58 -msgid "Add Tag Link" -msgstr "Ajout d'un lien entre mots-clés" - -#: ../../../tag2tagdelete.php:43 -#: ../../../tag2tagedit.php:43 -msgid "Tag link deleted" -msgstr "Effacement d'un lien entre mots-clés" - -#: ../../../tag2tagdelete.php:46 -#: ../../../tag2tagedit.php:46 -msgid "Failed to delete the link" -msgstr "Impossible d'effacer le lien" - -#: ../../../tag2tagdelete.php:58 -msgid "Delete Link Between Tags" -msgstr "Effacer un lien entre mots-clés" - -#: ../../../tag2tagedit.php:58 -msgid "Edit Link Between Tags" -msgstr "Editer un lien entre mots-clés" - -#: ../../../tagcommondescriptionedit.php:45 -msgid "Tag common description updated" -msgstr "Editer la description commune du mot-clé" - -#: ../../../tagcommondescriptionedit.php:48 -msgid "Failed to update the tag common description" -msgstr "Impossible de mettre à jour la description commune du mot-clé" - -#: ../../../tagcommondescriptionedit.php:55 -#: ../../../templates/sidebar.block.tagactions.php:27 -msgid "Edit Tag Common Description" -msgstr "Editer la description commune du mot-clé" - -#: ../../../tagdelete.php:33 -msgid "Tag deleted" -msgstr "Mot-clé effacé" - -#: ../../../tagdelete.php:36 -msgid "Failed to delete the tag" -msgstr "Impossible d'effacer le mot-clé" - -#: ../../../tagdelete.php:44 -#: ../../../templates/sidebar.block.tagactions.php:23 -msgid "Delete Tag" -msgstr "Supprimer le mot-clé" - -#: ../../../tagedit.php:44 -msgid "Tag description updated" -msgstr "Description du mot-clé mise à jour" - -#: ../../../tagedit.php:47 -msgid "Failed to update the tag description" -msgstr "Impossible de mettre à jour la description du mot-clé" - -#: ../../../tagedit.php:54 -#: ../../../templates/sidebar.block.tagactions.php:25 -msgid "Edit Tag Description" -msgstr "Editer la description du mot-clé" - -#: ../../../tagrename.php:50 -msgid "Tag renamed" -msgstr "Mot-clé renommé" - -#: ../../../tagrename.php:54 -msgid "Failed to rename the tag" -msgstr "Erreur dans le renommage du mot-clé" - -#: ../../../tagrename.php:61 -#: ../../../templates/sidebar.block.tagactions.php:10 -msgid "Rename Tag" -msgid_plural "Rename Tags" -msgstr[0] "Renommer le mot-clé" -msgstr[1] "Renommer les mots-clés" - -#: ../../../tags.php:38 -#: ../../../templates/editbookmark.tpl.php:44 -#: ../../../templates/toolbar.inc.php:11 -msgid "Tags" -msgstr "Mots-clés" - -#: ../../../users.php:33 -msgid "Users" -msgstr "Utilisateurs" - -#: ../../../watch.php:46 -msgid "User removed from your watchlist" -msgstr "Utilisateur enlevé de votre liste des consultés" - -#: ../../../watch.php:48 -msgid "User added to your watchlist" -msgstr "Utilisateur ajouté à la liste des consultés." - -#: ../../../watchlist.php:103 -#, fuzzy -msgid "My Watchlist" -msgstr "Liste des signets vus" - -#: ../../../watchlist.php:105 -#: ../../../templates/toolbar.inc.php:12 -#, fuzzy -msgid "Watchlist" -msgstr "Liste des signets vus" - -#: ../../../templates/about.tpl.php:6 -msgid "Store all your favourite links in one place, accessible from anywhere." -msgstr "Conservez tous vos signets au même endroit, accessibles de partout. " - -#: ../../../templates/about.tpl.php:7 -msgid "Share your bookmarks with everyone, with friends on your watchlist or just keep them private." -msgstr "Partagez vos signets avec tout le monde, avec les utilisateurs autorisés ou gardez-les pour vous." - -#: ../../../templates/about.tpl.php:8 -msgid "Tag your bookmarks with as many labels as you want, instead of wrestling with folders." -msgstr "Taggez vos signets avec autant de labels que vous le souhaitez au lieu de les hiérarchiser avec des dossiers." - -#: ../../../templates/about.tpl.php:9 +#: data/templates/about.tpl.php:6 +msgid "" +"Store all your favourite links in one place, accessible " +"from anywhere." +msgstr "" +"Conservez tous vos signets au même endroit, accessibles de " +"partout. " + +#: data/templates/about.tpl.php:7 +msgid "" +"Share your bookmarks with everyone, with friends on your " +"watchlist or just keep them private." +msgstr "" +"Partagez vos signets avec tout le monde, avec les " +"utilisateurs autorisés ou gardez-les pour vous." + +#: data/templates/about.tpl.php:8 +msgid "" +"Tag your bookmarks with as many labels as you want, instead " +"of wrestling with folders." +msgstr "" +"Taggez vos signets avec autant de labels que vous le " +"souhaitez au lieu de les hiérarchiser avec des dossiers." + +#: data/templates/about.tpl.php:9 msgid "Register now" msgstr "S'enregistrer maintenant" -#: ../../../templates/about.tpl.php:9 +#: data/templates/about.tpl.php:9 #, php-format msgid " to start using %s!" msgstr "pour commencer à employer %s !" -#: ../../../templates/about.tpl.php:12 +#: data/templates/about.tpl.php:12 msgid "Geek Stuff" msgstr "Pour les Geeks" -#: ../../../templates/about.tpl.php:14 +#: data/templates/about.tpl.php:14 msgid "is licensed under the " msgstr "est sous licence" -#: ../../../templates/about.tpl.php:14 +#: data/templates/about.tpl.php:14 msgid "you can freely host it on your own web server." msgstr "vous pouvez librement l'installer sur votre serveur Web" -#: ../../../templates/about.tpl.php:15 +#: data/templates/about.tpl.php:15 #, php-format -msgid "%1$s supports most of the del.icio.us API. Almost all of the neat tools made for that system can be modified to work with %1$s instead. If you find a tool that won't let you change the API address, ask the creator to add this setting. You never know, they might just do it." -msgstr "%1$s supporte la plupart de l'API del.icio.us." +msgid "" +"%1$s supports most of the del.icio.us " +"API. Almost all " +"of the neat tools made for that system can be modified to work with %1$s " +"instead. If you find a tool that won't let you change the API address, ask " +"the creator to add this setting. You never know, they might just do it." +msgstr "" +"%1$s supporte la plupart de l'API del.icio.us." -#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:15 -#: ../../../templates/bookmarks.tpl.php:67 -#: ../../../templates/editbookmark.tpl.php:34 -msgid "Title" -msgstr "Titre" +#: data/templates/about.tpl.php:24 +msgid "Tips" +msgstr "" -#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:20 -#: ../../../templates/editbookmark.tpl.php:39 -#: ../../../templates/editprofile.tpl.php:46 -#: ../../../templates/profile.tpl.php:28 -#: ../../../templates/tagcommondescriptionedit.tpl.php:13 -#: ../../../templates/tagedit.tpl.php:13 -msgid "Description" -msgstr "Description" +#: data/templates/about.tpl.php:26 +msgid "Add search plugin into your browser:" +msgstr "" -#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:28 -#: ../../../templates/tagcommondescriptionedit.tpl.php:21 -msgid "Last modification:" -msgstr "Dernière modification :" +#: data/templates/about.tpl.php:27 +msgid "" +"The secret tag \"system:unfiled\" allows you to find bookmarks without tags." +msgstr "" -#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:39 -#: ../../../templates/tagcommondescriptionedit.tpl.php:32 -#: ../../../templates/tagedit.tpl.php:19 -msgid "Update" -msgstr "Mettre à jour" +#: data/templates/about.tpl.php:28 +msgid "" +"The secret tag \"system:imported\" allows you to find imported bookmarks." +msgstr "" -#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40 -#: ../../../templates/tag2tagadd.tpl.php:24 -#: ../../../templates/tag2tagedit.tpl.php:38 -#: ../../../templates/tagcommondescriptionedit.tpl.php:33 -#: ../../../templates/tagedit.tpl.php:20 -#: ../../../templates/tagrename.tpl.php:25 -msgid "Cancel" -msgstr "Annuler" +#: data/templates/admin.tpl.php:5 +#, fuzzy +msgid "Users management" +msgstr "Nom d'utilisateur" -#: ../../../templates/bookmarks.tpl.php:34 -#: ../../../templates/bookmarks.tpl.php:37 -msgid "edit common description" -msgstr "éditer la description commune" +#: data/templates/admin.tpl.php:14 +msgid "Public/Shared/Private" +msgstr "" -#: ../../../templates/bookmarks.tpl.php:64 +#: data/templates/admin.tpl.php:14 data/templates/bookmarks.tpl.php:93 msgid "bookmark(s)" msgstr "signet(s)" -#: ../../../templates/bookmarks.tpl.php:65 -#: ../../../templates/tags.tpl.php:10 -#: ../../../templates/users.tpl.php:8 -msgid "Sort by:" -msgstr "Classer par :" +#: data/templates/admin.tpl.php:19 data/templates/tag2tagadd.tpl.php:21 +#: data/templates/tag2tagdelete.tpl.php:13 +#: data/templates/tag2tagedit.tpl.php:14 data/templates/tag2tagedit.tpl.php:35 +#: data/templates/tagdelete.tpl.php:6 www/jsScuttle.php:23 +msgid "Are you sure?" +msgstr "Etes-vous sûr ?" -#: ../../../templates/bookmarks.tpl.php:66 -msgid "Date" -msgstr "Date" - -#: ../../../templates/bookmarks.tpl.php:71 -msgid "URL" -msgstr "URL" - -#: ../../../templates/bookmarks.tpl.php:81 -msgid "Bookmarks from other users for this tag" -msgstr "Signets des autres utilisateurs pour ce mot-clé" - -#: ../../../templates/bookmarks.tpl.php:86 -msgid "Only your bookmarks for this tag" -msgstr "Uniquement vos signets pour ce mot-clé" - -#: ../../../templates/bookmarks.tpl.php:129 -msgid "Edit" -msgstr "Editer" - -#: ../../../templates/bookmarks.tpl.php:129 +#: data/templates/admin.tpl.php:19 data/templates/bookmarks.tpl.php:267 msgid "Delete" msgstr "Supprimer" -#: ../../../templates/bookmarks.tpl.php:135 -msgid "by" -msgstr "par" +#: data/templates/admin.tpl.php:27 +#, fuzzy +msgid "Other actions" +msgstr "Instructions" -#: ../../../templates/bookmarks.tpl.php:139 -msgid "to" -msgstr "dans" +#: data/templates/admin.tpl.php:29 +msgid "Check all URLs (May take some time)" +msgstr "" -#: ../../../templates/bookmarks.tpl.php:147 -#, fuzzy, php-format -msgid " and %s1 other%s" -msgstr " et les autres %s" +#: data/templates/bookmarkcommondescriptionedit.tpl.php:16 +msgid "" +"Collaborative description: these fields can be viewed and modified by every " +"users" +msgstr "" -#: ../../../templates/bookmarks.tpl.php:150 -#, fuzzy, php-format -msgid " and %2$s%1$s others%3$s" -msgstr " et les autres %s" +#: data/templates/bookmarkcommondescriptionedit.tpl.php:18 +#: data/templates/bookmarks.tpl.php:137 data/templates/editbookmark.tpl.php:43 +msgid "Title" +msgstr "Titre" -#: ../../../templates/bookmarks.tpl.php:159 -msgid "Copy" -msgstr "Copier" +#: data/templates/bookmarkcommondescriptionedit.tpl.php:23 +#: data/templates/editbookmark.tpl.php:49 +#: data/templates/editprofile.tpl.php:47 data/templates/profile.tpl.php:33 +#: data/templates/tagcommondescriptionedit.tpl.php:13 +#: data/templates/tagedit.tpl.php:12 +msgid "Description" +msgstr "Description" -#: ../../../templates/bookmarks.tpl.php:218 -#: ../../../templates/bookmarks.tpl.php:224 +#: data/templates/bookmarkcommondescriptionedit.tpl.php:31 +#: data/templates/tagcommondescriptionedit.tpl.php:21 +msgid "Last modification:" +msgstr "Dernière modification :" + +#: data/templates/bookmarkcommondescriptionedit.tpl.php:42 +#: data/templates/tagcommondescriptionedit.tpl.php:32 +#: data/templates/tagedit.tpl.php:18 +msgid "Update" +msgstr "Mettre à jour" + +#: data/templates/bookmarkcommondescriptionedit.tpl.php:43 +#: data/templates/editbookmark.tpl.php:103 +#: data/templates/tag2tagadd.tpl.php:24 data/templates/tag2tagedit.tpl.php:38 +#: data/templates/tagcommondescriptionedit.tpl.php:33 +#: data/templates/tagedit.tpl.php:19 data/templates/tagrename.tpl.php:25 +msgid "Cancel" +msgstr "Annuler" + +#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:24 +#, php-format +msgid "Voting %d" +msgstr "" + +#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:32 +#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:35 +msgid "Vote for" +msgstr "" + +#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:43 +#: data/templates/bookmarks-vote-horizontal.inc.tpl.php:46 +msgid "Vote against" +msgstr "" + +#: data/templates/bookmarks.tpl.php:26 +msgid "Bookmarks on this page are managed by an admin user." +msgstr "" + +#: data/templates/bookmarks.tpl.php:51 data/templates/bookmarks.tpl.php:52 +#, fuzzy +msgid "Edit the common description of this tag" +msgstr "éditer la description commune" + +#: data/templates/bookmarks.tpl.php:55 data/templates/bookmarks.tpl.php:56 +#, fuzzy +msgid "Edit the common description of this bookmark" +msgstr "éditer la description commune" + +#: data/templates/bookmarks.tpl.php:76 data/templates/bookmarks.tpl.php:77 +msgid "Edit your personal description of this tag" +msgstr "" + +#: data/templates/bookmarks.tpl.php:93 data/templates/tags.tpl.php:10 +#: data/templates/users.tpl.php:8 +msgid "Sort by:" +msgstr "Classer par :" + +#: data/templates/bookmarks.tpl.php:135 +msgid "Date" +msgstr "Date" + +#: data/templates/bookmarks.tpl.php:140 +msgid "Voting" +msgstr "" + +#: data/templates/bookmarks.tpl.php:149 +msgid "Bookmarks from other users for this tag" +msgstr "Signets des autres utilisateurs pour ce mot-clé" + +#: data/templates/bookmarks.tpl.php:154 +msgid "Only your bookmarks for this tag" +msgstr "Uniquement vos signets pour ce mot-clé" + +#: data/templates/bookmarks.tpl.php:177 data/templates/bookmarks.tpl.php:183 msgid "First" msgstr "Première" -#: ../../../templates/bookmarks.tpl.php:219 -#: ../../../templates/bookmarks.tpl.php:225 +#: data/templates/bookmarks.tpl.php:178 data/templates/bookmarks.tpl.php:184 msgid "Previous" msgstr "Précédent" -#: ../../../templates/bookmarks.tpl.php:232 -#: ../../../templates/bookmarks.tpl.php:235 +#: data/templates/bookmarks.tpl.php:191 data/templates/bookmarks.tpl.php:194 msgid "Next" msgstr "Suivant" -#: ../../../templates/bookmarks.tpl.php:233 -#: ../../../templates/bookmarks.tpl.php:236 +#: data/templates/bookmarks.tpl.php:192 data/templates/bookmarks.tpl.php:195 msgid "Last" msgstr "Dernière" -#: ../../../templates/bookmarks.tpl.php:246 +#: data/templates/bookmarks.tpl.php:205 #, php-format msgid "Page %d of %d" msgstr "Page %d de %d" -#: ../../../templates/bookmarks.tpl.php:252 +#: data/templates/bookmarks.tpl.php:261 +#, fuzzy +msgid "Tags:" +msgstr "Mots-clés" + +#: data/templates/bookmarks.tpl.php:267 +msgid "Edit" +msgstr "Editer" + +#: data/templates/bookmarks.tpl.php:271 +msgid "Last update" +msgstr "" + +#: data/templates/bookmarks.tpl.php:274 +msgid "by" +msgstr "par" + +#: data/templates/bookmarks.tpl.php:276 +msgid "you" +msgstr "" + +#: data/templates/bookmarks.tpl.php:290 +#, fuzzy, php-format +msgid " and %s1 other%s" +msgstr " et les autres %s" + +#: data/templates/bookmarks.tpl.php:293 +#, fuzzy, php-format +msgid " and %2$s%1$s others%3$s" +msgstr " et les autres %s" + +#: data/templates/bookmarks.tpl.php:304 +#, fuzzy +msgid "Copy this bookmark to YOUR bookmarks." +msgstr "Importer les signets depuis un fichier" + +#: data/templates/bookmarks.tpl.php:305 +msgid "Copy" +msgstr "Copier" + +#: data/templates/bookmarks.tpl.php:325 +msgid "This bookmark is certified by an admin user." +msgstr "" + +#: data/templates/bookmarks.tpl.php:371 +#, fuzzy +msgid "Private Note on this bookmark" +msgstr "Vous n'êtes pas autorisé à éditer ce signet." + +#: data/templates/bookmarks.tpl.php:383 +msgid "Come back to the top of this page." +msgstr "" + +#: data/templates/bookmarks.tpl.php:383 +msgid "Top of the page" +msgstr "" + +#: data/templates/bookmarks.tpl.php:389 msgid "No bookmarks available" msgstr "Pas de signets disponibles." -#: ../../../templates/dynamictags.inc.php:108 -#: ../../../templates/sidebar.block.common.php:20 -#: ../../../templates/sidebar.block.popular.php:26 -#: ../../../templates/sidebar.block.recent.php:25 -#: ../../../templates/tags.tpl.php:19 +#: data/templates/bottom.inc.php:5 data/templates/toolbar.inc.php:15 +#: data/templates/toolbar.inc.php:28 www/about.php:23 www/about.php:24 +msgid "About" +msgstr "À propos" + +#: data/templates/bottom.inc.php:7 +msgid "Propulsed by " +msgstr "" + +#: data/templates/dynamictags.inc.php:47 +#: data/templates/sidebar.block.common.php:19 +#: data/templates/sidebar.block.popular.php:34 +#: data/templates/sidebar.block.recent.php:29 data/templates/tags.tpl.php:19 msgid "bookmark" msgid_plural "bookmarks" msgstr[0] "signet" msgstr[1] "Signets" -#: ../../../templates/editbookmark.tpl.php:29 +#: data/templates/dynamictags.inc.php:128 +#: data/templates/sidebar.block.common.php:9 +#: data/templates/sidebar.block.menu.php:74 +#: data/templates/sidebar.block.popular.php:23 +#: data/templates/sidebar.block.recent.php:34 +#: data/templates/toolbar.inc.php:27 www/populartags.php:46 +msgid "Popular Tags" +msgstr "Mots-clés populaires" + +#: data/templates/dynamictags.inc.php:131 +#, fuzzy +msgid "Popular Tags From All Users" +msgstr "Mots-clés populaires" + +#: data/templates/editbookmark.tpl.php:38 msgid "Address" msgstr "Adresse" -#: ../../../templates/editbookmark.tpl.php:31 -#: ../../../templates/editbookmark.tpl.php:36 -#: ../../../templates/editprofile.tpl.php:30 -#: ../../../templates/tagrename.tpl.php:14 -#: ../../../templates/tagrename.tpl.php:19 +#: data/templates/editbookmark.tpl.php:40 +#: data/templates/editbookmark.tpl.php:45 +#: data/templates/editprofile.tpl.php:31 data/templates/tagrename.tpl.php:14 +#: data/templates/tagrename.tpl.php:19 msgid "Required" msgstr "Requis" -#: ../../../templates/editbookmark.tpl.php:46 +#: data/templates/editbookmark.tpl.php:50 +msgid "Add Note" +msgstr "" + +#: data/templates/editbookmark.tpl.php:53 +msgid "" +"You can use anchors to delimite attributes. for example: [publisher]blah[/" +"publisher] " +msgstr "" + +#: data/templates/editbookmark.tpl.php:56 +msgid "Suggested anchors: " +msgstr "" + +#: data/templates/editbookmark.tpl.php:68 +#, fuzzy +msgid "Private Note" +msgstr "Privée" + +#: data/templates/editbookmark.tpl.php:70 +msgid "Just visible by you and your contacts." +msgstr "" + +#: data/templates/editbookmark.tpl.php:74 data/templates/toolbar.inc.php:10 +#: www/tags.php:45 www/tags.php:67 +msgid "Tags" +msgstr "Mots-clés" + +#: data/templates/editbookmark.tpl.php:78 msgid "Comma-separated" msgstr "Séparés par des virgules" -#: ../../../templates/editbookmark.tpl.php:50 -#: ../../../templates/tag2tagadd.tpl.php:9 -msgid "Note: use \">\" to include one tag in another. e.g.: europe>france>paris" -msgstr "Note: utiliser \">\" pour inclure un mot-clé dans un autre. ex: europe>france>paris" +#: data/templates/editbookmark.tpl.php:82 data/templates/tag2tagadd.tpl.php:9 +msgid "" +"Note: use \">\" to include one tag in another. e.g.: europe>france>paris" +msgstr "" +"Note: utiliser \">\" pour inclure un mot-clé dans un autre. ex: " +"europe>france>paris" -#: ../../../templates/editbookmark.tpl.php:54 -#: ../../../templates/mot-clé2tagadd.tpl.php:8 +#: data/templates/editbookmark.tpl.php:86 data/templates/tag2tagadd.tpl.php:8 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry" -msgstr "Note : utiliser \"=\" pour rendre deux mots-clés synonymes ex: europe=eu" +msgstr "" +"Note : utiliser \"=\" pour rendre deux mots-clés synonymes ex: " +"europe=eu" -#: ../../../templates/editbookmark.tpl.php:57 -#: ../../../templates/importDelicious.tpl.php:15 -#: ../../../templates/importNetscape.tpl.php:16 +#: data/templates/editbookmark.tpl.php:89 +#: data/templates/importDelicious.tpl.php:15 +#: data/templates/importNetscape.tpl.php:16 msgid "Privacy" msgstr "Vision" -#: ../../../templates/editbookmark.tpl.php:60 -#: ../../../templates/importDelicious.tpl.php:18 -#: ../../../templates/importNetscape.tpl.php:19 +#: data/templates/editbookmark.tpl.php:92 +#: data/templates/importDelicious.tpl.php:18 +#: data/templates/importNetscape.tpl.php:19 msgid "Public" msgstr "Publique" -#: ../../../templates/editbookmark.tpl.php:61 +#: data/templates/editbookmark.tpl.php:93 msgid "Shared with Watch List" msgstr "Partagé avec liste d'accès" -#: ../../../templates/editbookmark.tpl.php:62 -#: ../../../templates/importDelicious.tpl.php:20 -#: ../../../templates/importNetscape.tpl.php:21 +#: data/templates/editbookmark.tpl.php:94 +#: data/templates/importDelicious.tpl.php:20 +#: data/templates/importNetscape.tpl.php:21 msgid "Private" msgstr "Privée" -#: ../../../templates/editbookmark.tpl.php:74 +#: data/templates/editbookmark.tpl.php:107 msgid "Delete Bookmark" msgstr "Supprimer le signet" -#: ../../../templates/editbookmark.tpl.php:101 +#: data/templates/editbookmark.tpl.php:112 +msgid "edit common description" +msgstr "éditer la description commune" + +#: data/templates/editbookmark.tpl.php:139 msgid "Bookmarklet" msgstr "Bookmarklet" -#: ../../../templates/editbookmark.tpl.php:102 -#, php-format -msgid "Drag one of the following bookmarklets to your browser's bookmarks and click it whenever you want to add the page you are on to %s" -msgstr "Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un signet pour la page courante dans %s " +#: data/templates/editbookmark.tpl.php:145 +#, fuzzy, php-format +msgid "" +"Click one of the following bookmarklets to add a button you can click " +"whenever you want to add the page you are on to %s" +msgstr "" +"Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre " +"navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un " +"signet pour la page courante dans %s " -#: ../../../templates/editbookmark.tpl.php:114 +#: data/templates/editbookmark.tpl.php:149 +#, php-format +msgid "" +"Drag one of the following bookmarklets to your browser's bookmarks and click " +"it whenever you want to add the page you are on to %s" +msgstr "" +"Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre " +"navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un " +"signet pour la page courante dans %s " + +#: data/templates/editbookmark.tpl.php:162 +#: data/templates/editbookmark.tpl.php:167 #, php-format msgid "Post to %s" msgstr "Ajouter à %s" -#: ../../../templates/editbookmark.tpl.php:115 +#: data/templates/editbookmark.tpl.php:163 +#: data/templates/editbookmark.tpl.php:168 #, php-format msgid "Post to %s (Pop-up)" msgstr "Ajouter à %s (Pop-up)" -#: ../../../templates/editbookmark.tpl.php:119 -#: ../../../templates/importDelicious.tpl.php:26 -#: ../../../templates/importNetscape.tpl.php:27 +#: data/templates/editbookmark.tpl.php:173 +#: data/templates/importDelicious.tpl.php:26 +#: data/templates/importNetscape.tpl.php:27 +#: data/templates/importStructure.tpl.php:16 msgid "Import" msgstr "Importer" -#: ../../../templates/editbookmark.tpl.php:121 +#: data/templates/editbookmark.tpl.php:175 msgid "Import bookmarks from bookmark file" msgstr "Importer les signets depuis un fichier" -#: ../../../templates/editbookmark.tpl.php:121 +#: data/templates/editbookmark.tpl.php:175 msgid "Internet Explorer, Mozilla Firefox and Netscape" msgstr "Internet Explorer, Mozilla Firefox et Netscape" -#: ../../../templates/editbookmark.tpl.php:122 +#: data/templates/editbookmark.tpl.php:176 msgid "Import bookmarks from del.icio.us" msgstr "Importer les signets depuis del.icio.us" -#: ../../../templates/editprofile.tpl.php:9 +#: data/templates/editprofile.tpl.php:10 msgid "Account Details" msgstr "Détail du compte" -#: ../../../templates/editprofile.tpl.php:13 -#: ../../../templates/login.tpl.php:15 -#: ../../../templates/password.tpl.php:10 -#: ../../../templates/profile.tpl.php:7 -#: ../../../templates/register.tpl.php:16 +#: data/templates/editprofile.tpl.php:14 data/templates/login.tpl.php:21 +#: data/templates/password.tpl.php:10 data/templates/profile.tpl.php:6 +#: data/templates/register.tpl.php:16 msgid "Username" msgstr "Nom d'utilisateur" -#: ../../../templates/editprofile.tpl.php:18 +#: data/templates/editprofile.tpl.php:19 msgid "New Password" msgstr "Nouveau mot de passe" -#: ../../../templates/editprofile.tpl.php:23 +#: data/templates/editprofile.tpl.php:24 msgid "Confirm Password" msgstr "Confirmer le mot de passe" -#: ../../../templates/editprofile.tpl.php:28 -#: ../../../templates/password.tpl.php:14 -#: ../../../templates/register.tpl.php:26 +#: data/templates/editprofile.tpl.php:29 data/templates/password.tpl.php:14 +#: data/templates/register.tpl.php:26 msgid "E-mail" msgstr "E-mail" -#: ../../../templates/editprofile.tpl.php:34 +#: data/templates/editprofile.tpl.php:35 msgid "Personal Details" msgstr "Détails personnels" -#: ../../../templates/editprofile.tpl.php:38 -#: ../../../templates/profile.tpl.php:12 +#: data/templates/editprofile.tpl.php:39 data/templates/profile.tpl.php:17 msgid "Name" msgstr "Nom" -#: ../../../templates/editprofile.tpl.php:42 -#: ../../../templates/profile.tpl.php:18 +#: data/templates/editprofile.tpl.php:43 data/templates/profile.tpl.php:23 msgid "Homepage" msgstr "Page personnelle" -#: ../../../templates/editprofile.tpl.php:54 -#: ../../../templates/sidebar.block.tagactions.php:18 -#: ../../../templates/sidebar.block.watchstatus.php:17 +#: data/templates/editprofile.tpl.php:52 www/edit.php:113 +msgid "Save Changes" +msgstr "Enregistrer les modifications" + +#: data/templates/editprofile.tpl.php:55 +#: data/templates/sidebar.block.tagactions.php:17 +#: data/templates/sidebar.block.watchstatus.php:18 #, fuzzy msgid "Actions" msgstr "Instructions" -#: ../../../templates/editprofile.tpl.php:57 +#: data/templates/editprofile.tpl.php:58 msgid "Export bookmarks" msgstr "Exporter les signets" -#: ../../../templates/editprofile.tpl.php:59 +#: data/templates/editprofile.tpl.php:60 msgid "HTML file (for browsers)" msgstr "Fichier HTML (pour navigateurs)" -#: ../../../templates/editprofile.tpl.php:60 +#: data/templates/editprofile.tpl.php:61 msgid "XML file (like del.icio.us)" msgstr "Fichier XML (comme del.icio.us)" -#: ../../../templates/error.404.tpl.php:5 +#: data/templates/editprofile.tpl.php:62 +msgid "CSV file (for spreadsheet tools)" +msgstr "" + +#: data/templates/error.404.tpl.php:5 msgid "Not Found" msgstr "Non trouvé" -#: ../../../templates/error.404.tpl.php:6 +#: data/templates/error.404.tpl.php:6 msgid "The requested URL was not found on this server" msgstr "L'URL demandée n'a pas été trouvée sur ce serveur." -#: ../../../templates/error.500.tpl.php:5 +#: data/templates/error.500.tpl.php:5 msgid "General server error" msgstr "Erreur généralisée du serveur." -#: ../../../templates/error.500.tpl.php:6 +#: data/templates/error.500.tpl.php:6 msgid "The requested URL could not be processed" msgstr "L'URL demandée n'a pas été trouvée." -#: ../../../templates/importDelicious.tpl.php:19 -#: ../../../templates/importNetscape.tpl.php:20 +#: data/templates/importDelicious.tpl.php:19 +#: data/templates/importNetscape.tpl.php:20 #, fuzzy msgid "Shared with Watchlist" msgstr "Partagé avec liste d'accès" -#: ../../../templates/importDelicious.tpl.php:31 -#: ../../../templates/importNetscape.tpl.php:32 +#: data/templates/importDelicious.tpl.php:31 +#: data/templates/importNetscape.tpl.php:32 +#: data/templates/importStructure.tpl.php:21 msgid "Instructions" msgstr "Instructions" -#: ../../../templates/importDelicious.tpl.php:33 -msgid "Log in to the export page at del.icio.us" -msgstr "Se connecter à la page d'export de del.icio.us" +#: data/templates/importDelicious.tpl.php:33 +msgid "" +"Log in to the export page at " +"del.icio.us" +msgstr "" +"Se connecter à la page d'export " +"de del.icio.us" -#: ../../../templates/importDelicious.tpl.php:34 -msgid "Save the resulting XML file to your computer" -msgstr "Enregistrer le fichier XML résultant sur votre ordinateur" +#: data/templates/importDelicious.tpl.php:34 +msgid "" +"Save the resulting XML " +"file to your computer" +msgstr "" +"Enregistrer le fichier XML " +"résultant sur votre ordinateur" -#: ../../../templates/importDelicious.tpl.php:35 -msgid "Click Browse... to find this file on your computer. The maximum size the file can be is 1MB" -msgstr "Cliquez sur Parcourir... pour trouver le fichier sur votre ordinateur. La taille maximale du fichier ne peut excèder 1Mo" +#: data/templates/importDelicious.tpl.php:35 +msgid "" +"Click Browse... to find this file on your computer. The maximum " +"size the file can be is 1MB" +msgstr "" +"Cliquez sur Parcourir... pour trouver le fichier sur votre " +"ordinateur. La taille maximale du fichier ne peut excèder 1Mo" -#: ../../../templates/importDelicious.tpl.php:36 -#: ../../../templates/importNetscape.tpl.php:43 +#: data/templates/importDelicious.tpl.php:36 +#: data/templates/importNetscape.tpl.php:43 msgid "Select the default privacy setting for your imported bookmarks" msgstr "Selectionnez la vision par défaut à appliquer à vos signets importés" -#: ../../../templates/importDelicious.tpl.php:37 -#: ../../../templates/importNetscape.tpl.php:44 -msgid "Click Import to start importing the bookmarks; it may take a minute" -msgstr "Cliquez sur Importer pour débuter l'import des signets; cette opération peut prendre quelques minutes" +#: data/templates/importDelicious.tpl.php:37 +#: data/templates/importNetscape.tpl.php:44 +msgid "" +"Click Import to start importing the bookmarks; it may take a " +"minute" +msgstr "" +"Cliquez sur Importer pour débuter l'import des signets; cette " +"opération peut prendre quelques minutes" -#: ../../../templates/importNetscape.tpl.php:35 +#: data/templates/importNetscape.tpl.php:35 msgid "Export your bookmarks from your browser to a file" msgstr "Exporter vos signets dans un fichier depuis votre navigateur" -#: ../../../templates/importNetscape.tpl.php:37 -msgid "Internet Explorer: File > Import and Export... > Export Favorites" -msgstr "Internet Explorer: Ficher > Importer et Exporter... > Exporter les favoris" +#: data/templates/importNetscape.tpl.php:37 +msgid "" +"Internet Explorer: File > Import and Export... > Export Favorites" +msgstr "" +"Internet Explorer: Ficher > Importer et Exporter... > Exporter " +"les favoris" -#: ../../../templates/importNetscape.tpl.php:38 -msgid "Mozilla Firefox: Bookmarks > Manage Bookmarks... > File > Export..." -msgstr "Mozilla Firefox: Marques-pages > Gérer les marques-pages... > Fichier > Exporter..." +#: data/templates/importNetscape.tpl.php:38 +msgid "" +"Mozilla Firefox: Bookmarks > Manage Bookmarks... > File > " +"Export..." +msgstr "" +"Mozilla Firefox: Marques-pages > Gérer les marques-pages... > " +"Fichier > Exporter..." -#: ../../../templates/importNetscape.tpl.php:39 -msgid "Netscape: Bookmarks > Manage Bookmarks... > Tools > Export..." -msgstr "Netscape: Marques-pages > Gérer les marques-pages... > Outils > Exporter..." +#: data/templates/importNetscape.tpl.php:39 +msgid "" +"Netscape: Bookmarks > Manage Bookmarks... > Tools > Export..." +msgstr "" +"Netscape: Marques-pages > Gérer les marques-pages... > Outils " +"> Exporter..." -#: ../../../templates/importNetscape.tpl.php:42 -msgid "Click Browse... to find the saved bookmark file on your computer. The maximum size the file can be is 1MB" -msgstr "Cliquez sur Parcourir... pour trouver le fichier sur votre ordinateur. La taille maximale du fichier ne peut excèder 1Mo" +#: data/templates/importNetscape.tpl.php:42 +msgid "" +"Click Browse... to find the saved bookmark file on your computer. " +"The maximum size the file can be is 1MB" +msgstr "" +"Cliquez sur Parcourir... pour trouver le fichier sur votre " +"ordinateur. La taille maximale du fichier ne peut excèder 1Mo" -#: ../../../templates/login.tpl.php:20 -#: ../../../templates/register.tpl.php:21 +#: data/templates/importStructure.tpl.php:24 +msgid "Create your structure into a simple text file and following this model:" +msgstr "" + +#: data/templates/importStructure.tpl.php:35 +msgid "" +"Then import the file. The tags and their relations will be added to your " +"profile." +msgstr "" + +#: data/templates/login.tpl.php:13 +msgid "Please activate cookies" +msgstr "" + +#: data/templates/login.tpl.php:26 data/templates/register.tpl.php:21 msgid "Password" msgstr "Mot de passe" -#: ../../../templates/login.tpl.php:22 +#: data/templates/login.tpl.php:28 msgid "Don't ask for my password for 2 weeks" msgstr "Ne pas demander mon mot de passe pendant 2 semaines" -#: ../../../templates/login.tpl.php:30 +#: data/templates/login.tpl.php:32 data/templates/toolbar.inc.php:29 +#: www/login.php:57 +msgid "Log In" +msgstr "Se connecter" + +#: data/templates/login.tpl.php:36 msgid "Forgotten your password?" msgstr "Avez-vous oublié votre mot de passe ?" -#: ../../../templates/password.tpl.php:5 +#: data/templates/password.tpl.php:5 #, php-format -msgid "If you have forgotten your password, %s can generate a new one. Enter the username and e-mail address of your account into the form below and we will e-mail your new password to you." -msgstr "Si vous avez oublié votre mot de passe, %s peut en générer un nouveau. Entrez le nom d'utilisateur et l'adresse email de votre compte dans le formulaire ci-dessous et nous vous enverrons un nouveau mot de passe." +msgid "" +"If you have forgotten your password, %s can generate a new one. Enter the " +"username and e-mail address of your account into the form below and we will " +"e-mail your new password to you." +msgstr "" +"Si vous avez oublié votre mot de passe, %s peut en générer un nouveau. " +"Entrez le nom d'utilisateur et l'adresse email de votre compte dans le " +"formulaire ci-dessous et nous vous enverrons un nouveau mot de passe." -#: ../../../templates/password.tpl.php:19 +#: data/templates/password.tpl.php:19 msgid "Generate Password" msgstr "Générer un mot de passe" -#: ../../../templates/profile.tpl.php:23 +#: data/templates/profile.tpl.php:11 +#, fuzzy +msgid "Email" +msgstr "E-mail" + +#: data/templates/profile.tpl.php:28 msgid "Member Since" msgstr "Membre depuis" -#: ../../../templates/profile.tpl.php:35 -#: ../../../templates/sidebar.block.watchlist.php:8 +#: data/templates/profile.tpl.php:40 +#: data/templates/sidebar.block.watchlist.php:30 #, fuzzy msgid "Watching" msgstr "Liste des signets vus" -#: ../../../templates/profile.tpl.php:50 +#: data/templates/profile.tpl.php:55 +#: data/templates/sidebar.block.watchlist.php:52 #, fuzzy msgid "Watched By" msgstr "Consultés" -#: ../../../templates/profile.tpl.php:63 -#: ../../../templates/toolbar.inc.php:10 +#: data/templates/profile.tpl.php:68 data/templates/toolbar.inc.php:9 msgid "Bookmarks" msgstr "Signets" -#: ../../../templates/profile.tpl.php:64 +#: data/templates/profile.tpl.php:69 msgid "Go to bookmarks" msgstr "Aller aux signets" -#: ../../../templates/register.tpl.php:11 +#: data/templates/register.tpl.php:11 #, php-format -msgid "Sign up here to create a free %s account. All the information requested below is required" -msgstr "Enregistrez-vous ici pour créer un compte gratuit %s. Toutes les informations requises ci-dessous sont nécessaires." +msgid "" +"Sign up here to create a free %s account. All the information requested " +"below is required" +msgstr "" +"Enregistrez-vous ici pour créer un compte gratuit %s. Toutes les " +"informations requises ci-dessous sont nécessaires." -#: ../../../templates/register.tpl.php:33 +#: data/templates/register.tpl.php:18 +msgid "" +" at least 5 characters, alphanumeric (no spaces, no dots or other special " +"ones)" +msgstr "" + +#: data/templates/register.tpl.php:28 +msgid " to send you your password if you forget it" +msgstr "" + +#: data/templates/register.tpl.php:33 msgid "Antispam question" msgstr "Question antispam" -#: ../../../templates/sidebar.block.linked.php:41 +#: data/templates/register.tpl.php:41 data/templates/toolbar.inc.php:31 +#: www/register.php:83 +msgid "Register" +msgstr "S'enregistrer" + +#: data/templates/search.menu.php:27 +#, fuzzy +msgid "Search..." +msgstr "Chercher dans" + +#: data/templates/search.menu.php:28 +#, fuzzy +msgid "in" +msgstr "Ligne" + +#: data/templates/search.menu.php:34 +msgid "this user's bookmarks" +msgstr "les signets de cet utilisateur" + +#: data/templates/search.menu.php:39 +msgid "my bookmarks" +msgstr "mes signets" + +#: data/templates/search.menu.php:40 +msgid "my watchlist" +msgstr "ma liste des consultés" + +#: data/templates/search.menu.php:44 +msgid "all bookmarks" +msgstr "tous les signets" + +#: data/templates/search.menu.php:54 +msgid "Search" +msgstr "Chercher dans" + +#: data/templates/sidebar.block.linked.php:51 msgid "Linked Tags" msgstr "Mots-clés structurés" -#: ../../../templates/sidebar.block.linked.php:55 -#: ../../../templates/sidebar.block.menu.php:40 +#: data/templates/sidebar.block.linked.php:62 +#: data/templates/sidebar.block.menu.php:46 msgid "Add new link" msgstr "Créer un lien" -#: ../../../templates/sidebar.block.linked.php:56 -#: ../../../templates/sidebar.block.menu.php:41 +#: data/templates/sidebar.block.linked.php:63 +#: data/templates/sidebar.block.menu.php:47 msgid "Delete link" msgstr "Supprimer un lien" -#: ../../../templates/sidebar.block.menu.php:29 +#: data/templates/sidebar.block.menu.php:35 #, php-format msgid "Tags included into the tag '%s'" msgstr "Mots-clés inclus dans le mot-clé '%s'" -#: ../../../templates/sidebar.block.menu.php:29 +#: data/templates/sidebar.block.menu.php:35 msgid "Menu Tags" msgstr "Mots-clés Menu" -#: ../../../templates/sidebar.block.menu.php:62 +#: data/templates/sidebar.block.menu.php:68 msgid "See all your tags" msgstr "Voir tous vos mots-clés" -#: ../../../templates/sidebar.block.menu.php:62 +#: data/templates/sidebar.block.menu.php:68 msgid "all your tags" msgstr "Tous vos mots-clés" -#: ../../../templates/sidebar.block.menu.php:64 +#: data/templates/sidebar.block.menu.php:70 msgid "See all tags from this user" msgstr "Voir tous les mots-clés de cet utilisateur" -#: ../../../templates/sidebar.block.menu.php:64 +#: data/templates/sidebar.block.menu.php:70 msgid "all tags from this user" msgstr "tous les mots-clés de cet utilisateur" -#: ../../../templates/sidebar.block.menu.php:68 +#: data/templates/sidebar.block.menu.php:74 #, fuzzy msgid "See popular tags" msgstr "Voir tous vos mots-clés" -#: ../../../templates/sidebar.block.recent.php:15 +#: data/templates/sidebar.block.menu2.php:25 +#, fuzzy +msgid "Featured Menu Tags" +msgstr "Mots-clés Menu" + +#: data/templates/sidebar.block.menu2.php:29 +msgid "This menu is composed of keywords (tags) organized by admins." +msgstr "" + +#: data/templates/sidebar.block.recent.php:18 msgid "Recent Tags" msgstr "Mots-clés récents" -#: ../../../templates/sidebar.block.related.php:17 +#: data/templates/sidebar.block.related.php:26 msgid "Related Tags" msgstr "Mots-clés en relation" -#: ../../../templates/sidebar.block.search.php:15 +#: data/templates/sidebar.block.search.php:15 msgid "Last Searches" msgstr "Dernières recherches" -#: ../../../templates/sidebar.block.search.php:24 +#: data/templates/sidebar.block.search.php:24 msgid "Number of bookmarks for this query" msgstr "Nombre de signets pour cette recherche" -#: ../../../templates/sidebar.block.tagactions.php:29 +#: data/templates/sidebar.block.tagactions.php:9 www/tagrename.php:72 +msgid "Rename Tag" +msgid_plural "Rename Tags" +msgstr[0] "Renommer le mot-clé" +msgstr[1] "Renommer les mots-clés" + +#: data/templates/sidebar.block.tagactions.php:22 www/tagdelete.php:54 +msgid "Delete Tag" +msgstr "Supprimer le mot-clé" + +#: data/templates/sidebar.block.tagactions.php:24 www/tagedit.php:61 +msgid "Edit Tag Description" +msgstr "Editer la description du mot-clé" + +#: data/templates/sidebar.block.tagactions.php:26 +#: www/tagcommondescriptionedit.php:76 +msgid "Edit Tag Common Description" +msgstr "Editer la description commune du mot-clé" + +#: data/templates/sidebar.block.tagactions.php:28 msgid "Create a link to another tag" msgstr "Créer un lien vers un autre mot-clé" -#: ../../../templates/sidebar.block.users.php:13 -msgid "Last Users" -msgstr "Derniers utilisateurs" +#: data/templates/sidebar.block.users.php:14 +#, fuzzy +msgid "New Users" +msgstr "Utilisateurs" -#: ../../../templates/sidebar.block.users.php:22 -#: ../../../templates/users.tpl.php:17 +#: data/templates/sidebar.block.users.php:23 data/templates/users.tpl.php:17 msgid "bookmarks" msgstr "signets" -#: ../../../templates/sidebar.block.users.php:29 +#: data/templates/sidebar.block.users.php:30 #, fuzzy msgid "See all users" msgstr "Voir tous vos mots-clés" -#: ../../../templates/sidebar.block.users.php:29 +#: data/templates/sidebar.block.users.php:30 msgid "All users" msgstr "Tous les utilisateurs" -#: ../../../templates/sidebar.block.watchstatus.php:10 +#: data/templates/sidebar.block.watchlist.php:19 +msgid "Close contacts are mutual contacts" +msgstr "" + +#: data/templates/sidebar.block.watchlist.php:19 +msgid "Close contacts" +msgstr "" + +#: data/templates/sidebar.block.watchlist.php:36 +msgid "Add a contact..." +msgstr "" + +#: data/templates/sidebar.block.watchlist.php:36 +msgid "Type a username to add it to your contacts." +msgstr "" + +#: data/templates/sidebar.block.watchlist.php:44 +#, fuzzy +msgid "Remove this contact" +msgstr "Enlever de la liste des consultés" + +#: data/templates/sidebar.block.watchstatus.php:11 msgid "Remove from Watchlist" msgstr "Enlever de la liste des consultés" -#: ../../../templates/sidebar.block.watchstatus.php:12 +#: data/templates/sidebar.block.watchstatus.php:13 msgid "Add to Watchlist" msgstr "Ajouter à la liste des consultés" -#: ../../../templates/sidebar.linkedtags.inc.php:18 +#: data/templates/sidebar.linkedtags.inc.php:18 msgid "Edit link" msgstr "Editer un lien" -#: ../../../templates/sidebar.linkedtags.inc.php:45 +#: data/templates/sidebar.linkedtags.inc.php:47 msgid "Synonyms:" msgstr "Synonymes :" -#: ../../../templates/tag2tagadd.tpl.php:12 +#: data/templates/tag2tagadd.tpl.php:12 msgid "Create new link:" msgstr "Créer un nouveau lien" -#: ../../../templates/tag2tagadd.tpl.php:19 +#: data/templates/tag2tagadd.tpl.php:19 #, php-format -msgid "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into the menu box" -msgstr "Note : inclure un mot-clé dans le mot-clé '%s' (e.g. %s>countries) affiche ce mot-clé dans la boîte de menu" +msgid "" +"Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into " +"the menu box" +msgstr "" +"Note : inclure un mot-clé dans le mot-clé '%s' (e.g. %" +"s>countries) affiche ce mot-clé dans la boîte de menu" -#: ../../../templates/tag2tagadd.tpl.php:23 -#: ../../../templates/tag2tagedit.tpl.php:37 +#: data/templates/tag2tagadd.tpl.php:23 data/templates/tag2tagedit.tpl.php:37 msgid "Create" msgstr "Créer" -#: ../../../templates/tag2tagadd.tpl.php:35 -#: ../../../templates/tag2tagdelete.tpl.php:27 -#: ../../../templates/tag2tagedit.tpl.php:51 +#: data/templates/tag2tagadd.tpl.php:35 +#: data/templates/tag2tagdelete.tpl.php:27 +#: data/templates/tag2tagedit.tpl.php:51 msgid "Existing links:" msgstr "Liens existants :" -#: ../../../templates/tag2tagadd.tpl.php:53 -#: ../../../templates/tag2tagdelete.tpl.php:45 -#: ../../../templates/tag2tagedit.tpl.php:69 +#: data/templates/tag2tagadd.tpl.php:53 +#: data/templates/tag2tagdelete.tpl.php:45 +#: data/templates/tag2tagedit.tpl.php:69 msgid "No links" msgstr "Pas de liens" -#: ../../../templates/tag2tagedit.tpl.php:6 +#: data/templates/tag2tagdelete.tpl.php:15 +#: data/templates/tag2tagedit.tpl.php:16 data/templates/tagdelete.tpl.php:8 +#: www/jsScuttle.php:23 +msgid "Yes" +msgstr "Oui" + +#: data/templates/tag2tagdelete.tpl.php:16 +#: data/templates/tag2tagedit.tpl.php:17 data/templates/tagdelete.tpl.php:9 +#: www/jsScuttle.php:23 +msgid "No" +msgstr "Non" + +#: data/templates/tag2tagedit.tpl.php:6 msgid "Delete the link" msgstr "Supprimer le lien" -#: ../../../templates/tag2tagedit.tpl.php:29 +#: data/templates/tag2tagedit.tpl.php:29 msgid "Create new link" msgstr "Créer un nouveau lien" -#: ../../../templates/tagrename.tpl.php:12 +#: data/templates/tagrename.tpl.php:12 msgid "Old" msgstr "Ancien" -#: ../../../templates/tagrename.tpl.php:17 +#: data/templates/tagrename.tpl.php:17 msgid "New" msgstr "Nouveau" -#: ../../../templates/tagrename.tpl.php:24 +#: data/templates/tagrename.tpl.php:24 msgid "Rename" msgstr "Renommer" -#: ../../../templates/tags.tpl.php:11 -#: ../../../templates/users.tpl.php:9 +#: data/templates/tags.tpl.php:11 data/templates/users.tpl.php:9 msgid "Alphabet" msgstr "Alphabet" -#: ../../../templates/tags.tpl.php:12 -#: ../../../templates/users.tpl.php:10 +#: data/templates/tags.tpl.php:12 data/templates/users.tpl.php:10 msgid "Popularity" msgstr "Popularité" -#: ../../../templates/toolbar.inc.php:15 +#: data/templates/toolbar.inc.php:8 data/templates/toolbar.inc.php:26 +#, fuzzy +msgid "Home" +msgstr "Page personnelle" + +#: data/templates/toolbar.inc.php:11 www/watchlist.php:106 +#, fuzzy +msgid "Watchlist" +msgstr "Liste des signets vus" + +#: data/templates/toolbar.inc.php:12 www/profile.php:67 +msgid "Profile" +msgstr "Profil" + +#: data/templates/toolbar.inc.php:13 www/bookmarks.php:209 +msgid "Add a Bookmark" +msgstr "Ajouter un signet" + +#: data/templates/toolbar.inc.php:14 msgid "Log Out" msgstr "Quitter" -#: ../../../templates/users.tpl.php:17 +#: data/templates/toolbar.inc.php:17 +msgid "Admin" +msgstr "" + +#: data/templates/top.inc.php:49 +msgid "" +"Admins, your installation is in \"Debug Mode\" ($debugMode = true). To go in " +"\"Normal Mode\" and hide debugging messages, change $debugMode to false into " +"config.php." +msgstr "" + +#: data/templates/users.tpl.php:17 msgid "profile" msgstr "Profil" -#: ../../../templates/users.tpl.php:17 +#: data/templates/users.tpl.php:17 msgid "created in" msgstr "Créé en " +#: www/admin.php:32 +msgid "Manage users" +msgstr "" + +#: www/admin.php:68 +#, php-format +msgid "%s and all his bookmarks and tags were deleted." +msgstr "" + +#: www/admin.php:75 +msgid "Problem with " +msgstr "" + +#: www/ajaxDelete.php:37 +msgid "You are not allowed to delete this bookmark" +msgstr "Vous n'êtes pas autorisés à supprimer ce signet" + +#: www/ajaxDelete.php:41 www/edit.php:103 +msgid "Failed to delete bookmark" +msgstr "Erreur dans la suppression du signet" + +#: www/alltags.php:50 +msgid "All Tags" +msgstr "Tous les mots-clés" + +#: www/alltags.php:56 www/bookmarks.php:96 www/populartags.php:52 +#: www/profile.php:51 www/rss.php:76 www/search.php:109 www/watch.php:45 +#: www/watchlist.php:61 +#, php-format +msgid "User with username %s was not found" +msgstr "L'utilisateur %s n'a pas été trouvé." + +#: www/bookmarkcommondescriptionedit.php:51 www/tag2tagadd.php:37 +#: www/tag2tagdelete.php:41 www/tag2tagedit.php:33 +#: www/tagcommondescriptionedit.php:51 www/tagedit.php:43 +msgid "Permission denied." +msgstr "Permission non accordée." + +#: www/bookmarkcommondescriptionedit.php:60 +msgid "Bookmark common description updated" +msgstr "Description commune du signet mise à jour." + +#: www/bookmarkcommondescriptionedit.php:63 +msgid "Failed to update the bookmark common description" +msgstr "Erreur dans la mise à jour de la description du signet" + +#: www/bookmarkcommondescriptionedit.php:71 +msgid "Edit Bookmark Common Description" +msgstr "Editer la description commune du signet" + +#: www/bookmarks.php:111 www/tags.php:47 +#, fuzzy +msgid "Remove the tag from the selection" +msgstr "Voir tous les mots-clés de cet utilisateur" + +#: www/bookmarks.php:131 www/edit.php:65 +msgid "Your bookmark must have a title and an address" +msgstr "Votre signet doit avoir un titre et une adresse." + +#: www/bookmarks.php:152 www/edit.php:83 www/edit.php:86 +msgid "Bookmark saved" +msgstr "Signet enregistré." + +#: www/bookmarks.php:152 +msgid "(Come back to previous page.)" +msgstr "" + +#: www/bookmarks.php:159 www/import.php:106 www/importNetscape.php:108 +msgid "" +"There was an error saving your bookmark. Please try again or contact the " +"administrator." +msgstr "" +"Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou " +"contacter votre administrateur." + +#: www/bookmarks.php:216 +msgid "Add Bookmark" +msgstr "Ajouter signet" + +#: www/bookmarks.php:219 +msgid "You must be logged in before you can add bookmarks." +msgstr "Vous devez être authentifié avant de pouvoir ajouter des signets." + +#: www/bookmarks.php:274 www/bookmarks.php:275 +msgid "My Bookmarks" +msgstr "Mes signets" + +#: www/edit.php:44 www/edit.php:45 +msgid "Edit Bookmark" +msgstr "Editer le signet" + +#: www/edit.php:51 +#, php-format +msgid "Bookmark with id %s not was not found" +msgstr "Signet %s non trouvé" + +#: www/edit.php:57 +msgid "You are not allowed to edit this bookmark" +msgstr "Vous n'êtes pas autorisé à éditer ce signet." + +#: www/edit.php:77 +msgid "Error while saving your bookmark" +msgstr "Erreur pendant l'enregistrement de votre signet." + +#: www/history.php:61 +msgid "History" +msgstr "Historique" + +#: www/history.php:62 +#, php-format +msgid "History for %s" +msgstr "Historique de %s" + +#: www/history.php:84 +msgid "Address was not found" +msgstr "L'adresse n'a pas été trouvée." + +#: www/import.php:47 +msgid "Could not open XML input" +msgstr "Impossible d'ouvrir le flux XML." + +#: www/import.php:51 +#, php-format +msgid "XML error: %s at line %d" +msgstr "Erreur XML: %s à la ligne %d" + +#: www/import.php:60 +msgid "Import Bookmarks from del.icio.us" +msgstr "Importer les signet depuis del.icio.us" + +#: www/import.php:93 +msgid "You have already submitted this bookmark." +msgstr "Vous avez déjà enregistré ce signet." + +#: www/import.php:104 +msgid "Bookmark imported." +msgstr "Signet importé." + +#: www/importNetscape.php:95 +#, fuzzy +msgid "You have already submitted some of these bookmarks." +msgstr "Vous avez déjà enregistré ce signet." + +#: www/importNetscape.php:115 +#, fuzzy +msgid "Bookmarks found: " +msgstr "Pas de signets trouvés" + +#: www/importNetscape.php:116 +#, fuzzy +msgid "Bookmarks imported: " +msgstr "Signet importé." + +#: www/importNetscape.php:117 www/importNetscape.php:122 +msgid "Import Bookmarks from Browser File" +msgstr "Importer les signets depuis un fichier" + +#: www/importStructure.php:61 +msgid "Bad indentation" +msgstr "" + +#: www/importStructure.php:67 +#, fuzzy +msgid "New links between tags: " +msgstr "Effacer un lien entre mots-clés" + +#: www/importStructure.php:72 +msgid "Import Structure" +msgstr "" + +#: www/index.php:38 +msgid "You have now logged out" +msgstr "Vous êtes maintenant déconnecté." + +#: www/index.php:45 +#, php-format +msgid "%s: Recent bookmarks" +msgstr "%s: Signets récents" + +#: www/index.php:75 +msgid "Store, share and tag your favourite links" +msgstr "Conservez, partagez et libellez vos liens favoris" + +#: www/index.php:76 +msgid "All Bookmarks" +msgstr "Tous les signets" + +#: www/jsScuttle.php:70 +msgid "Available" +msgstr "Disponible" + +#: www/jsScuttle.php:73 +msgid "Not Available" +msgstr "Non Disponible" + +#: www/login.php:48 +msgid "The details you have entered are incorrect. Please try again." +msgstr "" +"Les informations que vous avez entrées sont incorrectes. Veuillez " +"recommencer." + +#: www/password.php:36 +msgid "You must enter your username." +msgstr "Vous devez entrer votre nom d'utilisateur." + +#: www/password.php:40 +msgid "" +"You must enter your e-mail address." +msgstr "" +"Vous devez saisir une E-mail." + +#: www/password.php:48 +msgid "No matches found for that username." +msgstr "Rien de trouvé pour ce nom d'utilisateur." + +#: www/password.php:51 +#, fuzzy +msgid "" +"No matches found for that combination of username and e-mail address." +msgstr "" +"Nous n'avons rien trouvé pour cette combinaison de nom d'utilisateur et " +"d'e-mail." + +#: www/password.php:59 +msgid "" +"There was an error while generating your new password. Please try again." +msgstr "" +"Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou " +"contacter votre administrateur." + +#: www/password.php:63 +msgid "Your new password is:" +msgstr "Votre nouveau mot de passe est:" + +#: www/password.php:63 +msgid "" +"To keep your bookmarks secure, you should change this password in your " +"profile the next time you log in." +msgstr "" +"Pour garder vos signets sûrs, vous devriez changer ce mot de passe dans " +"votre profil lors de votre prochaine authentification." + +#: www/password.php:66 +#, php-format +msgid "%s Account Information" +msgstr "Informations du compte de %s" + +#: www/password.php:68 +#, php-format +msgid "New password generated and sent to %s" +msgstr "Nouveau mot de passe généré et envoyé à l'adresse %s" + +#: www/password.php:75 +msgid "Forgotten Password" +msgstr "Mot de passe oublié" + +#: www/profile.php:59 www/watchlist.php:119 +msgid "Username was not specified" +msgstr "Le nom d'utilisateur n'a pas été spécifié." + +#: www/profile.php:65 +msgid "My Profile" +msgstr "Mon Profil" + +#: www/profile.php:89 +msgid "Invalid Token" +msgstr "" + +#: www/profile.php:94 +msgid "Password and confirmation do not match." +msgstr "Le mot de passe et sa vérification ne correspondent pas." + +#: www/profile.php:98 +msgid "Password must be at least 6 characters long." +msgstr "Le mot de passe doit avoir au moins 6 caractères." + +#: www/profile.php:102 +msgid "E-mail address is not valid." +msgstr "Adresse de courrier électronique invalide." + +#: www/profile.php:106 +msgid "An error occurred while saving your changes." +msgstr "" +"Une erreur s'est produite pendant l'enregistrement de vos modifications." + +#: www/profile.php:108 +msgid "Changes saved." +msgstr "Modifications enregistrées." + +#: www/register.php:46 +msgid "You must enter a username, password and e-mail address." +msgstr "" +"Vous devez saisir un nom d'utilisateur, un mot de passe, un nom et " +"un e-mail" + +#: www/register.php:50 +msgid "This username has been reserved, please make another choice." +msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre." + +#: www/register.php:54 +msgid "This username already exists, please make another choice." +msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre." + +#: www/register.php:58 +#, fuzzy +msgid "" +"This username is not valid (too short, too long, forbidden characters...), " +"please make another choice." +msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre." + +#: www/register.php:62 +msgid "E-mail address is not valid. Please try again." +msgstr "Adresse de courrier électronique invalide. Veuilez réessayer." + +#: www/register.php:66 +msgid "Antispam answer is not valid. Please try again." +msgstr "La réponse antispam n'est pas valide. Veuillez réessayer." + +#: www/register.php:75 +msgid "You have successfully registered. Enjoy!" +msgstr "Votre inscription a bien été prise en compte !" + +#: www/register.php:77 +msgid "Registration failed. Please try again." +msgstr "Enregistrement raté. Veuillez rééssayer." + +#: www/rss.php:93 +#, php-format +msgid "Recent bookmarks posted to %s" +msgstr "Signets ajoutés récemment à %s" + +#: www/search.php:81 www/search.php:145 +msgid "Search Bookmarks" +msgstr "Recherche de signets" + +#: www/search.php:87 +msgid "Search Results" +msgstr "Résultats de recherche" + +#: www/search.php:135 +msgid "Unsatisfied? You can also try our " +msgstr "" + +#: www/tag2tagadd.php:50 +msgid "Tag link created" +msgstr "Lien entre mot-clé créé." + +#: www/tag2tagadd.php:53 +msgid "Failed to create the link" +msgstr "Impossible de créer le lien" + +#: www/tag2tagadd.php:65 +msgid "Add Tag Link" +msgstr "Ajout d'un lien entre mots-clés" + +#: www/tag2tagdelete.php:66 +msgid "Tag link deleted" +msgstr "Effacement d'un lien entre mots-clés" + +#: www/tag2tagdelete.php:69 +msgid "Failed to delete the link" +msgstr "Impossible d'effacer le lien" + +#: www/tag2tagdelete.php:81 +msgid "Delete Link Between Tags" +msgstr "Effacer un lien entre mots-clés" + +#: www/tag2tagedit.php:55 +msgid "Edit Link Between Tags" +msgstr "Editer un lien entre mots-clés" + +#: www/tagcommondescriptionedit.php:62 +msgid "Tag common description updated" +msgstr "Editer la description commune du mot-clé" + +#: www/tagcommondescriptionedit.php:67 +msgid "Failed to update the tag common description" +msgstr "Impossible de mettre à jour la description commune du mot-clé" + +#: www/tagdelete.php:43 +msgid "Tag deleted" +msgstr "Mot-clé effacé" + +#: www/tagdelete.php:46 +msgid "Failed to delete the tag" +msgstr "Impossible d'effacer le mot-clé" + +#: www/tagedit.php:52 +msgid "Tag description updated" +msgstr "Description du mot-clé mise à jour" + +#: www/tagedit.php:55 +msgid "Failed to update the tag description" +msgstr "Impossible de mettre à jour la description du mot-clé" + +#: www/tagrename.php:63 +msgid "Tag renamed" +msgstr "Mot-clé renommé" + +#: www/tagrename.php:66 +msgid "Failed to rename the tag" +msgstr "Erreur dans le renommage du mot-clé" + +#: www/users.php:31 +msgid "Users" +msgstr "Utilisateurs" + +#: www/watch.php:54 +msgid "User removed from your watchlist" +msgstr "Utilisateur enlevé de votre liste des consultés" + +#: www/watch.php:56 +msgid "User added to your watchlist" +msgstr "Utilisateur ajouté à la liste des consultés." + +#: www/watchlist.php:104 +#, fuzzy +msgid "My Watchlist" +msgstr "Liste des signets vus" + +#: www/api/httpauth.inc.php:11 +msgid "Use of the API calls requires authentication." +msgstr "" + +#: www/gsearch/index.php:27 +msgid "Come back to " +msgstr "" + +#: www/gsearch/index.php:32 +msgid "Admin tips: " +msgstr "" + +#: www/gsearch/index.php:33 +msgid "To refresh manually Google Custom Search Engine, goes to: " +msgstr "" + +#: www/gsearch/index.php:35 +msgid "" +"If no result appears, check that all the urls are valid in the admin section." +msgstr "" + +#~ msgid "for" +#~ msgstr "pour" + +#~ msgid "URL" +#~ msgstr "URL" + +#~ msgid "to" +#~ msgstr "dans" + +#~ msgid "Last Users" +#~ msgstr "Derniers utilisateurs" + #~ msgid "Recent Bookmarks" #~ msgstr "Signets récents" + #~ msgid "plus" #~ msgstr "plus" + #~ msgid "" #~ "Register now to start using " #~ "%s!" #~ msgstr "" #~ "Enregistrez-vous maintenant pour poster vos " #~ "propres signets sur %s !" + #~ msgid "" #~ "Semantic " #~ "Scuttle is licensed under the , sous license GNU General Public " #~ "License (vous pouvez donc l'héberger sur votre propre serveur)." + #~ msgid "edit" #~ msgstr "éditer" + #~ msgid "User with username %s not was not found" #~ msgstr "L'utilisateur %s n'a pas été trouvé." + #~ msgid "%s Bookmarks" #~ msgstr "Signets de %s" + #~ msgid "E-mail" #~ msgstr "E-mail" -#~ msgid "No bookmarks found" -#~ msgstr "Pas de signets trouvés" diff --git a/data/locales/fr_FR/LC_MESSAGES/messages.po b/data/locales/fr_FR/LC_MESSAGES/messages.po index 396c85e..0aa8be1 100644 --- a/data/locales/fr_FR/LC_MESSAGES/messages.po +++ b/data/locales/fr_FR/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Scuttle\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-16 20:55+0100\n" +"POT-Creation-Date: 2010-09-15 19:15+0200\n" "PO-Revision-Date: 2009-11-16 21:14+0100\n" "Last-Translator: BenjaminHKB \n" "Language-Team: fr-FR \n" @@ -19,64 +19,76 @@ msgstr "" "X-Poedit-Country: FRANCE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/SemanticScuttle/functions.php:163 +#: src/SemanticScuttle/functions.php:189 msgid "message_die() was called multiple times." msgstr "message_die() was called multiple times. ?" -#: src/SemanticScuttle/functions.php:175 +#: src/SemanticScuttle/functions.php:201 msgid "SQL Error" msgstr "Erreur SQL" -#: src/SemanticScuttle/functions.php:181 +#: src/SemanticScuttle/functions.php:207 msgid "Line" msgstr "Ligne" -#: src/SemanticScuttle/functions.php:181 +#: src/SemanticScuttle/functions.php:207 #: data/templates/importDelicious.tpl.php:8 #: data/templates/importNetscape.tpl.php:9 #: data/templates/importStructure.tpl.php:10 msgid "File" msgstr "Fichier" -#: src/SemanticScuttle/functions.php:189 +#: src/SemanticScuttle/functions.php:215 msgid "Information" msgstr "Information" -#: src/SemanticScuttle/functions.php:194 +#: src/SemanticScuttle/functions.php:220 msgid "Critical Information" msgstr "Information critique." -#: src/SemanticScuttle/functions.php:199 +#: src/SemanticScuttle/functions.php:225 msgid "An error occured" msgstr "Une erreur s'est produite." -#: src/SemanticScuttle/functions.php:202 +#: src/SemanticScuttle/functions.php:228 msgid "General Error" msgstr "Erreur générale." -#: src/SemanticScuttle/functions.php:210 +#: src/SemanticScuttle/functions.php:236 msgid "An critical error occured" msgstr "Une erreur critique s'est produite." -#: src/SemanticScuttle/functions.php:213 +#: src/SemanticScuttle/functions.php:239 msgid "Critical Error" msgstr "Erreur critique." -#: src/SemanticScuttle/functions.php:222 +#: src/SemanticScuttle/functions.php:248 msgid "DEBUG MODE" msgstr "Mode de débogage." #: data/templates/about.tpl.php:6 -msgid "Store all your favourite links in one place, accessible from anywhere." -msgstr "Conservez tous vos signets au même endroit, accessibles de partout. " +msgid "" +"Store all your favourite links in one place, accessible " +"from anywhere." +msgstr "" +"Conservez tous vos signets au même endroit, accessibles de " +"partout. " #: data/templates/about.tpl.php:7 -msgid "Share your bookmarks with everyone, with friends on your watchlist or just keep them private." -msgstr "Partagez vos signets avec tout le monde, avec vos contacts ou gardez-les pour vous." +msgid "" +"Share your bookmarks with everyone, with friends on your " +"watchlist or just keep them private." +msgstr "" +"Partagez vos signets avec tout le monde, avec vos contacts " +"ou gardez-les pour vous." #: data/templates/about.tpl.php:8 -msgid "Tag your bookmarks with as many labels as you want, instead of wrestling with folders." -msgstr "Taggez vos signets avec autant de labels que vous le souhaitez au lieu de les hiérarchiser avec des dossiers." +msgid "" +"Tag your bookmarks with as many labels as you want, instead " +"of wrestling with folders." +msgstr "" +"Taggez vos signets avec autant de labels que vous le " +"souhaitez au lieu de les hiérarchiser avec des dossiers." #: data/templates/about.tpl.php:9 msgid "Register now" @@ -101,8 +113,15 @@ msgstr "vous pouvez librement l'installer sur votre serveur Web" #: data/templates/about.tpl.php:15 #, php-format -msgid "%1$s supports most of the del.icio.us API. Almost all of the neat tools made for that system can be modified to work with %1$s instead. If you find a tool that won't let you change the API address, ask the creator to add this setting. You never know, they might just do it." -msgstr "%1$s supporte la plupart de l'API del.icio.us." +msgid "" +"%1$s supports most of the del.icio.us " +"API. Almost all " +"of the neat tools made for that system can be modified to work with %1$s " +"instead. If you find a tool that won't let you change the API address, ask " +"the creator to add this setting. You never know, they might just do it." +msgstr "" +"%1$s supporte la plupart de l'API del.icio.us." #: data/templates/about.tpl.php:24 msgid "Tips" @@ -113,12 +132,18 @@ msgid "Add search plugin into your browser:" msgstr "Ajouter un plugin de recherche à votre navigateur :" #: data/templates/about.tpl.php:27 -msgid "The secret tag \"system:unfiled\" allows you to find bookmarks without tags." -msgstr "Le tag secret \"system:unfiled\" vous permet de trouver les signets sans tags." +msgid "" +"The secret tag \"system:unfiled\" allows you to find bookmarks without tags." +msgstr "" +"Le tag secret \"system:unfiled\" vous permet de trouver les signets sans " +"tags." #: data/templates/about.tpl.php:28 -msgid "The secret tag \"system:imported\" allows you to find imported bookmarks." -msgstr "Le tag secret \"system:imported\" vous permet de trouver les signets importés." +msgid "" +"The secret tag \"system:imported\" allows you to find imported bookmarks." +msgstr "" +"Le tag secret \"system:imported\" vous permet de trouver les signets " +"importés." #: data/templates/admin.tpl.php:5 msgid "Users management" @@ -128,23 +153,18 @@ msgstr "Gestion des utilisateurs" msgid "Public/Shared/Private" msgstr "Publique/Partagé/Privé" -#: data/templates/admin.tpl.php:14 -#: data/templates/bookmarks.tpl.php:93 +#: data/templates/admin.tpl.php:14 data/templates/bookmarks.tpl.php:93 msgid "bookmark(s)" msgstr "signet(s)" -#: data/templates/admin.tpl.php:19 -#: data/templates/tag2tagadd.tpl.php:21 +#: data/templates/admin.tpl.php:19 data/templates/tag2tagadd.tpl.php:21 #: data/templates/tag2tagdelete.tpl.php:13 -#: data/templates/tag2tagedit.tpl.php:14 -#: data/templates/tag2tagedit.tpl.php:35 -#: data/templates/tagdelete.tpl.php:6 -#: www/jsScuttle.php:23 +#: data/templates/tag2tagedit.tpl.php:14 data/templates/tag2tagedit.tpl.php:35 +#: data/templates/tagdelete.tpl.php:6 www/jsScuttle.php:23 msgid "Are you sure?" msgstr "Etes-vous sûr ?" -#: data/templates/admin.tpl.php:19 -#: data/templates/bookmarks.tpl.php:251 +#: data/templates/admin.tpl.php:19 data/templates/bookmarks.tpl.php:267 msgid "Delete" msgstr "Supprimer" @@ -157,19 +177,21 @@ msgid "Check all URLs (May take some time)" msgstr "Vérifier toutes les URLs (Peut prendre du temps)" #: data/templates/bookmarkcommondescriptionedit.tpl.php:16 -msgid "Collaborative description: these fields can be viewed and modified by every users" -msgstr "Description collaborative : ces champs peuvent être vus et modifiés par tous les utilisateurs." +msgid "" +"Collaborative description: these fields can be viewed and modified by every " +"users" +msgstr "" +"Description collaborative : ces champs peuvent être vus et modifiés par tous " +"les utilisateurs." #: data/templates/bookmarkcommondescriptionedit.tpl.php:18 -#: data/templates/bookmarks.tpl.php:137 -#: data/templates/editbookmark.tpl.php:38 +#: data/templates/bookmarks.tpl.php:137 data/templates/editbookmark.tpl.php:43 msgid "Title" msgstr "Titre" #: data/templates/bookmarkcommondescriptionedit.tpl.php:23 -#: data/templates/editbookmark.tpl.php:44 -#: data/templates/editprofile.tpl.php:47 -#: data/templates/profile.tpl.php:33 +#: data/templates/editbookmark.tpl.php:49 +#: data/templates/editprofile.tpl.php:47 data/templates/profile.tpl.php:33 #: data/templates/tagcommondescriptionedit.tpl.php:13 #: data/templates/tagedit.tpl.php:12 msgid "Description" @@ -187,12 +209,10 @@ msgid "Update" msgstr "Mettre à jour" #: data/templates/bookmarkcommondescriptionedit.tpl.php:43 -#: data/templates/editbookmark.tpl.php:98 -#: data/templates/tag2tagadd.tpl.php:24 -#: data/templates/tag2tagedit.tpl.php:38 +#: data/templates/editbookmark.tpl.php:103 +#: data/templates/tag2tagadd.tpl.php:24 data/templates/tag2tagedit.tpl.php:38 #: data/templates/tagcommondescriptionedit.tpl.php:33 -#: data/templates/tagedit.tpl.php:19 -#: data/templates/tagrename.tpl.php:25 +#: data/templates/tagedit.tpl.php:19 data/templates/tagrename.tpl.php:25 msgid "Cancel" msgstr "Annuler" @@ -215,23 +235,19 @@ msgstr "Vote contre" msgid "Bookmarks on this page are managed by an admin user." msgstr "Les signets de cette page sont gérés par un administrateur." -#: data/templates/bookmarks.tpl.php:51 -#: data/templates/bookmarks.tpl.php:52 +#: data/templates/bookmarks.tpl.php:51 data/templates/bookmarks.tpl.php:52 msgid "Edit the common description of this tag" msgstr "Editer la description commune de ce tag" -#: data/templates/bookmarks.tpl.php:55 -#: data/templates/bookmarks.tpl.php:56 +#: data/templates/bookmarks.tpl.php:55 data/templates/bookmarks.tpl.php:56 msgid "Edit the common description of this bookmark" msgstr "Editer la description commune de ce signet" -#: data/templates/bookmarks.tpl.php:76 -#: data/templates/bookmarks.tpl.php:77 +#: data/templates/bookmarks.tpl.php:76 data/templates/bookmarks.tpl.php:77 msgid "Edit your personal description of this tag" msgstr "Editer votre description personnelle de ce tag" -#: data/templates/bookmarks.tpl.php:93 -#: data/templates/tags.tpl.php:10 +#: data/templates/bookmarks.tpl.php:93 data/templates/tags.tpl.php:10 #: data/templates/users.tpl.php:8 msgid "Sort by:" msgstr "Classer par :" @@ -252,23 +268,19 @@ msgstr "Signets des autres utilisateurs pour ce tag" msgid "Only your bookmarks for this tag" msgstr "Uniquement vos signets pour ce tag" -#: data/templates/bookmarks.tpl.php:177 -#: data/templates/bookmarks.tpl.php:183 +#: data/templates/bookmarks.tpl.php:177 data/templates/bookmarks.tpl.php:183 msgid "First" msgstr "Première" -#: data/templates/bookmarks.tpl.php:178 -#: data/templates/bookmarks.tpl.php:184 +#: data/templates/bookmarks.tpl.php:178 data/templates/bookmarks.tpl.php:184 msgid "Previous" msgstr "Précédent" -#: data/templates/bookmarks.tpl.php:191 -#: data/templates/bookmarks.tpl.php:194 +#: data/templates/bookmarks.tpl.php:191 data/templates/bookmarks.tpl.php:194 msgid "Next" msgstr "Suivant" -#: data/templates/bookmarks.tpl.php:192 -#: data/templates/bookmarks.tpl.php:195 +#: data/templates/bookmarks.tpl.php:192 data/templates/bookmarks.tpl.php:195 msgid "Last" msgstr "Dernière" @@ -277,69 +289,66 @@ msgstr "Dernière" msgid "Page %d of %d" msgstr "Page %d de %d" -#: data/templates/bookmarks.tpl.php:245 +#: data/templates/bookmarks.tpl.php:261 msgid "Tags:" msgstr "Tags:" -#: data/templates/bookmarks.tpl.php:251 +#: data/templates/bookmarks.tpl.php:267 msgid "Edit" msgstr "Editer" -#: data/templates/bookmarks.tpl.php:255 +#: data/templates/bookmarks.tpl.php:271 msgid "Last update" msgstr "Date de dernière mise à jour" -#: data/templates/bookmarks.tpl.php:258 +#: data/templates/bookmarks.tpl.php:274 msgid "by" msgstr "par" -#: data/templates/bookmarks.tpl.php:260 +#: data/templates/bookmarks.tpl.php:276 msgid "you" msgstr "vous" -#: data/templates/bookmarks.tpl.php:274 +#: data/templates/bookmarks.tpl.php:290 #, php-format msgid " and %s1 other%s" msgstr " et %s1 autre%s" -#: data/templates/bookmarks.tpl.php:277 +#: data/templates/bookmarks.tpl.php:293 #, php-format msgid " and %2$s%1$s others%3$s" msgstr " et %2$s%1$s autres%3$s" -#: data/templates/bookmarks.tpl.php:288 +#: data/templates/bookmarks.tpl.php:304 msgid "Copy this bookmark to YOUR bookmarks." msgstr "Copier ce signet dans VOS signets." -#: data/templates/bookmarks.tpl.php:289 +#: data/templates/bookmarks.tpl.php:305 msgid "Copy" msgstr "Copier" -#: data/templates/bookmarks.tpl.php:309 +#: data/templates/bookmarks.tpl.php:325 msgid "This bookmark is certified by an admin user." msgstr "Ce signet est certifié par un administrateur." -#: data/templates/bookmarks.tpl.php:351 +#: data/templates/bookmarks.tpl.php:371 msgid "Private Note on this bookmark" msgstr "Note privée sur ce signet" -#: data/templates/bookmarks.tpl.php:363 +#: data/templates/bookmarks.tpl.php:383 msgid "Come back to the top of this page." msgstr "Revenir en haut de cette page." -#: data/templates/bookmarks.tpl.php:363 +#: data/templates/bookmarks.tpl.php:383 msgid "Top of the page" msgstr "Haut de page" -#: data/templates/bookmarks.tpl.php:369 +#: data/templates/bookmarks.tpl.php:389 msgid "No bookmarks available" msgstr "Pas de signets disponibles." -#: data/templates/bottom.inc.php:5 -#: data/templates/toolbar.inc.php:15 -#: data/templates/toolbar.inc.php:28 -#: www/about.php:23 -#: www/about.php:24 +#: data/templates/bottom.inc.php:5 data/templates/toolbar.inc.php:15 +#: data/templates/toolbar.inc.php:28 www/about.php:23 www/about.php:24 msgid "About" msgstr "À propos" @@ -350,8 +359,7 @@ msgstr "Propulsé par " #: data/templates/dynamictags.inc.php:47 #: data/templates/sidebar.block.common.php:19 #: data/templates/sidebar.block.popular.php:34 -#: data/templates/sidebar.block.recent.php:29 -#: data/templates/tags.tpl.php:19 +#: data/templates/sidebar.block.recent.php:29 data/templates/tags.tpl.php:19 msgid "bookmark" msgid_plural "bookmarks" msgstr[0] "signet" @@ -362,8 +370,7 @@ msgstr[1] "Signets" #: data/templates/sidebar.block.menu.php:74 #: data/templates/sidebar.block.popular.php:23 #: data/templates/sidebar.block.recent.php:34 -#: data/templates/toolbar.inc.php:27 -#: www/populartags.php:46 +#: data/templates/toolbar.inc.php:27 www/populartags.php:46 msgid "Popular Tags" msgstr "Tags populaires" @@ -371,131 +378,143 @@ msgstr "Tags populaires" msgid "Popular Tags From All Users" msgstr "Tags populaires pour tous les utilisateurs" -#: data/templates/editbookmark.tpl.php:33 +#: data/templates/editbookmark.tpl.php:38 msgid "Address" msgstr "Adresse" -#: data/templates/editbookmark.tpl.php:35 #: data/templates/editbookmark.tpl.php:40 -#: data/templates/editprofile.tpl.php:31 -#: data/templates/tagrename.tpl.php:14 +#: data/templates/editbookmark.tpl.php:45 +#: data/templates/editprofile.tpl.php:31 data/templates/tagrename.tpl.php:14 #: data/templates/tagrename.tpl.php:19 msgid "Required" msgstr "Requis" -#: data/templates/editbookmark.tpl.php:45 +#: data/templates/editbookmark.tpl.php:50 msgid "Add Note" msgstr "Ajouter une note" -#: data/templates/editbookmark.tpl.php:48 -msgid "You can use anchors to delimite attributes. for example: [publisher]blah[/publisher] " -msgstr "Vous pouvez utiliser des balises pour délimiter des attributs. Par exemple : [publisher]blah[/publisher]" +#: data/templates/editbookmark.tpl.php:53 +msgid "" +"You can use anchors to delimite attributes. for example: [publisher]blah[/" +"publisher] " +msgstr "" +"Vous pouvez utiliser des balises pour délimiter des attributs. Par exemple : " +"[publisher]blah[/publisher]" -#: data/templates/editbookmark.tpl.php:51 +#: data/templates/editbookmark.tpl.php:56 msgid "Suggested anchors: " msgstr "Balises suggérées : " -#: data/templates/editbookmark.tpl.php:63 +#: data/templates/editbookmark.tpl.php:68 msgid "Private Note" msgstr "Note privée" -#: data/templates/editbookmark.tpl.php:65 +#: data/templates/editbookmark.tpl.php:70 msgid "Just visible by you and your contacts." msgstr "Visible uniquement par vous et vos contacts." -#: data/templates/editbookmark.tpl.php:69 -#: data/templates/toolbar.inc.php:10 -#: www/tags.php:45 -#: www/tags.php:67 +#: data/templates/editbookmark.tpl.php:74 data/templates/toolbar.inc.php:10 +#: www/tags.php:45 www/tags.php:67 msgid "Tags" msgstr "Tags" -#: data/templates/editbookmark.tpl.php:73 +#: data/templates/editbookmark.tpl.php:78 msgid "Comma-separated" msgstr "Séparés par des virgules" -#: data/templates/editbookmark.tpl.php:77 -#: data/templates/tag2tagadd.tpl.php:9 -msgid "Note: use \">\" to include one tag in another. e.g.: europe>france>paris" -msgstr "Note: utiliser \">\" pour inclure un tag dans un autre. ex: europe>france>paris" +#: data/templates/editbookmark.tpl.php:82 data/templates/tag2tagadd.tpl.php:9 +msgid "" +"Note: use \">\" to include one tag in another. e.g.: europe>france>paris" +msgstr "" +"Note: utiliser \">\" pour inclure un tag dans un autre. ex: " +"europe>france>paris" -#: data/templates/editbookmark.tpl.php:81 -#: data/templates/tag2tagadd.tpl.php:8 +#: data/templates/editbookmark.tpl.php:86 data/templates/tag2tagadd.tpl.php:8 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry" msgstr "Note : utiliser \"=\" pour rendre deux tags synonymes ex: europe=eu" -#: data/templates/editbookmark.tpl.php:84 +#: data/templates/editbookmark.tpl.php:89 #: data/templates/importDelicious.tpl.php:15 #: data/templates/importNetscape.tpl.php:16 msgid "Privacy" msgstr "Accès" -#: data/templates/editbookmark.tpl.php:87 +#: data/templates/editbookmark.tpl.php:92 #: data/templates/importDelicious.tpl.php:18 #: data/templates/importNetscape.tpl.php:19 msgid "Public" msgstr "Publique" -#: data/templates/editbookmark.tpl.php:88 +#: data/templates/editbookmark.tpl.php:93 msgid "Shared with Watch List" msgstr "Partagé avec mes contacts" -#: data/templates/editbookmark.tpl.php:89 +#: data/templates/editbookmark.tpl.php:94 #: data/templates/importDelicious.tpl.php:20 #: data/templates/importNetscape.tpl.php:21 msgid "Private" msgstr "Privée" -#: data/templates/editbookmark.tpl.php:102 +#: data/templates/editbookmark.tpl.php:107 msgid "Delete Bookmark" msgstr "Supprimer le signet" -#: data/templates/editbookmark.tpl.php:107 +#: data/templates/editbookmark.tpl.php:112 msgid "edit common description" msgstr "éditer la description commune" -#: data/templates/editbookmark.tpl.php:134 +#: data/templates/editbookmark.tpl.php:139 msgid "Bookmarklet" msgstr "Bookmarklet" -#: data/templates/editbookmark.tpl.php:140 +#: data/templates/editbookmark.tpl.php:145 #, php-format -msgid "Click one of the following bookmarklets to add a button you can click whenever you want to add the page you are on to %s" -msgstr "Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un signet pour la page courante dans %s " +msgid "" +"Click one of the following bookmarklets to add a button you can click " +"whenever you want to add the page you are on to %s" +msgstr "" +"Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre " +"navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un " +"signet pour la page courante dans %s " -#: data/templates/editbookmark.tpl.php:144 +#: data/templates/editbookmark.tpl.php:149 #, php-format -msgid "Drag one of the following bookmarklets to your browser's bookmarks and click it whenever you want to add the page you are on to %s" -msgstr "Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un signet pour la page courante dans %s " +msgid "" +"Drag one of the following bookmarklets to your browser's bookmarks and click " +"it whenever you want to add the page you are on to %s" +msgstr "" +"Déplacez l'un des 'bookmarklet' suivants dans les marques-pages de votre " +"navigateur et cliquez dessus chaque fois que vous souhaitez ajouter un " +"signet pour la page courante dans %s " -#: data/templates/editbookmark.tpl.php:157 #: data/templates/editbookmark.tpl.php:162 +#: data/templates/editbookmark.tpl.php:167 #, php-format msgid "Post to %s" msgstr "Ajouter à %s" -#: data/templates/editbookmark.tpl.php:158 #: data/templates/editbookmark.tpl.php:163 +#: data/templates/editbookmark.tpl.php:168 #, php-format msgid "Post to %s (Pop-up)" msgstr "Ajouter à %s (Pop-up)" -#: data/templates/editbookmark.tpl.php:168 +#: data/templates/editbookmark.tpl.php:173 #: data/templates/importDelicious.tpl.php:26 #: data/templates/importNetscape.tpl.php:27 #: data/templates/importStructure.tpl.php:16 msgid "Import" msgstr "Importer" -#: data/templates/editbookmark.tpl.php:170 +#: data/templates/editbookmark.tpl.php:175 msgid "Import bookmarks from bookmark file" msgstr "Importer les signets depuis un fichier" -#: data/templates/editbookmark.tpl.php:170 +#: data/templates/editbookmark.tpl.php:175 msgid "Internet Explorer, Mozilla Firefox and Netscape" msgstr "Internet Explorer, Mozilla Firefox et Netscape" -#: data/templates/editbookmark.tpl.php:171 +#: data/templates/editbookmark.tpl.php:176 msgid "Import bookmarks from del.icio.us" msgstr "Importer les signets depuis del.icio.us" @@ -503,10 +522,8 @@ msgstr "Importer les signets depuis del.icio.us" msgid "Account Details" msgstr "Détail du compte" -#: data/templates/editprofile.tpl.php:14 -#: data/templates/login.tpl.php:21 -#: data/templates/password.tpl.php:10 -#: data/templates/profile.tpl.php:6 +#: data/templates/editprofile.tpl.php:14 data/templates/login.tpl.php:21 +#: data/templates/password.tpl.php:10 data/templates/profile.tpl.php:6 #: data/templates/register.tpl.php:16 msgid "Username" msgstr "Nom d'utilisateur" @@ -519,8 +536,7 @@ msgstr "Nouveau mot de passe" msgid "Confirm Password" msgstr "Confirmer le mot de passe" -#: data/templates/editprofile.tpl.php:29 -#: data/templates/password.tpl.php:14 +#: data/templates/editprofile.tpl.php:29 data/templates/password.tpl.php:14 #: data/templates/register.tpl.php:26 msgid "E-mail" msgstr "E-mail" @@ -529,18 +545,15 @@ msgstr "E-mail" msgid "Personal Details" msgstr "Détails personnels" -#: data/templates/editprofile.tpl.php:39 -#: data/templates/profile.tpl.php:17 +#: data/templates/editprofile.tpl.php:39 data/templates/profile.tpl.php:17 msgid "Name" msgstr "Nom" -#: data/templates/editprofile.tpl.php:43 -#: data/templates/profile.tpl.php:23 +#: data/templates/editprofile.tpl.php:43 data/templates/profile.tpl.php:23 msgid "Homepage" msgstr "Page personnelle" -#: data/templates/editprofile.tpl.php:52 -#: www/edit.php:113 +#: data/templates/editprofile.tpl.php:52 www/edit.php:113 msgid "Save Changes" msgstr "Enregistrer les modifications" @@ -594,16 +607,28 @@ msgid "Instructions" msgstr "Instructions" #: data/templates/importDelicious.tpl.php:33 -msgid "Log in to the export page at del.icio.us" -msgstr "Se connecter à la page d'export de del.icio.us" +msgid "" +"Log in to the export page at " +"del.icio.us" +msgstr "" +"Se connecter à la page d'export " +"de del.icio.us" #: data/templates/importDelicious.tpl.php:34 -msgid "Save the resulting XML file to your computer" -msgstr "Enregistrer le fichier XML résultant sur votre ordinateur" +msgid "" +"Save the resulting XML " +"file to your computer" +msgstr "" +"Enregistrer le fichier XML " +"résultant sur votre ordinateur" #: data/templates/importDelicious.tpl.php:35 -msgid "Click Browse... to find this file on your computer. The maximum size the file can be is 1MB" -msgstr "Cliquez sur Parcourir... pour trouver le fichier sur votre ordinateur. La taille maximale du fichier ne peut excèder 1Mo" +msgid "" +"Click Browse... to find this file on your computer. The maximum " +"size the file can be is 1MB" +msgstr "" +"Cliquez sur Parcourir... pour trouver le fichier sur votre " +"ordinateur. La taille maximale du fichier ne peut excèder 1Mo" #: data/templates/importDelicious.tpl.php:36 #: data/templates/importNetscape.tpl.php:43 @@ -612,43 +637,62 @@ msgstr "Selectionnez la vision par défaut à appliquer à vos signets importés #: data/templates/importDelicious.tpl.php:37 #: data/templates/importNetscape.tpl.php:44 -msgid "Click Import to start importing the bookmarks; it may take a minute" -msgstr "Cliquez sur Importer pour débuter l'import des signets; cette opération peut prendre quelques minutes" +msgid "" +"Click Import to start importing the bookmarks; it may take a " +"minute" +msgstr "" +"Cliquez sur Importer pour débuter l'import des signets; cette " +"opération peut prendre quelques minutes" #: data/templates/importNetscape.tpl.php:35 msgid "Export your bookmarks from your browser to a file" msgstr "Exporter vos signets dans un fichier depuis votre navigateur" #: data/templates/importNetscape.tpl.php:37 -msgid "Internet Explorer: File > Import and Export... > Export Favorites" -msgstr "Internet Explorer: Ficher > Importer et Exporter... > Exporter les favoris" +msgid "" +"Internet Explorer: File > Import and Export... > Export Favorites" +msgstr "" +"Internet Explorer: Ficher > Importer et Exporter... > Exporter " +"les favoris" #: data/templates/importNetscape.tpl.php:38 -msgid "Mozilla Firefox: Bookmarks > Manage Bookmarks... > File > Export..." -msgstr "Mozilla Firefox: Marques-pages > Gérer les marques-pages... > Fichier > Exporter..." +msgid "" +"Mozilla Firefox: Bookmarks > Manage Bookmarks... > File > " +"Export..." +msgstr "" +"Mozilla Firefox: Marques-pages > Gérer les marques-pages... > " +"Fichier > Exporter..." #: data/templates/importNetscape.tpl.php:39 -msgid "Netscape: Bookmarks > Manage Bookmarks... > Tools > Export..." -msgstr "Netscape: Marques-pages > Gérer les marques-pages... > Outils > Exporter..." +msgid "" +"Netscape: Bookmarks > Manage Bookmarks... > Tools > Export..." +msgstr "" +"Netscape: Marques-pages > Gérer les marques-pages... > Outils " +"> Exporter..." #: data/templates/importNetscape.tpl.php:42 -msgid "Click Browse... to find the saved bookmark file on your computer. The maximum size the file can be is 1MB" -msgstr "Cliquez sur Parcourir... pour trouver le fichier sur votre ordinateur. La taille maximale du fichier ne peut excèder 1Mo" +msgid "" +"Click Browse... to find the saved bookmark file on your computer. " +"The maximum size the file can be is 1MB" +msgstr "" +"Cliquez sur Parcourir... pour trouver le fichier sur votre " +"ordinateur. La taille maximale du fichier ne peut excèder 1Mo" #: data/templates/importStructure.tpl.php:24 msgid "Create your structure into a simple text file and following this model:" msgstr "" #: data/templates/importStructure.tpl.php:35 -msgid "Then import the file. The tags and their relations will be added to your profile." +msgid "" +"Then import the file. The tags and their relations will be added to your " +"profile." msgstr "" #: data/templates/login.tpl.php:13 msgid "Please activate cookies" msgstr "SVP activez les cookies" -#: data/templates/login.tpl.php:26 -#: data/templates/register.tpl.php:21 +#: data/templates/login.tpl.php:26 data/templates/register.tpl.php:21 msgid "Password" msgstr "Mot de passe" @@ -656,8 +700,7 @@ msgstr "Mot de passe" msgid "Don't ask for my password for 2 weeks" msgstr "Ne pas demander mon mot de passe pendant 2 semaines" -#: data/templates/login.tpl.php:32 -#: data/templates/toolbar.inc.php:29 +#: data/templates/login.tpl.php:32 data/templates/toolbar.inc.php:29 #: www/login.php:57 msgid "Log In" msgstr "Se connecter" @@ -668,8 +711,14 @@ msgstr "Avez-vous oublié votre mot de passe ?" #: data/templates/password.tpl.php:5 #, php-format -msgid "If you have forgotten your password, %s can generate a new one. Enter the username and e-mail address of your account into the form below and we will e-mail your new password to you." -msgstr "Si vous avez oublié votre mot de passe, %s peut en générer un nouveau. Entrez le nom d'utilisateur et l'adresse email de votre compte dans le formulaire ci-dessous et nous vous enverrons un nouveau mot de passe." +msgid "" +"If you have forgotten your password, %s can generate a new one. Enter the " +"username and e-mail address of your account into the form below and we will " +"e-mail your new password to you." +msgstr "" +"Si vous avez oublié votre mot de passe, %s peut en générer un nouveau. " +"Entrez le nom d'utilisateur et l'adresse email de votre compte dans le " +"formulaire ci-dessous et nous vous enverrons un nouveau mot de passe." #: data/templates/password.tpl.php:19 msgid "Generate Password" @@ -693,8 +742,7 @@ msgstr "Mes contacts" msgid "Watched By" msgstr "Dans les contacts de" -#: data/templates/profile.tpl.php:68 -#: data/templates/toolbar.inc.php:9 +#: data/templates/profile.tpl.php:68 data/templates/toolbar.inc.php:9 msgid "Bookmarks" msgstr "Signets" @@ -704,12 +752,20 @@ msgstr "Aller aux signets" #: data/templates/register.tpl.php:11 #, php-format -msgid "Sign up here to create a free %s account. All the information requested below is required" -msgstr "Enregistrez-vous ici pour créer un compte gratuit %s. Toutes les informations requises ci-dessous sont nécessaires." +msgid "" +"Sign up here to create a free %s account. All the information requested " +"below is required" +msgstr "" +"Enregistrez-vous ici pour créer un compte gratuit %s. Toutes les " +"informations requises ci-dessous sont nécessaires." #: data/templates/register.tpl.php:18 -msgid " at least 5 characters, alphanumeric (no spaces, no dots or other special ones)" -msgstr " au moins 5 caractères, alphanumériques (pas d'espaces, pas de points ou autre caractère spécial)" +msgid "" +" at least 5 characters, alphanumeric (no spaces, no dots or other special " +"ones)" +msgstr "" +" au moins 5 caractères, alphanumériques (pas d'espaces, pas de points ou " +"autre caractère spécial)" #: data/templates/register.tpl.php:28 msgid " to send you your password if you forget it" @@ -719,8 +775,7 @@ msgstr " pour vous envoyer votre mot de passe en cas de perte" msgid "Antispam question" msgstr "Question antispam" -#: data/templates/register.tpl.php:41 -#: data/templates/toolbar.inc.php:31 +#: data/templates/register.tpl.php:41 data/templates/toolbar.inc.php:31 #: www/register.php:83 msgid "Register" msgstr "S'enregistrer" @@ -802,7 +857,8 @@ msgstr "Tags Principaux" #: data/templates/sidebar.block.menu2.php:29 msgid "This menu is composed of keywords (tags) organized by admins." -msgstr "Ce menu est composé de mots-clefs (tags) organisés par les administrateurs." +msgstr "" +"Ce menu est composé de mots-clefs (tags) organisés par les administrateurs." #: data/templates/sidebar.block.recent.php:18 msgid "Recent Tags" @@ -820,25 +876,22 @@ msgstr "Dernières recherches" msgid "Number of bookmarks for this query" msgstr "Nombre de signets pour cette recherche" -#: data/templates/sidebar.block.tagactions.php:9 -#: www/tagrename.php:72 +#: data/templates/sidebar.block.tagactions.php:9 www/tagrename.php:72 msgid "Rename Tag" msgid_plural "Rename Tags" msgstr[0] "Renommer le tag" msgstr[1] "Renommer les tags" -#: data/templates/sidebar.block.tagactions.php:22 -#: www/tagdelete.php:54 +#: data/templates/sidebar.block.tagactions.php:22 www/tagdelete.php:54 msgid "Delete Tag" msgstr "Supprimer le tag" -#: data/templates/sidebar.block.tagactions.php:24 -#: www/tagedit.php:61 +#: data/templates/sidebar.block.tagactions.php:24 www/tagedit.php:61 msgid "Edit Tag Description" msgstr "Editer la description du tag" #: data/templates/sidebar.block.tagactions.php:26 -#: www/tagcommondescriptionedit.php:64 +#: www/tagcommondescriptionedit.php:76 msgid "Edit Tag Common Description" msgstr "Editer la description commune du tag" @@ -850,8 +903,7 @@ msgstr "Créer un lien vers un autre tag" msgid "New Users" msgstr "Nouveaux Utilisateurs" -#: data/templates/sidebar.block.users.php:23 -#: data/templates/users.tpl.php:17 +#: data/templates/sidebar.block.users.php:23 data/templates/users.tpl.php:17 msgid "bookmarks" msgstr "signets" @@ -905,11 +957,14 @@ msgstr "Créer un nouveau lien" #: data/templates/tag2tagadd.tpl.php:19 #, php-format -msgid "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into the menu box" -msgstr "Note : inclure un tag dans le tag '%s' (e.g. %s>countries) affiche ce tag dans la boîte de menu" +msgid "" +"Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into " +"the menu box" +msgstr "" +"Note : inclure un tag dans le tag '%s' (e.g. %s>countries) affiche ce tag " +"dans la boîte de menu" -#: data/templates/tag2tagadd.tpl.php:23 -#: data/templates/tag2tagedit.tpl.php:37 +#: data/templates/tag2tagadd.tpl.php:23 data/templates/tag2tagedit.tpl.php:37 msgid "Create" msgstr "Créer" @@ -926,15 +981,13 @@ msgid "No links" msgstr "Pas de liens" #: data/templates/tag2tagdelete.tpl.php:15 -#: data/templates/tag2tagedit.tpl.php:16 -#: data/templates/tagdelete.tpl.php:8 +#: data/templates/tag2tagedit.tpl.php:16 data/templates/tagdelete.tpl.php:8 #: www/jsScuttle.php:23 msgid "Yes" msgstr "Oui" #: data/templates/tag2tagdelete.tpl.php:16 -#: data/templates/tag2tagedit.tpl.php:17 -#: data/templates/tagdelete.tpl.php:9 +#: data/templates/tag2tagedit.tpl.php:17 data/templates/tagdelete.tpl.php:9 #: www/jsScuttle.php:23 msgid "No" msgstr "Non" @@ -959,33 +1012,27 @@ msgstr "Nouveau" msgid "Rename" msgstr "Renommer" -#: data/templates/tags.tpl.php:11 -#: data/templates/users.tpl.php:9 +#: data/templates/tags.tpl.php:11 data/templates/users.tpl.php:9 msgid "Alphabet" msgstr "Alphabet" -#: data/templates/tags.tpl.php:12 -#: data/templates/users.tpl.php:10 +#: data/templates/tags.tpl.php:12 data/templates/users.tpl.php:10 msgid "Popularity" msgstr "Popularité" -#: data/templates/toolbar.inc.php:8 -#: data/templates/toolbar.inc.php:26 +#: data/templates/toolbar.inc.php:8 data/templates/toolbar.inc.php:26 msgid "Home" msgstr "Accueil" -#: data/templates/toolbar.inc.php:11 -#: www/watchlist.php:106 +#: data/templates/toolbar.inc.php:11 www/watchlist.php:106 msgid "Watchlist" msgstr "Contacts" -#: data/templates/toolbar.inc.php:12 -#: www/profile.php:67 +#: data/templates/toolbar.inc.php:12 www/profile.php:67 msgid "Profile" msgstr "Profil" -#: data/templates/toolbar.inc.php:13 -#: www/bookmarks.php:209 +#: data/templates/toolbar.inc.php:13 www/bookmarks.php:209 msgid "Add a Bookmark" msgstr "Ajouter un signet" @@ -998,8 +1045,14 @@ msgid "Admin" msgstr "Admin" #: data/templates/top.inc.php:49 -msgid "Admins, your installation is in \"Debug Mode\" ($debugMode = true). To go in \"Normal Mode\" and hide debugging messages, change $debugMode to false into config.php." -msgstr "Admins, votre installation est en \"Mode Debug\" ($debugMode = true). Pour passer en \"Mode Normal\" et cacher les messages de debuggage, changez $debugMode à false dans config.inc.php." +msgid "" +"Admins, your installation is in \"Debug Mode\" ($debugMode = true). To go in " +"\"Normal Mode\" and hide debugging messages, change $debugMode to false into " +"config.php." +msgstr "" +"Admins, votre installation est en \"Mode Debug\" ($debugMode = true). Pour " +"passer en \"Mode Normal\" et cacher les messages de debuggage, changez " +"$debugMode à false dans config.inc.php." #: data/templates/users.tpl.php:17 msgid "profile" @@ -1026,33 +1079,24 @@ msgstr "Problème avec " msgid "You are not allowed to delete this bookmark" msgstr "Vous n'êtes pas autorisés à supprimer ce signet" -#: www/ajaxDelete.php:41 -#: www/edit.php:103 +#: www/ajaxDelete.php:41 www/edit.php:103 msgid "Failed to delete bookmark" msgstr "Erreur dans la suppression du signet" -#: www/alltags.php:49 +#: www/alltags.php:50 msgid "All Tags" msgstr "Tous les tags" -#: www/alltags.php:55 -#: www/bookmarks.php:96 -#: www/populartags.php:52 -#: www/profile.php:51 -#: www/rss.php:67 -#: www/search.php:109 -#: www/watch.php:45 +#: www/alltags.php:56 www/bookmarks.php:96 www/populartags.php:52 +#: www/profile.php:51 www/rss.php:76 www/search.php:109 www/watch.php:45 #: www/watchlist.php:61 #, php-format msgid "User with username %s was not found" msgstr "L'utilisateur %s n'a pas été trouvé." -#: www/bookmarkcommondescriptionedit.php:51 -#: www/tag2tagadd.php:37 -#: www/tag2tagdelete.php:41 -#: www/tag2tagedit.php:33 -#: www/tagcommondescriptionedit.php:43 -#: www/tagedit.php:43 +#: www/bookmarkcommondescriptionedit.php:51 www/tag2tagadd.php:37 +#: www/tag2tagdelete.php:41 www/tag2tagedit.php:33 +#: www/tagcommondescriptionedit.php:51 www/tagedit.php:43 msgid "Permission denied." msgstr "Permission non accordée." @@ -1068,19 +1112,15 @@ msgstr "Erreur dans la mise à jour de la description du signet" msgid "Edit Bookmark Common Description" msgstr "Editer la description commune du signet" -#: www/bookmarks.php:111 -#: www/tags.php:47 +#: www/bookmarks.php:111 www/tags.php:47 msgid "Remove the tag from the selection" msgstr "Retirer le tag de la sélection" -#: www/bookmarks.php:131 -#: www/edit.php:65 +#: www/bookmarks.php:131 www/edit.php:65 msgid "Your bookmark must have a title and an address" msgstr "Votre signet doit avoir un titre et une adresse." -#: www/bookmarks.php:152 -#: www/edit.php:83 -#: www/edit.php:86 +#: www/bookmarks.php:152 www/edit.php:83 www/edit.php:86 msgid "Bookmark saved" msgstr "Signet enregistré." @@ -1088,11 +1128,13 @@ msgstr "Signet enregistré." msgid "(Come back to previous page.)" msgstr "(Revenir à la page précédente.)" -#: www/bookmarks.php:159 -#: www/import.php:106 -#: www/importNetscape.php:108 -msgid "There was an error saving your bookmark. Please try again or contact the administrator." -msgstr "Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou contacter votre administrateur." +#: www/bookmarks.php:159 www/import.php:106 www/importNetscape.php:108 +msgid "" +"There was an error saving your bookmark. Please try again or contact the " +"administrator." +msgstr "" +"Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou " +"contacter votre administrateur." #: www/bookmarks.php:216 msgid "Add Bookmark" @@ -1102,13 +1144,11 @@ msgstr "Ajouter signet" msgid "You must be logged in before you can add bookmarks." msgstr "Vous devez être authentifié avant de pouvoir ajouter des signets." -#: www/bookmarks.php:274 -#: www/bookmarks.php:275 +#: www/bookmarks.php:274 www/bookmarks.php:275 msgid "My Bookmarks" msgstr "Mes signets" -#: www/edit.php:44 -#: www/edit.php:45 +#: www/edit.php:44 www/edit.php:45 msgid "Edit Bookmark" msgstr "Editer le signet" @@ -1171,8 +1211,7 @@ msgstr "Signets trouvés :" msgid "Bookmarks imported: " msgstr "Signets importés :" -#: www/importNetscape.php:117 -#: www/importNetscape.php:122 +#: www/importNetscape.php:117 www/importNetscape.php:122 msgid "Import Bookmarks from Browser File" msgstr "Importer les signets depuis un fichier" @@ -1197,11 +1236,11 @@ msgstr "Vous êtes maintenant déconnecté." msgid "%s: Recent bookmarks" msgstr "%s: Signets récents" -#: www/index.php:78 +#: www/index.php:75 msgid "Store, share and tag your favourite links" msgstr "Conservez, partagez et taggez vos liens favoris" -#: www/index.php:79 +#: www/index.php:76 msgid "All Bookmarks" msgstr "Tous les signets" @@ -1215,35 +1254,51 @@ msgstr "Non Disponible" #: www/login.php:48 msgid "The details you have entered are incorrect. Please try again." -msgstr "Les informations que vous avez entrées sont incorrectes. Veuillez recommencer." +msgstr "" +"Les informations que vous avez entrées sont incorrectes. Veuillez " +"recommencer." #: www/password.php:36 msgid "You must enter your username." msgstr "Vous devez entrer votre nom d'utilisateur." #: www/password.php:40 -msgid "You must enter your e-mail address." -msgstr "Vous devez saisir une E-mail." +msgid "" +"You must enter your e-mail address." +msgstr "" +"Vous devez saisir une E-mail." #: www/password.php:48 msgid "No matches found for that username." msgstr "Rien de trouvé pour ce nom d'utilisateur." #: www/password.php:51 -msgid "No matches found for that combination of username and e-mail address." -msgstr "Pas d'entrée pour ce nom d'utilisateur et cet e-mail." +msgid "" +"No matches found for that combination of username and e-mail address." +msgstr "" +"Pas d'entrée pour ce nom d'utilisateur et cet e-" +"mail." #: www/password.php:59 -msgid "There was an error while generating your new password. Please try again." -msgstr "Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou contacter votre administrateur." +msgid "" +"There was an error while generating your new password. Please try again." +msgstr "" +"Il y a eu une erreur en enregistrant ce signet. Veuillez rééssayer ou " +"contacter votre administrateur." #: www/password.php:63 msgid "Your new password is:" msgstr "Votre nouveau mot de passe est:" #: www/password.php:63 -msgid "To keep your bookmarks secure, you should change this password in your profile the next time you log in." -msgstr "Pour garder vos signets sûrs, vous devriez changer ce mot de passe dans votre profil lors de votre prochaine authentification." +msgid "" +"To keep your bookmarks secure, you should change this password in your " +"profile the next time you log in." +msgstr "" +"Pour garder vos signets sûrs, vous devriez changer ce mot de passe dans " +"votre profil lors de votre prochaine authentification." #: www/password.php:66 #, php-format @@ -1259,8 +1314,7 @@ msgstr "Nouveau mot de passe généré et envoyé à l'adresse %s" msgid "Forgotten Password" msgstr "Mot de passe oublié" -#: www/profile.php:59 -#: www/watchlist.php:119 +#: www/profile.php:59 www/watchlist.php:119 msgid "Username was not specified" msgstr "Le nom d'utilisateur n'a pas été spécifié." @@ -1286,7 +1340,8 @@ msgstr "Adresse de courrier électronique invalide." #: www/profile.php:106 msgid "An error occurred while saving your changes." -msgstr "Une erreur s'est produite pendant l'enregistrement de vos modifications." +msgstr "" +"Une erreur s'est produite pendant l'enregistrement de vos modifications." #: www/profile.php:108 msgid "Changes saved." @@ -1294,7 +1349,9 @@ msgstr "Modifications enregistrées." #: www/register.php:46 msgid "You must enter a username, password and e-mail address." -msgstr "Vous devez saisir un nom d'utilisateur, un mot de passe, un nom et un e-mail" +msgstr "" +"Vous devez saisir un nom d'utilisateur, un mot de passe, un nom et " +"un e-mail" #: www/register.php:50 msgid "This username has been reserved, please make another choice." @@ -1305,8 +1362,12 @@ msgid "This username already exists, please make another choice." msgstr "Ce nom d'utilisateur existe déjà, veuillez en choisir un autre." #: www/register.php:58 -msgid "This username is not valid (too short, too long, forbidden characters...), please make another choice." -msgstr "Ce nom d'utilisateur n'est pas valide (trop court, trop long, caractères interdits...), Merci de faire un autre choix." +msgid "" +"This username is not valid (too short, too long, forbidden characters...), " +"please make another choice." +msgstr "" +"Ce nom d'utilisateur n'est pas valide (trop court, trop long, caractères " +"interdits...), Merci de faire un autre choix." #: www/register.php:62 msgid "E-mail address is not valid. Please try again." @@ -1324,13 +1385,12 @@ msgstr "Votre inscription a bien été prise en compte !" msgid "Registration failed. Please try again." msgstr "Enregistrement raté. Veuillez rééssayer." -#: www/rss.php:84 +#: www/rss.php:93 #, php-format msgid "Recent bookmarks posted to %s" msgstr "Signets ajoutés récemment à %s" -#: www/search.php:81 -#: www/search.php:145 +#: www/search.php:81 www/search.php:145 msgid "Search Bookmarks" msgstr "Recherche de signets" @@ -1370,11 +1430,11 @@ msgstr "Effacer un lien entre tags" msgid "Edit Link Between Tags" msgstr "Editer un lien entre tags" -#: www/tagcommondescriptionedit.php:55 +#: www/tagcommondescriptionedit.php:62 msgid "Tag common description updated" msgstr "Editer la description commune du tag" -#: www/tagcommondescriptionedit.php:58 +#: www/tagcommondescriptionedit.php:67 msgid "Failed to update the tag common description" msgstr "Impossible de mettre à jour la description commune du tag" @@ -1432,34 +1492,45 @@ msgstr "Conseil pour admin:" #: www/gsearch/index.php:33 msgid "To refresh manually Google Custom Search Engine, goes to: " -msgstr "Pour rafraîchir manuellement le moteur de Google Custom Search, allez à :" +msgstr "" +"Pour rafraîchir manuellement le moteur de Google Custom Search, allez à :" #: www/gsearch/index.php:35 -msgid "If no result appears, check that all the urls are valid in the admin section." -msgstr "Si aucun résultat apparaît, vérifier que toutes les urls sont valides dans la section admin." +msgid "" +"If no result appears, check that all the urls are valid in the admin section." +msgstr "" +"Si aucun résultat apparaît, vérifier que toutes les urls sont valides dans " +"la section admin." #~ msgid "Add this tag to the query" #~ msgstr "Ajouter ce tag à la requête" + #~ msgid "Last Users" #~ msgstr "Derniers utilisateurs" #, fuzzy #~ msgid "Watched by" #~ msgstr "Consultés" + #~ msgid "URL" #~ msgstr "URL" + #~ msgid "for" #~ msgstr "pour" + #~ msgid "Recent Bookmarks" #~ msgstr "Signets récents" + #~ msgid "plus" #~ msgstr "plus" + #~ msgid "" #~ "Register now to start using " #~ "%s!" #~ msgstr "" #~ "Enregistrez-vous maintenant pour poster vos " #~ "propres signets sur %s !" + #~ msgid "" #~ "Semantic " #~ "Scuttle is licensed under the , sous license GNU General Public " #~ "License (vous pouvez donc l'héberger sur votre propre serveur)." + #~ msgid "edit" #~ msgstr "éditer" + #~ msgid "User with username %s not was not found" #~ msgstr "L'utilisateur %s n'a pas été trouvé." + #~ msgid "%s Bookmarks" #~ msgstr "Signets de %s" + #~ msgid "E-mail" #~ msgstr "E-mail" - From e3f7ed95cd71de74f94c4333e475dee4a96805ea Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:33:15 +0000 Subject: [PATCH 028/173] implement patch 3059829: update FR_CA translation git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@743 b3834d28-1941-0410-a4f8-b48e95affb8f --- data/locales/fr_CA/LC_MESSAGES/messages.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/locales/fr_CA/LC_MESSAGES/messages.po b/data/locales/fr_CA/LC_MESSAGES/messages.po index 41894e8..ae74c4b 100644 --- a/data/locales/fr_CA/LC_MESSAGES/messages.po +++ b/data/locales/fr_CA/LC_MESSAGES/messages.po @@ -234,7 +234,7 @@ msgstr "" #: data/templates/bookmarks.tpl.php:51 data/templates/bookmarks.tpl.php:52 #, fuzzy msgid "Edit the common description of this tag" -msgstr "éditer la description commune" +msgstr "Modifier la description public de ce mot-clé" #: data/templates/bookmarks.tpl.php:55 data/templates/bookmarks.tpl.php:56 #, fuzzy @@ -243,7 +243,7 @@ msgstr "éditer la description commune" #: data/templates/bookmarks.tpl.php:76 data/templates/bookmarks.tpl.php:77 msgid "Edit your personal description of this tag" -msgstr "" +msgstr "Modifier la description privée de ce mot-clé" #: data/templates/bookmarks.tpl.php:93 data/templates/tags.tpl.php:10 #: data/templates/users.tpl.php:8 @@ -306,7 +306,7 @@ msgstr "par" #: data/templates/bookmarks.tpl.php:276 msgid "you" -msgstr "" +msgstr "vous" #: data/templates/bookmarks.tpl.php:290 #, fuzzy, php-format @@ -581,7 +581,7 @@ msgstr "Fichier XML (comme del.icio.us)" #: data/templates/editprofile.tpl.php:62 msgid "CSV file (for spreadsheet tools)" -msgstr "" +msgstr "Fichier CSV (pour les classeurs)" #: data/templates/error.404.tpl.php:5 msgid "Not Found" @@ -742,13 +742,13 @@ msgstr "Membre depuis" #: data/templates/sidebar.block.watchlist.php:30 #, fuzzy msgid "Watching" -msgstr "Liste des signets vus" +msgstr "Éléments surveillés" #: data/templates/profile.tpl.php:55 #: data/templates/sidebar.block.watchlist.php:52 #, fuzzy msgid "Watched By" -msgstr "Consultés" +msgstr "Surveillé par" #: data/templates/profile.tpl.php:68 data/templates/toolbar.inc.php:9 msgid "Bookmarks" @@ -806,7 +806,7 @@ msgstr "mes signets" #: data/templates/search.menu.php:40 msgid "my watchlist" -msgstr "ma liste des consultés" +msgstr "ma liste de suivi" #: data/templates/search.menu.php:44 msgid "all bookmarks" @@ -1493,7 +1493,7 @@ msgstr "Utilisateur ajouté à la liste des consultés." #: www/watchlist.php:104 #, fuzzy msgid "My Watchlist" -msgstr "Liste des signets vus" +msgstr "Ma liste de suivi" #: www/api/httpauth.inc.php:11 msgid "Use of the API calls requires authentication." @@ -1522,8 +1522,8 @@ msgstr "" #~ msgid "URL" #~ msgstr "URL" -#~ msgid "to" -#~ msgstr "dans" +msgid "to" +msgstr "dans" #~ msgid "Last Users" #~ msgstr "Derniers utilisateurs" From ea4c9fa4f741007b575a9437a0c0a642d1398c1d Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:33:38 +0000 Subject: [PATCH 029/173] update changelog git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@744 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index b1248fd..52f60bc 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -5,6 +5,7 @@ ChangeLog for SemantiScuttle ------------------- - Fix bug getTagsForBookmarks() that fetched all tags - Show error message on mysqli connection errors +- Implement patch #3059829: update FR_CA translation 0.97.0 - 2010-06-09 From b17e8f940c8008b034e4db477f748a1f7e4eddb6 Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:34:05 +0000 Subject: [PATCH 030/173] Fix bug #3073215: Updating bookmark time does not work git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@745 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/ChangeLog | 1 + src/SemanticScuttle/Service/Bookmark.php | 2 +- tests/BookmarkTest.php | 32 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 52f60bc..07b1e49 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -6,6 +6,7 @@ ChangeLog for SemantiScuttle - Fix bug getTagsForBookmarks() that fetched all tags - Show error message on mysqli connection errors - Implement patch #3059829: update FR_CA translation +- Fix bug #3073215: Updating bookmark time does not work 0.97.0 - 2010-06-09 diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php index 364b1a0..d5a63a3 100644 --- a/src/SemanticScuttle/Service/Bookmark.php +++ b/src/SemanticScuttle/Service/Bookmark.php @@ -611,7 +611,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService if (!is_null($date)) { $datetime = gmdate('Y-m-d H:i:s', strtotime($date)); - $updates[] = array('bDateTime' => $datetime); + $updates['bDatetime'] = $datetime; } $sql = 'UPDATE '. $GLOBALS['tableprefix'] .'bookmarks SET '. $this->db->sql_build_array('UPDATE', $updates) .' WHERE bId = '. intval($bId); diff --git a/tests/BookmarkTest.php b/tests/BookmarkTest.php index 40b40e3..c836d5e 100644 --- a/tests/BookmarkTest.php +++ b/tests/BookmarkTest.php @@ -982,6 +982,38 @@ class BookmarkTest extends TestBase $this->assertEquals('newShortNambb', $bm['bShort']); } + /** + * Tests if updating a bookmark's date works. + * This once was a bug, see bug #3073215. + * + * @return void + * + * @link https://sourceforge.net/tracker/?func=detail&atid=1017430&aid=3073215&group_id=211356 + */ + public function testUpdateBookmarkDate() + { + $bid = $this->bs->addBookmark( + 'http://example.org', 'title', 'desc', 'priv', + 0, array(), 'myShortName' + ); + $bm = $this->bs->getBookmark($bid); + $this->assertEquals('myShortName', $bm['bShort']); + + $this->assertTrue( + $this->bs->updateBookmark( + $bid, 'http://example2.org', 'my title', 'desc', + 'priv', 0, array(), 'newShortNambb', + //we need to use zulu (GMT) time zone here + // since the dates/times are stored as that + // in the database + '2002-03-04T05:06:07Z' + ) + ); + $bm = $this->bs->getBookmark($bid); + $this->assertEquals('newShortNambb', $bm['bShort']); + $this->assertEquals('2002-03-04 05:06:07', $bm['bDatetime']); + } + /** From 6fb920199695b4b595ec15aad73039eac0feca60 Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:34:25 +0000 Subject: [PATCH 031/173] update description git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@746 b3834d28-1941-0410-a4f8-b48e95affb8f --- src/SemanticScuttle/Model/User.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SemanticScuttle/Model/User.php b/src/SemanticScuttle/Model/User.php index ed9f454..500f5b1 100644 --- a/src/SemanticScuttle/Model/User.php +++ b/src/SemanticScuttle/Model/User.php @@ -15,7 +15,7 @@ /** * SemanticScuttle user object. - * Rare fields are filled if required. + * Rarely used fields are filled if required. * * @category Bookmarking * @package SemanticScuttle @@ -133,7 +133,8 @@ class SemanticScuttle_Model_User } /** - * Returns user creation time + * Returns user creation time. + * UTC/Zulu time zone is used. * * @return string Datetime value: "YYYY-MM-DD HH:MM:SS" */ From 647a13499e5fa56f8de39504547cef8a2d89b8ff Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:34:47 +0000 Subject: [PATCH 032/173] Move user IP resolution into own class method git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@747 b3834d28-1941-0410-a4f8-b48e95affb8f --- src/SemanticScuttle/Model/RemoteUser.php | 48 ++++++++++++++++++++++++ src/SemanticScuttle/Service/Bookmark.php | 21 ++--------- 2 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 src/SemanticScuttle/Model/RemoteUser.php diff --git a/src/SemanticScuttle/Model/RemoteUser.php b/src/SemanticScuttle/Model/RemoteUser.php new file mode 100644 index 0000000..6d48e3a --- /dev/null +++ b/src/SemanticScuttle/Model/RemoteUser.php @@ -0,0 +1,48 @@ + + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +/** + * Remote User helper methods. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Christian Weiske + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class SemanticScuttle_Model_RemoteUser +{ + /** + * Returns the remote user's IP. + * + * @return string IP address. NULL if not found. + */ + public static function getIp() + { + $ip = null; + if (getenv('REMOTE_ADDR')) { + $ip = getenv('REMOTE_ADDR'); + } else if (getenv('HTTP_CLIENT_IP')) { + $ip = getenv('HTTP_CLIENT_IP'); + } else if (getenv('HTTP_X_FORWARDED_FOR')) { + $ip = getenv('HTTP_X_FORWARDED_FOR'); + } + + return $ip; + } + +} + +?> \ No newline at end of file diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php index d5a63a3..4b51f35 100644 --- a/src/SemanticScuttle/Service/Bookmark.php +++ b/src/SemanticScuttle/Service/Bookmark.php @@ -12,6 +12,7 @@ * @license GPL http://www.gnu.org/licenses/gpl.html * @link http://sourceforge.net/projects/semanticscuttle */ +require_once 'SemanticScuttle/Model/RemoteUser.php'; /** * SemanticScuttle bookmark service. @@ -453,14 +454,6 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService $address = $this->normalize($address); - if (getenv('HTTP_CLIENT_IP')) { - $ip = getenv('HTTP_CLIENT_IP'); - } else if (getenv('REMOTE_ADDR')) { - $ip = getenv('REMOTE_ADDR'); - } else { - $ip = getenv('HTTP_X_FORWARDED_FOR'); - } - /* * Note that if date is NULL, then it's added with a date and * time of now, and if it's present, @@ -480,7 +473,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService // Set up the SQL insert statement and execute it. $values = array( 'uId' => intval($sId), - 'bIp' => $ip, + 'bIp' => SemanticScuttle_Model_RemoteUser::getIp(), 'bDatetime' => $datetime, 'bModified' => $datetime, 'bTitle' => $title, @@ -570,15 +563,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService return false; } - // Get the client's IP address and the date; note that the date is in GMT. - if (getenv('HTTP_CLIENT_IP')) - $ip = getenv('HTTP_CLIENT_IP'); - else - if (getenv('REMOTE_ADDR')) - $ip = getenv('REMOTE_ADDR'); - else - $ip = getenv('HTTP_X_FORWARDED_FOR'); - + // Get the the date; note that the date is in GMT. $moddatetime = gmdate('Y-m-d H:i:s', time()); $address = $this->normalize($address); From a62dfd6d70b158646693e8331afa7f7624bf2dcc Mon Sep 17 00:00:00 2001 From: cweiske Date: Thu, 23 Sep 2010 07:35:11 +0000 Subject: [PATCH 033/173] Fix CS, fix docblocks git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@748 b3834d28-1941-0410-a4f8-b48e95affb8f --- src/SemanticScuttle/Service/Bookmark.php | 111 +++++++++++++++++------ 1 file changed, 81 insertions(+), 30 deletions(-) diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php index 4b51f35..dde1df5 100644 --- a/src/SemanticScuttle/Service/Bookmark.php +++ b/src/SemanticScuttle/Service/Bookmark.php @@ -45,6 +45,13 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService + /** + * Creates a new instance. Initializes the table name. + * + * @param DB $db Database object + * + * @uses $GLOBALS['tableprefix'] + */ public function __construct($db) { $this->db = $db; @@ -169,7 +176,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService * Retrieves a bookmark with the given URL. * DOES NOT RESPECT PRIVACY SETTINGS! * - * @param string $hash URL + * @param string $address URL to get bookmarks for * * @return mixed Array with bookmark data or false in case * of an error (i.e. not found). @@ -574,7 +581,11 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService if ($bookmark['bAddress'] != $address && $this->bookmarkExists($address, $bookmark['uId']) ) { - message_die(GENERAL_ERROR, 'Could not update bookmark (URL already existing = '.$address.')', '', __LINE__, __FILE__); + message_die( + GENERAL_ERROR, + 'Could not update bookmark (URL already exists: ' . $address . ')', + '', __LINE__, __FILE__ + ); return false; } @@ -599,22 +610,30 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService $updates['bDatetime'] = $datetime; } - $sql = 'UPDATE '. $GLOBALS['tableprefix'] .'bookmarks SET '. $this->db->sql_build_array('UPDATE', $updates) .' WHERE bId = '. intval($bId); + $sql = 'UPDATE '. $GLOBALS['tableprefix'] . 'bookmarks' + . ' SET '. $this->db->sql_build_array('UPDATE', $updates) + . ' WHERE bId = ' . intval($bId); $this->db->sql_transaction('begin'); if (!($dbresult = & $this->db->sql_query($sql))) { $this->db->sql_transaction('rollback'); - message_die(GENERAL_ERROR, 'Could not update bookmark', '', __LINE__, __FILE__, $sql, $this->db); + message_die( + GENERAL_ERROR, 'Could not update bookmark', + '', __LINE__, __FILE__, $sql, $this->db + ); } - $uriparts = explode('.', $address); + $uriparts = explode('.', $address); $extension = end($uriparts); unset($uriparts); $b2tservice = SemanticScuttle_Service_Factory :: get('Bookmark2Tag'); if (!$b2tservice->attachTags($bId, $categories, $fromApi, $extension)) { $this->db->sql_transaction('rollback'); - message_die(GENERAL_ERROR, 'Could not update bookmark', '', __LINE__, __FILE__, $sql, $this->db); + message_die( + GENERAL_ERROR, 'Could not update bookmark', + '', __LINE__, __FILE__, $sql, $this->db + ); } $this->db->sql_transaction('commit'); @@ -730,7 +749,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService $arrWatch = $userservice->getWatchlist($user); if (count($arrWatch) > 0) { $query_3_1 = ''; - foreach($arrWatch as $row) { + foreach ($arrWatch as $row) { $query_3_1 .= 'B.uId = '. intval($row) .' OR '; } $query_3_1 = substr($query_3_1, 0, -3); @@ -741,7 +760,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService } $query_5 = ''; - if($hash == null) { + if ($hash == null) { $query_5.= ' GROUP BY B.bHash'; } @@ -789,7 +808,9 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService $query_2 .= ', '. $b2tservice->getTableName() .' AS T'. $i; $query_4 .= ' AND ('; - $allLinkedTags = $tag2tagservice->getAllLinkedTags($this->db->sql_escape($tags[$i]), '>', $user); + $allLinkedTags = $tag2tagservice->getAllLinkedTags( + $this->db->sql_escape($tags[$i]), '>', $user + ); while (is_array($allLinkedTags) && count($allLinkedTags)>0) { $query_4 .= ' T'. $i .'.tag = "'. array_pop($allLinkedTags) .'"'; @@ -810,7 +831,8 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService // Search terms in tags as well when none given if (!count($tags)) { - $query_2 .= ' LEFT JOIN '. $b2tservice->getTableName() .' AS T ON B.bId = T.bId'; + $query_2 .= ' LEFT JOIN '. $b2tservice->getTableName() .' AS T' + . ' ON B.bId = T.bId'; $dotags = true; } else { $dotags = false; @@ -818,12 +840,24 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService $query_4 = ''; for ($i = 0; $i < count($aTerms); $i++) { - $query_4 .= ' AND (B.bTitle LIKE "%'. $this->db->sql_escape($aTerms[$i]) .'%"'; - $query_4 .= ' OR B.bDescription LIKE "%'. $this->db->sql_escape($aTerms[$i]) .'%"'; - $query_4 .= ' OR B.bPrivateNote LIKE "'. $this->db->sql_escape($aTerms[$i]) .'%"'; //warning : search in private notes of everybody but private notes won't appear if not allowed. - $query_4 .= ' OR U.username = "'. $this->db->sql_escape($aTerms[$i]) .'"'; //exact match for username + $query_4 .= ' AND (B.bTitle LIKE "%' + . $this->db->sql_escape($aTerms[$i]) + . '%"'; + $query_4 .= ' OR B.bDescription LIKE "%' + . $this->db->sql_escape($aTerms[$i]) + . '%"'; + //warning : search in private notes of everybody + // but private notes won't appear if not allowed. + $query_4 .= ' OR B.bPrivateNote LIKE "' + . $this->db->sql_escape($aTerms[$i]) + .'%"'; + $query_4 .= ' OR U.username = "' + . $this->db->sql_escape($aTerms[$i]) + . '"'; //exact match for username if ($dotags) { - $query_4 .= ' OR T.tag LIKE "'. $this->db->sql_escape($aTerms[$i]) .'%"'; + $query_4 .= ' OR T.tag LIKE "' + . $this->db->sql_escape($aTerms[$i]) + . '%"'; } $query_4 .= ')'; } @@ -845,22 +879,35 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService $query = $query_1 . $query_2 . $query_3 . $query_4 . $query_5; - if (!($dbresult = & $this->db->sql_query_limit($query, intval($perpage), intval($start)))) { - message_die(GENERAL_ERROR, 'Could not get bookmarks', '', __LINE__, __FILE__, $query, $this->db); + $dbresult = $this->db->sql_query_limit( + $query, intval($perpage), intval($start) + ); + if (!$dbresult) { + message_die( + GENERAL_ERROR, 'Could not get bookmarks', + '', __LINE__, __FILE__, $query, $this->db + ); } if (SQL_LAYER == 'mysql4') { $totalquery = 'SELECT FOUND_ROWS() AS total'; } else { if ($hash) { - $totalquery = 'SELECT COUNT(*) AS total'. $query_2 . $query_3 . $query_4; + $totalquery = 'SELECT COUNT(*) AS total'. $query_2 + . $query_3 . $query_4; } else { - $totalquery = 'SELECT COUNT(DISTINCT bAddress) AS total'. $query_2 . $query_3 . $query_4; + $totalquery = 'SELECT COUNT(DISTINCT bAddress) AS total' + . $query_2 . $query_3 . $query_4; } } - if (!($totalresult = & $this->db->sql_query($totalquery)) || (!($row = & $this->db->sql_fetchrow($totalresult)))) { - message_die(GENERAL_ERROR, 'Could not get total bookmarks', '', __LINE__, __FILE__, $totalquery, $this->db); + if (!($totalresult = $this->db->sql_query($totalquery)) + || (!($row = $this->db->sql_fetchrow($totalresult))) + ) { + message_die( + GENERAL_ERROR, 'Could not get total bookmarks', + '', __LINE__, __FILE__, $totalquery, $this->db + ); } $total = $row['total']; @@ -947,10 +994,14 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService */ public function deleteBookmarksForUser($uId) { - $query = 'DELETE FROM '. $GLOBALS['tableprefix'] .'bookmarks WHERE uId = '. intval($uId); + $query = 'DELETE FROM '. $GLOBALS['tableprefix'] . 'bookmarks' + . ' WHERE uId = '. intval($uId); - if (!($dbresult = & $this->db->sql_query($query))) { - message_die(GENERAL_ERROR, 'Could not delete bookmarks', '', __LINE__, __FILE__, $query, $this->db); + if (!($dbresult = $this->db->sql_query($query))) { + message_die( + GENERAL_ERROR, 'Could not delete bookmarks', + '', __LINE__, __FILE__, $query, $this->db + ); } return true; @@ -962,12 +1013,6 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService * Counts the number of bookmarks that have the same address * as the given address. * - * @internal - * We do support fetching counts for multiple addresses at once - * because that allows us to reduce the number of queries - * we need in the web interface when displaying i.e. - * 10 bookmarks - only one SQL query is needed then. - * * @param string|array $addresses Address/URL to look for, string * of one address or array with * multiple ones @@ -976,6 +1021,12 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService * In case $addresses was an array, key-value array * with key being the address, value said number of * bookmarks + * + * @internal + * We do support fetching counts for multiple addresses at once + * because that allows us to reduce the number of queries + * we need in the web interface when displaying i.e. + * 10 bookmarks - only one SQL query is needed then. */ public function countOthers($addresses) { From fbf28d0753338c23eaa2f44fd449911ef5bf1965 Mon Sep 17 00:00:00 2001 From: cweiske Date: Sun, 26 Sep 2010 22:05:20 +0000 Subject: [PATCH 034/173] give bookmarks.tpl.php nice looking generated html code git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@749 b3834d28-1941-0410-a4f8-b48e95affb8f --- data/templates/bookmarks.tpl.php | 131 ++++++++++++++++++++----------- 1 file changed, 87 insertions(+), 44 deletions(-) diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php index a8299fd..2eed9c3 100644 --- a/data/templates/bookmarks.tpl.php +++ b/data/templates/bookmarks.tpl.php @@ -1,14 +1,30 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ /* Service creation: only useful services are created */ -$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); -$tagservice =SemanticScuttle_Service_Factory::get('Tag'); -$cdservice =SemanticScuttle_Service_Factory::get('CommonDescription'); +$bookmarkservice = SemanticScuttle_Service_Factory::get('Bookmark'); +$tagservice = SemanticScuttle_Service_Factory::get('Tag'); +$cdservice = SemanticScuttle_Service_Factory::get('CommonDescription'); -$pageName = isset($pageName)?$pageName:""; -$user = isset($user)?$user:""; -$currenttag = isset($currenttag)?$currenttag:""; +$pageName = isset($pageName) ? $pageName : ''; +$user = isset($user) ? $user : ''; +$currenttag = isset($currenttag) ? $currenttag : ''; $this->includeTemplate($GLOBALS['top_include']); @@ -132,23 +148,23 @@ default: break; } ?> - -/ - -/ + + / + + / - -/ + + / '; echo T_('Bookmarks from other users for this tag').''; //echo T_(' for these tags'); - } else if($userservice->isLoggedOn()){ + } else if ($userservice->isLoggedOn()){ echo ' - '; echo ''; echo T_('Only your bookmarks for this tag').''; @@ -213,10 +229,8 @@ if($currenttag!= '') { -
    0 ? ' start="'. ++$start .'"' : ''); ?> - id="bookmarks"> - - 0 ? ' start="'. ++$start .'"' : ''); ?> id="bookmarks"> + &$row) { $addresses[$row['bId']] = $row['bAddress']; @@ -253,35 +267,52 @@ if($currenttag!= '') { $tagsForCopy = ''; $tags = $row['tags']; foreach ($tags as $tkey => &$tag) { - $cats .= ', '; - $tagsForCopy.= $tag.','; + $tagcaturl = sprintf( + $cat_url, + filter($row['username'], 'url'), + filter($tag, 'url') + ); + $cats .= sprintf( + ', ', + $tagcaturl, filter($tag) + ); + $tagsForCopy .= $tag . ','; } $cats = substr($cats, 0, -2); if ($cats != '') { - $cats = ' '.T_('Tags:').' '. $cats; + $cats = T_('Tags:') . ' ' . $cats; } // Edit and delete links $edit = ''; if ($bookmarkservice->editAllowed($row)) { - $edit = ' - '. T_('Edit') .''; + $edit = ' - ' + . T_('Edit') + . '' + . ''; } // Last update - $update = ' ('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') '; + $update = ' ('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') '; // User attribution - $copy = ' '. T_('by'). ' '; - if($userservice->isLoggedOn() && $currentUser->getUsername() == $row['username']) { - $copy.= T_('you'); + $copy = ' ' . T_('by') . ' '; + if ($userservice->isLoggedOn() + && $currentUser->getUsername() == $row['username'] + ) { + $copy .= T_('you'); } else { - $copy.= ''. $row['username'] .''; + $copy .= '' + . $row['username'] . ''; } // Udders! if (!isset($hash)) { $others = $otherCounts[$row['bAddress']]; - $ostart = ''; + $ostart = ''; $oend = ''; switch ($others) { case 0: @@ -300,7 +331,10 @@ if($currenttag!= '') { && !$existence[$row['bAddress']] ) { $copy .= ' - ' . T_('Copy') . ''; @@ -321,11 +355,11 @@ if($currenttag!= '') { // Admin specific design if ($userservice->isAdmin($row['username']) && $GLOBALS['enableAdminColors']) { - $adminBgClass = 'class="adminBackground"'; - $adminStar = ' '; + $adminBgClass = ' class="adminBackground"'; + $adminStar = ' '; } else { $adminBgClass = ''; - $adminStar = ''; + $adminStar = ''; } // Private Note (just visible by the owner and his/her contacts) @@ -346,13 +380,16 @@ if($currenttag!= '') { } // Output - echo '
  1. '."\n"; + echo '
  2. '."\n"; include 'bookmarks-thumbnail.inc.tpl.php'; include 'bookmarks-vote.inc.tpl.php'; - echo '
    ';; + echo ' ' . "\n"; - echo '
    '. filter($row['bTitle']) ."" . $adminStar . "
    \n"; + echo '
    ' + . '' + . filter($row['bTitle']) + . '' . $adminStar . "
    \n"; if ($row['bDescription'] == '') { $bkDescription = $GLOBALS['blankDescription']; } else { @@ -362,17 +399,23 @@ if($currenttag!= '') { $bkDescription = preg_replace('@((http|https|ftp)://.*?)( |\r|$)@', '$1$3', $bkDescription); // make url clickable } - echo '
    '. nl2br($bkDescription) ."
    \n"; - //if(!isset($hash)) { - echo '
    ' . shortenString($oaddress) . '
    '; - //} + echo '
    '. nl2br($bkDescription) ."
    \n"; + echo '
    ' . shortenString($oaddress) . "
    \n"; - echo '
    '. $cats . $copy . $edit . $update ."
    \n"; - echo $privateNoteField!=''?'
    '.$privateNoteField."
    \n":''; + echo '
    ' + . $cats . "\n" + . $copy . "\n" + . $edit . "\n" + . $update . "\n" + . "
    \n"; + echo $privateNoteField != '' + ? '
    '.$privateNoteField."
    \n" + : ''; + echo ' '; include 'bookmarks-vote-horizontal.inc.tpl.php'; - echo '
    '; + echo " \n"; - echo "
    3. \n"; + echo " \n"; } ?> From 8b45ba9e75a5d911906e95c3980e214eff9e61b0 Mon Sep 17 00:00:00 2001 From: cweiske Date: Sun, 26 Sep 2010 22:06:31 +0000 Subject: [PATCH 035/173] escape the installation name; html code was broken when one had quotes in the name git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@750 b3834d28-1941-0410-a4f8-b48e95affb8f --- data/templates/bookmarks.tpl.php | 5 +++- data/templates/sidebar.block.search.php | 37 ++++++++++++++++++------- data/templates/top.inc.php | 9 ++++-- 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php index 2eed9c3..e32d3c9 100644 --- a/data/templates/bookmarks.tpl.php +++ b/data/templates/bookmarks.tpl.php @@ -215,7 +215,10 @@ if ($currenttag!= '') { $brss = ''; $size = count($rsschannels); for ($i = 0; $i < $size; $i++) { - $brss = ''. $rsschannels[$i][0] .''; + $brss = '' + . '' . htmlspecialchars($rsschannels[$i][0]) .'' + . ''; } $pagesBanner = '

    '. $bfirst .' / '. $bprev .' / '. $bnext .' / '. $blast .' / '. sprintf(T_('Page %d of %d'), $page, $totalpages) ." ". $brss ."

    \n"; diff --git a/data/templates/sidebar.block.search.php b/data/templates/sidebar.block.search.php index 64cb8ac..660ce00 100644 --- a/data/templates/sidebar.block.search.php +++ b/data/templates/sidebar.block.search.php @@ -1,13 +1,26 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ /* Service creation: only useful services are created */ -$searchhistoryservice =SemanticScuttle_Service_Factory::get('SearchHistory'); +$searchhistoryservice = SemanticScuttle_Service_Factory::get('SearchHistory'); -$logged_on_userid = $userservice->getCurrentUserId(); -if ($logged_on_userid === false) { - $logged_on_userid = NULL; -} - -$lastSearches = $searchhistoryservice->getAllSearches('all', NULL, 3, NULL, true, false); +$lastSearches = $searchhistoryservice->getAllSearches( + 'all', NULL, 3, NULL, true, false +); if ($lastSearches && count($lastSearches) > 0) { ?> @@ -18,11 +31,15 @@ if ($lastSearches && count($lastSearches) > 0) { '; - echo ''; + echo ''; echo $row['shTerms']; echo ''; - echo ' ('.$row['shNbResults'].')'; - echo ''; + echo ' (' . $row['shNbResults'] . ')'; + echo '' . "\n"; } //echo '...'; ?> diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php index 830da65..b1ffa14 100644 --- a/data/templates/top.inc.php +++ b/data/templates/top.inc.php @@ -5,15 +5,18 @@ <?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' » ' . $pagetitle : '')); ?> - + '; + echo ' '; } } ?> + From f52cba5cb3185adf468165bc4d53c8a64cd313ae Mon Sep 17 00:00:00 2001 From: cweiske Date: Sun, 26 Sep 2010 22:07:36 +0000 Subject: [PATCH 036/173] make html more readable git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@751 b3834d28-1941-0410-a4f8-b48e95affb8f --- data/templates/sidebar.block.search.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/templates/sidebar.block.search.php b/data/templates/sidebar.block.search.php index 660ce00..f4e6b42 100644 --- a/data/templates/sidebar.block.search.php +++ b/data/templates/sidebar.block.search.php @@ -27,10 +27,10 @@ if ($lastSearches && count($lastSearches) > 0) {

    Date: Sun, 26 Sep 2010 22:08:44 +0000 Subject: [PATCH 037/173] reformat the code (CS) git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@752 b3834d28-1941-0410-a4f8-b48e95affb8f --- src/SemanticScuttle/Service/SearchHistory.php | 189 ++++++++++++++---- 1 file changed, 150 insertions(+), 39 deletions(-) diff --git a/src/SemanticScuttle/Service/SearchHistory.php b/src/SemanticScuttle/Service/SearchHistory.php index df9b256..4947bf7 100644 --- a/src/SemanticScuttle/Service/SearchHistory.php +++ b/src/SemanticScuttle/Service/SearchHistory.php @@ -26,7 +26,9 @@ */ class SemanticScuttle_Service_SearchHistory extends SemanticScuttle_DbService { - var $sizeSearchHistory; + public $sizeSearchHistory; + + /** * Returns the single service instance @@ -44,109 +46,218 @@ class SemanticScuttle_Service_SearchHistory extends SemanticScuttle_DbService return $instance; } + + + /** + * Creates a new instance + * + * @param DB $db Database object + */ public function __construct($db) { $this->db = $db; $this->tablename = $GLOBALS['tableprefix'] .'searchhistory'; - if(isset($GLOBALS['sizeSearchHistory'])) { + if (isset($GLOBALS['sizeSearchHistory'])) { $this->sizeSearchHistory = $GLOBALS['sizeSearchHistory']; } else { $this->sizeSearchHistory = 10; } } - function addSearch($terms, $range, $nbResults, $uId=0) { - if(strlen($terms) == 0) { + + + /** + * Adds a new search to the search history + * + * @param string $terms Search terms separated by spaces + * @param string $range - 'all' - search was in all bookmarks + * - 'watchlist' - searched in watchlist + * - any username to show that the search happened + * in his own bookmarks. + * @param integer $nbResults Number of search result rows + * @param integer $uId ID of user that searched + * + * @return boolean True if it has been added, false if not + */ + public function addSearch($terms, $range, $nbResults, $uId = 0) + { + if (strlen($terms) == 0) { return false; } $datetime = gmdate('Y-m-d H:i:s', time()); //Insert values - $values = array('shTerms'=>$terms, 'shRange'=>$range, 'shDatetime'=>$datetime, 'shNbResults'=>$nbResults, 'uId'=>$uId); - $sql = 'INSERT INTO '. $this->getTableName() .' '. $this->db->sql_build_array('INSERT', $values); + $values = array( + 'shTerms' => $terms, + 'shRange' => $range, + 'shDatetime' => $datetime, + 'shNbResults' => $nbResults, + 'uId' => $uId + ); + $sql = 'INSERT INTO ' . $this->getTableName() + . ' ' . $this->db->sql_build_array('INSERT', $values); + $this->db->sql_transaction('begin'); - if (!($dbresult = & $this->db->sql_query($sql))) { + if (!($dbresult = $this->db->sql_query($sql))) { $this->db->sql_transaction('rollback'); - message_die(GENERAL_ERROR, 'Could not insert search history', '', __LINE__, __FILE__, $sql, $this->db); + message_die( + GENERAL_ERROR, 'Could not insert search history', + '', __LINE__, __FILE__, $sql, $this->db + ); return false; } - if($this->sizeSearchHistory != -1 && - $this->countSearches() > $this->sizeSearchHistory) { + if ($this->sizeSearchHistory != -1 + && $this->countSearches() > $this->sizeSearchHistory + ) { $this->deleteOldestSearch(); } + + return true; } - function getAllSearches($range = NULL, $uId = NULL, $nb = NULL, $start = NULL, $distinct = false, $withResults = false) { - $sql = 'SELECT DISTINCT(shTerms), shId, shRange, shNbResults, shDatetime, uId'; + + + /** + * Returns searches with the given features. + * + * @param string $range - 'all' - search was in all bookmarks + * - 'watchlist' - searched in watchlist + * - any username to show that the search happened + * in his own bookmarks. + * @param integer $uId Id of the user who searched. 0 for anonymous users + * @param integer $nb Number of bookmarks to retrieve (paging) + * @param integer $start Number of bookmark to begin with (paging) + * @param boolean $distinct If the search terms shall be distinct + * @param boolean $withResults Only return searches that had at least one result + * + * @return array Array of search history database rows + */ + public function getAllSearches( + $range = null, $uId = null, $nb = null, + $start = null, $distinct = false, $withResults = false + ) { + $sql = 'SELECT DISTINCT(shTerms),' + . ' shId, shRange, shNbResults, shDatetime, uId'; $sql.= ' FROM '. $this->getTableName(); $sql.= ' WHERE 1=1'; - if($range != NULL) { + if ($range != null) { $sql.= ' AND shRange = "'.$range.'"'; } else { $sql.= ' AND shRange = "all"'; } - if($uId != NULL) { + if ($uId != null) { $sql.= ' AND uId = '.$uId; } - if($withResults = true) { + if ($withResults = true) { $sql.= ' AND shNbResults > 0'; } - if($distinct) { + if ($distinct) { $sql.= ' GROUP BY shTerms'; } $sql.= ' ORDER BY shId DESC'; - if (!($dbresult = & $this->db->sql_query_limit($sql, $nb, $start))) { - message_die(GENERAL_ERROR, 'Could not get searches', '', __LINE__, __FILE__, $sql, $this->db); + if (!($dbresult = $this->db->sql_query_limit($sql, $nb, $start))) { + message_die( + GENERAL_ERROR, 'Could not get searches', + '', __LINE__, __FILE__, $sql, $this->db + ); return false; } $searches = array(); - while ($row = & $this->db->sql_fetchrow($dbresult)) { + while ($row = $this->db->sql_fetchrow($dbresult)) { $searches[] = $row; } $this->db->sql_freeresult($dbresult); return $searches; } - function countSearches() { + + + /** + * Counts the number of searches that have been made in total. + * + * @return integer Number of searches + */ + public function countSearches() + { $sql = 'SELECT COUNT(*) AS `total` FROM '. $this->getTableName(); - if (!($dbresult = & $this->db->sql_query($sql)) || (!($row = & $this->db->sql_fetchrow($dbresult)))) { - message_die(GENERAL_ERROR, 'Could not get total searches', '', __LINE__, __FILE__, $sql, $this->db); + if (!($dbresult = $this->db->sql_query($sql)) + || (!($row = & $this->db->sql_fetchrow($dbresult))) + ) { + message_die( + GENERAL_ERROR, 'Could not get total searches', + '', __LINE__, __FILE__, $sql, $this->db + ); return false; } $this->db->sql_freeresult($dbresult); return $row['total']; } - /* This function allows to limit the number of saved searches - by deleting the oldest one */ - function deleteOldestSearch() { + + + /** + * This function allows to limit the number of saved searches + * by deleting the oldest one + * + * @return boolean True when all went well, false in case of an error + */ + public function deleteOldestSearch() + { $sql = 'DELETE FROM '.$this->getTableName(); - $sql.= ' ORDER BY shId ASC LIMIT 1'; // warning: here the limit is important + // warning: here the limit is important + $sql .= ' ORDER BY shId ASC LIMIT 1'; $this->db->sql_transaction('begin'); - if (!($dbresult = & $this->db->sql_query($sql))) { + if (!($dbresult = $this->db->sql_query($sql))) { $this->db->sql_transaction('rollback'); - message_die(GENERAL_ERROR, 'Could not delete bookmarks', '', __LINE__, __FILE__, $query, $this->db); - return false; - } - } - - function deleteSearchHistoryForUser($uId) { - $query = 'DELETE FROM '. $this->getTableName() .' WHERE uId = '. intval($uId); - - if (!($dbresult = & $this->db->sql_query($query))) { - message_die(GENERAL_ERROR, 'Could not delete search history', '', - __LINE__, __FILE__, $query, $this->db); + message_die( + GENERAL_ERROR, 'Could not delete bookmarks', + '', __LINE__, __FILE__, $query, $this->db + ); return false; } return true; } - function deleteAll() { + + + /** + * Deletes all search history entries that have been made by the user + * with the given ID. + * + * @param integer $uId ID of the user + * + * @return boolean True when all went well, false in case of an error + */ + public function deleteSearchHistoryForUser($uId) + { + $query = 'DELETE FROM '. $this->getTableName() + . ' WHERE uId = ' . intval($uId); + + if (!($dbresult = $this->db->sql_query($query))) { + message_die( + GENERAL_ERROR, 'Could not delete search history', '', + __LINE__, __FILE__, $query, $this->db + ); + return false; + } + + return true; + } + + + + /** + * Deletes all search history entries. + * + * @return void + */ + public function deleteAll() + { $query = 'TRUNCATE TABLE `'. $this->getTableName() .'`'; $this->db->sql_query($query); } From 5c65da5bffd8c464a8afb6fadbc3aa5549322880 Mon Sep 17 00:00:00 2001 From: cweiske Date: Sun, 26 Sep 2010 22:09:55 +0000 Subject: [PATCH 038/173] fix nasty bug with $withResults in getAllSearches() git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@753 b3834d28-1941-0410-a4f8-b48e95affb8f --- src/SemanticScuttle/Service/SearchHistory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SemanticScuttle/Service/SearchHistory.php b/src/SemanticScuttle/Service/SearchHistory.php index 4947bf7..6ec240a 100644 --- a/src/SemanticScuttle/Service/SearchHistory.php +++ b/src/SemanticScuttle/Service/SearchHistory.php @@ -149,7 +149,7 @@ class SemanticScuttle_Service_SearchHistory extends SemanticScuttle_DbService if ($uId != null) { $sql.= ' AND uId = '.$uId; } - if ($withResults = true) { + if ($withResults == true) { $sql.= ' AND shNbResults > 0'; } if ($distinct) { From 93e520165890a14ce8269b04303216458b98ad7e Mon Sep 17 00:00:00 2001 From: cweiske Date: Sun, 26 Sep 2010 22:10:54 +0000 Subject: [PATCH 039/173] add some new tests git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@754 b3834d28-1941-0410-a4f8-b48e95affb8f --- tests/SearchHistoryTest.php | 168 ++++++++++++++++++++++++++---------- 1 file changed, 122 insertions(+), 46 deletions(-) diff --git a/tests/SearchHistoryTest.php b/tests/SearchHistoryTest.php index 3716b37..f140063 100644 --- a/tests/SearchHistoryTest.php +++ b/tests/SearchHistoryTest.php @@ -55,63 +55,139 @@ class SearchHistoryTest extends TestBase + /** + * Set up all services + * + * @return void + */ protected function setUp() { - $this->us =SemanticScuttle_Service_Factory::get('User'); - $this->bs =SemanticScuttle_Service_Factory::get('Bookmark'); - $this->bs->deleteAll(); - $this->b2ts =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); - $this->b2ts->deleteAll(); - $this->tts =SemanticScuttle_Service_Factory::get('Tag2Tag'); - $this->tts->deleteAll(); - $this->tsts =SemanticScuttle_Service_Factory::get('TagStat'); - $this->tsts->deleteAll(); - $this->shs =SemanticScuttle_Service_Factory::get('SearchHistory'); - $this->shs->deleteAll(); + $this->us = SemanticScuttle_Service_Factory::get('User'); + $this->bs = SemanticScuttle_Service_Factory::get('Bookmark'); + $this->bs->deleteAll(); + + $this->b2ts =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); + $this->b2ts->deleteAll(); + + $this->tts = SemanticScuttle_Service_Factory::get('Tag2Tag'); + $this->tts->deleteAll(); + + $this->tsts = SemanticScuttle_Service_Factory::get('TagStat'); + $this->tsts->deleteAll(); + + $this->shs = SemanticScuttle_Service_Factory::get('SearchHistory'); + $this->shs->deleteAll(); + } + + /** + * Tests if adding searches to the database works + */ + public function testAddSearch() + { + $this->assertEquals(0, $this->shs->countSearches()); + + $this->assertTrue( + $this->shs->addSearch('testsearchterm', 'all', 0) + ); + $this->assertEquals(1, $this->shs->countSearches()); + } + + /** + * Tests if adding a search without terms should fail + */ + public function testAddSearchNoTerms() + { + $this->assertEquals(0, $this->shs->countSearches()); + + $this->assertFalse( + $this->shs->addSearch('', 'all', 0) + ); + $this->assertEquals(0, $this->shs->countSearches()); } public function testSearchHistory() { - $shs = $this->shs; + $shs = $this->shs; - $terms = 'bbqsdkbb;,:,:q;,qddds&é"\'\\\\\(-è_çà)'; - $terms2 = '~#{|`]'; - $range = 'all'; - $nbResults = 10908; - $uId = 10; + $terms = 'bbqsdkbb;,:,:q;,qddds&é"\'\\\\\(-è_çà)'; + $terms2 = '~#{|`]'; + $range = 'all'; + $nbResults = 10908; + $uId = 10; - $shs->addSearch($terms, $range, $nbResults, $uId); - $shs->addSearch($terms2, $range, $nbResults, $uId); - $shs->addSearch('', $range, $nbResults, $uId); // A void search must not be saved + $shs->addSearch($terms, $range, $nbResults, $uId); + $shs->addSearch($terms2, $range, $nbResults, $uId); + $shs->addSearch('', $range, $nbResults, $uId); // A void search must not be saved - $searches = $shs->getAllSearches(); - $this->assertSame(2, count($searches)); - $searches = $shs->getAllSearches($range, $uId); - $this->assertEquals(2, count($searches)); - $searches = $shs->getAllSearches($range, 20); // fake userid - $this->assertEquals(0, count($searches)); - $searches = $shs->getAllSearches($range, $uId, 1); - $this->assertEquals(1, count($searches)); - $searches = $shs->getAllSearches($range, null, 1, 1); - $this->assertEquals(1, count($searches)); + $searches = $shs->getAllSearches(); + $this->assertSame(2, count($searches)); + $searches = $shs->getAllSearches($range, $uId); + $this->assertEquals(2, count($searches)); + $searches = $shs->getAllSearches($range, 20); // fake userid + $this->assertEquals(0, count($searches)); + $searches = $shs->getAllSearches($range, $uId, 1); + $this->assertEquals(1, count($searches)); + $searches = $shs->getAllSearches($range, null, 1, 1); + $this->assertEquals(1, count($searches)); - //test content of results - $searches = $shs->getAllSearches(); - $this->assertSame($terms2, $searches[0]['shTerms']); - $this->assertSame($range, $searches[0]['shRange']); - $this->assertEquals($nbResults, $searches[0]['shNbResults']); - $this->assertEquals($uId, $searches[0]['uId']); - $this->assertSame($terms, $searches[1]['shTerms']); - $this->assertSame($range, $searches[1]['shRange']); - $this->assertEquals($nbResults, $searches[1]['shNbResults']); - $this->assertEquals($uId, $searches[1]['uId']); + //test content of results + $searches = $shs->getAllSearches(); + $this->assertSame($terms2, $searches[0]['shTerms']); + $this->assertSame($range, $searches[0]['shRange']); + $this->assertEquals($nbResults, $searches[0]['shNbResults']); + $this->assertEquals($uId, $searches[0]['uId']); + $this->assertSame($terms, $searches[1]['shTerms']); + $this->assertSame($range, $searches[1]['shRange']); + $this->assertEquals($nbResults, $searches[1]['shNbResults']); + $this->assertEquals($uId, $searches[1]['uId']); - //test distinct parameter - $shs->addSearch($terms, $range, $nbResults, 30); // we repeat a search (same terms) - $searches = $shs->getAllSearches(); - $this->assertSame(3, count($searches)); - $searches = $shs->getAllSearches(NULL, NULL, NULL, NULL, true); - $this->assertSame(2, count($searches)); + //test distinct parameter + $shs->addSearch( + $terms, $range, $nbResults, 30 + ); // we repeat a search (same terms) + $searches = $shs->getAllSearches(); + $this->assertSame(3, count($searches)); + $searches = $shs->getAllSearches(null, null, null, null, true); + $this->assertSame(2, count($searches)); + } + + /** + * Deleting the oldest search without any historical searches + */ + public function testDeleteOldestSearchNone() + { + $this->assertEquals(0, $this->shs->countSearches()); + $this->assertTrue($this->shs->deleteOldestSearch()); + $this->assertEquals(0, $this->shs->countSearches()); + } + + /** + * Test deleting the oldest search + */ + public function testDeleteOldestSearchSome() + { + $this->assertEquals(0, $this->shs->countSearches()); + $this->shs->addSearch('testsearchterm1', 'all', 0); + $this->shs->addSearch('testsearchterm2', 'all', 0); + + $rows = $this->shs->getAllSearches(); + $this->assertEquals(2, count($rows)); + + $highestId = -1; + foreach ($rows as $row) { + if ($row['shId'] > $highestId) { + $highestId = $row['shId']; + } + } + + $this->shs->deleteOldestSearch(); + + $rows = $this->shs->getAllSearches(); + $this->assertEquals(1, count($rows)); + $this->assertEquals( + $highestId, + $rows[0]['shId'] + ); } } From 84224c32948fb80f64c26d0d84834a1c13ef7710 Mon Sep 17 00:00:00 2001 From: cweiske Date: Sun, 26 Sep 2010 22:28:54 +0000 Subject: [PATCH 040/173] explain $sizeSearchHistory git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@755 b3834d28-1941-0410-a4f8-b48e95affb8f --- src/SemanticScuttle/Service/SearchHistory.php | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/SemanticScuttle/Service/SearchHistory.php b/src/SemanticScuttle/Service/SearchHistory.php index 6ec240a..f13f8f9 100644 --- a/src/SemanticScuttle/Service/SearchHistory.php +++ b/src/SemanticScuttle/Service/SearchHistory.php @@ -26,6 +26,15 @@ */ class SemanticScuttle_Service_SearchHistory extends SemanticScuttle_DbService { + /** + * Size of the search history. + * If the number of logged searches is larger than this, + * adding a new search will delete the oldest one automatically. + * + * Use -1 to deactivate automatic deletion. + * + * @var integer + */ public $sizeSearchHistory; @@ -49,14 +58,17 @@ class SemanticScuttle_Service_SearchHistory extends SemanticScuttle_DbService /** - * Creates a new instance + * Creates a new instance. + * + * Sets $this->sizeSearchHistory to $GLOBALS['sizeSearchHistory'] or 10 + * if the global variable is not defined. * * @param DB $db Database object */ public function __construct($db) { $this->db = $db; - $this->tablename = $GLOBALS['tableprefix'] .'searchhistory'; + $this->tablename = $GLOBALS['tableprefix'] . 'searchhistory'; if (isset($GLOBALS['sizeSearchHistory'])) { $this->sizeSearchHistory = $GLOBALS['sizeSearchHistory']; } else { @@ -67,7 +79,9 @@ class SemanticScuttle_Service_SearchHistory extends SemanticScuttle_DbService /** - * Adds a new search to the search history + * Adds a new search to the search history. + * Automatically deletes the oldest search when the number of + * searches is larger than $sizeSearchHistory. * * @param string $terms Search terms separated by spaces * @param string $range - 'all' - search was in all bookmarks From eb105d379bc2283e2bf2ea33bf455ec9caf5c7ee Mon Sep 17 00:00:00 2001 From: cweiske Date: Sun, 26 Sep 2010 22:29:51 +0000 Subject: [PATCH 041/173] tell which test covers which method git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@756 b3834d28-1941-0410-a4f8-b48e95affb8f --- tests/SearchHistoryTest.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/SearchHistoryTest.php b/tests/SearchHistoryTest.php index f140063..53d0451 100644 --- a/tests/SearchHistoryTest.php +++ b/tests/SearchHistoryTest.php @@ -81,6 +81,8 @@ class SearchHistoryTest extends TestBase /** * Tests if adding searches to the database works + * + * @covers SemanticScuttle_Service_SearchHistory::addSearch */ public function testAddSearch() { @@ -94,6 +96,8 @@ class SearchHistoryTest extends TestBase /** * Tests if adding a search without terms should fail + * + * @covers SemanticScuttle_Service_SearchHistory::addSearch */ public function testAddSearchNoTerms() { @@ -153,6 +157,8 @@ class SearchHistoryTest extends TestBase /** * Deleting the oldest search without any historical searches + * + * @covers SemanticScuttle_Service_SearchHistory::deleteOldestSearch */ public function testDeleteOldestSearchNone() { @@ -163,6 +169,8 @@ class SearchHistoryTest extends TestBase /** * Test deleting the oldest search + * + * @covers SemanticScuttle_Service_SearchHistory::deleteOldestSearch */ public function testDeleteOldestSearchSome() { From f0456530b4940918efba25ea15e22532c682fb70 Mon Sep 17 00:00:00 2001 From: cweiske Date: Mon, 27 Sep 2010 20:43:35 +0000 Subject: [PATCH 042/173] Fix bug #3074816: French translation breaks edit javascript git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@757 b3834d28-1941-0410-a4f8-b48e95affb8f --- data/templates/editbookmark.tpl.php | 28 ++++++++++++++++++++-------- doc/ChangeLog | 1 + 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index c58bd1b..dd6b100 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -140,14 +140,26 @@ if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) {

    '; - //echo ''; - //echo ''; - //echo ''; echo ''; + */ } ?> + - From da20b90bbaafef116c7a5d439e44210b126c3522 Mon Sep 17 00:00:00 2001 From: cweiske Date: Tue, 28 Sep 2010 22:08:02 +0000 Subject: [PATCH 051/173] update php-gettext to 1.0.10 git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@763 b3834d28-1941-0410-a4f8-b48e95affb8f --- src/php-gettext/Makefile | 14 +- src/php-gettext/README | 74 +-- .../locale/sr_CS/LC_MESSAGES/messages.mo | Bin 834 -> 829 bytes .../locale/sr_CS/LC_MESSAGES/messages.po | 3 +- src/php-gettext/examples/pigs_dropin.php | 10 +- src/php-gettext/examples/pigs_fallback.php | 10 +- src/php-gettext/examples/update | 4 +- src/php-gettext/gettext.inc | 480 +++++++++++++----- src/php-gettext/gettext.php | 179 ++++--- src/php-gettext/streams.php | 32 +- src/php-gettext/tests/LocalesTest.php | 66 +++ src/php-gettext/tests/ParsingTest.php | 43 ++ 12 files changed, 643 insertions(+), 272 deletions(-) create mode 100644 src/php-gettext/tests/LocalesTest.php create mode 100644 src/php-gettext/tests/ParsingTest.php diff --git a/src/php-gettext/Makefile b/src/php-gettext/Makefile index 2dba911..a6cce12 100644 --- a/src/php-gettext/Makefile +++ b/src/php-gettext/Makefile @@ -1,12 +1,11 @@ PACKAGE = php-gettext-$(VERSION) -VERSION = 1.0.7 +VERSION = 1.0.10 DIST_FILES = \ gettext.php \ gettext.inc \ streams.php \ AUTHORS \ - ChangeLog \ README \ COPYING \ Makefile \ @@ -17,9 +16,14 @@ DIST_FILES = \ examples/locale/sr_CS/LC_MESSAGES/messages.mo \ examples/locale/de_CH/LC_MESSAGES/messages.po \ examples/locale/de_CH/LC_MESSAGES/messages.mo \ - examples/update + examples/update \ + tests/LocalesTest.php \ + tests/ParsingTest.php -dist: +check: + phpunit --verbose tests + +dist: check if [ -d $(PACKAGE) ]; then \ rm -rf $(PACKAGE); \ fi; \ @@ -30,3 +34,5 @@ dist: rm -rf $(PACKAGE); \ fi; +clean: + rm -f $(PACKAGE).tar.gz diff --git a/src/php-gettext/README b/src/php-gettext/README index c7525e2..bca4f91 100644 --- a/src/php-gettext/README +++ b/src/php-gettext/README @@ -1,9 +1,9 @@ -PHP-gettext 1.0 +PHP-gettext 1.0 (https://launchpad.net/php-gettext) -Copyright 2003, 2006 -- Danilo "angry with PHP[1]" Segan +Copyright 2003, 2006, 2009 -- Danilo "angry with PHP[1]" Segan Licensed under GPLv2 (or any later version, see COPYING) -[1] PHP is actually cyrillic, and translates roughly to +[1] PHP is actually cyrillic, and translates roughly to "works-doesn't-work" (UTF-8: Ради-Не-Ради) @@ -50,36 +50,16 @@ Features file data, I used imaginary abstract class StreamReader to do all the input (check streams.php). For your convenience, I've already provided two classes for reading files: FileReader and - StringReader (CachedFileReader is a combination of the two: it - loads entire file contents into a string, and then works on that). - See example below for usage. You can for instance use StringReader - when you read in data from a database, or you can create your own - derivative of StreamReader for anything you like. - + StringReader (CachedFileReader is a combination of the two: it + loads entire file contents into a string, and then works on that). + See example below for usage. You can for instance use StringReader + when you read in data from a database, or you can create your own + derivative of StreamReader for anything you like. + Bugs - Plural-forms field in MO header (translation for empty string, - i.e. "") is treated according to PHP syntactic rules (it's - eval()ed). Since these should actually follow C syntax, there are - some problems. - - For instance, I'm used to using this: - Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : \ - n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2; - but it fails with PHP (it sets $plural=2 instead of 0 for $n==1). - - The fix is usually simple, but I'm lazy to go into the details of - PHP operator precedence, and maybe try to fix it. In here, I had - to put everything after the first ':' in parenthesis: - Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : \ - (n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); - That works, and I'm satisfied. - - Besides this one, there are probably a bunch of other bugs, since - I hate PHP (did I mention it already? no? strange), and don't - know it very well. So, feel free to fix any of those and report - them back to me at . + Report them on https://bugs.launchpad.net/php-gettext Usage @@ -94,19 +74,19 @@ Usage Then, use that as a parameter to gettext_reader constructor: $wohoo = new gettext_reader($streamer); - If you want to disable pre-loading of entire message catalog in - memory (if, for example, you have a multi-thousand message catalog - which you'll use only occasionally), use "false" for second + If you want to disable pre-loading of entire message catalog in + memory (if, for example, you have a multi-thousand message catalog + which you'll use only occasionally), use "false" for second parameter to gettext_reader constructor: $wohoo = new gettext_reader($streamer, false); From now on, you have all the benefits of gettext data at your - disposal, so may run: + disposal, so may run: print $wohoo->translate("This is a test"); print $wohoo->ngettext("%d bird", "%d birds", $birds); You might need to pass parameter "-k" to xgettext to make it - extract all the strings. In above example, try with + extract all the strings. In above example, try with xgettext -ktranslate -kngettext:1,2 file.php what should create messages.po which contains two messages for translation. @@ -118,8 +98,8 @@ Usage Usage with gettext.inc (standard gettext interfaces emulation) - Check example in examples/pig_dropin.php, basically you include - gettext.inc and use all the standard gettext interfaces as + Check example in examples/pig_dropin.php, basically you include + gettext.inc and use all the standard gettext interfaces as documented on: http://www.php.net/gettext @@ -137,20 +117,12 @@ Example There is also simple "update" script that can be used to generate POT file and to update the translation using msgmerge. -Interesting TODO: +TODO: - o Try to parse "plural-forms" header field, and to follow C syntax - rules. This won't be easy. + o Improve speed to be even more comparable to the native gettext + implementation. -Boring TODO: - - o Learn PHP and fix bugs, slowness and other stuff resulting from - my lack of knowledge (but *maybe*, it's not my knowledge that is - bad, but PHP itself ;-). - - (This is mostly done thanks to Nico Kaiser.) - - o Try to use hash tables in MO files: with pre-loading, would it + o Try to use hash tables in MO files: with pre-loading, would it be useful at all? Never-asked-questions: @@ -160,7 +132,7 @@ Never-asked-questions: Well, it's quite simple. I consider that the first released thing should be labeled "version 1" (first, right?). Zero is there to - indicate that there's zero improvement and/or change compared to + indicate that there's zero improvement and/or change compared to "version 1". I plan to use version numbers 1.0.* for small bugfixes, and to @@ -173,7 +145,7 @@ Never-asked-questions: Mozart's 40th Symphony (there is one like that, right?). o Can I...? - + Yes, you can. This is free software (as in freedom, free speech), and you might do whatever you wish with it, provided you do not limit freedom of others (GPL). diff --git a/src/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo b/src/php-gettext/examples/locale/sr_CS/LC_MESSAGES/messages.mo index 6ffccfd52d91a1db0870a94d12472e104f9c6b2b..497c8830ca84f880f8d484df057c0bf725163edd 100644 GIT binary patch delta 44 xcmX@awwG;!iRd~;28L}63=G?WIF*TkK^{oUZuC6FIGK-0X|f@c>Ev{#+W_V;3U~kj delta 51 zcmdnXc8G0)iRflV28L}63=G?WIE#saK^{meZS*|E$fTe!nTtu8QDd?$lPRO-=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: pigs.php:19 msgid "" diff --git a/src/php-gettext/examples/pigs_dropin.php b/src/php-gettext/examples/pigs_dropin.php index edd2b0d..94fd850 100644 --- a/src/php-gettext/examples/pigs_dropin.php +++ b/src/php-gettext/examples/pigs_dropin.php @@ -1,6 +1,6 @@ . + Copyright (c) 2003,2004,2005,2009 Danilo Segan . Copyright (c) 2005,2006 Steven Armstrong This file is part of PHP-gettext. @@ -21,10 +21,12 @@ */ +error_reporting(E_ALL | E_STRICT); + // define constants -define(PROJECT_DIR, realpath('./')); -define(LOCALE_DIR, PROJECT_DIR .'/locale'); -define(DEFAULT_LOCALE, 'en_US'); +define('PROJECT_DIR', realpath('./')); +define('LOCALE_DIR', PROJECT_DIR .'/locale'); +define('DEFAULT_LOCALE', 'en_US'); require_once('../gettext.inc'); diff --git a/src/php-gettext/examples/pigs_fallback.php b/src/php-gettext/examples/pigs_fallback.php index b50f752..353190d 100644 --- a/src/php-gettext/examples/pigs_fallback.php +++ b/src/php-gettext/examples/pigs_fallback.php @@ -1,6 +1,6 @@ . + Copyright (c) 2003,2004,2005,2009 Danilo Segan . Copyright (c) 2005,2006 Steven Armstrong This file is part of PHP-gettext. @@ -21,10 +21,12 @@ */ +error_reporting(E_ALL | E_STRICT); + // define constants -define(PROJECT_DIR, realpath('./')); -define(LOCALE_DIR, PROJECT_DIR .'/locale'); -define(DEFAULT_LOCALE, 'en_US'); +define('PROJECT_DIR', realpath('./')); +define('LOCALE_DIR', PROJECT_DIR .'/locale'); +define('DEFAULT_LOCALE', 'en_US'); require_once('../gettext.inc'); diff --git a/src/php-gettext/examples/update b/src/php-gettext/examples/update index c8d8b61..76b4308 100644 --- a/src/php-gettext/examples/update +++ b/src/php-gettext/examples/update @@ -1,7 +1,7 @@ #!/bin/sh TEMPLATE=pigs.pot -xgettext -kT_ngettext:1,2 -kT_ -L PHP -o $TEMPLATE pigs.php -if [ x$1 == 'x-p' ]; then +xgettext -kT_ngettext:1,2 -kT_ -L PHP -o $TEMPLATE pigs_dropin.php +if [ "x$1" = "x-p" ]; then msgfmt --statistics $TEMPLATE else if [ -f $1.po ]; then diff --git a/src/php-gettext/gettext.inc b/src/php-gettext/gettext.inc index a67811f..399a0f2 100644 --- a/src/php-gettext/gettext.inc +++ b/src/php-gettext/gettext.inc @@ -1,9 +1,10 @@ - + Copyright (c) 2009 Danilo Segan + Drop in replacement for native gettext. - + This file is part of PHP-gettext. PHP-gettext is free software; you can redistribute it and/or modify @@ -22,15 +23,22 @@ */ /* -LC_CTYPE 0 -LC_NUMERIC 1 -LC_TIME 2 -LC_COLLATE 3 -LC_MONETARY 4 -LC_MESSAGES 5 -LC_ALL 6 +LC_CTYPE 0 +LC_NUMERIC 1 +LC_TIME 2 +LC_COLLATE 3 +LC_MONETARY 4 +LC_MESSAGES 5 +LC_ALL 6 */ + +// LC_MESSAGES is not available if php-gettext is not loaded +// while the other constants are already available from session extension. +if (!defined('LC_MESSAGES')) { + define('LC_MESSAGES', 5); +} + require('streams.php'); require('gettext.php'); @@ -44,29 +52,96 @@ $LC_CATEGORIES = array('LC_CTYPE', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MO $EMULATEGETTEXT = 0; $CURRENTLOCALE = ''; +/* Class to hold a single domain included in $text_domains. */ +class domain { + var $l10n; + var $path; + var $codeset; +} // Utility functions +/** + * Return a list of locales to try for any POSIX-style locale specification. + */ +function get_list_of_locales($locale) { + /* Figure out all possible locale names and start with the most + * specific ones. I.e. for sr_CS.UTF-8@latin, look through all of + * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr. + */ + $locale_names = array(); + $lang = NULL; + $country = NULL; + $charset = NULL; + $modifier = NULL; + if ($locale) { + if (preg_match("/^(?P[a-z]{2,3})" // language code + ."(?:_(?P[A-Z]{2}))?" // country code + ."(?:\.(?P[-A-Za-z0-9_]+))?" // charset + ."(?:@(?P[-A-Za-z0-9_]+))?$/", // @ modifier + $locale, $matches)) { + + if (isset($matches["lang"])) $lang = $matches["lang"]; + if (isset($matches["country"])) $country = $matches["country"]; + if (isset($matches["charset"])) $charset = $matches["charset"]; + if (isset($matches["modifier"])) $modifier = $matches["modifier"]; + + if ($modifier) { + if ($country) { + if ($charset) + array_push($locale_names, "${lang}_$country.$charset@$modifier"); + array_push($locale_names, "${lang}_$country@$modifier"); + } elseif ($charset) + array_push($locale_names, "${lang}.$charset@$modifier"); + array_push($locale_names, "$lang@$modifier"); + } + if ($country) { + if ($charset) + array_push($locale_names, "${lang}_$country.$charset"); + array_push($locale_names, "${lang}_$country"); + } elseif ($charset) + array_push($locale_names, "${lang}.$charset"); + array_push($locale_names, $lang); + } + + // If the locale name doesn't match POSIX style, just include it as-is. + if (!in_array($locale, $locale_names)) + array_push($locale_names, $locale); + } + return $locale_names; +} + /** * Utility function to get a StreamReader for the given text domain. */ function _get_reader($domain=null, $category=5, $enable_cache=true) { - global $text_domains, $default_domain, $LC_CATEGORIES; - if (!isset($domain)) $domain = $default_domain; - if (!isset($text_domains[$domain]->l10n)) { - // get the current locale - $locale = _setlocale(LC_MESSAGES, 0); - $p = isset($text_domains[$domain]->path) ? $text_domains[$domain]->path : './'; - $path = $p . "$locale/". $LC_CATEGORIES[$category] ."/$domain.mo"; - if (file_exists($path)) { - $input = new FileReader($path); - } - else { - $input = null; - } - $text_domains[$domain]->l10n = new gettext_reader($input, $enable_cache); - } - return $text_domains[$domain]->l10n; + global $text_domains, $default_domain, $LC_CATEGORIES; + if (!isset($domain)) $domain = $default_domain; + if (!isset($text_domains[$domain]->l10n)) { + // get the current locale + $locale = _setlocale(LC_MESSAGES, 0); + $bound_path = isset($text_domains[$domain]->path) ? + $text_domains[$domain]->path : './'; + $subpath = $LC_CATEGORIES[$category] ."/$domain.mo"; + + $locale_names = get_list_of_locales($locale); + $input = null; + foreach ($locale_names as $locale) { + $full_path = $bound_path . $locale . "/" . $subpath; + if (file_exists($full_path)) { + $input = new FileReader($full_path); + break; + } + } + + if (!array_key_exists($domain, $text_domains)) { + // Initialize an empty domain object. + $text_domains[$domain] = new domain(); + } + $text_domains[$domain]->l10n = new gettext_reader($input, + $enable_cache); + } + return $text_domains[$domain]->l10n; } /** @@ -80,8 +155,10 @@ function locale_emulation() { /** * Checks if the current locale is supported on this system. */ -function _check_locale() { +function _check_locale_and_function($function=false) { global $EMULATEGETTEXT; + if ($function and !function_exists($function)) + return false; return !$EMULATEGETTEXT; } @@ -89,56 +166,70 @@ function _check_locale() { * Get the codeset for the given domain. */ function _get_codeset($domain=null) { - global $text_domains, $default_domain, $LC_CATEGORIES; - if (!isset($domain)) $domain = $default_domain; - return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding'); + global $text_domains, $default_domain, $LC_CATEGORIES; + if (!isset($domain)) $domain = $default_domain; + return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding'); } /** * Convert the given string to the encoding set by bind_textdomain_codeset. */ function _encode($text) { - $source_encoding = mb_detect_encoding($text); - $target_encoding = _get_codeset(); - if ($source_encoding != $target_encoding) { - return mb_convert_encoding($text, $target_encoding, $source_encoding); - } - else { - return $text; - } + $source_encoding = mb_detect_encoding($text); + $target_encoding = _get_codeset(); + if ($source_encoding != $target_encoding) { + return mb_convert_encoding($text, $target_encoding, $source_encoding); + } + else { + return $text; + } } - - // Custom implementation of the standard gettext related functions +/** + * Returns passed in $locale, or environment variable $LANG if $locale == ''. + */ +function _get_default_locale($locale) { + if ($locale == '') // emulate variable support + return getenv('LANG'); + else + return $locale; +} + /** * Sets a requested locale, if needed emulates it. */ function _setlocale($category, $locale) { global $CURRENTLOCALE, $EMULATEGETTEXT; if ($locale === 0) { // use === to differentiate between string "0" - if ($CURRENTLOCALE != '') + if ($CURRENTLOCALE != '') return $CURRENTLOCALE; - else + else // obey LANG variable, maybe extend to support all of LC_* vars // even if we tried to read locale without setting it first return _setlocale($category, $CURRENTLOCALE); } else { - $ret = 0; - if (function_exists('setlocale')) // I don't know if this ever happens ;) - $ret = @setlocale($category, $locale); //the @ hides warning messages on few installations - if (($ret and $locale == '') or ($ret == $locale)) { - $EMULATEGETTEXT = 0; - $CURRENTLOCALE = $ret; - } else { - if ($locale == '') // emulate variable support - $CURRENTLOCALE = getenv('LANG'); - else - $CURRENTLOCALE = $locale; + if (function_exists('setlocale')) { + $ret = setlocale($category, $locale); + if (($locale == '' and !$ret) or // failed setting it by env + ($locale != '' and $ret != $locale)) { // failed setting it + // Failed setting it according to environment. + $CURRENTLOCALE = _get_default_locale($locale); $EMULATEGETTEXT = 1; + } else { + $CURRENTLOCALE = $ret; + $EMULATEGETTEXT = 0; + } + } else { + // No function setlocale(), emulate it all. + $CURRENTLOCALE = _get_default_locale($locale); + $EMULATEGETTEXT = 1; } + // Allow locale to be changed on the go for one translation domain. + global $text_domains, $default_domain; + unset($text_domains[$default_domain]->l10n); return $CURRENTLOCALE; } } @@ -147,135 +238,240 @@ function _setlocale($category, $locale) { * Sets the path for a domain. */ function _bindtextdomain($domain, $path) { - global $text_domains; - // ensure $path ends with a slash - if ($path[strlen($path) - 1] != '/') $path .= '/'; - elseif ($path[strlen($path) - 1] != '\\') $path .= '\\'; - $text_domains[$domain]->path = $path; + global $text_domains; + // ensure $path ends with a slash ('/' should work for both, but lets still play nice) + if (substr(php_uname(), 0, 7) == "Windows") { + if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/') + $path .= '\\'; + } else { + if ($path[strlen($path)-1] != '/') + $path .= '/'; + } + if (!array_key_exists($domain, $text_domains)) { + // Initialize an empty domain object. + $text_domains[$domain] = new domain(); + } + $text_domains[$domain]->path = $path; } /** * Specify the character encoding in which the messages from the DOMAIN message catalog will be returned. */ function _bind_textdomain_codeset($domain, $codeset) { - global $text_domains; - $text_domains[$domain]->codeset = $codeset; + global $text_domains; + $text_domains[$domain]->codeset = $codeset; } /** * Sets the default domain. */ function _textdomain($domain) { - global $default_domain; - $default_domain = $domain; + global $default_domain; + $default_domain = $domain; } /** * Lookup a message in the current domain. */ function _gettext($msgid) { - $l10n = _get_reader(); - //return $l10n->translate($msgid); - return _encode($l10n->translate($msgid)); + $l10n = _get_reader(); + return _encode($l10n->translate($msgid)); } + /** * Alias for gettext. */ function __($msgid) { - return _gettext($msgid); + return _gettext($msgid); } + /** * Plural version of gettext. */ function _ngettext($single, $plural, $number) { - $l10n = _get_reader(); - //return $l10n->ngettext($single, $plural, $number); - return _encode($l10n->ngettext($single, $plural, $number)); + $l10n = _get_reader(); + return _encode($l10n->ngettext($single, $plural, $number)); } /** * Override the current domain. */ function _dgettext($domain, $msgid) { - $l10n = _get_reader($domain); - //return $l10n->translate($msgid); - return _encode($l10n->translate($msgid)); + $l10n = _get_reader($domain); + return _encode($l10n->translate($msgid)); } + /** * Plural version of dgettext. */ function _dngettext($domain, $single, $plural, $number) { - $l10n = _get_reader($domain); - //return $l10n->ngettext($single, $plural, $number); - return _encode($l10n->ngettext($single, $plural, $number)); + $l10n = _get_reader($domain); + return _encode($l10n->ngettext($single, $plural, $number)); } /** * Overrides the domain and category for a single lookup. */ function _dcgettext($domain, $msgid, $category) { - $l10n = _get_reader($domain, $category); - //return $l10n->translate($msgid); - return _encode($l10n->translate($msgid)); + $l10n = _get_reader($domain, $category); + return _encode($l10n->translate($msgid)); } /** * Plural version of dcgettext. */ function _dcngettext($domain, $single, $plural, $number, $category) { - $l10n = _get_reader($domain, $category); - //return $l10n->ngettext($single, $plural, $number); - return _encode($l10n->ngettext($single, $plural, $number)); + $l10n = _get_reader($domain, $category); + return _encode($l10n->ngettext($single, $plural, $number)); +} + +/** + * Context version of gettext. + */ +function _pgettext($context, $msgid) { + $l10n = _get_reader(); + return _encode($l10n->pgettext($context, $msgid)); +} + +/** + * Override the current domain in a context gettext call. + */ +function _dpgettext($domain, $context, $msgid) { + $l10n = _get_reader($domain); + return _encode($l10n->pgettext($context, $msgid)); +} + +/** + * Overrides the domain and category for a single context-based lookup. + */ +function _dcpgettext($domain, $context, $msgid, $category) { + $l10n = _get_reader($domain, $category); + return _encode($l10n->pgettext($context, $msgid)); +} + +/** + * Context version of ngettext. + */ +function _npgettext($context, $singular, $plural) { + $l10n = _get_reader(); + return _encode($l10n->npgettext($context, $singular, $plural)); +} + +/** + * Override the current domain in a context ngettext call. + */ +function _dnpgettext($domain, $context, $singular, $plural) { + $l10n = _get_reader($domain); + return _encode($l10n->npgettext($context, $singular, $plural)); +} + +/** + * Overrides the domain and category for a plural context-based lookup. + */ +function _dcnpgettext($domain, $context, $singular, $plural, $category) { + $l10n = _get_reader($domain, $category); + return _encode($l10n->npgettext($context, $singular, $plural)); } -// Wrappers to use if the standard gettext functions are available, but the current locale is not supported by the system. -// Use the standard impl if the current locale is supported, use the custom impl otherwise. +// Wrappers to use if the standard gettext functions are available, +// but the current locale is not supported by the system. +// Use the standard impl if the current locale is supported, use the +// custom impl otherwise. function T_setlocale($category, $locale) { return _setlocale($category, $locale); } function T_bindtextdomain($domain, $path) { - if (_check_locale()) return bindtextdomain($domain, $path); - else return _bindtextdomain($domain, $path); + if (_check_locale_and_function()) return bindtextdomain($domain, $path); + else return _bindtextdomain($domain, $path); } function T_bind_textdomain_codeset($domain, $codeset) { // bind_textdomain_codeset is available only in PHP 4.2.0+ - if (_check_locale() and function_exists('bind_textdomain_codeset')) return bind_textdomain_codeset($domain, $codeset); - else return _bind_textdomain_codeset($domain, $codeset); + if (_check_locale_and_function('bind_textdomain_codeset')) + return bind_textdomain_codeset($domain, $codeset); + else return _bind_textdomain_codeset($domain, $codeset); } function T_textdomain($domain) { - if (_check_locale()) return textdomain($domain); - else return _textdomain($domain); + if (_check_locale_and_function()) return textdomain($domain); + else return _textdomain($domain); } function T_gettext($msgid) { - if (_check_locale()) return gettext($msgid); - else return _gettext($msgid); + if (_check_locale_and_function()) return gettext($msgid); + else return _gettext($msgid); } function T_($msgid) { - if (_check_locale()) return _($msgid); - return __($msgid); + if (_check_locale_and_function()) return _($msgid); + return __($msgid); } function T_ngettext($single, $plural, $number) { - if (_check_locale()) return ngettext($single, $plural, $number); - else return _ngettext($single, $plural, $number); + if (_check_locale_and_function()) + return ngettext($single, $plural, $number); + else return _ngettext($single, $plural, $number); } function T_dgettext($domain, $msgid) { - if (_check_locale()) return dgettext($domain, $msgid); - else return _dgettext($domain, $msgid); + if (_check_locale_and_function()) return dgettext($domain, $msgid); + else return _dgettext($domain, $msgid); } function T_dngettext($domain, $single, $plural, $number) { - if (_check_locale()) return dngettext($domain, $single, $plural, $number); - else return _dngettext($domain, $single, $plural, $number); + if (_check_locale_and_function()) + return dngettext($domain, $single, $plural, $number); + else return _dngettext($domain, $single, $plural, $number); } function T_dcgettext($domain, $msgid, $category) { - if (_check_locale()) return dcgettext($domain, $msgid, $category); - else return _dcgettext($domain, $msgid, $category); + if (_check_locale_and_function()) + return dcgettext($domain, $msgid, $category); + else return _dcgettext($domain, $msgid, $category); } function T_dcngettext($domain, $single, $plural, $number, $category) { - if (_check_locale()) return dcngettext($domain, $single, $plural, $number, $category); - else return _dcngettext($domain, $single, $plural, $number, $category); + if (_check_locale_and_function()) + return dcngettext($domain, $single, $plural, $number, $category); + else return _dcngettext($domain, $single, $plural, $number, $category); +} + +function T_pgettext($context, $msgid) { + if (_check_locale_and_function('pgettext')) + return pgettext($context, $msgid); + else + return _pgettext($context, $msgid); +} + +function T_dpgettext($domain, $context, $msgid) { + if (_check_locale_and_function('dpgettext')) + return dpgettext($domain, $context, $msgid); + else + return _dpgettext($domain, $context, $msgid); +} + +function T_dcpgettext($domain, $context, $msgid, $category) { + if (_check_locale_and_function('dcpgettext')) + return dcpgettext($domain, $context, $msgid, $category); + else + return _dcpgettext($domain, $context, $msgid, $category); +} + +function T_npgettext($context, $singular, $plural) { + if (_check_locale_and_function('npgettext')) + return npgettext($context, $single, $plural, $number); + else + return _npgettext($context, $single, $plural, $number); +} + +function T_dnpgettext($domain, $context, $singular, $plural) { + if (_check_locale_and_function('dnpgettext')) + return dnpgettext($domain, $context, $single, $plural, $number); + else + return _dnpgettext($domain, $context, $single, $plural, $number); +} + +function T_dcnpgettext($domain, $context, $singular, $plural, $category) { + if (_check_locale_and_function('dcnpgettext')) + return dcnpgettext($domain, $context, $single, + $plural, $number, $category); + else + return _dcnpgettext($domain, $context, $single, + $plural, $number, $category); } @@ -283,36 +479,56 @@ function T_dcngettext($domain, $single, $plural, $number, $category) { // Wrappers used as a drop in replacement for the standard gettext functions if (!function_exists('gettext')) { - function bindtextdomain($domain, $path) { - return _bindtextdomain($domain, $path); - } - function bind_textdomain_codeset($domain, $codeset) { - return _bind_textdomain_codeset($domain, $codeset); - } - function textdomain($domain) { - return _textdomain($domain); - } - function gettext($msgid) { - return _gettext($msgid); - } - function _($msgid) { - return __($msgid); - } - function ngettext($single, $plural, $number) { - return _ngettext($single, $plural, $number); - } - function dgettext($domain, $msgid) { - return _dgettext($domain, $msgid); - } - function dngettext($domain, $single, $plural, $number) { - return _dngettext($domain, $single, $plural, $number); - } - function dcgettext($domain, $msgid, $category) { - return _dcgettext($domain, $msgid, $category); - } - function dcngettext($domain, $single, $plural, $number, $category) { - return _dcngettext($domain, $single, $plural, $number, $category); - } + function bindtextdomain($domain, $path) { + return _bindtextdomain($domain, $path); + } + function bind_textdomain_codeset($domain, $codeset) { + return _bind_textdomain_codeset($domain, $codeset); + } + function textdomain($domain) { + return _textdomain($domain); + } + function gettext($msgid) { + return _gettext($msgid); + } + function _($msgid) { + return __($msgid); + } + function ngettext($single, $plural, $number) { + return _ngettext($single, $plural, $number); + } + function dgettext($domain, $msgid) { + return _dgettext($domain, $msgid); + } + function dngettext($domain, $single, $plural, $number) { + return _dngettext($domain, $single, $plural, $number); + } + function dcgettext($domain, $msgid, $category) { + return _dcgettext($domain, $msgid, $category); + } + function dcngettext($domain, $single, $plural, $number, $category) { + return _dcngettext($domain, $single, $plural, $number, $category); + } + function pgettext($context, $msgid) { + return _pgettext($context, $msgid); + } + function npgettext($context, $single, $plural, $number) { + return _npgettext($context, $single, $plural, $number); + } + function dpgettext($domain, $context, $msgid) { + return _dpgettext($domain, $context, $msgid); + } + function dnpgettext($domain, $context, $single, $plural, $number) { + return _dnpgettext($domain, $context, $single, $plural, $number); + } + function dcpgettext($domain, $context, $msgid, $category) { + return _dcpgettext($domain, $context, $msgid, $category); + } + function dcnpgettext($domain, $context, $single, $plural, + $number, $category) { + return _dcnpgettext($domain, $context, $single, $plural, + $number, $category); + } } ?> diff --git a/src/php-gettext/gettext.php b/src/php-gettext/gettext.php index 978794c..a121f9c 100644 --- a/src/php-gettext/gettext.php +++ b/src/php-gettext/gettext.php @@ -1,8 +1,8 @@ . + Copyright (c) 2003, 2009 Danilo Segan . Copyright (c) 2005 Nico Kaiser - + This file is part of PHP-gettext. PHP-gettext is free software; you can redistribute it and/or modify @@ -20,13 +20,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - + /** * Provides a simple gettext replacement that works independently from * the system's gettext abilities. * It can read MO files and use them for translating strings. * The files are passed to gettext_reader as a Stream (see streams.php) - * + * * This version has the ability to cache all strings and translations to * speed up the string lookup. * While the cache is enabled by default, it can be switched off with the @@ -36,7 +36,7 @@ class gettext_reader { //public: var $error = 0; // public variable that holds error code (0 if no error) - + //private: var $BYTEORDER = 0; // 0: low endian, 1: big endian var $STREAM = NULL; @@ -52,27 +52,33 @@ class gettext_reader { /* Methods */ - - + + /** * Reads a 32bit Integer from the Stream - * + * * @access private * @return Integer from the Stream */ function readint() { if ($this->BYTEORDER == 0) { // low endian - return array_shift(unpack('V', $this->STREAM->read(4))); + $input=unpack('V', $this->STREAM->read(4)); + return array_shift($input); } else { // big endian - return array_shift(unpack('N', $this->STREAM->read(4))); + $input=unpack('N', $this->STREAM->read(4)); + return array_shift($input); } } + function read($bytes) { + return $this->STREAM->read($bytes); + } + /** * Reads an array of Integers from the Stream - * + * * @param int count How many elements should be read * @return Array of Integers */ @@ -85,10 +91,10 @@ class gettext_reader { return unpack('N'.$count, $this->STREAM->read(4 * $count)); } } - + /** * Constructor - * + * * @param object Reader the StreamReader object * @param boolean enable_cache Enable or disable caching of strings (default on) */ @@ -98,39 +104,37 @@ class gettext_reader { $this->short_circuit = true; return; } - + // Caching can be turned off $this->enable_cache = $enable_cache; - // $MAGIC1 = (int)0x950412de; //bug in PHP 5 - $MAGIC1 = (int) - 1794895138; - // $MAGIC2 = (int)0xde120495; //bug - $MAGIC2 = (int) - 569244523; + $MAGIC1 = "\x95\x04\x12\xde"; + $MAGIC2 = "\xde\x12\x04\x95"; $this->STREAM = $Reader; - $magic = $this->readint(); - if ($magic == $MAGIC1 || $magic == ($MAGIC1 & 0xFFFFFFFF)) { - $this->BYTEORDER = 0; - } elseif ($magic == $MAGIC2 || $magic == ($MAGIC2 & 0xFFFFFFFF)) { + $magic = $this->read(4); + if ($magic == $MAGIC1) { $this->BYTEORDER = 1; + } elseif ($magic == $MAGIC2) { + $this->BYTEORDER = 0; } else { $this->error = 1; // not MO file return false; } - + // FIXME: Do we care about revision? We should. $revision = $this->readint(); - + $this->total = $this->readint(); $this->originals = $this->readint(); $this->translations = $this->readint(); } - + /** * Loads the translation tables from the MO file into the cache * If caching is enabled, also loads all strings into a cache * to speed up translation lookups - * + * * @access private */ function load_tables() { @@ -138,13 +142,17 @@ class gettext_reader { is_array($this->table_originals) && is_array($this->table_translations)) return; - + /* get original and translations tables */ - $this->STREAM->seekto($this->originals); - $this->table_originals = $this->readintarray($this->total * 2); - $this->STREAM->seekto($this->translations); - $this->table_translations = $this->readintarray($this->total * 2); - + if (!is_array($this->table_originals)) { + $this->STREAM->seekto($this->originals); + $this->table_originals = $this->readintarray($this->total * 2); + } + if (!is_array($this->table_translations)) { + $this->STREAM->seekto($this->translations); + $this->table_translations = $this->readintarray($this->total * 2); + } + if ($this->enable_cache) { $this->cache_translations = array (); /* read all strings in the cache */ @@ -157,10 +165,10 @@ class gettext_reader { } } } - + /** * Returns a string from the "originals" table - * + * * @access private * @param int num Offset number of original string * @return string Requested string if found, otherwise '' @@ -174,10 +182,10 @@ class gettext_reader { $data = $this->STREAM->read($length); return (string)$data; } - + /** * Returns a string from the "translations" table - * + * * @access private * @param int num Offset number of original string * @return string Requested string if found, otherwise '' @@ -191,10 +199,10 @@ class gettext_reader { $data = $this->STREAM->read($length); return (string)$data; } - + /** * Binary search for string - * + * * @access private * @param string string * @param int start (internally used in recursive function) @@ -232,10 +240,10 @@ class gettext_reader { return $this->find_string($string, $half, $end); } } - + /** * Translates a string - * + * * @access public * @param string string to be translated * @return string translated string (or original, if not found) @@ -243,8 +251,8 @@ class gettext_reader { function translate($string) { if ($this->short_circuit) return $string; - $this->load_tables(); - + $this->load_tables(); + if ($this->enable_cache) { // Caching enabled, get translated string from cache if (array_key_exists($string, $this->cache_translations)) @@ -261,17 +269,66 @@ class gettext_reader { } } + /** + * Sanitize plural form expression for use in PHP eval call. + * + * @access private + * @return string sanitized plural form expression + */ + function sanitize_plural_expression($expr) { + // Get rid of disallowed characters. + $expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr); + + // Add parenthesis for tertiary '?' operator. + $expr .= ';'; + $res = ''; + $p = 0; + for ($i = 0; $i < strlen($expr); $i++) { + $ch = $expr[$i]; + switch ($ch) { + case '?': + $res .= ' ? ('; + $p++; + break; + case ':': + $res .= ') : ('; + break; + case ';': + $res .= str_repeat( ')', $p) . ';'; + $p = 0; + break; + default: + $res .= $ch; + } + } + return $res; + } + + /** + * Parse full PO header and extract only plural forms line. + * + * @access private + * @return string verbatim plural form header field + */ + function extract_plural_forms_header_from_po_header($header) { + if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs)) + $expr = $regs[2]; + else + $expr = "nplurals=2; plural=n == 1 ? 0 : 1;"; + return $expr; + } + /** * Get possible plural forms from MO header - * + * * @access private * @return string plural form header */ function get_plural_forms() { - // lets assume message number 0 is header + // lets assume message number 0 is header // this is true, right? $this->load_tables(); - + // cache header field for plural forms if (! is_string($this->pluralheader)) { if ($this->enable_cache) { @@ -279,18 +336,15 @@ class gettext_reader { } else { $header = $this->get_translation_string(0); } - if (eregi("plural-forms: ([^\n]*)\n", $header, $regs)) - $expr = $regs[1]; - else - $expr = "nplurals=2; plural=n == 1 ? 0 : 1;"; - $this->pluralheader = $expr; + $expr = $this->extract_plural_forms_header_from_po_header($header); + $this->pluralheader = $this->sanitize_plural_expression($expr); } return $this->pluralheader; } /** * Detects which plural form to take - * + * * @access private * @param n count * @return int array index of the right plural form @@ -300,7 +354,7 @@ class gettext_reader { $string = str_replace('nplurals',"\$total",$string); $string = str_replace("n",$n,$string); $string = str_replace('plural',"\$plural",$string); - + $total = 0; $plural = 0; @@ -311,7 +365,7 @@ class gettext_reader { /** * Plural version of gettext - * + * * @access public * @param string single * @param string plural @@ -327,12 +381,12 @@ class gettext_reader { } // find out the appropriate form - $select = $this->select_string($number); - + $select = $this->select_string($number); + // this should contains all strings separated by NULLs - $key = $single.chr(0).$plural; - - + $key = $single . chr(0) . $plural; + + if ($this->enable_cache) { if (! array_key_exists($key, $this->cache_translations)) { return ($number != 1) ? $plural : $single; @@ -353,6 +407,15 @@ class gettext_reader { } } + function pgettext($context, $msgid) { + $key = $context . chr(4) . $msgid; + return $this->translate($key); + } + + function npgettext($context, $singular, $plural, $number) { + $singular = $context . chr(4) . $singular; + return $this->ngettext($singular, $plural, $number); + } } ?> diff --git a/src/php-gettext/streams.php b/src/php-gettext/streams.php index 4237de1..3cdc158 100644 --- a/src/php-gettext/streams.php +++ b/src/php-gettext/streams.php @@ -1,6 +1,6 @@ . + Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan . This file is part of PHP-gettext. @@ -21,29 +21,29 @@ */ -// Simple class to wrap file streams, string streams, etc. -// seek is essential, and it should be byte stream + // Simple class to wrap file streams, string streams, etc. + // seek is essential, and it should be byte stream class StreamReader { // should return a string [FIXME: perhaps return array of bytes?] function read($bytes) { return false; } - + // should return new position function seekto($position) { return false; } - + // returns current position function currentpos() { return false; } - + // returns length of entire stream (limit for seekto()s) function length() { return false; } -} +}; class StringReader { var $_pos; @@ -78,7 +78,7 @@ class StringReader { return strlen($this->_str); } -} +}; class FileReader { @@ -93,8 +93,8 @@ class FileReader { $this->_pos = 0; $this->_fd = fopen($filename,'rb'); if (!$this->_fd) { - $this->error = 3; // Cannot read file, probably permissions - return false; + $this->error = 3; // Cannot read file, probably permissions + return false; } } else { $this->error = 2; // File doesn't exist @@ -115,7 +115,7 @@ class FileReader { $bytes -= strlen($chunk); } $this->_pos = ftell($this->_fd); - + return $data; } else return ''; } @@ -138,9 +138,9 @@ class FileReader { fclose($this->_fd); } -} +}; -// Preloads entire file in memory first, then creates a StringReader +// Preloads entire file in memory first, then creates a StringReader // over it (it assumes knowledge of StringReader internals) class CachedFileReader extends StringReader { function CachedFileReader($filename) { @@ -150,8 +150,8 @@ class CachedFileReader extends StringReader { $fd = fopen($filename,'rb'); if (!$fd) { - $this->error = 3; // Cannot read file, probably permissions - return false; + $this->error = 3; // Cannot read file, probably permissions + return false; } $this->_str = fread($fd, $length); fclose($fd); @@ -161,7 +161,7 @@ class CachedFileReader extends StringReader { return false; } } -} +}; ?> diff --git a/src/php-gettext/tests/LocalesTest.php b/src/php-gettext/tests/LocalesTest.php new file mode 100644 index 0000000..3000286 --- /dev/null +++ b/src/php-gettext/tests/LocalesTest.php @@ -0,0 +1,66 @@ +assertEquals('sr_RS', _setlocale(LC_MESSAGES, 0)); + + // For an existing locale, it never needs emulation. + putenv("LANG=C"); + _setlocale(LC_MESSAGES, ""); + $this->assertEquals(0, locale_emulation()); + + // If we set it to a non-existent locale, it still works, but uses + // emulation. + _setlocale(LC_MESSAGES, "xxx_XXX"); + $this->assertEquals('xxx_XXX', _setlocale(LC_MESSAGES, 0)); + $this->assertEquals(1, locale_emulation()); + } + + public function test_get_list_of_locales() + { + // For a locale containing country code, we prefer + // full locale name, but if that's not found, fall back + // to the language only locale name. + $this->assertEquals(array("sr_RS", "sr"), + get_list_of_locales("sr_RS")); + + // If language code is used, it's the only thing returned. + $this->assertEquals(array("sr"), + get_list_of_locales("sr")); + + // There is support for language and charset only. + $this->assertEquals(array("sr.UTF-8", "sr"), + get_list_of_locales("sr.UTF-8")); + + // It can also split out character set from the full locale name. + $this->assertEquals(array("sr_RS.UTF-8", "sr_RS", "sr"), + get_list_of_locales("sr_RS.UTF-8")); + + // There is support for @modifier in locale names as well. + $this->assertEquals(array("sr_RS.UTF-8@latin", "sr_RS@latin", "sr@latin", + "sr_RS.UTF-8", "sr_RS", "sr"), + get_list_of_locales("sr_RS.UTF-8@latin")); + + // We can pass in only language and modifier. + $this->assertEquals(array("sr@latin", "sr"), + get_list_of_locales("sr@latin")); + + + // If locale name is not following the regular POSIX pattern, + // it's used verbatim. + $this->assertEquals(array("something"), + get_list_of_locales("something")); + + // Passing in an empty string returns an empty array. + $this->assertEquals(array(), + get_list_of_locales("")); + } +} + +?> diff --git a/src/php-gettext/tests/ParsingTest.php b/src/php-gettext/tests/ParsingTest.php new file mode 100644 index 0000000..9b350b2 --- /dev/null +++ b/src/php-gettext/tests/ParsingTest.php @@ -0,0 +1,43 @@ +assertEquals( + 'nplurals=2; plural=n == 1 ? 0 : 1;', + $parser->extract_plural_forms_header_from_po_header("")); + + // Extracting it from the middle of the header works. + $this->assertEquals( + 'nplurals=1; plural=0;', + $parser->extract_plural_forms_header_from_po_header( + "Content-type: text/html; charset=UTF-8\n" + ."Plural-Forms: nplurals=1; plural=0;\n" + ."Last-Translator: nobody\n" + )); + + // It's also case-insensitive. + $this->assertEquals( + 'nplurals=1; plural=0;', + $parser->extract_plural_forms_header_from_po_header( + "PLURAL-forms: nplurals=1; plural=0;\n" + )); + + // It falls back to default if it's not on a separate line. + $this->assertEquals( + 'nplurals=2; plural=n == 1 ? 0 : 1;', + $parser->extract_plural_forms_header_from_po_header( + "Content-type: text/html; charset=UTF-8" // note the missing \n here + ."Plural-Forms: nplurals=1; plural=0;\n" + ."Last-Translator: nobody\n" + )); + + } + +} +?> From f20135d16a0fa2bb8cd2820323052fccab8f3451 Mon Sep 17 00:00:00 2001 From: cweiske Date: Tue, 28 Sep 2010 22:08:58 +0000 Subject: [PATCH 052/173] add gettext changelog entry git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@764 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 2633fc8..e2562e4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -6,6 +6,7 @@ ChangeLog for SemantiScuttle - Fix bug getTagsForBookmarks() that fetched all tags - Show error message on mysqli connection errors - Implement patch #3059829: update FR_CA translation +- Update php-gettext library to 1.0.10 - Fix bug #3073215: Updating bookmark time does not work - Fix bug #3074816: French translation breaks edit javascript From b9256b14377251e6303d6abbe3cd7e7edc2583a4 Mon Sep 17 00:00:00 2001 From: cweiske Date: Tue, 28 Sep 2010 22:09:58 +0000 Subject: [PATCH 053/173] add header to httpauth.inc.php git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@765 b3834d28-1941-0410-a4f8-b48e95affb8f --- www/api/httpauth.inc.php | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/www/api/httpauth.inc.php b/www/api/httpauth.inc.php index 0e3a66d..ee5c7f2 100644 --- a/www/api/httpauth.inc.php +++ b/www/api/httpauth.inc.php @@ -1,10 +1,29 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ require_once '../www-header.php'; -// Provides HTTP Basic authentication of a user -// and logs the user in if necessary - -function authenticate() { +/** + * Sends HTTP auth headers to the browser + */ +function authenticate() +{ header('WWW-Authenticate: Basic realm="SemanticScuttle API"'); header('HTTP/1.0 401 Unauthorized'); @@ -26,7 +45,9 @@ if (!$userservice->isLoggedOn()) { if (!isset($_SERVER['PHP_AUTH_USER'])) { authenticate(); } else { - $login = $userservice->login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']); + $login = $userservice->login( + $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'] + ); if ($login) { $currentUser = $userservice->getCurrentObjectUser(); } else { From 6b3f1d476ea0d1be46b3e4a7df6983320865303b Mon Sep 17 00:00:00 2001 From: cweiske Date: Tue, 28 Sep 2010 22:10:53 +0000 Subject: [PATCH 054/173] update docblocks git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@766 b3834d28-1941-0410-a4f8-b48e95affb8f --- tests/TestBaseApi.php | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php index 645ead9..eb1457f 100644 --- a/tests/TestBaseApi.php +++ b/tests/TestBaseApi.php @@ -29,6 +29,16 @@ class TestBaseApi extends TestBase protected $url; protected $urlPart = null; + /** + * @var SemanticScuttle_Service_User + */ + protected $us; + + /** + * @var SemanticScuttle_Service_Bookmark + */ + protected $bs; + protected function setUp() @@ -52,11 +62,14 @@ class TestBaseApi extends TestBase /** - * Gets a HTTP request object + * Gets a HTTP request object. + * Uses $this->url plus $urlSuffix as request URL. * * @param string $urlSuffix Suffix for the URL * * @return HTTP_Request2 HTTP request object + * + * @uses $url */ protected function getRequest($urlSuffix = null) { @@ -71,13 +84,17 @@ class TestBaseApi extends TestBase /** - * Gets a HTTP request object + * Creates a user and a HTTP request object and prepares + * the request object with authentication details, so that + * the user is logged in. * * @param string $urlSuffix Suffix for the URL * @param mixed $auth If user authentication is needed (true/false) * or array with username and password * * @return array(HTTP_Request2, integer) HTTP request object and user id + * + * @uses getRequest() */ protected function getAuthRequest($urlSuffix = null, $auth = true) { From b31886b67aaa814dc0ffe48bb7d5c4863de0106e Mon Sep 17 00:00:00 2001 From: cweiske Date: Tue, 28 Sep 2010 22:11:59 +0000 Subject: [PATCH 055/173] tests for deleting bookmarks via the API. two of them fail currently because of a security issue git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@767 b3834d28-1941-0410-a4f8-b48e95affb8f --- tests/Api/PostsDeleteTest.php | 302 ++++++++++++++++++++++++++++++++++ 1 file changed, 302 insertions(+) create mode 100644 tests/Api/PostsDeleteTest.php diff --git a/tests/Api/PostsDeleteTest.php b/tests/Api/PostsDeleteTest.php new file mode 100644 index 0000000..705f94e --- /dev/null +++ b/tests/Api/PostsDeleteTest.php @@ -0,0 +1,302 @@ + + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +require_once dirname(__FILE__) . '/../prepare.php'; +require_once 'HTTP/Request2.php'; + +if (!defined('PHPUnit_MAIN_METHOD')) { + define('PHPUnit_MAIN_METHOD', 'Api_PostsDeleteTest::main'); +} + +/** + * Unit tests for the SemanticScuttle post deletion API. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Benjamin Huynh-Kim-Bang + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class Api_PostsDeleteTest extends TestBaseApi +{ + protected $urlPart = 'api/posts/delete'; + + + + /** + * Used to run this test class standalone + * + * @return void + */ + public static function main() + { + require_once 'PHPUnit/TextUI/TestRunner.php'; + PHPUnit_TextUI_TestRunner::run( + new PHPUnit_Framework_TestSuite(__CLASS__) + ); + } + + + + /** + * Test if authentication is required when sending no auth data + */ + public function testAuthWithoutAuthData() + { + $req = $this->getRequest(null, false); + $res = $req->send(); + $this->assertEquals(401, $res->getStatus()); + } + + + + /** + * Test if authentication is required when sending wrong user data + + */ + public function testAuthWrongCredentials() + { + $req = $this->getRequest(null, false); + $req->setAuth('user', 'password', HTTP_Request2::AUTH_BASIC); + $res = $req->send(); + $this->assertEquals(401, $res->getStatus()); + } + + + + /** + * Test if deleting an own bookmark works. + */ + public function testDeleteOwnBookmark() + { + $this->bs->deleteAll(); + + $bookmarkUrl = 'http://example.org/tag-1'; + + list($req, $uId) = $this->getAuthRequest( + '?url=' . urlencode($bookmarkUrl) + ); + + $bId = $this->addBookmark( + $uId, $bookmarkUrl, 0, + array('unittest', 'tag1') + ); + //user has one bookmark now + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(1, $data['total']); + + //send request + $res = $req->send(); + + $this->assertEquals(200, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'text/xml; charset=utf-8', + $res->getHeader('content-type') + ); + + //verify xml + $this->assertTag( + array( + 'tag' => 'result', + 'attributes' => array('code' => 'done') + ), + $res->getBody(), + null, false + ); + + //bookmark should be deleted now + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(0, $data['total']); + } + + + + /** + * Test if deleting an own bookmark via POST works. + */ + public function testDeleteOwnBookmarkPost() + { + $this->bs->deleteAll(); + + $bookmarkUrl = 'http://example.org/tag-1'; + + list($req, $uId) = $this->getAuthRequest(); + + $bId = $this->addBookmark( + $uId, $bookmarkUrl, 0, + array('unittest', 'tag1') + ); + //user has one bookmark now + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(1, $data['total']); + + //send request + $req->setMethod(HTTP_Request2::METHOD_POST); + $req->addPostParameter('url', $bookmarkUrl); + $res = $req->send(); + + $this->assertEquals(200, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'text/xml; charset=utf-8', + $res->getHeader('content-type') + ); + + //verify xml + $this->assertTag( + array( + 'tag' => 'result', + 'attributes' => array('code' => 'done') + ), + $res->getBody(), + null, false + ); + + //bookmark should be deleted now + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(0, $data['total']); + } + + + + /** + * Verify that deleting a bookmark of a different does not work + */ + public function testDeleteOtherBookmark() + { + $this->bs->deleteAll(); + + $bookmarkUrl = 'http://example.org/tag-1'; + + list($req, $uId) = $this->getAuthRequest( + '?url=' . urlencode($bookmarkUrl) + ); + $uId2 = $this->addUser(); + + $bId = $this->addBookmark( + $uId2, $bookmarkUrl, 0, + array('unittest', 'tag1') + ); + //user 1 has no bookmarks + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(0, $data['total']); + //user 2 has one bookmark + $data = $this->bs->getBookmarks(0, null, $uId2); + $this->assertEquals(1, $data['total']); + + //send request + $res = $req->send(); + + //401 - unauthorized + $this->assertEquals(401, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'text/xml; charset=utf-8', + $res->getHeader('content-type') + ); + + //verify xml + $this->assertNotTag( + array( + 'tag' => 'result', + 'attributes' => array('code' => 'done') + ), + $res->getBody(), + '', false + ); + + //bookmark should still be there + $data = $this->bs->getBookmarks(0, null, $uId2); + $this->assertEquals(1, $data['total']); + } + + + + /** + * Test if deleting a bookmark works that also other users + * bookmarked. + */ + public function testDeleteBookmarkOneOfTwo() + { + $this->bs->deleteAll(); + + $bookmarkUrl = 'http://example.org/tag-1'; + + list($req, $uId) = $this->getAuthRequest( + '?url=' . urlencode($bookmarkUrl) + ); + $uId2 = $this->addUser(); + $uId3 = $this->addUser(); + + //important: the order of addition is crucial here + $this->addBookmark( + $uId2, $bookmarkUrl, 0, + array('unittest', 'tag1') + ); + $bId = $this->addBookmark( + $uId, $bookmarkUrl, 0, + array('unittest', 'tag1') + ); + $this->addBookmark( + $uId3, $bookmarkUrl, 0, + array('unittest', 'tag1') + ); + + //user one and two have a bookmark now + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(1, $data['total']); + $data = $this->bs->getBookmarks(0, null, $uId2); + $this->assertEquals(1, $data['total']); + + //send request + $res = $req->send(); + + $this->assertEquals(200, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'text/xml; charset=utf-8', + $res->getHeader('content-type') + ); + + //verify xml + $this->assertTag( + array( + 'tag' => 'result', + 'attributes' => array('code' => 'done') + ), + $res->getBody(), + '', false + ); + + //bookmark should be deleted now + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(0, $data['total']); + //user 2 should still have his + $data = $this->bs->getBookmarks(0, null, $uId2); + $this->assertEquals(1, $data['total']); + //user 3 should still have his, too + $data = $this->bs->getBookmarks(0, null, $uId3); + $this->assertEquals(1, $data['total']); + } + +} + +if (PHPUnit_MAIN_METHOD == 'Api_PostsDeleteTest::main') { + Api_PostsDeleteTest::main(); +} +?> \ No newline at end of file From df8216d607a9806b57b83eea9eb55577eae7d54f Mon Sep 17 00:00:00 2001 From: cweiske Date: Tue, 28 Sep 2010 22:12:55 +0000 Subject: [PATCH 056/173] execute api tests git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@768 b3834d28-1941-0410-a4f8-b48e95affb8f --- tests/AllTests.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/AllTests.php b/tests/AllTests.php index d29de7f..61e1a57 100644 --- a/tests/AllTests.php +++ b/tests/AllTests.php @@ -64,6 +64,8 @@ class AllTests extends PHPUnit_Framework_TestSuite $suite->addTestFile($tdir . '/TagTest.php'); $suite->addTestFile($tdir . '/VoteTest.php'); $suite->addTestFile($tdir . '/UserTest.php'); + $suite->addTestFile($tdir . '/Api/ExportCsvTest.php'); + $suite->addTestFile($tdir . '/Api/PostsDeleteTest.php'); return $suite; } From 22c9a01ee845d2b92fcab6b6cb10ac6ff0eec52e Mon Sep 17 00:00:00 2001 From: cweiske Date: Tue, 28 Sep 2010 22:14:31 +0000 Subject: [PATCH 057/173] rewrite api/posts/delete to be more secure and add unit tests for it git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@769 b3834d28-1941-0410-a4f8-b48e95affb8f --- src/SemanticScuttle/Service/Bookmark.php | 18 ++++--- tests/Api/PostsDeleteTest.php | 9 ++-- www/api/posts_delete.php | 63 +++++++++++++++++------- 3 files changed, 62 insertions(+), 28 deletions(-) diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php index dde1df5..4e18d3f 100644 --- a/src/SemanticScuttle/Service/Bookmark.php +++ b/src/SemanticScuttle/Service/Bookmark.php @@ -176,7 +176,10 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService * Retrieves a bookmark with the given URL. * DOES NOT RESPECT PRIVACY SETTINGS! * - * @param string $address URL to get bookmarks for + * @param string $address URL to get bookmarks for + * @param boolean $all Retrieve from all users (true) + * or only bookmarks owned by the current + * user (false) * * @return mixed Array with bookmark data or false in case * of an error (i.e. not found). @@ -184,9 +187,9 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService * @uses getBookmarkByHash() * @see getBookmarkByShortname() */ - public function getBookmarkByAddress($address) + public function getBookmarkByAddress($address, $all = true) { - return $this->getBookmarkByHash($this->getHash($address)); + return $this->getBookmarkByHash($this->getHash($address), $all); } @@ -195,16 +198,19 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService * Retrieves a bookmark with the given hash. * DOES NOT RESPECT PRIVACY SETTINGS! * - * @param string $hash URL hash + * @param string $hash URL hash + * @param boolean $all Retrieve from all users (true) + * or only bookmarks owned by the current + * user (false) * * @return mixed Array with bookmark data or false in case * of an error (i.e. not found). * * @see getHash() */ - public function getBookmarkByHash($hash) + public function getBookmarkByHash($hash, $all = true) { - return $this->_getbookmark('bHash', $hash, true); + return $this->_getbookmark('bHash', $hash, $all); } diff --git a/tests/Api/PostsDeleteTest.php b/tests/Api/PostsDeleteTest.php index 705f94e..626746f 100644 --- a/tests/Api/PostsDeleteTest.php +++ b/tests/Api/PostsDeleteTest.php @@ -202,8 +202,9 @@ class Api_PostsDeleteTest extends TestBaseApi //send request $res = $req->send(); - //401 - unauthorized - $this->assertEquals(401, $res->getStatus()); + //404 - user does not have that bookmark + $this->assertEquals(404, $res->getStatus()); + //verify MIME content type $this->assertEquals( 'text/xml; charset=utf-8', @@ -211,10 +212,10 @@ class Api_PostsDeleteTest extends TestBaseApi ); //verify xml - $this->assertNotTag( + $this->assertTag( array( 'tag' => 'result', - 'attributes' => array('code' => 'done') + 'attributes' => array('code' => 'something went wrong') ), $res->getBody(), '', false diff --git a/www/api/posts_delete.php b/www/api/posts_delete.php index a63cc62..982b686 100644 --- a/www/api/posts_delete.php +++ b/www/api/posts_delete.php @@ -1,33 +1,60 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ // Force HTTP authentication first! $httpContentType = 'text/xml'; require_once 'httpauth.inc.php'; -/* Service creation: only useful services are created */ -$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); +$bs = SemanticScuttle_Service_Factory::get('Bookmark'); +$uId = $userservice->getCurrentUserId(); -// Note that del.icio.us only errors out if no URL was passed in; there's no error on attempting -// to delete a bookmark you don't have. - // Error out if there's no address -if (is_null($_REQUEST['url'])) { +if (!isset($_REQUEST['url']) + || $_REQUEST['url'] == '' +) { $deleted = false; +} else if (!$bs->bookmarkExists($_REQUEST['url'], $uId)) { + //the user does not have such a bookmark + // Note that del.icio.us only errors out if no URL was passed in; + // there's no error on attempting to delete a bookmark you don't have. + // this sucks, and I don't care about being different but correct here. + header('HTTP/1.0 404 Not Found'); + $deleted = false; + } else { - $bookmark = $bookmarkservice->getBookmarkByAddress($_REQUEST['url']); - $bid = $bookmark['bId']; - $delete = $bookmarkservice->deleteBookmark($bid); - $deleted = true; + $bookmark = $bs->getBookmarkByAddress($_REQUEST['url'], false); + $bId = $bookmark['bId']; + $deleted = $bs->deleteBookmark($bId); + if (!$deleted) { + //something really went wrong + header('HTTP/1.0 500 Internal Server Error'); + } } // Set up the XML file and output the result. -echo '\r\n"; -echo ''; +echo '\r\n"; +echo ''; ?> \ No newline at end of file From 70c39a8eea7896271c0ad3f0c435ec06c64074d1 Mon Sep 17 00:00:00 2001 From: cweiske Date: Wed, 29 Sep 2010 20:49:14 +0000 Subject: [PATCH 058/173] delicious returns a proper error message when deleting non-existant items, which we do now, too git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@770 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/developers/api | 10 ++++++++++ tests/Api/PostsDeleteTest.php | 2 +- www/api/posts_delete.php | 14 +++++--------- 3 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 doc/developers/api diff --git a/doc/developers/api b/doc/developers/api new file mode 100644 index 0000000..efa05fe --- /dev/null +++ b/doc/developers/api @@ -0,0 +1,10 @@ +SemanticScuttle API +=================== + +SemanticScuttle tries to implement the delicious API v1 as closely as sensible. + +Where it makes sense and the delicious API just does things plainly wrong +(i.e. when returning a wrong status code on an error), we do it better. + +- http://www.delicious.com/help/api +- http://support.delicious.com/forum/comments.php?DiscussionID=5286&page=1 diff --git a/tests/Api/PostsDeleteTest.php b/tests/Api/PostsDeleteTest.php index 626746f..d9fb6cd 100644 --- a/tests/Api/PostsDeleteTest.php +++ b/tests/Api/PostsDeleteTest.php @@ -215,7 +215,7 @@ class Api_PostsDeleteTest extends TestBaseApi $this->assertTag( array( 'tag' => 'result', - 'attributes' => array('code' => 'something went wrong') + 'attributes' => array('code' => 'item not found') ), $res->getBody(), '', false diff --git a/www/api/posts_delete.php b/www/api/posts_delete.php index 982b686..03cc968 100644 --- a/www/api/posts_delete.php +++ b/www/api/posts_delete.php @@ -4,8 +4,6 @@ * The delicious API is implemented here. * * The delicious API behaves like that: - * - returns "done" even if the bookmark doesn't exist - * - we do it correctly * - does NOT allow the hash for the url parameter * - doesn't set the Content-Type to text/xml * - we do it correctly, too @@ -35,26 +33,24 @@ $uId = $userservice->getCurrentUserId(); if (!isset($_REQUEST['url']) || $_REQUEST['url'] == '' ) { - $deleted = false; + $msg = 'something went wrong'; } else if (!$bs->bookmarkExists($_REQUEST['url'], $uId)) { //the user does not have such a bookmark - // Note that del.icio.us only errors out if no URL was passed in; - // there's no error on attempting to delete a bookmark you don't have. - // this sucks, and I don't care about being different but correct here. header('HTTP/1.0 404 Not Found'); - $deleted = false; - + $msg = 'item not found'; } else { $bookmark = $bs->getBookmarkByAddress($_REQUEST['url'], false); $bId = $bookmark['bId']; $deleted = $bs->deleteBookmark($bId); + $msg = 'done'; if (!$deleted) { //something really went wrong header('HTTP/1.0 500 Internal Server Error'); + $msg = 'something really went wrong'; } } // Set up the XML file and output the result. echo '\r\n"; -echo ''; +echo ''; ?> \ No newline at end of file From 20ec8b4958dc2d6a4a08f9b0dcae27c90f0155ef Mon Sep 17 00:00:00 2001 From: cweiske Date: Wed, 29 Sep 2010 20:50:38 +0000 Subject: [PATCH 059/173] test for api/posts/update git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@771 b3834d28-1941-0410-a4f8-b48e95affb8f --- tests/AllTests.php | 1 + tests/Api/PostsUpdateTest.php | 135 ++++++++++++++++++++++++++++++++++ www/api/posts_delete.php | 1 + www/api/posts_update.php | 46 ++++++++---- 4 files changed, 170 insertions(+), 13 deletions(-) create mode 100644 tests/Api/PostsUpdateTest.php diff --git a/tests/AllTests.php b/tests/AllTests.php index 61e1a57..799f43b 100644 --- a/tests/AllTests.php +++ b/tests/AllTests.php @@ -66,6 +66,7 @@ class AllTests extends PHPUnit_Framework_TestSuite $suite->addTestFile($tdir . '/UserTest.php'); $suite->addTestFile($tdir . '/Api/ExportCsvTest.php'); $suite->addTestFile($tdir . '/Api/PostsDeleteTest.php'); + $suite->addTestFile($tdir . '/Api/PostsUpdateTest.php'); return $suite; } diff --git a/tests/Api/PostsUpdateTest.php b/tests/Api/PostsUpdateTest.php new file mode 100644 index 0000000..c497a55 --- /dev/null +++ b/tests/Api/PostsUpdateTest.php @@ -0,0 +1,135 @@ + + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +require_once dirname(__FILE__) . '/../prepare.php'; +require_once 'HTTP/Request2.php'; + +if (!defined('PHPUnit_MAIN_METHOD')) { + define('PHPUnit_MAIN_METHOD', 'Api_PostsUpdateTest::main'); +} + +/** + * Unit tests for the SemanticScuttle last-update time API. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Benjamin Huynh-Kim-Bang + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class Api_PostsUpdateTest extends TestBaseApi +{ + protected $urlPart = 'api/posts/update'; + + + + /** + * Used to run this test class standalone + * + * @return void + */ + public static function main() + { + require_once 'PHPUnit/TextUI/TestRunner.php'; + PHPUnit_TextUI_TestRunner::run( + new PHPUnit_Framework_TestSuite(__CLASS__) + ); + } + + + + /** + * Test if authentication is required when sending no auth data + */ + public function testAuthWithoutAuthData() + { + $req = $this->getRequest(null, false); + $res = $req->send(); + $this->assertEquals(401, $res->getStatus()); + } + + + + /** + * Test if authentication is required when sending wrong user data + + */ + public function testAuthWrongCredentials() + { + $req = $this->getRequest(null, false); + $req->setAuth('user', 'password', HTTP_Request2::AUTH_BASIC); + $res = $req->send(); + $this->assertEquals(401, $res->getStatus()); + } + + + + /** + * See if posts/update behaves correct if there is one bookmark + */ + public function testPostUpdateOneBookmark() + { + $this->bs->deleteAll(); + + list($req, $uId) = $this->getAuthRequest(); + $bId = $this->addBookmark( + $uId, 'http://example.org/tag1', 0, + array('unittest', 'tag1') + ); + + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(1, $data['total']); + $bookmark = $data['bookmarks'][0]; + + //send request + $res = $req->send(); + + $this->assertEquals(200, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'text/xml; charset=utf-8', + $res->getHeader('content-type') + ); + + //verify xml + $this->assertTag( + array( + 'tag' => 'update', + 'attributes' => array( + 'inboxnew' => '0' + ) + ), + $res->getBody(), + '', false + ); + //check time + $xml = simplexml_load_string($res->getBody()); + $this->assertTrue(isset($xml['time'])); + $this->assertEquals( + strtotime($bookmark['bDatetime']), + strtotime( + (string)$xml['time'] + ) + ); + } + +} + +if (PHPUnit_MAIN_METHOD == 'Api_PostsUpdateTest::main') { + Api_PostsUpdateTest::main(); +} +?> \ No newline at end of file diff --git a/www/api/posts_delete.php b/www/api/posts_delete.php index 03cc968..69b2429 100644 --- a/www/api/posts_delete.php +++ b/www/api/posts_delete.php @@ -19,6 +19,7 @@ * @author Eric Dane * @license GPL http://www.gnu.org/licenses/gpl.html * @link http://sourceforge.net/projects/semanticscuttle + * @link http://www.delicious.com/help/api */ // Force HTTP authentication first! diff --git a/www/api/posts_update.php b/www/api/posts_update.php index 4aeedc3..4b080e2 100644 --- a/www/api/posts_update.php +++ b/www/api/posts_update.php @@ -1,24 +1,44 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + * @link http://www.delicious.com/help/api + */ // Force HTTP authentication first! $httpContentType = 'text/xml'; require_once 'httpauth.inc.php'; -/* Service creation: only useful services are created */ -$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); - - -// Get the posts relevant to the passed-in variables. -$bookmarks =& $bookmarkservice->getBookmarks(0, 1, $userservice->getCurrentUserId()); +$bs = SemanticScuttle_Service_Factory::get('Bookmark'); +$bookmarks = $bs->getBookmarks(0, 1, $userservice->getCurrentUserId()); // Set up the XML file and output all the tags. -echo '\r\n"; -foreach($bookmarks['bookmarks'] as $row) { - echo ''; +echo '\r\n"; +//foreach is used in case there are no bookmarks +foreach ($bookmarks['bookmarks'] as $row) { + echo ''; } ?> \ No newline at end of file From 2f3b23f96a5f595c9d0ef02abf5037f41e907390 Mon Sep 17 00:00:00 2001 From: cweiske Date: Wed, 29 Sep 2010 20:52:01 +0000 Subject: [PATCH 060/173] first tests for api/posts/add git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@772 b3834d28-1941-0410-a4f8-b48e95affb8f --- tests/AllTests.php | 1 + tests/Api/PostsAddTest.php | 197 +++++++++++++++++++++++++++++++++++++ www/api/posts_add.php | 2 + 3 files changed, 200 insertions(+) create mode 100644 tests/Api/PostsAddTest.php diff --git a/tests/AllTests.php b/tests/AllTests.php index 799f43b..ded6824 100644 --- a/tests/AllTests.php +++ b/tests/AllTests.php @@ -65,6 +65,7 @@ class AllTests extends PHPUnit_Framework_TestSuite $suite->addTestFile($tdir . '/VoteTest.php'); $suite->addTestFile($tdir . '/UserTest.php'); $suite->addTestFile($tdir . '/Api/ExportCsvTest.php'); + $suite->addTestFile($tdir . '/Api/PostsAddTest.php'); $suite->addTestFile($tdir . '/Api/PostsDeleteTest.php'); $suite->addTestFile($tdir . '/Api/PostsUpdateTest.php'); return $suite; diff --git a/tests/Api/PostsAddTest.php b/tests/Api/PostsAddTest.php new file mode 100644 index 0000000..1db8af9 --- /dev/null +++ b/tests/Api/PostsAddTest.php @@ -0,0 +1,197 @@ + + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +require_once dirname(__FILE__) . '/../prepare.php'; +require_once 'HTTP/Request2.php'; + +if (!defined('PHPUnit_MAIN_METHOD')) { + define('PHPUnit_MAIN_METHOD', 'Api_PostsAddTest::main'); +} + +/** + * Unit tests for the SemanticScuttle post addition API. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Benjamin Huynh-Kim-Bang + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class Api_PostsAddTest extends TestBaseApi +{ + protected $urlPart = 'api/posts/add'; + + + + /** + * Used to run this test class standalone + * + * @return void + */ + public static function main() + { + require_once 'PHPUnit/TextUI/TestRunner.php'; + PHPUnit_TextUI_TestRunner::run( + new PHPUnit_Framework_TestSuite(__CLASS__) + ); + } + + + + /** + * Test if authentication is required when sending no auth data + */ + public function testAuthWithoutAuthData() + { + $req = $this->getRequest(null, false); + $res = $req->send(); + $this->assertEquals(401, $res->getStatus()); + } + + + + /** + * Test if authentication is required when sending wrong user data + */ + public function testAuthWrongCredentials() + { + $req = $this->getRequest(null, false); + $req->setAuth('user', 'password', HTTP_Request2::AUTH_BASIC); + $res = $req->send(); + $this->assertEquals(401, $res->getStatus()); + } + + + + /** + * Test if adding a bookmark via POST works. + */ + public function testAddBookmarkPost() + { + $this->bs->deleteAll(); + + $bmUrl = 'http://example.org/tag-1'; + $bmTags = array('foo', 'bar', 'baz'); + $bmDatetime = '2010-09-08T03:02:01Z'; + $bmTitle = 'This is a foo title'; + $bmDescription = <<?&\$ÄÖ'"§special"' +characters +TXT; + + list($req, $uId) = $this->getAuthRequest(); + $req->setMethod(HTTP_Request2::METHOD_POST); + $req->addPostParameter('url', $bmUrl); + $req->addPostParameter('description', $bmTitle); + $req->addPostParameter('extended', $bmDescription); + $req->addPostParameter('tags', implode(' ', $bmTags)); + $res = $req->send(); + + //all should be well + $this->assertEquals(200, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'text/xml; charset=utf-8', + $res->getHeader('content-type') + ); + + //verify xml + $this->assertTag( + array( + 'tag' => 'result', + 'attributes' => array('code' => 'done') + ), + $res->getBody(), + null, false + ); + + //user should have one bookmark now + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(1, $data['total']); + $bm = $data['bookmarks'][0]; + + $this->assertEquals($bmUrl, $bm['bAddress']); + $this->assertEquals($bmTitle, $bm['bTitle']); + $this->assertEquals($bmDescription, $bm['bDescription']); + $this->assertEquals($bmTags, $bm['tags']); + } + + + + /** + * Test if adding a bookmark via GET works. + */ + public function testAddBookmarkGet() + { + $this->bs->deleteAll(); + + $bmUrl = 'http://example.org/tag-1'; + $bmTags = array('foo', 'bar', 'baz'); + $bmDatetime = '2010-09-08T03:02:01Z'; + $bmTitle = 'This is a foo title'; + $bmDescription = <<?&\$ÄÖ'"§special"' +characters +TXT; + + list($req, $uId) = $this->getAuthRequest( + '?url=' . urlencode($bmUrl) + . '&description=' . urlencode($bmTitle) + . '&extended=' . urlencode($bmDescription) + . '&tags=' . urlencode(implode(' ', $bmTags)) + ); + $res = $req->send(); + + //all should be well + $this->assertEquals(200, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'text/xml; charset=utf-8', + $res->getHeader('content-type') + ); + + //verify xml + $this->assertTag( + array( + 'tag' => 'result', + 'attributes' => array('code' => 'done') + ), + $res->getBody(), + null, false + ); + + //user should have one bookmark now + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(1, $data['total']); + $bm = $data['bookmarks'][0]; + + $this->assertEquals($bmUrl, $bm['bAddress']); + $this->assertEquals($bmTitle, $bm['bTitle']); + $this->assertEquals($bmDescription, $bm['bDescription']); + $this->assertEquals($bmTags, $bm['tags']); + } + +} + +if (PHPUnit_MAIN_METHOD == 'Api_PostsAddTest::main') { + Api_PostsAddTest::main(); +} +?> \ No newline at end of file diff --git a/www/api/posts_add.php b/www/api/posts_add.php index 59f7dce..b392a80 100644 --- a/www/api/posts_add.php +++ b/www/api/posts_add.php @@ -5,6 +5,8 @@ // del.icio.us behavior: // - tags can't have spaces // - address and description are mandatory +// - description == title in semanticscuttle +// - extended == description in semanticscuttle // Scuttle behavior: // - Additional 'status' variable for privacy From c9398ccd5b5208b87feef21d3996761c8be590a7 Mon Sep 17 00:00:00 2001 From: cweiske Date: Wed, 29 Sep 2010 20:52:59 +0000 Subject: [PATCH 061/173] first tests for api/posts/add git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@773 b3834d28-1941-0410-a4f8-b48e95affb8f --- tests/Api/PostsAddTest.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/Api/PostsAddTest.php b/tests/Api/PostsAddTest.php index 1db8af9..cc9a2c9 100644 --- a/tests/Api/PostsAddTest.php +++ b/tests/Api/PostsAddTest.php @@ -101,6 +101,7 @@ TXT; $req->addPostParameter('description', $bmTitle); $req->addPostParameter('extended', $bmDescription); $req->addPostParameter('tags', implode(' ', $bmTags)); + $req->addPostParameter('dt', $bmDatetime); $res = $req->send(); //all should be well @@ -130,6 +131,10 @@ TXT; $this->assertEquals($bmTitle, $bm['bTitle']); $this->assertEquals($bmDescription, $bm['bDescription']); $this->assertEquals($bmTags, $bm['tags']); + $this->assertEquals( + strtotime($bmDatetime), + strtotime($bm['bDatetime']) + ); } From da272b5a20bec8d39c6d9cdf2fd5573de99083be Mon Sep 17 00:00:00 2001 From: cweiske Date: Wed, 29 Sep 2010 20:53:57 +0000 Subject: [PATCH 062/173] check datetime setting git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@774 b3834d28-1941-0410-a4f8-b48e95affb8f --- tests/Api/PostsAddTest.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/Api/PostsAddTest.php b/tests/Api/PostsAddTest.php index cc9a2c9..0769bdd 100644 --- a/tests/Api/PostsAddTest.php +++ b/tests/Api/PostsAddTest.php @@ -132,8 +132,8 @@ TXT; $this->assertEquals($bmDescription, $bm['bDescription']); $this->assertEquals($bmTags, $bm['tags']); $this->assertEquals( - strtotime($bmDatetime), - strtotime($bm['bDatetime']) + gmdate('Y-m-d H:i:s', strtotime($bmDatetime)), + $bm['bDatetime'] ); } @@ -162,6 +162,7 @@ TXT; . '&description=' . urlencode($bmTitle) . '&extended=' . urlencode($bmDescription) . '&tags=' . urlencode(implode(' ', $bmTags)) + . '&dt=' . urlencode($bmDatetime) ); $res = $req->send(); @@ -192,6 +193,10 @@ TXT; $this->assertEquals($bmTitle, $bm['bTitle']); $this->assertEquals($bmDescription, $bm['bDescription']); $this->assertEquals($bmTags, $bm['tags']); + $this->assertEquals( + gmdate('Y-m-d H:i:s', strtotime($bmDatetime)), + $bm['bDatetime'] + ); } } From 3ff661c0e0180b7808b1b95f9d25cc736d710026 Mon Sep 17 00:00:00 2001 From: cweiske Date: Wed, 29 Sep 2010 20:55:14 +0000 Subject: [PATCH 063/173] send 400 status code if a parameter is missing git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@775 b3834d28-1941-0410-a4f8-b48e95affb8f --- tests/Api/PostsAddTest.php | 107 +++++++++++++++++++++++++++++++++++++ www/api/posts_add.php | 26 +++++---- 2 files changed, 124 insertions(+), 9 deletions(-) diff --git a/tests/Api/PostsAddTest.php b/tests/Api/PostsAddTest.php index 0769bdd..dea002e 100644 --- a/tests/Api/PostsAddTest.php +++ b/tests/Api/PostsAddTest.php @@ -199,6 +199,113 @@ TXT; ); } + /** + * Verify that the URL and description/title are enough parameters + * to add a bookmark. + */ + public function testUrlDescEnough() + { + $this->bs->deleteAll(); + + list($req, $uId) = $this->getAuthRequest(); + $req->setMethod(HTTP_Request2::METHOD_POST); + $req->addPostParameter('url', 'http://example.org/tag2'); + $req->addPostParameter('description', 'foo bar'); + $res = $req->send(); + + //all should be well + $this->assertEquals(200, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'text/xml; charset=utf-8', + $res->getHeader('content-type') + ); + + //verify xml + $this->assertTag( + array( + 'tag' => 'result', + 'attributes' => array('code' => 'done') + ), + $res->getBody(), + null, false + ); + + //user has 1 bookmark now + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(1, $data['total']); + } + + /** + * Verify that the URL is required + */ + public function testUrlRequired() + { + $this->bs->deleteAll(); + + list($req, $uId) = $this->getAuthRequest(); + $req->setMethod(HTTP_Request2::METHOD_POST); + //$req->addPostParameter('url', 'http://example.org/tag2'); + $req->addPostParameter('description', 'foo bar'); + $res = $req->send(); + + //all should be well + $this->assertEquals(400, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'text/xml; charset=utf-8', + $res->getHeader('content-type') + ); + + //verify xml + $this->assertTag( + array( + 'tag' => 'result', + 'attributes' => array('code' => 'URL missing') + ), + $res->getBody(), + null, false + ); + + //user still has 0 bookmarks + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(0, $data['total']); + } + + /** + * Verify that the description/title is required + */ + public function testDescriptionRequired() + { + $this->bs->deleteAll(); + + list($req, $uId) = $this->getAuthRequest(); + $req->setMethod(HTTP_Request2::METHOD_POST); + $req->addPostParameter('url', 'http://example.org/tag2'); + $res = $req->send(); + + //all should be well + $this->assertEquals(400, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'text/xml; charset=utf-8', + $res->getHeader('content-type') + ); + + //verify xml + $this->assertTag( + array( + 'tag' => 'result', + 'attributes' => array('code' => 'Description missing') + ), + $res->getBody(), + null, false + ); + + //user still has 0 bookmarks + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(0, $data['total']); + } } if (PHPUnit_MAIN_METHOD == 'Api_PostsAddTest::main') { diff --git a/www/api/posts_add.php b/www/api/posts_add.php index b392a80..8b63a16 100644 --- a/www/api/posts_add.php +++ b/www/api/posts_add.php @@ -73,17 +73,25 @@ if (isset($_REQUEST['shared']) && (trim($_REQUEST['shared']) == 'no')) { } // Error out if there's no address or description -if (is_null($url) || is_null($description)) { - $added = false; +if (is_null($url)) { + header('HTTP/1.0 400 Bad Request'); + $msg = 'URL missing'; +} else if (is_null($description)) { + header('HTTP/1.0 400 Bad Request'); + $msg = 'Description missing'; } else { -// We're good with info; now insert it! - if ($bookmarkservice->bookmarkExists($url, $userservice->getCurrentUserId())) - $added = false; - else - $added = $bookmarkservice->addBookmark($url, $description, $extended, '', $status, $tags, null, $dt, true); + // We're good with info; now insert it! + if ($bookmarkservice->bookmarkExists($url, $userservice->getCurrentUserId())) { + $msg = 'something went wrong'; + } else { + $added = $bookmarkservice->addBookmark( + $url, $description, $extended, '', $status, $tags, null, $dt, true + ); + $msg = 'done'; + } } // Set up the XML file and output the result. -echo '\r\n"; -echo ''; +echo '\r\n"; +echo ''; ?> \ No newline at end of file From 66af94feaf9ef817da260c0d293577bf74e53bcf Mon Sep 17 00:00:00 2001 From: cweiske Date: Wed, 29 Sep 2010 20:56:10 +0000 Subject: [PATCH 064/173] reformat api/posts/add and document it better git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@776 b3834d28-1941-0410-a4f8-b48e95affb8f --- www/api/posts_add.php | 115 +++++++++++++++++++++++++++--------------- 1 file changed, 74 insertions(+), 41 deletions(-) diff --git a/www/api/posts_add.php b/www/api/posts_add.php index 8b63a16..0e06d50 100644 --- a/www/api/posts_add.php +++ b/www/api/posts_add.php @@ -1,69 +1,102 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + * @link http://www.delicious.com/help/api + */ // Force HTTP authentication $httpContentType = 'text/xml'; require_once 'httpauth.inc.php'; -/* Service creation: only useful services are created */ -$bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark'); +$bs = SemanticScuttle_Service_Factory::get('Bookmark'); // Get all the bookmark's passed-in information -if (isset($_REQUEST['url']) && (trim($_REQUEST['url']) != '')) +if (isset($_REQUEST['url']) && (trim($_REQUEST['url']) != '')) { $url = trim(urldecode($_REQUEST['url'])); -else - $url = NULL; +} else { + $url = null; +} -if (isset($_REQUEST['description']) && (trim($_REQUEST['description']) != '')) +if (isset($_REQUEST['description']) && (trim($_REQUEST['description']) != '')) { $description = trim($_REQUEST['description']); -else - $description = NULL; +} else { + $description = null; +} -if (isset($_REQUEST['extended']) && (trim($_REQUEST['extended']) != "")) +if (isset($_REQUEST['extended']) && (trim($_REQUEST['extended']) != '')) { $extended = trim($_REQUEST['extended']); -else - $extended = NULL; +} else { + $extended = null; +} -if (isset($_REQUEST['tags']) && (trim($_REQUEST['tags']) != '') && (trim($_REQUEST['tags']) != ',')) +if (isset($_REQUEST['tags']) && (trim($_REQUEST['tags']) != '') + && (trim($_REQUEST['tags']) != ',') +) { $tags = trim($_REQUEST['tags']); -else - $tags = NULL; +} else { + $tags = null; +} -if (isset($_REQUEST['dt']) && (trim($_REQUEST['dt']) != '')) +if (isset($_REQUEST['dt']) && (trim($_REQUEST['dt']) != '')) { $dt = trim($_REQUEST['dt']); -else - $dt = NULL; +} else { + $dt = null; +} $status = 0; if (isset($_REQUEST['status'])) { $status_str = trim($_REQUEST['status']); if (is_numeric($status_str)) { $status = intval($status_str); - if($status < 0 || $status > 2) { + if ($status < 0 || $status > 2) { $status = 0; } } else { switch ($status_str) { - case 'private': - $status = 2; - break; - case 'shared': - $status = 1; - break; - default: - $status = 0; - break; + case 'private': + $status = 2; + break; + case 'shared': + $status = 1; + break; + default: + $status = 0; + break; } } } @@ -81,10 +114,10 @@ if (is_null($url)) { $msg = 'Description missing'; } else { // We're good with info; now insert it! - if ($bookmarkservice->bookmarkExists($url, $userservice->getCurrentUserId())) { + if ($bs->bookmarkExists($url, $userservice->getCurrentUserId())) { $msg = 'something went wrong'; } else { - $added = $bookmarkservice->addBookmark( + $added = $bs->addBookmark( $url, $description, $extended, '', $status, $tags, null, $dt, true ); $msg = 'done'; From 8e2b25a095ab769146ac7fa672d7a4c4eda32ab4 Mon Sep 17 00:00:00 2001 From: cweiske Date: Wed, 29 Sep 2010 20:57:30 +0000 Subject: [PATCH 065/173] api/posts/add respects the "replace" parameter now git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@777 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/ChangeLog | 7 ++- tests/Api/PostsAddTest.php | 121 +++++++++++++++++++++++++++++++++++++ www/api/posts_add.php | 24 ++++++-- 3 files changed, 145 insertions(+), 7 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index e2562e4..d711dd4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -3,12 +3,13 @@ ChangeLog for SemantiScuttle 0.9X.X - 2010-XX-XX ------------------- -- Fix bug getTagsForBookmarks() that fetched all tags +- Fix bug in getTagsForBookmarks() that fetched all tags +- Fix bug #3073215: Updating bookmark time does not work +- Fix bug #3074816: French translation breaks edit javascript - Show error message on mysqli connection errors - Implement patch #3059829: update FR_CA translation - Update php-gettext library to 1.0.10 -- Fix bug #3073215: Updating bookmark time does not work -- Fix bug #3074816: French translation breaks edit javascript +- api/posts/add respects the "replace" parameter now 0.97.0 - 2010-06-09 diff --git a/tests/Api/PostsAddTest.php b/tests/Api/PostsAddTest.php index dea002e..1f21d04 100644 --- a/tests/Api/PostsAddTest.php +++ b/tests/Api/PostsAddTest.php @@ -306,6 +306,127 @@ TXT; $data = $this->bs->getBookmarks(0, null, $uId); $this->assertEquals(0, $data['total']); } + + /** + * Test that the replace=no parameter prevents the bookmark from being + * overwritten. + */ + public function testReplaceNo() + { + $this->bs->deleteAll(); + + $url = 'http://example.org/tag2'; + $title1 = 'foo bar 1'; + $title2 = 'bar 2 foo'; + + list($req, $uId) = $this->getAuthRequest(); + $req->setMethod(HTTP_Request2::METHOD_POST); + $req->addPostParameter('url', $url); + $req->addPostParameter('description', $title1); + $res = $req->send(); + + //all should be well + $this->assertEquals(200, $res->getStatus()); + + //send it a second time, with different title + list($req, $dummy) = $this->getAuthRequest(); + $req->setMethod(HTTP_Request2::METHOD_POST); + $req->addPostParameter('url', $url); + $req->addPostParameter('description', $title2); + $req->addPostParameter('replace', 'no'); + $res = $req->send(); + + //this time we should get an error + $this->assertEquals(409, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'text/xml; charset=utf-8', + $res->getHeader('content-type') + ); + + //verify xml + $this->assertTag( + array( + 'tag' => 'result', + 'attributes' => array('code' => 'bookmark does already exist') + ), + $res->getBody(), + null, false + ); + + //user still has 1 bookmark now + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(1, $data['total']); + $this->assertEquals($title1, $data['bookmarks'][0]['bTitle']); + + //send it a third time, without the replace parameter + // it defaults to "no", so the bookmark should not get overwritten + list($req, $dummy) = $this->getAuthRequest(); + $req->setMethod(HTTP_Request2::METHOD_POST); + $req->addPostParameter('url', $url); + $req->addPostParameter('description', $title2); + $res = $req->send(); + + //this time we should get an error + $this->assertEquals(409, $res->getStatus()); + + //bookmark should not have changed + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(1, $data['total']); + $this->assertEquals($title1, $data['bookmarks'][0]['bTitle']); + } + + /** + * Test that the replace=yes parameter causes the bookmark to be updated. + */ + public function testReplaceYes() + { + $this->bs->deleteAll(); + + $url = 'http://example.org/tag2'; + $title1 = 'foo bar 1'; + $title2 = 'bar 2 foo'; + + list($req, $uId) = $this->getAuthRequest(); + $req->setMethod(HTTP_Request2::METHOD_POST); + $req->addPostParameter('url', $url); + $req->addPostParameter('description', $title1); + $res = $req->send(); + + //all should be well + $this->assertEquals(200, $res->getStatus()); + + //send it a second time, with different title + list($req, $dummy) = $this->getAuthRequest(); + $req->setMethod(HTTP_Request2::METHOD_POST); + $req->addPostParameter('url', $url); + $req->addPostParameter('description', $title2); + $req->addPostParameter('replace', 'yes'); + $res = $req->send(); + + //no error + $this->assertEquals(200, $res->getStatus()); + //verify MIME content type + $this->assertEquals( + 'text/xml; charset=utf-8', + $res->getHeader('content-type') + ); + + //verify xml + $this->assertTag( + array( + 'tag' => 'result', + 'attributes' => array('code' => 'done') + ), + $res->getBody(), + null, false + ); + + //user still has 1 bookmark now, but with the new title + $data = $this->bs->getBookmarks(0, null, $uId); + $this->assertEquals(1, $data['total']); + $this->assertEquals($title2, $data['bookmarks'][0]['bTitle']); + } } if (PHPUnit_MAIN_METHOD == 'Api_PostsAddTest::main') { diff --git a/www/api/posts_add.php b/www/api/posts_add.php index 0e06d50..7f9dc59 100644 --- a/www/api/posts_add.php +++ b/www/api/posts_add.php @@ -16,6 +16,8 @@ * - 0 or 'public': Everyone can see the bookmark * @param string $shared "no" or "yes": Switches between private and * public (optional) + * @param string $replace "yes" or "no" - replaces a bookmark with the + * same URL (optional) * * Notes: * - tags cannot have spaces @@ -23,7 +25,6 @@ * - delicious "description" is the "title" in SemanticScuttle * - delicious "extended" is the "description" in SemanticScuttle * - "status" is a SemanticScuttle addition to this API method - * - SemanticScuttle currently ignores the "replace" parameter * * SemanticScuttle - your social bookmark manager. * @@ -78,6 +79,8 @@ if (isset($_REQUEST['dt']) && (trim($_REQUEST['dt']) != '')) { $dt = null; } +$replace = isset($_REQUEST['replace']) && ($_REQUEST['replace'] == 'yes'); + $status = 0; if (isset($_REQUEST['status'])) { $status_str = trim($_REQUEST['status']); @@ -114,9 +117,22 @@ if (is_null($url)) { $msg = 'Description missing'; } else { // We're good with info; now insert it! - if ($bs->bookmarkExists($url, $userservice->getCurrentUserId())) { - $msg = 'something went wrong'; - } else { + $exists = $bs->bookmarkExists($url, $userservice->getCurrentUserId()); + if ($exists) { + if (!$replace) { + header('HTTP/1.0 409 Conflict'); + $msg = 'bookmark does already exist'; + } else { + //delete it before we re-add it + $bookmark = $bs->getBookmarkByAddress($url, false); + $bId = $bookmark['bId']; + $bs->deleteBookmark($bId); + + $exists = false; + } + } + + if (!$exists) { $added = $bs->addBookmark( $url, $description, $extended, '', $status, $tags, null, $dt, true ); From e1f9d9e3a07652d4ec668a2337d8b788e031ab9f Mon Sep 17 00:00:00 2001 From: cweiske Date: Wed, 29 Sep 2010 22:01:29 +0000 Subject: [PATCH 066/173] merge changelog from 0.97 branch git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@781 b3834d28-1941-0410-a4f8-b48e95affb8f --- doc/ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index d711dd4..0a60bff 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -12,6 +12,14 @@ ChangeLog for SemantiScuttle - api/posts/add respects the "replace" parameter now +0.97.1 - 2010-09-30 +------------------- +This is a security release! We do highly recommend to update +your SemanticScuttle installations! + +- Fix bug #3077187: Permission problem when deleting bookmarks + + 0.97.0 - 2010-06-09 ------------------- - Many SQL optimizations - SemanticScuttle shows bookmarks 4 times faster now From 95c05e49a70d007f41be60f90a7ae0ed7e5996a2 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 30 Sep 2010 07:58:07 +0200 Subject: [PATCH 067/173] remove deprecate split() --- src/SemanticScuttle/Service/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php index 6fc3bb7..d74d104 100644 --- a/src/SemanticScuttle/Service/User.php +++ b/src/SemanticScuttle/Service/User.php @@ -359,7 +359,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService return $_SESSION[$this->getSessionKey()]; } else if (isset($_COOKIE[$this->getCookieKey()])) { - $cook = split(':', $_COOKIE[$this->getCookieKey()]); + $cook = explode(':', $_COOKIE[$this->getCookieKey()]); //cookie looks like this: 'id:md5(username+password)' $query = 'SELECT * FROM '. $this->getTableName() . ' WHERE MD5(CONCAT('.$this->getFieldName('username') . From b53b77d0dcf2ea89087d23ad037063dd8f620331 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 30 Sep 2010 19:12:49 +0200 Subject: [PATCH 068/173] make sidebar menu2 use jquery.jstree. ajax loading of subtags is still missing --- data/templates/sidebar.block.menu2.php | 18 +- www/js/jquery-1.4.2.js | 6240 ++++++++++++++++++++++++ www/js/jquery-1.4.2.min.js | 154 + www/js/jquery.jstree.js | 3510 +++++++++++++ www/js/themes/apple/bg.jpg | Bin 0 -> 331 bytes www/js/themes/apple/d.png | Bin 0 -> 7765 bytes www/js/themes/apple/dot_for_ie.gif | Bin 0 -> 43 bytes www/js/themes/apple/style.css | 60 + www/js/themes/apple/throbber.gif | Bin 0 -> 1849 bytes www/js/themes/classic/d.png | Bin 0 -> 7535 bytes www/js/themes/classic/dot_for_ie.gif | Bin 0 -> 43 bytes www/js/themes/classic/style.css | 59 + www/js/themes/classic/throbber.gif | Bin 0 -> 1849 bytes www/js/themes/default-rtl/d.gif | Bin 0 -> 2872 bytes www/js/themes/default-rtl/d.png | Bin 0 -> 7459 bytes www/js/themes/default-rtl/dots.gif | Bin 0 -> 132 bytes www/js/themes/default-rtl/style.css | 83 + www/js/themes/default-rtl/throbber.gif | Bin 0 -> 1849 bytes www/js/themes/default/d.gif | Bin 0 -> 2944 bytes www/js/themes/default/d.png | Bin 0 -> 7635 bytes www/js/themes/default/style.css | 73 + www/js/themes/default/throbber.gif | Bin 0 -> 1849 bytes www/scuttle.css | 3 +- 23 files changed, 10197 insertions(+), 3 deletions(-) create mode 100644 www/js/jquery-1.4.2.js create mode 100644 www/js/jquery-1.4.2.min.js create mode 100644 www/js/jquery.jstree.js create mode 100644 www/js/themes/apple/bg.jpg create mode 100644 www/js/themes/apple/d.png create mode 100644 www/js/themes/apple/dot_for_ie.gif create mode 100644 www/js/themes/apple/style.css create mode 100644 www/js/themes/apple/throbber.gif create mode 100644 www/js/themes/classic/d.png create mode 100644 www/js/themes/classic/dot_for_ie.gif create mode 100644 www/js/themes/classic/style.css create mode 100644 www/js/themes/classic/throbber.gif create mode 100644 www/js/themes/default-rtl/d.gif create mode 100644 www/js/themes/default-rtl/d.png create mode 100644 www/js/themes/default-rtl/dots.gif create mode 100644 www/js/themes/default-rtl/style.css create mode 100644 www/js/themes/default-rtl/throbber.gif create mode 100644 www/js/themes/default/d.gif create mode 100644 www/js/themes/default/d.png create mode 100644 www/js/themes/default/style.css create mode 100644 www/js/themes/default/throbber.gif diff --git a/data/templates/sidebar.block.menu2.php b/data/templates/sidebar.block.menu2.php index 00ad74f..81ee121 100644 --- a/data/templates/sidebar.block.menu2.php +++ b/data/templates/sidebar.block.menu2.php @@ -1,3 +1,5 @@ + + 0) { foreach ($menu2Tags as $menu2Tag) { echo '

  3. ' . sprintf( - '%s', + '%s', sprintf($cat_url, $menu2Tag), $menu2Tag ) @@ -46,10 +48,22 @@ foreach ($menu2Tags as $menu2Tag) { echo ''; */ } +//ROOT.'ajax/getadminlinkedtags.php?tag='.filter($menu2Tag, 'url') ?> - + diff --git a/www/js/jquery-1.4.2.js b/www/js/jquery-1.4.2.js new file mode 100644 index 0000000..fff6776 --- /dev/null +++ b/www/js/jquery-1.4.2.js @@ -0,0 +1,6240 @@ +/*! + * jQuery JavaScript Library v1.4.2 + * http://jquery.com/ + * + * Copyright 2010, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2010, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Sat Feb 13 22:33:48 2010 -0500 + */ +(function( window, undefined ) { + +// Define a local copy of jQuery +var jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + return new jQuery.fn.init( selector, context ); + }, + + // Map over jQuery in case of overwrite + _jQuery = window.jQuery, + + // Map over the $ in case of overwrite + _$ = window.$, + + // Use the correct document accordingly with window argument (sandbox) + document = window.document, + + // A central reference to the root jQuery(document) + rootjQuery, + + // A simple way to check for HTML strings or ID strings + // (both of which we optimize for) + quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/, + + // Is it a simple selector + isSimple = /^.[^:#\[\.,]*$/, + + // Check if a string has a non-whitespace character in it + rnotwhite = /\S/, + + // Used for trimming whitespace + rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g, + + // Match a standalone tag + rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/, + + // Keep a UserAgent string for use with jQuery.browser + userAgent = navigator.userAgent, + + // For matching the engine and version of the browser + browserMatch, + + // Has the ready events already been bound? + readyBound = false, + + // The functions to execute on DOM ready + readyList = [], + + // The ready event handler + DOMContentLoaded, + + // Save a reference to some core methods + toString = Object.prototype.toString, + hasOwnProperty = Object.prototype.hasOwnProperty, + push = Array.prototype.push, + slice = Array.prototype.slice, + indexOf = Array.prototype.indexOf; + +jQuery.fn = jQuery.prototype = { + init: function( selector, context ) { + var match, elem, ret, doc; + + // Handle $(""), $(null), or $(undefined) + if ( !selector ) { + return this; + } + + // Handle $(DOMElement) + if ( selector.nodeType ) { + this.context = this[0] = selector; + this.length = 1; + return this; + } + + // The body element only exists once, optimize finding it + if ( selector === "body" && !context ) { + this.context = document; + this[0] = document.body; + this.selector = "body"; + this.length = 1; + return this; + } + + // Handle HTML strings + if ( typeof selector === "string" ) { + // Are we dealing with HTML string or an ID? + match = quickExpr.exec( selector ); + + // Verify a match, and that no context was specified for #id + if ( match && (match[1] || !context) ) { + + // HANDLE: $(html) -> $(array) + if ( match[1] ) { + doc = (context ? context.ownerDocument || context : document); + + // If a single string is passed in and it's a single tag + // just do a createElement and skip the rest + ret = rsingleTag.exec( selector ); + + if ( ret ) { + if ( jQuery.isPlainObject( context ) ) { + selector = [ document.createElement( ret[1] ) ]; + jQuery.fn.attr.call( selector, context, true ); + + } else { + selector = [ doc.createElement( ret[1] ) ]; + } + + } else { + ret = buildFragment( [ match[1] ], [ doc ] ); + selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes; + } + + return jQuery.merge( this, selector ); + + // HANDLE: $("#id") + } else { + elem = document.getElementById( match[2] ); + + if ( elem ) { + // Handle the case where IE and Opera return items + // by name instead of ID + if ( elem.id !== match[2] ) { + return rootjQuery.find( selector ); + } + + // Otherwise, we inject the element directly into the jQuery object + this.length = 1; + this[0] = elem; + } + + this.context = document; + this.selector = selector; + return this; + } + + // HANDLE: $("TAG") + } else if ( !context && /^\w+$/.test( selector ) ) { + this.selector = selector; + this.context = document; + selector = document.getElementsByTagName( selector ); + return jQuery.merge( this, selector ); + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return (context || rootjQuery).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { + return jQuery( context ).find( selector ); + } + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) { + return rootjQuery.ready( selector ); + } + + if (selector.selector !== undefined) { + this.selector = selector.selector; + this.context = selector.context; + } + + return jQuery.makeArray( selector, this ); + }, + + // Start with an empty selector + selector: "", + + // The current version of jQuery being used + jquery: "1.4.2", + + // The default length of a jQuery object is 0 + length: 0, + + // The number of elements contained in the matched element set + size: function() { + return this.length; + }, + + toArray: function() { + return slice.call( this, 0 ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num == null ? + + // Return a 'clean' array + this.toArray() : + + // Return just the object + ( num < 0 ? this.slice(num)[ 0 ] : this[ num ] ); + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems, name, selector ) { + // Build a new jQuery matched element set + var ret = jQuery(); + + if ( jQuery.isArray( elems ) ) { + push.apply( ret, elems ); + + } else { + jQuery.merge( ret, elems ); + } + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + + ret.context = this.context; + + if ( name === "find" ) { + ret.selector = this.selector + (this.selector ? " " : "") + selector; + } else if ( name ) { + ret.selector = this.selector + "." + name + "(" + selector + ")"; + } + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + // (You can seed the arguments with an array of args, but this is + // only used internally.) + each: function( callback, args ) { + return jQuery.each( this, callback, args ); + }, + + ready: function( fn ) { + // Attach the listeners + jQuery.bindReady(); + + // If the DOM is already ready + if ( jQuery.isReady ) { + // Execute the function immediately + fn.call( document, jQuery ); + + // Otherwise, remember the function for later + } else if ( readyList ) { + // Add the function to the wait list + readyList.push( fn ); + } + + return this; + }, + + eq: function( i ) { + return i === -1 ? + this.slice( i ) : + this.slice( i, +i + 1 ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + slice: function() { + return this.pushStack( slice.apply( this, arguments ), + "slice", slice.call(arguments).join(",") ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map(this, function( elem, i ) { + return callback.call( elem, i, elem ); + })); + }, + + end: function() { + return this.prevObject || jQuery(null); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: push, + sort: [].sort, + splice: [].splice +}; + +// Give the init function the jQuery prototype for later instantiation +jQuery.fn.init.prototype = jQuery.fn; + +jQuery.extend = jQuery.fn.extend = function() { + // copy reference to target object + var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + target = arguments[1] || {}; + // skip the boolean and the target + i = 2; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction(target) ) { + target = {}; + } + + // extend jQuery itself if only one argument is passed + if ( length === i ) { + target = this; + --i; + } + + for ( ; i < length; i++ ) { + // Only deal with non-null/undefined values + if ( (options = arguments[ i ]) != null ) { + // Extend the base object + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) { + continue; + } + + // Recurse if we're merging object literal values or arrays + if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) { + var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src + : jQuery.isArray(copy) ? [] : {}; + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend({ + noConflict: function( deep ) { + window.$ = _$; + + if ( deep ) { + window.jQuery = _jQuery; + } + + return jQuery; + }, + + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // Handle when the DOM is ready + ready: function() { + // Make sure that the DOM is not already loaded + if ( !jQuery.isReady ) { + // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). + if ( !document.body ) { + return setTimeout( jQuery.ready, 13 ); + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If there are functions bound, to execute + if ( readyList ) { + // Execute all of them + var fn, i = 0; + while ( (fn = readyList[ i++ ]) ) { + fn.call( document, jQuery ); + } + + // Reset the list of functions + readyList = null; + } + + // Trigger any bound ready events + if ( jQuery.fn.triggerHandler ) { + jQuery( document ).triggerHandler( "ready" ); + } + } + }, + + bindReady: function() { + if ( readyBound ) { + return; + } + + readyBound = true; + + // Catch cases where $(document).ready() is called after the + // browser event has already occurred. + if ( document.readyState === "complete" ) { + return jQuery.ready(); + } + + // Mozilla, Opera and webkit nightlies currently support this event + if ( document.addEventListener ) { + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", jQuery.ready, false ); + + // If IE event model is used + } else if ( document.attachEvent ) { + // ensure firing before onload, + // maybe late but safe also for iframes + document.attachEvent("onreadystatechange", DOMContentLoaded); + + // A fallback to window.onload, that will always work + window.attachEvent( "onload", jQuery.ready ); + + // If IE and not a frame + // continually check to see if the document is ready + var toplevel = false; + + try { + toplevel = window.frameElement == null; + } catch(e) {} + + if ( document.documentElement.doScroll && toplevel ) { + doScrollCheck(); + } + } + }, + + // See test/unit/core.js for details concerning isFunction. + // Since version 1.3, DOM methods and functions like alert + // aren't supported. They return false on IE (#2968). + isFunction: function( obj ) { + return toString.call(obj) === "[object Function]"; + }, + + isArray: function( obj ) { + return toString.call(obj) === "[object Array]"; + }, + + isPlainObject: function( obj ) { + // Must be an Object. + // Because of IE, we also have to check the presence of the constructor property. + // Make sure that DOM nodes and window objects don't pass through, as well + if ( !obj || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) { + return false; + } + + // Not own constructor property must be Object + if ( obj.constructor + && !hasOwnProperty.call(obj, "constructor") + && !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) { + return false; + } + + // Own properties are enumerated firstly, so to speed up, + // if last one is own, then all properties are own. + + var key; + for ( key in obj ) {} + + return key === undefined || hasOwnProperty.call( obj, key ); + }, + + isEmptyObject: function( obj ) { + for ( var name in obj ) { + return false; + } + return true; + }, + + error: function( msg ) { + throw msg; + }, + + parseJSON: function( data ) { + if ( typeof data !== "string" || !data ) { + return null; + } + + // Make sure leading/trailing whitespace is removed (IE can't handle it) + data = jQuery.trim( data ); + + // Make sure the incoming data is actual JSON + // Logic borrowed from http://json.org/json2.js + if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@") + .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]") + .replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) { + + // Try to use the native JSON parser first + return window.JSON && window.JSON.parse ? + window.JSON.parse( data ) : + (new Function("return " + data))(); + + } else { + jQuery.error( "Invalid JSON: " + data ); + } + }, + + noop: function() {}, + + // Evalulates a script in a global context + globalEval: function( data ) { + if ( data && rnotwhite.test(data) ) { + // Inspired by code by Andrea Giammarchi + // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html + var head = document.getElementsByTagName("head")[0] || document.documentElement, + script = document.createElement("script"); + + script.type = "text/javascript"; + + if ( jQuery.support.scriptEval ) { + script.appendChild( document.createTextNode( data ) ); + } else { + script.text = data; + } + + // Use insertBefore instead of appendChild to circumvent an IE6 bug. + // This arises when a base node is used (#2709). + head.insertBefore( script, head.firstChild ); + head.removeChild( script ); + } + }, + + nodeName: function( elem, name ) { + return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase(); + }, + + // args is for internal usage only + each: function( object, callback, args ) { + var name, i = 0, + length = object.length, + isObj = length === undefined || jQuery.isFunction(object); + + if ( args ) { + if ( isObj ) { + for ( name in object ) { + if ( callback.apply( object[ name ], args ) === false ) { + break; + } + } + } else { + for ( ; i < length; ) { + if ( callback.apply( object[ i++ ], args ) === false ) { + break; + } + } + } + + // A special, fast, case for the most common use of each + } else { + if ( isObj ) { + for ( name in object ) { + if ( callback.call( object[ name ], name, object[ name ] ) === false ) { + break; + } + } + } else { + for ( var value = object[0]; + i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {} + } + } + + return object; + }, + + trim: function( text ) { + return (text || "").replace( rtrim, "" ); + }, + + // results is for internal usage only + makeArray: function( array, results ) { + var ret = results || []; + + if ( array != null ) { + // The window, strings (and functions) also have 'length' + // The extra typeof function check is to prevent crashes + // in Safari 2 (See: #3039) + if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) { + push.call( ret, array ); + } else { + jQuery.merge( ret, array ); + } + } + + return ret; + }, + + inArray: function( elem, array ) { + if ( array.indexOf ) { + return array.indexOf( elem ); + } + + for ( var i = 0, length = array.length; i < length; i++ ) { + if ( array[ i ] === elem ) { + return i; + } + } + + return -1; + }, + + merge: function( first, second ) { + var i = first.length, j = 0; + + if ( typeof second.length === "number" ) { + for ( var l = second.length; j < l; j++ ) { + first[ i++ ] = second[ j ]; + } + + } else { + while ( second[j] !== undefined ) { + first[ i++ ] = second[ j++ ]; + } + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, inv ) { + var ret = []; + + // Go through the array, only saving the items + // that pass the validator function + for ( var i = 0, length = elems.length; i < length; i++ ) { + if ( !inv !== !callback( elems[ i ], i ) ) { + ret.push( elems[ i ] ); + } + } + + return ret; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var ret = [], value; + + // Go through the array, translating each of the items to their + // new value (or values). + for ( var i = 0, length = elems.length; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret[ ret.length ] = value; + } + } + + return ret.concat.apply( [], ret ); + }, + + // A global GUID counter for objects + guid: 1, + + proxy: function( fn, proxy, thisObject ) { + if ( arguments.length === 2 ) { + if ( typeof proxy === "string" ) { + thisObject = fn; + fn = thisObject[ proxy ]; + proxy = undefined; + + } else if ( proxy && !jQuery.isFunction( proxy ) ) { + thisObject = proxy; + proxy = undefined; + } + } + + if ( !proxy && fn ) { + proxy = function() { + return fn.apply( thisObject || this, arguments ); + }; + } + + // Set the guid of unique handler to the same of original handler, so it can be removed + if ( fn ) { + proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++; + } + + // So proxy can be declared as an argument + return proxy; + }, + + // Use of jQuery.browser is frowned upon. + // More details: http://docs.jquery.com/Utilities/jQuery.browser + uaMatch: function( ua ) { + ua = ua.toLowerCase(); + + var match = /(webkit)[ \/]([\w.]+)/.exec( ua ) || + /(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) || + /(msie) ([\w.]+)/.exec( ua ) || + !/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) || + []; + + return { browser: match[1] || "", version: match[2] || "0" }; + }, + + browser: {} +}); + +browserMatch = jQuery.uaMatch( userAgent ); +if ( browserMatch.browser ) { + jQuery.browser[ browserMatch.browser ] = true; + jQuery.browser.version = browserMatch.version; +} + +// Deprecated, use jQuery.browser.webkit instead +if ( jQuery.browser.webkit ) { + jQuery.browser.safari = true; +} + +if ( indexOf ) { + jQuery.inArray = function( elem, array ) { + return indexOf.call( array, elem ); + }; +} + +// All jQuery objects should point back to these +rootjQuery = jQuery(document); + +// Cleanup functions for the document ready method +if ( document.addEventListener ) { + DOMContentLoaded = function() { + document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false ); + jQuery.ready(); + }; + +} else if ( document.attachEvent ) { + DOMContentLoaded = function() { + // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443). + if ( document.readyState === "complete" ) { + document.detachEvent( "onreadystatechange", DOMContentLoaded ); + jQuery.ready(); + } + }; +} + +// The DOM ready check for Internet Explorer +function doScrollCheck() { + if ( jQuery.isReady ) { + return; + } + + try { + // If IE is used, use the trick by Diego Perini + // http://javascript.nwbox.com/IEContentLoaded/ + document.documentElement.doScroll("left"); + } catch( error ) { + setTimeout( doScrollCheck, 1 ); + return; + } + + // and execute any waiting functions + jQuery.ready(); +} + +function evalScript( i, elem ) { + if ( elem.src ) { + jQuery.ajax({ + url: elem.src, + async: false, + dataType: "script" + }); + } else { + jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" ); + } + + if ( elem.parentNode ) { + elem.parentNode.removeChild( elem ); + } +} + +// Mutifunctional method to get and set values to a collection +// The value/s can be optionally by executed if its a function +function access( elems, key, value, exec, fn, pass ) { + var length = elems.length; + + // Setting many attributes + if ( typeof key === "object" ) { + for ( var k in key ) { + access( elems, k, key[k], exec, fn, value ); + } + return elems; + } + + // Setting one attribute + if ( value !== undefined ) { + // Optionally, function values get executed if exec is true + exec = !pass && exec && jQuery.isFunction(value); + + for ( var i = 0; i < length; i++ ) { + fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass ); + } + + return elems; + } + + // Getting an attribute + return length ? fn( elems[0], key ) : undefined; +} + +function now() { + return (new Date).getTime(); +} +(function() { + + jQuery.support = {}; + + var root = document.documentElement, + script = document.createElement("script"), + div = document.createElement("div"), + id = "script" + now(); + + div.style.display = "none"; + div.innerHTML = "
    a"; + + var all = div.getElementsByTagName("*"), + a = div.getElementsByTagName("a")[0]; + + // Can't get basic test support + if ( !all || !all.length || !a ) { + return; + } + + jQuery.support = { + // IE strips leading whitespace when .innerHTML is used + leadingWhitespace: div.firstChild.nodeType === 3, + + // Make sure that tbody elements aren't automatically inserted + // IE will insert them into empty tables + tbody: !div.getElementsByTagName("tbody").length, + + // Make sure that link elements get serialized correctly by innerHTML + // This requires a wrapper element in IE + htmlSerialize: !!div.getElementsByTagName("link").length, + + // Get the style information from getAttribute + // (IE uses .cssText insted) + style: /red/.test( a.getAttribute("style") ), + + // Make sure that URLs aren't manipulated + // (IE normalizes it by default) + hrefNormalized: a.getAttribute("href") === "/a", + + // Make sure that element opacity exists + // (IE uses filter instead) + // Use a regex to work around a WebKit issue. See #5145 + opacity: /^0.55$/.test( a.style.opacity ), + + // Verify style float existence + // (IE uses styleFloat instead of cssFloat) + cssFloat: !!a.style.cssFloat, + + // Make sure that if no value is specified for a checkbox + // that it defaults to "on". + // (WebKit defaults to "" instead) + checkOn: div.getElementsByTagName("input")[0].value === "on", + + // Make sure that a selected-by-default option has a working selected property. + // (WebKit defaults to false instead of true, IE too, if it's in an optgroup) + optSelected: document.createElement("select").appendChild( document.createElement("option") ).selected, + + parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null, + + // Will be defined later + deleteExpando: true, + checkClone: false, + scriptEval: false, + noCloneEvent: true, + boxModel: null + }; + + script.type = "text/javascript"; + try { + script.appendChild( document.createTextNode( "window." + id + "=1;" ) ); + } catch(e) {} + + root.insertBefore( script, root.firstChild ); + + // Make sure that the execution of code works by injecting a script + // tag with appendChild/createTextNode + // (IE doesn't support this, fails, and uses .text instead) + if ( window[ id ] ) { + jQuery.support.scriptEval = true; + delete window[ id ]; + } + + // Test to see if it's possible to delete an expando from an element + // Fails in Internet Explorer + try { + delete script.test; + + } catch(e) { + jQuery.support.deleteExpando = false; + } + + root.removeChild( script ); + + if ( div.attachEvent && div.fireEvent ) { + div.attachEvent("onclick", function click() { + // Cloning a node shouldn't copy over any + // bound event handlers (IE does this) + jQuery.support.noCloneEvent = false; + div.detachEvent("onclick", click); + }); + div.cloneNode(true).fireEvent("onclick"); + } + + div = document.createElement("div"); + div.innerHTML = ""; + + var fragment = document.createDocumentFragment(); + fragment.appendChild( div.firstChild ); + + // WebKit doesn't clone checked state correctly in fragments + jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked; + + // Figure out if the W3C box model works as expected + // document.body must exist before we can do this + jQuery(function() { + var div = document.createElement("div"); + div.style.width = div.style.paddingLeft = "1px"; + + document.body.appendChild( div ); + jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2; + document.body.removeChild( div ).style.display = 'none'; + + div = null; + }); + + // Technique from Juriy Zaytsev + // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/ + var eventSupported = function( eventName ) { + var el = document.createElement("div"); + eventName = "on" + eventName; + + var isSupported = (eventName in el); + if ( !isSupported ) { + el.setAttribute(eventName, "return;"); + isSupported = typeof el[eventName] === "function"; + } + el = null; + + return isSupported; + }; + + jQuery.support.submitBubbles = eventSupported("submit"); + jQuery.support.changeBubbles = eventSupported("change"); + + // release memory in IE + root = script = div = all = a = null; +})(); + +jQuery.props = { + "for": "htmlFor", + "class": "className", + readonly: "readOnly", + maxlength: "maxLength", + cellspacing: "cellSpacing", + rowspan: "rowSpan", + colspan: "colSpan", + tabindex: "tabIndex", + usemap: "useMap", + frameborder: "frameBorder" +}; +var expando = "jQuery" + now(), uuid = 0, windowData = {}; + +jQuery.extend({ + cache: {}, + + expando:expando, + + // The following elements throw uncatchable exceptions if you + // attempt to add expando properties to them. + noData: { + "embed": true, + "object": true, + "applet": true + }, + + data: function( elem, name, data ) { + if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) { + return; + } + + elem = elem == window ? + windowData : + elem; + + var id = elem[ expando ], cache = jQuery.cache, thisCache; + + if ( !id && typeof name === "string" && data === undefined ) { + return null; + } + + // Compute a unique ID for the element + if ( !id ) { + id = ++uuid; + } + + // Avoid generating a new cache unless none exists and we + // want to manipulate it. + if ( typeof name === "object" ) { + elem[ expando ] = id; + thisCache = cache[ id ] = jQuery.extend(true, {}, name); + + } else if ( !cache[ id ] ) { + elem[ expando ] = id; + cache[ id ] = {}; + } + + thisCache = cache[ id ]; + + // Prevent overriding the named cache with undefined values + if ( data !== undefined ) { + thisCache[ name ] = data; + } + + return typeof name === "string" ? thisCache[ name ] : thisCache; + }, + + removeData: function( elem, name ) { + if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) { + return; + } + + elem = elem == window ? + windowData : + elem; + + var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ]; + + // If we want to remove a specific section of the element's data + if ( name ) { + if ( thisCache ) { + // Remove the section of cache data + delete thisCache[ name ]; + + // If we've removed all the data, remove the element's cache + if ( jQuery.isEmptyObject(thisCache) ) { + jQuery.removeData( elem ); + } + } + + // Otherwise, we want to remove all of the element's data + } else { + if ( jQuery.support.deleteExpando ) { + delete elem[ jQuery.expando ]; + + } else if ( elem.removeAttribute ) { + elem.removeAttribute( jQuery.expando ); + } + + // Completely remove the data cache + delete cache[ id ]; + } + } +}); + +jQuery.fn.extend({ + data: function( key, value ) { + if ( typeof key === "undefined" && this.length ) { + return jQuery.data( this[0] ); + + } else if ( typeof key === "object" ) { + return this.each(function() { + jQuery.data( this, key ); + }); + } + + var parts = key.split("."); + parts[1] = parts[1] ? "." + parts[1] : ""; + + if ( value === undefined ) { + var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); + + if ( data === undefined && this.length ) { + data = jQuery.data( this[0], key ); + } + return data === undefined && parts[1] ? + this.data( parts[0] ) : + data; + } else { + return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() { + jQuery.data( this, key, value ); + }); + } + }, + + removeData: function( key ) { + return this.each(function() { + jQuery.removeData( this, key ); + }); + } +}); +jQuery.extend({ + queue: function( elem, type, data ) { + if ( !elem ) { + return; + } + + type = (type || "fx") + "queue"; + var q = jQuery.data( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( !data ) { + return q || []; + } + + if ( !q || jQuery.isArray(data) ) { + q = jQuery.data( elem, type, jQuery.makeArray(data) ); + + } else { + q.push( data ); + } + + return q; + }, + + dequeue: function( elem, type ) { + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), fn = queue.shift(); + + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + } + + if ( fn ) { + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift("inprogress"); + } + + fn.call(elem, function() { + jQuery.dequeue(elem, type); + }); + } + } +}); + +jQuery.fn.extend({ + queue: function( type, data ) { + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + } + + if ( data === undefined ) { + return jQuery.queue( this[0], type ); + } + return this.each(function( i, elem ) { + var queue = jQuery.queue( this, type, data ); + + if ( type === "fx" && queue[0] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + }); + }, + dequeue: function( type ) { + return this.each(function() { + jQuery.dequeue( this, type ); + }); + }, + + // Based off of the plugin by Clint Helfers, with permission. + // http://blindsignals.com/index.php/2009/07/jquery-delay/ + delay: function( time, type ) { + time = jQuery.fx ? jQuery.fx.speeds[time] || time : time; + type = type || "fx"; + + return this.queue( type, function() { + var elem = this; + setTimeout(function() { + jQuery.dequeue( elem, type ); + }, time ); + }); + }, + + clearQueue: function( type ) { + return this.queue( type || "fx", [] ); + } +}); +var rclass = /[\n\t]/g, + rspace = /\s+/, + rreturn = /\r/g, + rspecialurl = /href|src|style/, + rtype = /(button|input)/i, + rfocusable = /(button|input|object|select|textarea)/i, + rclickable = /^(a|area)$/i, + rradiocheck = /radio|checkbox/; + +jQuery.fn.extend({ + attr: function( name, value ) { + return access( this, name, value, true, jQuery.attr ); + }, + + removeAttr: function( name, fn ) { + return this.each(function(){ + jQuery.attr( this, name, "" ); + if ( this.nodeType === 1 ) { + this.removeAttribute( name ); + } + }); + }, + + addClass: function( value ) { + if ( jQuery.isFunction(value) ) { + return this.each(function(i) { + var self = jQuery(this); + self.addClass( value.call(this, i, self.attr("class")) ); + }); + } + + if ( value && typeof value === "string" ) { + var classNames = (value || "").split( rspace ); + + for ( var i = 0, l = this.length; i < l; i++ ) { + var elem = this[i]; + + if ( elem.nodeType === 1 ) { + if ( !elem.className ) { + elem.className = value; + + } else { + var className = " " + elem.className + " ", setClass = elem.className; + for ( var c = 0, cl = classNames.length; c < cl; c++ ) { + if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) { + setClass += " " + classNames[c]; + } + } + elem.className = jQuery.trim( setClass ); + } + } + } + } + + return this; + }, + + removeClass: function( value ) { + if ( jQuery.isFunction(value) ) { + return this.each(function(i) { + var self = jQuery(this); + self.removeClass( value.call(this, i, self.attr("class")) ); + }); + } + + if ( (value && typeof value === "string") || value === undefined ) { + var classNames = (value || "").split(rspace); + + for ( var i = 0, l = this.length; i < l; i++ ) { + var elem = this[i]; + + if ( elem.nodeType === 1 && elem.className ) { + if ( value ) { + var className = (" " + elem.className + " ").replace(rclass, " "); + for ( var c = 0, cl = classNames.length; c < cl; c++ ) { + className = className.replace(" " + classNames[c] + " ", " "); + } + elem.className = jQuery.trim( className ); + + } else { + elem.className = ""; + } + } + } + } + + return this; + }, + + toggleClass: function( value, stateVal ) { + var type = typeof value, isBool = typeof stateVal === "boolean"; + + if ( jQuery.isFunction( value ) ) { + return this.each(function(i) { + var self = jQuery(this); + self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal ); + }); + } + + return this.each(function() { + if ( type === "string" ) { + // toggle individual class names + var className, i = 0, self = jQuery(this), + state = stateVal, + classNames = value.split( rspace ); + + while ( (className = classNames[ i++ ]) ) { + // check each className given, space seperated list + state = isBool ? state : !self.hasClass( className ); + self[ state ? "addClass" : "removeClass" ]( className ); + } + + } else if ( type === "undefined" || type === "boolean" ) { + if ( this.className ) { + // store className if set + jQuery.data( this, "__className__", this.className ); + } + + // toggle whole className + this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || ""; + } + }); + }, + + hasClass: function( selector ) { + var className = " " + selector + " "; + for ( var i = 0, l = this.length; i < l; i++ ) { + if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) { + return true; + } + } + + return false; + }, + + val: function( value ) { + if ( value === undefined ) { + var elem = this[0]; + + if ( elem ) { + if ( jQuery.nodeName( elem, "option" ) ) { + return (elem.attributes.value || {}).specified ? elem.value : elem.text; + } + + // We need to handle select boxes special + if ( jQuery.nodeName( elem, "select" ) ) { + var index = elem.selectedIndex, + values = [], + options = elem.options, + one = elem.type === "select-one"; + + // Nothing was selected + if ( index < 0 ) { + return null; + } + + // Loop through all the selected options + for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { + var option = options[ i ]; + + if ( option.selected ) { + // Get the specifc value for the option + value = jQuery(option).val(); + + // We don't need an array for one selects + if ( one ) { + return value; + } + + // Multi-Selects return an array + values.push( value ); + } + } + + return values; + } + + // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified + if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) { + return elem.getAttribute("value") === null ? "on" : elem.value; + } + + + // Everything else, we just grab the value + return (elem.value || "").replace(rreturn, ""); + + } + + return undefined; + } + + var isFunction = jQuery.isFunction(value); + + return this.each(function(i) { + var self = jQuery(this), val = value; + + if ( this.nodeType !== 1 ) { + return; + } + + if ( isFunction ) { + val = value.call(this, i, self.val()); + } + + // Typecast each time if the value is a Function and the appended + // value is therefore different each time. + if ( typeof val === "number" ) { + val += ""; + } + + if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) { + this.checked = jQuery.inArray( self.val(), val ) >= 0; + + } else if ( jQuery.nodeName( this, "select" ) ) { + var values = jQuery.makeArray(val); + + jQuery( "option", this ).each(function() { + this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0; + }); + + if ( !values.length ) { + this.selectedIndex = -1; + } + + } else { + this.value = val; + } + }); + } +}); + +jQuery.extend({ + attrFn: { + val: true, + css: true, + html: true, + text: true, + data: true, + width: true, + height: true, + offset: true + }, + + attr: function( elem, name, value, pass ) { + // don't set attributes on text and comment nodes + if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { + return undefined; + } + + if ( pass && name in jQuery.attrFn ) { + return jQuery(elem)[name](value); + } + + var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ), + // Whether we are setting (or getting) + set = value !== undefined; + + // Try to normalize/fix the name + name = notxml && jQuery.props[ name ] || name; + + // Only do all the following if this is a node (faster for style) + if ( elem.nodeType === 1 ) { + // These attributes require special treatment + var special = rspecialurl.test( name ); + + // Safari mis-reports the default selected property of an option + // Accessing the parent's selectedIndex property fixes it + if ( name === "selected" && !jQuery.support.optSelected ) { + var parent = elem.parentNode; + if ( parent ) { + parent.selectedIndex; + + // Make sure that it also works with optgroups, see #5701 + if ( parent.parentNode ) { + parent.parentNode.selectedIndex; + } + } + } + + // If applicable, access the attribute via the DOM 0 way + if ( name in elem && notxml && !special ) { + if ( set ) { + // We can't allow the type property to be changed (since it causes problems in IE) + if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) { + jQuery.error( "type property can't be changed" ); + } + + elem[ name ] = value; + } + + // browsers index elements by id/name on forms, give priority to attributes. + if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) { + return elem.getAttributeNode( name ).nodeValue; + } + + // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set + // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ + if ( name === "tabIndex" ) { + var attributeNode = elem.getAttributeNode( "tabIndex" ); + + return attributeNode && attributeNode.specified ? + attributeNode.value : + rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ? + 0 : + undefined; + } + + return elem[ name ]; + } + + if ( !jQuery.support.style && notxml && name === "style" ) { + if ( set ) { + elem.style.cssText = "" + value; + } + + return elem.style.cssText; + } + + if ( set ) { + // convert the value to a string (all browsers do this but IE) see #1070 + elem.setAttribute( name, "" + value ); + } + + var attr = !jQuery.support.hrefNormalized && notxml && special ? + // Some attributes require a special call on IE + elem.getAttribute( name, 2 ) : + elem.getAttribute( name ); + + // Non-existent attributes return null, we normalize to undefined + return attr === null ? undefined : attr; + } + + // elem is actually elem.style ... set the style + // Using attr for specific style information is now deprecated. Use style instead. + return jQuery.style( elem, name, value ); + } +}); +var rnamespaces = /\.(.*)$/, + fcleanup = function( nm ) { + return nm.replace(/[^\w\s\.\|`]/g, function( ch ) { + return "\\" + ch; + }); + }; + +/* + * A number of helper functions used for managing events. + * Many of the ideas behind this code originated from + * Dean Edwards' addEvent library. + */ +jQuery.event = { + + // Bind an event to an element + // Original by Dean Edwards + add: function( elem, types, handler, data ) { + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } + + // For whatever reason, IE has trouble passing the window object + // around, causing it to be cloned in the process + if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) { + elem = window; + } + + var handleObjIn, handleObj; + + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + } + + // Make sure that the function being executed has a unique ID + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure + var elemData = jQuery.data( elem ); + + // If no elemData is found then we must be trying to bind to one of the + // banned noData elements + if ( !elemData ) { + return; + } + + var events = elemData.events = elemData.events || {}, + eventHandle = elemData.handle, eventHandle; + + if ( !eventHandle ) { + elemData.handle = eventHandle = function() { + // Handle the second event of a trigger and when + // an event is called after a page has unloaded + return typeof jQuery !== "undefined" && !jQuery.event.triggered ? + jQuery.event.handle.apply( eventHandle.elem, arguments ) : + undefined; + }; + } + + // Add elem as a property of the handle function + // This is to prevent a memory leak with non-native events in IE. + eventHandle.elem = elem; + + // Handle multiple events separated by a space + // jQuery(...).bind("mouseover mouseout", fn); + types = types.split(" "); + + var type, i = 0, namespaces; + + while ( (type = types[ i++ ]) ) { + handleObj = handleObjIn ? + jQuery.extend({}, handleObjIn) : + { handler: handler, data: data }; + + // Namespaced event handlers + if ( type.indexOf(".") > -1 ) { + namespaces = type.split("."); + type = namespaces.shift(); + handleObj.namespace = namespaces.slice(0).sort().join("."); + + } else { + namespaces = []; + handleObj.namespace = ""; + } + + handleObj.type = type; + handleObj.guid = handler.guid; + + // Get the current list of functions bound to this event + var handlers = events[ type ], + special = jQuery.event.special[ type ] || {}; + + // Init the event handler queue + if ( !handlers ) { + handlers = events[ type ] = []; + + // Check for a special event handler + // Only use addEventListener/attachEvent if the special + // events handler returns false + if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + // Bind the global event handler to the element + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle, false ); + + } else if ( elem.attachEvent ) { + elem.attachEvent( "on" + type, eventHandle ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add the function to the element's handler list + handlers.push( handleObj ); + + // Keep track of which events have been used, for global triggering + jQuery.event.global[ type ] = true; + } + + // Nullify elem to prevent memory leaks in IE + elem = null; + }, + + global: {}, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, pos ) { + // don't do events on text and comment nodes + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } + + var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType, + elemData = jQuery.data( elem ), + events = elemData && elemData.events; + + if ( !elemData || !events ) { + return; + } + + // types is actually an event object here + if ( types && types.type ) { + handler = types.handler; + types = types.type; + } + + // Unbind all events for the element + if ( !types || typeof types === "string" && types.charAt(0) === "." ) { + types = types || ""; + + for ( type in events ) { + jQuery.event.remove( elem, type + types ); + } + + return; + } + + // Handle multiple events separated by a space + // jQuery(...).unbind("mouseover mouseout", fn); + types = types.split(" "); + + while ( (type = types[ i++ ]) ) { + origType = type; + handleObj = null; + all = type.indexOf(".") < 0; + namespaces = []; + + if ( !all ) { + // Namespaced event handlers + namespaces = type.split("."); + type = namespaces.shift(); + + namespace = new RegExp("(^|\\.)" + + jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)") + } + + eventType = events[ type ]; + + if ( !eventType ) { + continue; + } + + if ( !handler ) { + for ( var j = 0; j < eventType.length; j++ ) { + handleObj = eventType[ j ]; + + if ( all || namespace.test( handleObj.namespace ) ) { + jQuery.event.remove( elem, origType, handleObj.handler, j ); + eventType.splice( j--, 1 ); + } + } + + continue; + } + + special = jQuery.event.special[ type ] || {}; + + for ( var j = pos || 0; j < eventType.length; j++ ) { + handleObj = eventType[ j ]; + + if ( handler.guid === handleObj.guid ) { + // remove the given handler for the given type + if ( all || namespace.test( handleObj.namespace ) ) { + if ( pos == null ) { + eventType.splice( j--, 1 ); + } + + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + + if ( pos != null ) { + break; + } + } + } + + // remove generic event handler if no more handlers exist + if ( eventType.length === 0 || pos != null && eventType.length === 1 ) { + if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) { + removeEvent( elem, type, elemData.handle ); + } + + ret = null; + delete events[ type ]; + } + } + + // Remove the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + var handle = elemData.handle; + if ( handle ) { + handle.elem = null; + } + + delete elemData.events; + delete elemData.handle; + + if ( jQuery.isEmptyObject( elemData ) ) { + jQuery.removeData( elem ); + } + } + }, + + // bubbling is internal + trigger: function( event, data, elem /*, bubbling */ ) { + // Event object or event type + var type = event.type || event, + bubbling = arguments[3]; + + if ( !bubbling ) { + event = typeof event === "object" ? + // jQuery.Event object + event[expando] ? event : + // Object literal + jQuery.extend( jQuery.Event(type), event ) : + // Just the event type (string) + jQuery.Event(type); + + if ( type.indexOf("!") >= 0 ) { + event.type = type = type.slice(0, -1); + event.exclusive = true; + } + + // Handle a global trigger + if ( !elem ) { + // Don't bubble custom events when global (to avoid too much overhead) + event.stopPropagation(); + + // Only trigger if we've ever bound an event for it + if ( jQuery.event.global[ type ] ) { + jQuery.each( jQuery.cache, function() { + if ( this.events && this.events[type] ) { + jQuery.event.trigger( event, data, this.handle.elem ); + } + }); + } + } + + // Handle triggering a single element + + // don't do events on text and comment nodes + if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) { + return undefined; + } + + // Clean up in case it is reused + event.result = undefined; + event.target = elem; + + // Clone the incoming data, if any + data = jQuery.makeArray( data ); + data.unshift( event ); + } + + event.currentTarget = elem; + + // Trigger the event, it is assumed that "handle" is a function + var handle = jQuery.data( elem, "handle" ); + if ( handle ) { + handle.apply( elem, data ); + } + + var parent = elem.parentNode || elem.ownerDocument; + + // Trigger an inline bound script + try { + if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) { + if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) { + event.result = false; + } + } + + // prevent IE from throwing an error for some elements with some event types, see #3533 + } catch (e) {} + + if ( !event.isPropagationStopped() && parent ) { + jQuery.event.trigger( event, data, parent, true ); + + } else if ( !event.isDefaultPrevented() ) { + var target = event.target, old, + isClick = jQuery.nodeName(target, "a") && type === "click", + special = jQuery.event.special[ type ] || {}; + + if ( (!special._default || special._default.call( elem, event ) === false) && + !isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) { + + try { + if ( target[ type ] ) { + // Make sure that we don't accidentally re-trigger the onFOO events + old = target[ "on" + type ]; + + if ( old ) { + target[ "on" + type ] = null; + } + + jQuery.event.triggered = true; + target[ type ](); + } + + // prevent IE from throwing an error for some elements with some event types, see #3533 + } catch (e) {} + + if ( old ) { + target[ "on" + type ] = old; + } + + jQuery.event.triggered = false; + } + } + }, + + handle: function( event ) { + var all, handlers, namespaces, namespace, events; + + event = arguments[0] = jQuery.event.fix( event || window.event ); + event.currentTarget = this; + + // Namespaced event handlers + all = event.type.indexOf(".") < 0 && !event.exclusive; + + if ( !all ) { + namespaces = event.type.split("."); + event.type = namespaces.shift(); + namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)"); + } + + var events = jQuery.data(this, "events"), handlers = events[ event.type ]; + + if ( events && handlers ) { + // Clone the handlers to prevent manipulation + handlers = handlers.slice(0); + + for ( var j = 0, l = handlers.length; j < l; j++ ) { + var handleObj = handlers[ j ]; + + // Filter the functions by class + if ( all || namespace.test( handleObj.namespace ) ) { + // Pass in a reference to the handler function itself + // So that we can later remove it + event.handler = handleObj.handler; + event.data = handleObj.data; + event.handleObj = handleObj; + + var ret = handleObj.handler.apply( this, arguments ); + + if ( ret !== undefined ) { + event.result = ret; + if ( ret === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + + if ( event.isImmediatePropagationStopped() ) { + break; + } + } + } + } + + return event.result; + }, + + props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "), + + fix: function( event ) { + if ( event[ expando ] ) { + return event; + } + + // store a copy of the original event object + // and "clone" to set read-only properties + var originalEvent = event; + event = jQuery.Event( originalEvent ); + + for ( var i = this.props.length, prop; i; ) { + prop = this.props[ --i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Fix target property, if necessary + if ( !event.target ) { + event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either + } + + // check if target is a textnode (safari) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } + + // Add relatedTarget, if necessary + if ( !event.relatedTarget && event.fromElement ) { + event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement; + } + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && event.clientX != null ) { + var doc = document.documentElement, body = document.body; + event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0); + event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc && doc.clientTop || body && body.clientTop || 0); + } + + // Add which for key events + if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) { + event.which = event.charCode || event.keyCode; + } + + // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs) + if ( !event.metaKey && event.ctrlKey ) { + event.metaKey = event.ctrlKey; + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && event.button !== undefined ) { + event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) )); + } + + return event; + }, + + // Deprecated, use jQuery.guid instead + guid: 1E8, + + // Deprecated, use jQuery.proxy instead + proxy: jQuery.proxy, + + special: { + ready: { + // Make sure the ready event is setup + setup: jQuery.bindReady, + teardown: jQuery.noop + }, + + live: { + add: function( handleObj ) { + jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) ); + }, + + remove: function( handleObj ) { + var remove = true, + type = handleObj.origType.replace(rnamespaces, ""); + + jQuery.each( jQuery.data(this, "events").live || [], function() { + if ( type === this.origType.replace(rnamespaces, "") ) { + remove = false; + return false; + } + }); + + if ( remove ) { + jQuery.event.remove( this, handleObj.origType, liveHandler ); + } + } + + }, + + beforeunload: { + setup: function( data, namespaces, eventHandle ) { + // We only want to do this special case on windows + if ( this.setInterval ) { + this.onbeforeunload = eventHandle; + } + + return false; + }, + teardown: function( namespaces, eventHandle ) { + if ( this.onbeforeunload === eventHandle ) { + this.onbeforeunload = null; + } + } + } + } +}; + +var removeEvent = document.removeEventListener ? + function( elem, type, handle ) { + elem.removeEventListener( type, handle, false ); + } : + function( elem, type, handle ) { + elem.detachEvent( "on" + type, handle ); + }; + +jQuery.Event = function( src ) { + // Allow instantiation without the 'new' keyword + if ( !this.preventDefault ) { + return new jQuery.Event( src ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + // Event type + } else { + this.type = src; + } + + // timeStamp is buggy for some events on Firefox(#3843) + // So we won't rely on the native value + this.timeStamp = now(); + + // Mark it as fixed + this[ expando ] = true; +}; + +function returnFalse() { + return false; +} +function returnTrue() { + return true; +} + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + preventDefault: function() { + this.isDefaultPrevented = returnTrue; + + var e = this.originalEvent; + if ( !e ) { + return; + } + + // if preventDefault exists run it on the original event + if ( e.preventDefault ) { + e.preventDefault(); + } + // otherwise set the returnValue property of the original event to false (IE) + e.returnValue = false; + }, + stopPropagation: function() { + this.isPropagationStopped = returnTrue; + + var e = this.originalEvent; + if ( !e ) { + return; + } + // if stopPropagation exists run it on the original event + if ( e.stopPropagation ) { + e.stopPropagation(); + } + // otherwise set the cancelBubble property of the original event to true (IE) + e.cancelBubble = true; + }, + stopImmediatePropagation: function() { + this.isImmediatePropagationStopped = returnTrue; + this.stopPropagation(); + }, + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse +}; + +// Checks if an event happened on an element within another element +// Used in jQuery.event.special.mouseenter and mouseleave handlers +var withinElement = function( event ) { + // Check if mouse(over|out) are still within the same parent element + var parent = event.relatedTarget; + + // Firefox sometimes assigns relatedTarget a XUL element + // which we cannot access the parentNode property of + try { + // Traverse up the tree + while ( parent && parent !== this ) { + parent = parent.parentNode; + } + + if ( parent !== this ) { + // set the correct event type + event.type = event.data; + + // handle event if we actually just moused on to a non sub-element + jQuery.event.handle.apply( this, arguments ); + } + + // assuming we've left the element since we most likely mousedover a xul element + } catch(e) { } +}, + +// In case of event delegation, we only need to rename the event.type, +// liveHandler will take care of the rest. +delegate = function( event ) { + event.type = event.data; + jQuery.event.handle.apply( this, arguments ); +}; + +// Create mouseenter and mouseleave events +jQuery.each({ + mouseenter: "mouseover", + mouseleave: "mouseout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + setup: function( data ) { + jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig ); + }, + teardown: function( data ) { + jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement ); + } + }; +}); + +// submit delegation +if ( !jQuery.support.submitBubbles ) { + + jQuery.event.special.submit = { + setup: function( data, namespaces ) { + if ( this.nodeName.toLowerCase() !== "form" ) { + jQuery.event.add(this, "click.specialSubmit", function( e ) { + var elem = e.target, type = elem.type; + + if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) { + return trigger( "submit", this, arguments ); + } + }); + + jQuery.event.add(this, "keypress.specialSubmit", function( e ) { + var elem = e.target, type = elem.type; + + if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) { + return trigger( "submit", this, arguments ); + } + }); + + } else { + return false; + } + }, + + teardown: function( namespaces ) { + jQuery.event.remove( this, ".specialSubmit" ); + } + }; + +} + +// change delegation, happens here so we have bind. +if ( !jQuery.support.changeBubbles ) { + + var formElems = /textarea|input|select/i, + + changeFilters, + + getVal = function( elem ) { + var type = elem.type, val = elem.value; + + if ( type === "radio" || type === "checkbox" ) { + val = elem.checked; + + } else if ( type === "select-multiple" ) { + val = elem.selectedIndex > -1 ? + jQuery.map( elem.options, function( elem ) { + return elem.selected; + }).join("-") : + ""; + + } else if ( elem.nodeName.toLowerCase() === "select" ) { + val = elem.selectedIndex; + } + + return val; + }, + + testChange = function testChange( e ) { + var elem = e.target, data, val; + + if ( !formElems.test( elem.nodeName ) || elem.readOnly ) { + return; + } + + data = jQuery.data( elem, "_change_data" ); + val = getVal(elem); + + // the current data will be also retrieved by beforeactivate + if ( e.type !== "focusout" || elem.type !== "radio" ) { + jQuery.data( elem, "_change_data", val ); + } + + if ( data === undefined || val === data ) { + return; + } + + if ( data != null || val ) { + e.type = "change"; + return jQuery.event.trigger( e, arguments[1], elem ); + } + }; + + jQuery.event.special.change = { + filters: { + focusout: testChange, + + click: function( e ) { + var elem = e.target, type = elem.type; + + if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) { + return testChange.call( this, e ); + } + }, + + // Change has to be called before submit + // Keydown will be called before keypress, which is used in submit-event delegation + keydown: function( e ) { + var elem = e.target, type = elem.type; + + if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") || + (e.keyCode === 32 && (type === "checkbox" || type === "radio")) || + type === "select-multiple" ) { + return testChange.call( this, e ); + } + }, + + // Beforeactivate happens also before the previous element is blurred + // with this event you can't trigger a change event, but you can store + // information/focus[in] is not needed anymore + beforeactivate: function( e ) { + var elem = e.target; + jQuery.data( elem, "_change_data", getVal(elem) ); + } + }, + + setup: function( data, namespaces ) { + if ( this.type === "file" ) { + return false; + } + + for ( var type in changeFilters ) { + jQuery.event.add( this, type + ".specialChange", changeFilters[type] ); + } + + return formElems.test( this.nodeName ); + }, + + teardown: function( namespaces ) { + jQuery.event.remove( this, ".specialChange" ); + + return formElems.test( this.nodeName ); + } + }; + + changeFilters = jQuery.event.special.change.filters; +} + +function trigger( type, elem, args ) { + args[0].type = type; + return jQuery.event.handle.apply( elem, args ); +} + +// Create "bubbling" focus and blur events +if ( document.addEventListener ) { + jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { + jQuery.event.special[ fix ] = { + setup: function() { + this.addEventListener( orig, handler, true ); + }, + teardown: function() { + this.removeEventListener( orig, handler, true ); + } + }; + + function handler( e ) { + e = jQuery.event.fix( e ); + e.type = fix; + return jQuery.event.handle.call( this, e ); + } + }); +} + +jQuery.each(["bind", "one"], function( i, name ) { + jQuery.fn[ name ] = function( type, data, fn ) { + // Handle object literals + if ( typeof type === "object" ) { + for ( var key in type ) { + this[ name ](key, data, type[key], fn); + } + return this; + } + + if ( jQuery.isFunction( data ) ) { + fn = data; + data = undefined; + } + + var handler = name === "one" ? jQuery.proxy( fn, function( event ) { + jQuery( this ).unbind( event, handler ); + return fn.apply( this, arguments ); + }) : fn; + + if ( type === "unload" && name !== "one" ) { + this.one( type, data, fn ); + + } else { + for ( var i = 0, l = this.length; i < l; i++ ) { + jQuery.event.add( this[i], type, handler, data ); + } + } + + return this; + }; +}); + +jQuery.fn.extend({ + unbind: function( type, fn ) { + // Handle object literals + if ( typeof type === "object" && !type.preventDefault ) { + for ( var key in type ) { + this.unbind(key, type[key]); + } + + } else { + for ( var i = 0, l = this.length; i < l; i++ ) { + jQuery.event.remove( this[i], type, fn ); + } + } + + return this; + }, + + delegate: function( selector, types, data, fn ) { + return this.live( types, data, fn, selector ); + }, + + undelegate: function( selector, types, fn ) { + if ( arguments.length === 0 ) { + return this.unbind( "live" ); + + } else { + return this.die( types, null, fn, selector ); + } + }, + + trigger: function( type, data ) { + return this.each(function() { + jQuery.event.trigger( type, data, this ); + }); + }, + + triggerHandler: function( type, data ) { + if ( this[0] ) { + var event = jQuery.Event( type ); + event.preventDefault(); + event.stopPropagation(); + jQuery.event.trigger( event, data, this[0] ); + return event.result; + } + }, + + toggle: function( fn ) { + // Save reference to arguments for access in closure + var args = arguments, i = 1; + + // link all the functions, so any of them can unbind this click handler + while ( i < args.length ) { + jQuery.proxy( fn, args[ i++ ] ); + } + + return this.click( jQuery.proxy( fn, function( event ) { + // Figure out which function to execute + var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i; + jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 ); + + // Make sure that clicks stop + event.preventDefault(); + + // and execute the function + return args[ lastToggle ].apply( this, arguments ) || false; + })); + }, + + hover: function( fnOver, fnOut ) { + return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver ); + } +}); + +var liveMap = { + focus: "focusin", + blur: "focusout", + mouseenter: "mouseover", + mouseleave: "mouseout" +}; + +jQuery.each(["live", "die"], function( i, name ) { + jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) { + var type, i = 0, match, namespaces, preType, + selector = origSelector || this.selector, + context = origSelector ? this : jQuery( this.context ); + + if ( jQuery.isFunction( data ) ) { + fn = data; + data = undefined; + } + + types = (types || "").split(" "); + + while ( (type = types[ i++ ]) != null ) { + match = rnamespaces.exec( type ); + namespaces = ""; + + if ( match ) { + namespaces = match[0]; + type = type.replace( rnamespaces, "" ); + } + + if ( type === "hover" ) { + types.push( "mouseenter" + namespaces, "mouseleave" + namespaces ); + continue; + } + + preType = type; + + if ( type === "focus" || type === "blur" ) { + types.push( liveMap[ type ] + namespaces ); + type = type + namespaces; + + } else { + type = (liveMap[ type ] || type) + namespaces; + } + + if ( name === "live" ) { + // bind live handler + context.each(function(){ + jQuery.event.add( this, liveConvert( type, selector ), + { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } ); + }); + + } else { + // unbind live handler + context.unbind( liveConvert( type, selector ), fn ); + } + } + + return this; + } +}); + +function liveHandler( event ) { + var stop, elems = [], selectors = [], args = arguments, + related, match, handleObj, elem, j, i, l, data, + events = jQuery.data( this, "events" ); + + // Make sure we avoid non-left-click bubbling in Firefox (#3861) + if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) { + return; + } + + event.liveFired = this; + + var live = events.live.slice(0); + + for ( j = 0; j < live.length; j++ ) { + handleObj = live[j]; + + if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) { + selectors.push( handleObj.selector ); + + } else { + live.splice( j--, 1 ); + } + } + + match = jQuery( event.target ).closest( selectors, event.currentTarget ); + + for ( i = 0, l = match.length; i < l; i++ ) { + for ( j = 0; j < live.length; j++ ) { + handleObj = live[j]; + + if ( match[i].selector === handleObj.selector ) { + elem = match[i].elem; + related = null; + + // Those two events require additional checking + if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) { + related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0]; + } + + if ( !related || related !== elem ) { + elems.push({ elem: elem, handleObj: handleObj }); + } + } + } + } + + for ( i = 0, l = elems.length; i < l; i++ ) { + match = elems[i]; + event.currentTarget = match.elem; + event.data = match.handleObj.data; + event.handleObj = match.handleObj; + + if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) { + stop = false; + break; + } + } + + return stop; +} + +function liveConvert( type, selector ) { + return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&"); +} + +jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " + + "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " + + "change select submit keydown keypress keyup error").split(" "), function( i, name ) { + + // Handle event binding + jQuery.fn[ name ] = function( fn ) { + return fn ? this.bind( name, fn ) : this.trigger( name ); + }; + + if ( jQuery.attrFn ) { + jQuery.attrFn[ name ] = true; + } +}); + +// Prevent memory leaks in IE +// Window isn't included so as not to unbind existing unload events +// More info: +// - http://isaacschlueter.com/2006/10/msie-memory-leaks/ +if ( window.attachEvent && !window.addEventListener ) { + window.attachEvent("onunload", function() { + for ( var id in jQuery.cache ) { + if ( jQuery.cache[ id ].handle ) { + // Try/Catch is to handle iframes being unloaded, see #4280 + try { + jQuery.event.remove( jQuery.cache[ id ].handle.elem ); + } catch(e) {} + } + } + }); +} +/*! + * Sizzle CSS Selector Engine - v1.0 + * Copyright 2009, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * More information: http://sizzlejs.com/ + */ +(function(){ + +var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, + done = 0, + toString = Object.prototype.toString, + hasDuplicate = false, + baseHasDuplicate = true; + +// Here we check if the JavaScript engine is using some sort of +// optimization where it does not always call our comparision +// function. If that is the case, discard the hasDuplicate value. +// Thus far that includes Google Chrome. +[0, 0].sort(function(){ + baseHasDuplicate = false; + return 0; +}); + +var Sizzle = function(selector, context, results, seed) { + results = results || []; + var origContext = context = context || document; + + if ( context.nodeType !== 1 && context.nodeType !== 9 ) { + return []; + } + + if ( !selector || typeof selector !== "string" ) { + return results; + } + + var parts = [], m, set, checkSet, extra, prune = true, contextXML = isXML(context), + soFar = selector; + + // Reset the position of the chunker regexp (start from head) + while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) { + soFar = m[3]; + + parts.push( m[1] ); + + if ( m[2] ) { + extra = m[3]; + break; + } + } + + if ( parts.length > 1 && origPOS.exec( selector ) ) { + if ( parts.length === 2 && Expr.relative[ parts[0] ] ) { + set = posProcess( parts[0] + parts[1], context ); + } else { + set = Expr.relative[ parts[0] ] ? + [ context ] : + Sizzle( parts.shift(), context ); + + while ( parts.length ) { + selector = parts.shift(); + + if ( Expr.relative[ selector ] ) { + selector += parts.shift(); + } + + set = posProcess( selector, set ); + } + } + } else { + // Take a shortcut and set the context if the root selector is an ID + // (but not if it'll be faster if the inner selector is an ID) + if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML && + Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) { + var ret = Sizzle.find( parts.shift(), context, contextXML ); + context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0]; + } + + if ( context ) { + var ret = seed ? + { expr: parts.pop(), set: makeArray(seed) } : + Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML ); + set = ret.expr ? Sizzle.filter( ret.expr, ret.set ) : ret.set; + + if ( parts.length > 0 ) { + checkSet = makeArray(set); + } else { + prune = false; + } + + while ( parts.length ) { + var cur = parts.pop(), pop = cur; + + if ( !Expr.relative[ cur ] ) { + cur = ""; + } else { + pop = parts.pop(); + } + + if ( pop == null ) { + pop = context; + } + + Expr.relative[ cur ]( checkSet, pop, contextXML ); + } + } else { + checkSet = parts = []; + } + } + + if ( !checkSet ) { + checkSet = set; + } + + if ( !checkSet ) { + Sizzle.error( cur || selector ); + } + + if ( toString.call(checkSet) === "[object Array]" ) { + if ( !prune ) { + results.push.apply( results, checkSet ); + } else if ( context && context.nodeType === 1 ) { + for ( var i = 0; checkSet[i] != null; i++ ) { + if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) { + results.push( set[i] ); + } + } + } else { + for ( var i = 0; checkSet[i] != null; i++ ) { + if ( checkSet[i] && checkSet[i].nodeType === 1 ) { + results.push( set[i] ); + } + } + } + } else { + makeArray( checkSet, results ); + } + + if ( extra ) { + Sizzle( extra, origContext, results, seed ); + Sizzle.uniqueSort( results ); + } + + return results; +}; + +Sizzle.uniqueSort = function(results){ + if ( sortOrder ) { + hasDuplicate = baseHasDuplicate; + results.sort(sortOrder); + + if ( hasDuplicate ) { + for ( var i = 1; i < results.length; i++ ) { + if ( results[i] === results[i-1] ) { + results.splice(i--, 1); + } + } + } + } + + return results; +}; + +Sizzle.matches = function(expr, set){ + return Sizzle(expr, null, null, set); +}; + +Sizzle.find = function(expr, context, isXML){ + var set, match; + + if ( !expr ) { + return []; + } + + for ( var i = 0, l = Expr.order.length; i < l; i++ ) { + var type = Expr.order[i], match; + + if ( (match = Expr.leftMatch[ type ].exec( expr )) ) { + var left = match[1]; + match.splice(1,1); + + if ( left.substr( left.length - 1 ) !== "\\" ) { + match[1] = (match[1] || "").replace(/\\/g, ""); + set = Expr.find[ type ]( match, context, isXML ); + if ( set != null ) { + expr = expr.replace( Expr.match[ type ], "" ); + break; + } + } + } + } + + if ( !set ) { + set = context.getElementsByTagName("*"); + } + + return {set: set, expr: expr}; +}; + +Sizzle.filter = function(expr, set, inplace, not){ + var old = expr, result = [], curLoop = set, match, anyFound, + isXMLFilter = set && set[0] && isXML(set[0]); + + while ( expr && set.length ) { + for ( var type in Expr.filter ) { + if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) { + var filter = Expr.filter[ type ], found, item, left = match[1]; + anyFound = false; + + match.splice(1,1); + + if ( left.substr( left.length - 1 ) === "\\" ) { + continue; + } + + if ( curLoop === result ) { + result = []; + } + + if ( Expr.preFilter[ type ] ) { + match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter ); + + if ( !match ) { + anyFound = found = true; + } else if ( match === true ) { + continue; + } + } + + if ( match ) { + for ( var i = 0; (item = curLoop[i]) != null; i++ ) { + if ( item ) { + found = filter( item, match, i, curLoop ); + var pass = not ^ !!found; + + if ( inplace && found != null ) { + if ( pass ) { + anyFound = true; + } else { + curLoop[i] = false; + } + } else if ( pass ) { + result.push( item ); + anyFound = true; + } + } + } + } + + if ( found !== undefined ) { + if ( !inplace ) { + curLoop = result; + } + + expr = expr.replace( Expr.match[ type ], "" ); + + if ( !anyFound ) { + return []; + } + + break; + } + } + } + + // Improper expression + if ( expr === old ) { + if ( anyFound == null ) { + Sizzle.error( expr ); + } else { + break; + } + } + + old = expr; + } + + return curLoop; +}; + +Sizzle.error = function( msg ) { + throw "Syntax error, unrecognized expression: " + msg; +}; + +var Expr = Sizzle.selectors = { + order: [ "ID", "NAME", "TAG" ], + match: { + ID: /#((?:[\w\u00c0-\uFFFF-]|\\.)+)/, + CLASS: /\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/, + NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/, + ATTR: /\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/, + TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/, + CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/, + POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/, + PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/ + }, + leftMatch: {}, + attrMap: { + "class": "className", + "for": "htmlFor" + }, + attrHandle: { + href: function(elem){ + return elem.getAttribute("href"); + } + }, + relative: { + "+": function(checkSet, part){ + var isPartStr = typeof part === "string", + isTag = isPartStr && !/\W/.test(part), + isPartStrNotTag = isPartStr && !isTag; + + if ( isTag ) { + part = part.toLowerCase(); + } + + for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) { + if ( (elem = checkSet[i]) ) { + while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {} + + checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ? + elem || false : + elem === part; + } + } + + if ( isPartStrNotTag ) { + Sizzle.filter( part, checkSet, true ); + } + }, + ">": function(checkSet, part){ + var isPartStr = typeof part === "string"; + + if ( isPartStr && !/\W/.test(part) ) { + part = part.toLowerCase(); + + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + if ( elem ) { + var parent = elem.parentNode; + checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false; + } + } + } else { + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + if ( elem ) { + checkSet[i] = isPartStr ? + elem.parentNode : + elem.parentNode === part; + } + } + + if ( isPartStr ) { + Sizzle.filter( part, checkSet, true ); + } + } + }, + "": function(checkSet, part, isXML){ + var doneName = done++, checkFn = dirCheck; + + if ( typeof part === "string" && !/\W/.test(part) ) { + var nodeCheck = part = part.toLowerCase(); + checkFn = dirNodeCheck; + } + + checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML); + }, + "~": function(checkSet, part, isXML){ + var doneName = done++, checkFn = dirCheck; + + if ( typeof part === "string" && !/\W/.test(part) ) { + var nodeCheck = part = part.toLowerCase(); + checkFn = dirNodeCheck; + } + + checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML); + } + }, + find: { + ID: function(match, context, isXML){ + if ( typeof context.getElementById !== "undefined" && !isXML ) { + var m = context.getElementById(match[1]); + return m ? [m] : []; + } + }, + NAME: function(match, context){ + if ( typeof context.getElementsByName !== "undefined" ) { + var ret = [], results = context.getElementsByName(match[1]); + + for ( var i = 0, l = results.length; i < l; i++ ) { + if ( results[i].getAttribute("name") === match[1] ) { + ret.push( results[i] ); + } + } + + return ret.length === 0 ? null : ret; + } + }, + TAG: function(match, context){ + return context.getElementsByTagName(match[1]); + } + }, + preFilter: { + CLASS: function(match, curLoop, inplace, result, not, isXML){ + match = " " + match[1].replace(/\\/g, "") + " "; + + if ( isXML ) { + return match; + } + + for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) { + if ( elem ) { + if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) { + if ( !inplace ) { + result.push( elem ); + } + } else if ( inplace ) { + curLoop[i] = false; + } + } + } + + return false; + }, + ID: function(match){ + return match[1].replace(/\\/g, ""); + }, + TAG: function(match, curLoop){ + return match[1].toLowerCase(); + }, + CHILD: function(match){ + if ( match[1] === "nth" ) { + // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' + var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec( + match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" || + !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]); + + // calculate the numbers (first)n+(last) including if they are negative + match[2] = (test[1] + (test[2] || 1)) - 0; + match[3] = test[3] - 0; + } + + // TODO: Move to normal caching system + match[0] = done++; + + return match; + }, + ATTR: function(match, curLoop, inplace, result, not, isXML){ + var name = match[1].replace(/\\/g, ""); + + if ( !isXML && Expr.attrMap[name] ) { + match[1] = Expr.attrMap[name]; + } + + if ( match[2] === "~=" ) { + match[4] = " " + match[4] + " "; + } + + return match; + }, + PSEUDO: function(match, curLoop, inplace, result, not){ + if ( match[1] === "not" ) { + // If we're dealing with a complex expression, or a simple one + if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) { + match[3] = Sizzle(match[3], null, null, curLoop); + } else { + var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not); + if ( !inplace ) { + result.push.apply( result, ret ); + } + return false; + } + } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) { + return true; + } + + return match; + }, + POS: function(match){ + match.unshift( true ); + return match; + } + }, + filters: { + enabled: function(elem){ + return elem.disabled === false && elem.type !== "hidden"; + }, + disabled: function(elem){ + return elem.disabled === true; + }, + checked: function(elem){ + return elem.checked === true; + }, + selected: function(elem){ + // Accessing this property makes selected-by-default + // options in Safari work properly + elem.parentNode.selectedIndex; + return elem.selected === true; + }, + parent: function(elem){ + return !!elem.firstChild; + }, + empty: function(elem){ + return !elem.firstChild; + }, + has: function(elem, i, match){ + return !!Sizzle( match[3], elem ).length; + }, + header: function(elem){ + return /h\d/i.test( elem.nodeName ); + }, + text: function(elem){ + return "text" === elem.type; + }, + radio: function(elem){ + return "radio" === elem.type; + }, + checkbox: function(elem){ + return "checkbox" === elem.type; + }, + file: function(elem){ + return "file" === elem.type; + }, + password: function(elem){ + return "password" === elem.type; + }, + submit: function(elem){ + return "submit" === elem.type; + }, + image: function(elem){ + return "image" === elem.type; + }, + reset: function(elem){ + return "reset" === elem.type; + }, + button: function(elem){ + return "button" === elem.type || elem.nodeName.toLowerCase() === "button"; + }, + input: function(elem){ + return /input|select|textarea|button/i.test(elem.nodeName); + } + }, + setFilters: { + first: function(elem, i){ + return i === 0; + }, + last: function(elem, i, match, array){ + return i === array.length - 1; + }, + even: function(elem, i){ + return i % 2 === 0; + }, + odd: function(elem, i){ + return i % 2 === 1; + }, + lt: function(elem, i, match){ + return i < match[3] - 0; + }, + gt: function(elem, i, match){ + return i > match[3] - 0; + }, + nth: function(elem, i, match){ + return match[3] - 0 === i; + }, + eq: function(elem, i, match){ + return match[3] - 0 === i; + } + }, + filter: { + PSEUDO: function(elem, match, i, array){ + var name = match[1], filter = Expr.filters[ name ]; + + if ( filter ) { + return filter( elem, i, match, array ); + } else if ( name === "contains" ) { + return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0; + } else if ( name === "not" ) { + var not = match[3]; + + for ( var i = 0, l = not.length; i < l; i++ ) { + if ( not[i] === elem ) { + return false; + } + } + + return true; + } else { + Sizzle.error( "Syntax error, unrecognized expression: " + name ); + } + }, + CHILD: function(elem, match){ + var type = match[1], node = elem; + switch (type) { + case 'only': + case 'first': + while ( (node = node.previousSibling) ) { + if ( node.nodeType === 1 ) { + return false; + } + } + if ( type === "first" ) { + return true; + } + node = elem; + case 'last': + while ( (node = node.nextSibling) ) { + if ( node.nodeType === 1 ) { + return false; + } + } + return true; + case 'nth': + var first = match[2], last = match[3]; + + if ( first === 1 && last === 0 ) { + return true; + } + + var doneName = match[0], + parent = elem.parentNode; + + if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) { + var count = 0; + for ( node = parent.firstChild; node; node = node.nextSibling ) { + if ( node.nodeType === 1 ) { + node.nodeIndex = ++count; + } + } + parent.sizcache = doneName; + } + + var diff = elem.nodeIndex - last; + if ( first === 0 ) { + return diff === 0; + } else { + return ( diff % first === 0 && diff / first >= 0 ); + } + } + }, + ID: function(elem, match){ + return elem.nodeType === 1 && elem.getAttribute("id") === match; + }, + TAG: function(elem, match){ + return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match; + }, + CLASS: function(elem, match){ + return (" " + (elem.className || elem.getAttribute("class")) + " ") + .indexOf( match ) > -1; + }, + ATTR: function(elem, match){ + var name = match[1], + result = Expr.attrHandle[ name ] ? + Expr.attrHandle[ name ]( elem ) : + elem[ name ] != null ? + elem[ name ] : + elem.getAttribute( name ), + value = result + "", + type = match[2], + check = match[4]; + + return result == null ? + type === "!=" : + type === "=" ? + value === check : + type === "*=" ? + value.indexOf(check) >= 0 : + type === "~=" ? + (" " + value + " ").indexOf(check) >= 0 : + !check ? + value && result !== false : + type === "!=" ? + value !== check : + type === "^=" ? + value.indexOf(check) === 0 : + type === "$=" ? + value.substr(value.length - check.length) === check : + type === "|=" ? + value === check || value.substr(0, check.length + 1) === check + "-" : + false; + }, + POS: function(elem, match, i, array){ + var name = match[2], filter = Expr.setFilters[ name ]; + + if ( filter ) { + return filter( elem, i, match, array ); + } + } + } +}; + +var origPOS = Expr.match.POS; + +for ( var type in Expr.match ) { + Expr.match[ type ] = new RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source ); + Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, function(all, num){ + return "\\" + (num - 0 + 1); + })); +} + +var makeArray = function(array, results) { + array = Array.prototype.slice.call( array, 0 ); + + if ( results ) { + results.push.apply( results, array ); + return results; + } + + return array; +}; + +// Perform a simple check to determine if the browser is capable of +// converting a NodeList to an array using builtin methods. +// Also verifies that the returned array holds DOM nodes +// (which is not the case in the Blackberry browser) +try { + Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType; + +// Provide a fallback method if it does not work +} catch(e){ + makeArray = function(array, results) { + var ret = results || []; + + if ( toString.call(array) === "[object Array]" ) { + Array.prototype.push.apply( ret, array ); + } else { + if ( typeof array.length === "number" ) { + for ( var i = 0, l = array.length; i < l; i++ ) { + ret.push( array[i] ); + } + } else { + for ( var i = 0; array[i]; i++ ) { + ret.push( array[i] ); + } + } + } + + return ret; + }; +} + +var sortOrder; + +if ( document.documentElement.compareDocumentPosition ) { + sortOrder = function( a, b ) { + if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) { + if ( a == b ) { + hasDuplicate = true; + } + return a.compareDocumentPosition ? -1 : 1; + } + + var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1; + if ( ret === 0 ) { + hasDuplicate = true; + } + return ret; + }; +} else if ( "sourceIndex" in document.documentElement ) { + sortOrder = function( a, b ) { + if ( !a.sourceIndex || !b.sourceIndex ) { + if ( a == b ) { + hasDuplicate = true; + } + return a.sourceIndex ? -1 : 1; + } + + var ret = a.sourceIndex - b.sourceIndex; + if ( ret === 0 ) { + hasDuplicate = true; + } + return ret; + }; +} else if ( document.createRange ) { + sortOrder = function( a, b ) { + if ( !a.ownerDocument || !b.ownerDocument ) { + if ( a == b ) { + hasDuplicate = true; + } + return a.ownerDocument ? -1 : 1; + } + + var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange(); + aRange.setStart(a, 0); + aRange.setEnd(a, 0); + bRange.setStart(b, 0); + bRange.setEnd(b, 0); + var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange); + if ( ret === 0 ) { + hasDuplicate = true; + } + return ret; + }; +} + +// Utility function for retreiving the text value of an array of DOM nodes +function getText( elems ) { + var ret = "", elem; + + for ( var i = 0; elems[i]; i++ ) { + elem = elems[i]; + + // Get the text from text nodes and CDATA nodes + if ( elem.nodeType === 3 || elem.nodeType === 4 ) { + ret += elem.nodeValue; + + // Traverse everything else, except comment nodes + } else if ( elem.nodeType !== 8 ) { + ret += getText( elem.childNodes ); + } + } + + return ret; +} + +// Check to see if the browser returns elements by name when +// querying by getElementById (and provide a workaround) +(function(){ + // We're going to inject a fake input element with a specified name + var form = document.createElement("div"), + id = "script" + (new Date).getTime(); + form.innerHTML = ""; + + // Inject it into the root element, check its status, and remove it quickly + var root = document.documentElement; + root.insertBefore( form, root.firstChild ); + + // The workaround has to do additional checks after a getElementById + // Which slows things down for other browsers (hence the branching) + if ( document.getElementById( id ) ) { + Expr.find.ID = function(match, context, isXML){ + if ( typeof context.getElementById !== "undefined" && !isXML ) { + var m = context.getElementById(match[1]); + return m ? m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : []; + } + }; + + Expr.filter.ID = function(elem, match){ + var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); + return elem.nodeType === 1 && node && node.nodeValue === match; + }; + } + + root.removeChild( form ); + root = form = null; // release memory in IE +})(); + +(function(){ + // Check to see if the browser returns only elements + // when doing getElementsByTagName("*") + + // Create a fake element + var div = document.createElement("div"); + div.appendChild( document.createComment("") ); + + // Make sure no comments are found + if ( div.getElementsByTagName("*").length > 0 ) { + Expr.find.TAG = function(match, context){ + var results = context.getElementsByTagName(match[1]); + + // Filter out possible comments + if ( match[1] === "*" ) { + var tmp = []; + + for ( var i = 0; results[i]; i++ ) { + if ( results[i].nodeType === 1 ) { + tmp.push( results[i] ); + } + } + + results = tmp; + } + + return results; + }; + } + + // Check to see if an attribute returns normalized href attributes + div.innerHTML = ""; + if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" && + div.firstChild.getAttribute("href") !== "#" ) { + Expr.attrHandle.href = function(elem){ + return elem.getAttribute("href", 2); + }; + } + + div = null; // release memory in IE +})(); + +if ( document.querySelectorAll ) { + (function(){ + var oldSizzle = Sizzle, div = document.createElement("div"); + div.innerHTML = "

    "; + + // Safari can't handle uppercase or unicode characters when + // in quirks mode. + if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { + return; + } + + Sizzle = function(query, context, extra, seed){ + context = context || document; + + // Only use querySelectorAll on non-XML documents + // (ID selectors don't work in non-HTML documents) + if ( !seed && context.nodeType === 9 && !isXML(context) ) { + try { + return makeArray( context.querySelectorAll(query), extra ); + } catch(e){} + } + + return oldSizzle(query, context, extra, seed); + }; + + for ( var prop in oldSizzle ) { + Sizzle[ prop ] = oldSizzle[ prop ]; + } + + div = null; // release memory in IE + })(); +} + +(function(){ + var div = document.createElement("div"); + + div.innerHTML = "
    "; + + // Opera can't find a second classname (in 9.6) + // Also, make sure that getElementsByClassName actually exists + if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) { + return; + } + + // Safari caches class attributes, doesn't catch changes (in 3.2) + div.lastChild.className = "e"; + + if ( div.getElementsByClassName("e").length === 1 ) { + return; + } + + Expr.order.splice(1, 0, "CLASS"); + Expr.find.CLASS = function(match, context, isXML) { + if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) { + return context.getElementsByClassName(match[1]); + } + }; + + div = null; // release memory in IE +})(); + +function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + if ( elem ) { + elem = elem[dir]; + var match = false; + + while ( elem ) { + if ( elem.sizcache === doneName ) { + match = checkSet[elem.sizset]; + break; + } + + if ( elem.nodeType === 1 && !isXML ){ + elem.sizcache = doneName; + elem.sizset = i; + } + + if ( elem.nodeName.toLowerCase() === cur ) { + match = elem; + break; + } + + elem = elem[dir]; + } + + checkSet[i] = match; + } + } +} + +function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) { + for ( var i = 0, l = checkSet.length; i < l; i++ ) { + var elem = checkSet[i]; + if ( elem ) { + elem = elem[dir]; + var match = false; + + while ( elem ) { + if ( elem.sizcache === doneName ) { + match = checkSet[elem.sizset]; + break; + } + + if ( elem.nodeType === 1 ) { + if ( !isXML ) { + elem.sizcache = doneName; + elem.sizset = i; + } + if ( typeof cur !== "string" ) { + if ( elem === cur ) { + match = true; + break; + } + + } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) { + match = elem; + break; + } + } + + elem = elem[dir]; + } + + checkSet[i] = match; + } + } +} + +var contains = document.compareDocumentPosition ? function(a, b){ + return !!(a.compareDocumentPosition(b) & 16); +} : function(a, b){ + return a !== b && (a.contains ? a.contains(b) : true); +}; + +var isXML = function(elem){ + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; + +var posProcess = function(selector, context){ + var tmpSet = [], later = "", match, + root = context.nodeType ? [context] : context; + + // Position selectors must be done after the filter + // And so must :not(positional) so we move all PSEUDOs to the end + while ( (match = Expr.match.PSEUDO.exec( selector )) ) { + later += match[0]; + selector = selector.replace( Expr.match.PSEUDO, "" ); + } + + selector = Expr.relative[selector] ? selector + "*" : selector; + + for ( var i = 0, l = root.length; i < l; i++ ) { + Sizzle( selector, root[i], tmpSet ); + } + + return Sizzle.filter( later, tmpSet ); +}; + +// EXPOSE +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; +jQuery.expr[":"] = jQuery.expr.filters; +jQuery.unique = Sizzle.uniqueSort; +jQuery.text = getText; +jQuery.isXMLDoc = isXML; +jQuery.contains = contains; + +return; + +window.Sizzle = Sizzle; + +})(); +var runtil = /Until$/, + rparentsprev = /^(?:parents|prevUntil|prevAll)/, + // Note: This RegExp should be improved, or likely pulled from Sizzle + rmultiselector = /,/, + slice = Array.prototype.slice; + +// Implement the identical functionality for filter and not +var winnow = function( elements, qualifier, keep ) { + if ( jQuery.isFunction( qualifier ) ) { + return jQuery.grep(elements, function( elem, i ) { + return !!qualifier.call( elem, i, elem ) === keep; + }); + + } else if ( qualifier.nodeType ) { + return jQuery.grep(elements, function( elem, i ) { + return (elem === qualifier) === keep; + }); + + } else if ( typeof qualifier === "string" ) { + var filtered = jQuery.grep(elements, function( elem ) { + return elem.nodeType === 1; + }); + + if ( isSimple.test( qualifier ) ) { + return jQuery.filter(qualifier, filtered, !keep); + } else { + qualifier = jQuery.filter( qualifier, filtered ); + } + } + + return jQuery.grep(elements, function( elem, i ) { + return (jQuery.inArray( elem, qualifier ) >= 0) === keep; + }); +}; + +jQuery.fn.extend({ + find: function( selector ) { + var ret = this.pushStack( "", "find", selector ), length = 0; + + for ( var i = 0, l = this.length; i < l; i++ ) { + length = ret.length; + jQuery.find( selector, this[i], ret ); + + if ( i > 0 ) { + // Make sure that the results are unique + for ( var n = length; n < ret.length; n++ ) { + for ( var r = 0; r < length; r++ ) { + if ( ret[r] === ret[n] ) { + ret.splice(n--, 1); + break; + } + } + } + } + } + + return ret; + }, + + has: function( target ) { + var targets = jQuery( target ); + return this.filter(function() { + for ( var i = 0, l = targets.length; i < l; i++ ) { + if ( jQuery.contains( this, targets[i] ) ) { + return true; + } + } + }); + }, + + not: function( selector ) { + return this.pushStack( winnow(this, selector, false), "not", selector); + }, + + filter: function( selector ) { + return this.pushStack( winnow(this, selector, true), "filter", selector ); + }, + + is: function( selector ) { + return !!selector && jQuery.filter( selector, this ).length > 0; + }, + + closest: function( selectors, context ) { + if ( jQuery.isArray( selectors ) ) { + var ret = [], cur = this[0], match, matches = {}, selector; + + if ( cur && selectors.length ) { + for ( var i = 0, l = selectors.length; i < l; i++ ) { + selector = selectors[i]; + + if ( !matches[selector] ) { + matches[selector] = jQuery.expr.match.POS.test( selector ) ? + jQuery( selector, context || this.context ) : + selector; + } + } + + while ( cur && cur.ownerDocument && cur !== context ) { + for ( selector in matches ) { + match = matches[selector]; + + if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) { + ret.push({ selector: selector, elem: cur }); + delete matches[selector]; + } + } + cur = cur.parentNode; + } + } + + return ret; + } + + var pos = jQuery.expr.match.POS.test( selectors ) ? + jQuery( selectors, context || this.context ) : null; + + return this.map(function( i, cur ) { + while ( cur && cur.ownerDocument && cur !== context ) { + if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) { + return cur; + } + cur = cur.parentNode; + } + return null; + }); + }, + + // Determine the position of an element within + // the matched set of elements + index: function( elem ) { + if ( !elem || typeof elem === "string" ) { + return jQuery.inArray( this[0], + // If it receives a string, the selector is used + // If it receives nothing, the siblings are used + elem ? jQuery( elem ) : this.parent().children() ); + } + // Locate the position of the desired element + return jQuery.inArray( + // If it receives a jQuery object, the first element is used + elem.jquery ? elem[0] : elem, this ); + }, + + add: function( selector, context ) { + var set = typeof selector === "string" ? + jQuery( selector, context || this.context ) : + jQuery.makeArray( selector ), + all = jQuery.merge( this.get(), set ); + + return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? + all : + jQuery.unique( all ) ); + }, + + andSelf: function() { + return this.add( this.prevObject ); + } +}); + +// A painfully simple check to see if an element is disconnected +// from a document (should be improved, where feasible). +function isDisconnected( node ) { + return !node || !node.parentNode || node.parentNode.nodeType === 11; +} + +jQuery.each({ + parent: function( elem ) { + var parent = elem.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + parents: function( elem ) { + return jQuery.dir( elem, "parentNode" ); + }, + parentsUntil: function( elem, i, until ) { + return jQuery.dir( elem, "parentNode", until ); + }, + next: function( elem ) { + return jQuery.nth( elem, 2, "nextSibling" ); + }, + prev: function( elem ) { + return jQuery.nth( elem, 2, "previousSibling" ); + }, + nextAll: function( elem ) { + return jQuery.dir( elem, "nextSibling" ); + }, + prevAll: function( elem ) { + return jQuery.dir( elem, "previousSibling" ); + }, + nextUntil: function( elem, i, until ) { + return jQuery.dir( elem, "nextSibling", until ); + }, + prevUntil: function( elem, i, until ) { + return jQuery.dir( elem, "previousSibling", until ); + }, + siblings: function( elem ) { + return jQuery.sibling( elem.parentNode.firstChild, elem ); + }, + children: function( elem ) { + return jQuery.sibling( elem.firstChild ); + }, + contents: function( elem ) { + return jQuery.nodeName( elem, "iframe" ) ? + elem.contentDocument || elem.contentWindow.document : + jQuery.makeArray( elem.childNodes ); + } +}, function( name, fn ) { + jQuery.fn[ name ] = function( until, selector ) { + var ret = jQuery.map( this, fn, until ); + + if ( !runtil.test( name ) ) { + selector = until; + } + + if ( selector && typeof selector === "string" ) { + ret = jQuery.filter( selector, ret ); + } + + ret = this.length > 1 ? jQuery.unique( ret ) : ret; + + if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) { + ret = ret.reverse(); + } + + return this.pushStack( ret, name, slice.call(arguments).join(",") ); + }; +}); + +jQuery.extend({ + filter: function( expr, elems, not ) { + if ( not ) { + expr = ":not(" + expr + ")"; + } + + return jQuery.find.matches(expr, elems); + }, + + dir: function( elem, dir, until ) { + var matched = [], cur = elem[dir]; + while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) { + if ( cur.nodeType === 1 ) { + matched.push( cur ); + } + cur = cur[dir]; + } + return matched; + }, + + nth: function( cur, result, dir, elem ) { + result = result || 1; + var num = 0; + + for ( ; cur; cur = cur[dir] ) { + if ( cur.nodeType === 1 && ++num === result ) { + break; + } + } + + return cur; + }, + + sibling: function( n, elem ) { + var r = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + r.push( n ); + } + } + + return r; + } +}); +var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g, + rleadingWhitespace = /^\s+/, + rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g, + rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i, + rtagName = /<([\w:]+)/, + rtbody = /"; + }, + wrapMap = { + option: [ 1, "" ], + legend: [ 1, "
    ", "
    " ], + thead: [ 1, "", "
    " ], + tr: [ 2, "", "
    " ], + td: [ 3, "", "
    " ], + col: [ 2, "", "
    " ], + area: [ 1, "", "" ], + _default: [ 0, "", "" ] + }; + +wrapMap.optgroup = wrapMap.option; +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + +// IE can't serialize and getAdminLinkedTags($tag, '>'); + } + $tagData = array(); + foreach ($linkedTags as $tag) { + $tagData[] = createTagArray($tag); + } -function displayTag($tag, $uId) { - $uId = ($uId==0)?NULL:$uId; // if user is nobody, NULL allows to look for every public tags - - $tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag'); - $output = '{ id:'.rand().', name:\''.$tag.'\''; - - $linkedTags = $tag2tagservice->getAdminLinkedTags($tag, '>'); - if(count($linkedTags) > 0) { - $output.= ', children: ['; - foreach($linkedTags as $linkedTag) { - $output.= displayTag($linkedTag, $uId); - } - $output = substr($output, 0, -1); // remove final comma avoiding IE6 Dojo bug - $output.= "]"; - } - - $output.= '},'; - return $output; + return $tagData; } -?> +function createTagArray($tag) +{ + return array( + 'data' => $tag, + 'attr' => array('rel' => $tag), + //'children' => array('foo', 'bar'), + 'state' => 'closed' + ); +} -{ label: 'name', identifier: 'id', items: [ - -] } + +$tagData = assembleTagData( + $tag, + SemanticScuttle_Service_Factory::get('Tag2Tag') +); +//$json = substr($json, 0, -1); // remove final comma avoiding IE6 Dojo bug +echo json_encode($tagData); +?> \ No newline at end of file From bd92516e6fac1970770fbddec612f3d8da30fb3f Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 1 Oct 2010 21:34:11 +0200 Subject: [PATCH 071/173] make the admin tag menu behave correctly now and show only arrows on nodes that have children --- www/ajax/getadminlinkedtags.php | 61 +++++++++++++++++---------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/www/ajax/getadminlinkedtags.php b/www/ajax/getadminlinkedtags.php index a08045a..5581c43 100644 --- a/www/ajax/getadminlinkedtags.php +++ b/www/ajax/getadminlinkedtags.php @@ -1,31 +1,27 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - ***************************************************************************/ - -/* Return a json file with list of linked tags */ $httpContentType = 'application/json'; -$httpContentType='text/plain'; require_once '../www-header.php'; -$tag = isset($_GET['tag']) ? trim($_GET['tag']) : ''; - function assembleTagData($tag, SemanticScuttle_Service_Tag2Tag $t2t) { if ($tag == '') { @@ -36,27 +32,34 @@ function assembleTagData($tag, SemanticScuttle_Service_Tag2Tag $t2t) $tagData = array(); foreach ($linkedTags as $tag) { - $tagData[] = createTagArray($tag); + //FIXME: the hasChildren code is nasty, because it causes too many + // queries onto the database + $hasChildren = 0 < count($t2t->getAdminLinkedTags($tag, '>')); + $tagData[] = createTagArray($tag, $hasChildren); } return $tagData; } -function createTagArray($tag) +function createTagArray($tag, $hasChildren = true) { - return array( + $ar = array( 'data' => $tag, 'attr' => array('rel' => $tag), - //'children' => array('foo', 'bar'), - 'state' => 'closed' ); + if ($hasChildren) { + //jstree needs that to show the arrows + $ar['state'] = 'closed'; + } + + return $ar; } +$tag = isset($_GET['tag']) ? trim($_GET['tag']) : ''; $tagData = assembleTagData( $tag, SemanticScuttle_Service_Factory::get('Tag2Tag') ); -//$json = substr($json, 0, -1); // remove final comma avoiding IE6 Dojo bug echo json_encode($tagData); ?> \ No newline at end of file From df5aca497a492d2200bee2325c73b9fc5c47ba1f Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 1 Oct 2010 21:36:40 +0200 Subject: [PATCH 072/173] remove unneeded dojo code from menu2 --- data/templates/sidebar.block.menu2.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/data/templates/sidebar.block.menu2.php b/data/templates/sidebar.block.menu2.php index dec520a..41c55ee 100644 --- a/data/templates/sidebar.block.menu2.php +++ b/data/templates/sidebar.block.menu2.php @@ -38,17 +38,7 @@ foreach ($menu2Tags as $menu2Tag) { $menu2Tag ) . '
    4. '; - /* - echo '
    '; - echo '
    '; - echo ''; - echo '
    '; - */ } -//ROOT.'ajax/getadminlinkedtags.php?tag='.filter($menu2Tag, 'url') ?> From 24e344f7879a932cc9a5a3491d460a05651c08a3 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 1 Oct 2010 21:37:53 +0200 Subject: [PATCH 073/173] remove dojo css --- data/templates/top.inc.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php index b1ffa14..8be978f 100644 --- a/data/templates/top.inc.php +++ b/data/templates/top.inc.php @@ -17,17 +17,12 @@ if (isset($rsschannels)) { } ?> - - - - - + Date: Thu, 7 Oct 2010 18:59:27 +0200 Subject: [PATCH 074/173] give admin tags a link href :) --- src/SemanticScuttle/constants.php | 4 +++- www/ajax/getadminlinkedtags.php | 21 +++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/SemanticScuttle/constants.php b/src/SemanticScuttle/constants.php index 95c4384..aebc059 100644 --- a/src/SemanticScuttle/constants.php +++ b/src/SemanticScuttle/constants.php @@ -17,7 +17,9 @@ if (!isset($GLOBALS['root'])) { $rootTmp = '/'; foreach ($pieces as $piece) { //we eliminate possible sscuttle subfolders (like gsearch for example) - if ($piece != '' && !strstr($piece, '.php') && $piece != 'gsearch') { + if ($piece != '' && !strstr($piece, '.php') + && $piece != 'gsearch' && $piece != 'ajax' + ) { $rootTmp .= $piece .'/'; } } diff --git a/www/ajax/getadminlinkedtags.php b/www/ajax/getadminlinkedtags.php index 5581c43..1004f29 100644 --- a/www/ajax/getadminlinkedtags.php +++ b/www/ajax/getadminlinkedtags.php @@ -41,11 +41,28 @@ function assembleTagData($tag, SemanticScuttle_Service_Tag2Tag $t2t) return $tagData; } +/** + * Creates an jsTree json array for the given tag + * + * @param string $tag Tag name + * @param boolean $hasChildren If the tag has subtags (children) or not + * + * @return array Array to be sent back to the browser as json + */ function createTagArray($tag, $hasChildren = true) { $ar = array( - 'data' => $tag, - 'attr' => array('rel' => $tag), + 'data' => array( + // attributes + 'title' => $tag, + 'attr' => array( + 'href' => createUrl('tags', $tag) + ) + ), + //
  4. attributes + 'attr' => array( + 'rel' => $tag,//needed for identifying the tag in html + ), ); if ($hasChildren) { //jstree needs that to show the arrows From aa6b6863b8b23aad2198b301d2b0979987f8b087 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 7 Oct 2010 19:02:06 +0200 Subject: [PATCH 075/173] CS on constants --- src/SemanticScuttle/constants.php | 70 +++++++++++++++++++------------ 1 file changed, 43 insertions(+), 27 deletions(-) diff --git a/src/SemanticScuttle/constants.php b/src/SemanticScuttle/constants.php index aebc059..c76f7b2 100644 --- a/src/SemanticScuttle/constants.php +++ b/src/SemanticScuttle/constants.php @@ -1,35 +1,49 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle */ // Debug managament -if(isset($GLOBALS['debugMode'])) { - define('DEBUG_MODE', $GLOBALS['debugMode']); - define('DEBUG_EXTRA', $GLOBALS['debugMode']); // Constant used exclusively into db/ directory +if (isset($GLOBALS['debugMode'])) { + define('DEBUG_MODE', $GLOBALS['debugMode']); + // Constant used exclusively into db/ directory + define('DEBUG_EXTRA', $GLOBALS['debugMode']); } // Determine the base URL as ROOT if (!isset($GLOBALS['root'])) { - $pieces = explode('/', $_SERVER['SCRIPT_NAME']); - - $rootTmp = '/'; - foreach ($pieces as $piece) { - //we eliminate possible sscuttle subfolders (like gsearch for example) + $pieces = explode('/', $_SERVER['SCRIPT_NAME']); + + $rootTmp = '/'; + foreach ($pieces as $piece) { + //we eliminate possible sscuttle subfolders (like gsearch for example) if ($piece != '' && !strstr($piece, '.php') && $piece != 'gsearch' && $piece != 'ajax' ) { - $rootTmp .= $piece .'/'; - } - } - if (($rootTmp != '/') && (substr($rootTmp, -1, 1) != '/')) { - $rootTmp .= '/'; - } + $rootTmp .= $piece .'/'; + } + } + if (($rootTmp != '/') && (substr($rootTmp, -1, 1) != '/')) { + $rootTmp .= '/'; + } - define('ROOT', 'http://'. $_SERVER['HTTP_HOST'] . $rootTmp); + define('ROOT', 'http://'. $_SERVER['HTTP_HOST'] . $rootTmp); } else { - define('ROOT', $GLOBALS['root']); + define('ROOT', $GLOBALS['root']); } // Error codes @@ -46,19 +60,21 @@ define('PAGE_WATCHLIST', "watchlist"); // Miscellanous -// INSTALLATION_ID is based on directory DB and used as prefix (in session and cookie) to prevent mutual login for different installations on the same host server +// INSTALLATION_ID is based on directory DB and used as prefix +// (in session and cookie) to prevent mutual login for different +// installations on the same host server define('INSTALLATION_ID', md5($GLOBALS['dbname'].$GLOBALS['tableprefix'])); // Correct bugs with PATH_INFO (maybe for Apache 1 or CGI) -- for 1&1 host... if (isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO'])) { - if(strlen($_SERVER["PATH_INFO"]) From 20cd1969d1ccf6dd20de0bb4f96be8d2460b22bd Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 7 Oct 2010 19:46:20 +0200 Subject: [PATCH 076/173] prettier html in menu2 tags --- data/templates/sidebar.block.menu2.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/templates/sidebar.block.menu2.php b/data/templates/sidebar.block.menu2.php index 41c55ee..0c112a8 100644 --- a/data/templates/sidebar.block.menu2.php +++ b/data/templates/sidebar.block.menu2.php @@ -30,14 +30,16 @@ if (count($menu2Tags) > 0) { > From 8e3daac73e324368a414fc0e9406dcbe43ffba29 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 7 Oct 2010 19:46:55 +0200 Subject: [PATCH 077/173] we do not need that service --- data/templates/sidebar.block.menu2.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/templates/sidebar.block.menu2.php b/data/templates/sidebar.block.menu2.php index 0c112a8..d608821 100644 --- a/data/templates/sidebar.block.menu2.php +++ b/data/templates/sidebar.block.menu2.php @@ -1,9 +1,6 @@ Date: Fri, 8 Oct 2010 16:59:04 +0200 Subject: [PATCH 078/173] scripts to dump and restore the semanticscuttle database quickly - useful to keep the database even when running unit tests --- .gitignore | 1 + scripts/database-dump.php | 26 +++++++++++++++++++++++++ scripts/database-restore.php | 37 ++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 scripts/database-dump.php create mode 100644 scripts/database-restore.php diff --git a/.gitignore b/.gitignore index 888ac2e..d84d93d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ dist/ build.properties package.xml +semanticscuttle-dump.sql diff --git a/scripts/database-dump.php b/scripts/database-dump.php new file mode 100644 index 0000000..f4f04ac --- /dev/null +++ b/scripts/database-dump.php @@ -0,0 +1,26 @@ + + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +require_once dirname(__FILE__) . '/../src/SemanticScuttle/header-standalone.php'; + +passthru( + 'mysqldump' + . ' -h' . escapeshellarg($GLOBALS['dbhost']) + . ' -u' . escapeshellarg($GLOBALS['dbuser']) + . ' -p' . escapeshellarg($GLOBALS['dbpass']) + . ' ' . escapeshellarg($GLOBALS['dbname']) + . ' > semanticscuttle-dump.sql' +); +?> \ No newline at end of file diff --git a/scripts/database-restore.php b/scripts/database-restore.php new file mode 100644 index 0000000..6516e71 --- /dev/null +++ b/scripts/database-restore.php @@ -0,0 +1,37 @@ + + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +if (!isset($argv[1])) { + echo "Please pass the sql file to restore\n"; + exit(1); +} +$file = $argv[1]; +if (!file_exists($file)) { + echo "The file does not exist\n"; + exit(2); +} + +require_once dirname(__FILE__) . '/../src/SemanticScuttle/header-standalone.php'; + +passthru( + 'mysql' + . ' -h' . escapeshellarg($GLOBALS['dbhost']) + . ' -u' . escapeshellarg($GLOBALS['dbuser']) + . ' -p' . escapeshellarg($GLOBALS['dbpass']) + . ' ' . escapeshellarg($GLOBALS['dbname']) + . ' < ' . escapeshellarg($file) +); +?> \ No newline at end of file From be126cc958212ed74fe916eabcb1e6ac928df5e4 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 8 Oct 2010 17:43:05 +0200 Subject: [PATCH 079/173] tests for getadminlinkedtags --- src/SemanticScuttle/Service/User.php | 18 ++- tests/TestBase.php | 28 +++++ tests/ajax/GetAdminLinkedTagsTest.php | 160 ++++++++++++++++++++++++++ 3 files changed, 201 insertions(+), 5 deletions(-) create mode 100644 tests/ajax/GetAdminLinkedTagsTest.php diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php index d74d104..fd9d84f 100644 --- a/src/SemanticScuttle/Service/User.php +++ b/src/SemanticScuttle/Service/User.php @@ -203,18 +203,26 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService } } - /* Takes an numerical "id" or a string "username" - and returns the numerical "id" if the user exists else returns NULL */ - function getIdFromUser($user) { + /** + * Obtains the ID of the given user name. + * If a user ID is passed, it is returned. + * In case the user does not exist, NULL is returned. + * + * @param string|integer $user User name or user ID + * + * @return integer NULL if not found or the user ID + */ + public function getIdFromUser($user) + { if (is_int($user)) { return intval($user); } else { $objectUser = $this->getObjectUserByUsername($user); - if($objectUser != NULL) { + if ($objectUser != null) { return $objectUser->getId(); } } - return NULL; + return null; } /** diff --git a/tests/TestBase.php b/tests/TestBase.php index 402330b..c0acd58 100644 --- a/tests/TestBase.php +++ b/tests/TestBase.php @@ -104,6 +104,34 @@ class TestBase extends PHPUnit_Framework_TestCase return $uid; } + + + /** + * Retrieves the UID of an admin user. + * If that user does not exist in the database, it is created. + * + * @return integer UID of admin user + */ + protected function getAdminUser() + { + if (count($GLOBALS['admin_users']) == 0) { + $this->fail('No admin users configured'); + } + $adminUserName = reset($GLOBALS['admin_users']); + + $us = SemanticScuttle_Service_Factory::get('User'); + $uid = $us->getIdFromUser($adminUserName); + if ($uid === null) { + //that user does not exist in the database; create it + $uid = $us->addUser( + $adminUserName, + rand(), + 'unittest-admin-' . $adminUserName . '@example.org' + ); + } + + return $uid; + } } ?> \ No newline at end of file diff --git a/tests/ajax/GetAdminLinkedTagsTest.php b/tests/ajax/GetAdminLinkedTagsTest.php new file mode 100644 index 0000000..d8ec447 --- /dev/null +++ b/tests/ajax/GetAdminLinkedTagsTest.php @@ -0,0 +1,160 @@ + + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +require_once dirname(__FILE__) . '/../prepare.php'; +require_once 'HTTP/Request2.php'; + +if (!defined('PHPUnit_MAIN_METHOD')) { + define('PHPUnit_MAIN_METHOD', 'ajax_GetAdminLinkedTagsTest::main'); +} + +/** + * Unit tests for the ajax linked admin tags script + * + * @category Bookmarking + * @package SemanticScuttle + * @author Christian Weiske + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class ajax_GetAdminLinkedTagsTest extends TestBaseApi +{ + protected $urlPart = 'ajax/getadminlinkedtags.php'; + + + + /** + * Used to run this test class standalone + * + * @return void + */ + public static function main() + { + require_once 'PHPUnit/TextUI/TestRunner.php'; + PHPUnit_TextUI_TestRunner::run( + new PHPUnit_Framework_TestSuite(__CLASS__) + ); + } + + + + /** + * Verify that we get the configured root tags if + * we do not pass any parameters + */ + public function testRootTags() + { + $req = $this->getRequest(); + $res = $req->send(); + + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + + $data = json_decode($res->getBody()); + $this->assertType('array', $data); + + //same number of elements as the menu2Tags array + $this->assertEquals( + count($GLOBALS['menu2Tags']), + count($data) + ); + + //and the same contents + foreach ($data as $tagObj) { + $tagName = $tagObj->data->title; + $this->assertContains($tagName, $GLOBALS['menu2Tags']); + } + } + + /** + * Verify that we get subtags of a given tag + */ + public function testSubTags() + { + $t2t = SemanticScuttle_Service_Factory::get('Tag2Tag'); + $t2t->deleteAll(); + + $menu2Tag = reset($GLOBALS['menu2Tags']); + //we have a subtag now + $this->addBookmark( + $this->getAdminUser(), + null, + 0, + $menu2Tag . '>adminsubtag' + ); + + $res = $this->getRequest('?tag=' . $menu2Tag)->send(); + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + + $data = json_decode($res->getBody()); + $this->assertType('array', $data); + + //only one subtag + $this->assertEquals(1, count($data)); + $this->assertEquals('adminsubtag', $data[0]->data->title); + } + + /** + * Verify that we only get admin tags, not tags from + * non-admin people + */ + public function testOnlyAdminTags() + { + $t2t = SemanticScuttle_Service_Factory::get('Tag2Tag'); + $t2t->deleteAll(); + + $menu2Tag = reset($GLOBALS['menu2Tags']); + //we have a subtag now + $this->addBookmark( + $this->getAdminUser(), + null, + 0, + $menu2Tag . '>adminsubtag' + ); + //add another bookmark now, but for a normal user + $this->addBookmark( + null, + null, + 0, + $menu2Tag . '>normalsubtag' + ); + + $res = $this->getRequest('?tag=' . $menu2Tag)->send(); + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + + $data = json_decode($res->getBody()); + $this->assertType('array', $data); + + //we should have only one subtag now, the admin one + $this->assertEquals(1, count($data)); + $this->assertEquals('adminsubtag', $data[0]->data->title); + } +} + +if (PHPUnit_MAIN_METHOD == 'ajax_GetAdminLinkedTagsTest::main') { + ajax_GetAdminLinkedTagsTest::main(); +} +?> \ No newline at end of file From aaf293b18da42e41cfcaed16d13f1d25157fd7cb Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 10:18:52 +0200 Subject: [PATCH 080/173] make the bookmark page valid xhtml --- data/templates/bookmarks.tpl.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php index e32d3c9..29d7248 100644 --- a/data/templates/bookmarks.tpl.php +++ b/data/templates/bookmarks.tpl.php @@ -62,12 +62,16 @@ if($currenttag!= '' && $cdservice->getLastTagDescription($currenttag)) { } //common tag description edit -if($userservice->isLoggedOn()) { - if($currenttag!= '' && ($GLOBALS['enableCommonTagDescriptionEditedByAll'] || $currentUser->isAdmin())) { +if ($userservice->isLoggedOn()) { + if ($currenttag != '' + && ($GLOBALS['enableCommonTagDescriptionEditedByAll'] + || $currentUser->isAdmin() + ) + ) { echo ' '; echo !is_array($cDescription) || strlen($cDescription['cdDescription'])==0?T_('Edit the common description of this tag'):''; echo ' '; - } elseif(isset($hash)) { + } else if (isset($hash)) { echo ' ('; echo T_('Edit the common description of this bookmark').')'; } @@ -312,7 +316,7 @@ if ($currenttag!= '') { . $row['username'] . ''; } - // Udders! + // others if (!isset($hash)) { $others = $otherCounts[$row['bAddress']]; $ostart = ''; @@ -390,7 +394,7 @@ if ($currenttag!= '') { echo ' ' . "\n"; echo '
    ' - . '' + . '' . filter($row['bTitle']) . '' . $adminStar . "
    \n"; if ($row['bDescription'] == '') { From 22e46a9b45810bae480aea72b16680d715a57ff4 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 10:20:14 +0200 Subject: [PATCH 081/173] make linkedtags sidebar tree menu work with jquery/jstree now --- data/templates/sidebar.block.linked.php | 131 ++++++---------- www/ajax/getadminlinkedtags.php | 16 +- www/ajax/getlinkedtags.php | 191 +++++++++++++++++------- 3 files changed, 193 insertions(+), 145 deletions(-) diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php index 9e91f93..db0d087 100644 --- a/data/templates/sidebar.block.linked.php +++ b/data/templates/sidebar.block.linked.php @@ -1,4 +1,11 @@ getCurrentUserId(); -if ($logged_on_userid === false) { - $logged_on_userid = NULL; -} - -$explodedTags = array(); -if (strlen($currenttag)>0) { - $explodedTags = explode('+', $currenttag); -} else { - if($summarizeLinkedTags == true) { - $orphewTags = $tag2tagservice->getOrphewTags('>', $userid, 4, "nb"); - } else { - $orphewTags = $tag2tagservice->getOrphewTags('>', $userid); - } - - foreach($orphewTags as $orphewTag) { - $explodedTags[] = $orphewTag['tag']; - } -} - +$editingMode = $logged_on_userid !== false; ?> - +

    + \ No newline at end of file diff --git a/www/ajax/getadminlinkedtags.php b/www/ajax/getadminlinkedtags.php index 1004f29..5f939a6 100644 --- a/www/ajax/getadminlinkedtags.php +++ b/www/ajax/getadminlinkedtags.php @@ -22,7 +22,16 @@ $httpContentType = 'application/json'; require_once '../www-header.php'; -function assembleTagData($tag, SemanticScuttle_Service_Tag2Tag $t2t) +/** + * Creates and returns an array of tags for the jsTree ajax loader. + * If the tag is empty, the configured menu2 (admin) main tags are used. + * + * @param string $tag Tag name to fetch subtags for + * @param SemanticScuttle_Service_Tag2Tag $t2t Tag relation service + * + * @return array Array of tag data suitable for the jsTree ajax loader + */ +function assembleAdminTagData($tag, SemanticScuttle_Service_Tag2Tag $t2t) { if ($tag == '') { $linkedTags = $GLOBALS['menu2Tags']; @@ -45,7 +54,8 @@ function assembleTagData($tag, SemanticScuttle_Service_Tag2Tag $t2t) * Creates an jsTree json array for the given tag * * @param string $tag Tag name - * @param boolean $hasChildren If the tag has subtags (children) or not + * @param boolean $hasChildren If the tag has subtags (children) or not. + * If unsure, set it to "true". * * @return array Array to be sent back to the browser as json */ @@ -74,7 +84,7 @@ function createTagArray($tag, $hasChildren = true) $tag = isset($_GET['tag']) ? trim($_GET['tag']) : ''; -$tagData = assembleTagData( +$tagData = assembleAdminTagData( $tag, SemanticScuttle_Service_Factory::get('Tag2Tag') ); diff --git a/www/ajax/getlinkedtags.php b/www/ajax/getlinkedtags.php index f412998..307ee26 100644 --- a/www/ajax/getlinkedtags.php +++ b/www/ajax/getlinkedtags.php @@ -1,64 +1,143 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ $httpContentType = 'application/json'; +#$httpContentType = 'text/plain'; require_once '../www-header.php'; -/* Service creation: only useful services are created */ -$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); -$bookmarkservice =SemanticScuttle_Service_Factory::get('Tag'); -$tagstatservice =SemanticScuttle_Service_Factory::get('TagStat'); +$tag = isset($_GET['tag']) ? $_GET['tag'] : null; +$uId = isset($_GET['uId']) ? (int)$_GET['uId'] : 0; +$loadParentTags = isset($_GET['parent']) ? (bool)$_GET['parent'] : false; -/* Managing all possible inputs */ -isset($_GET['tag']) ? define('GET_TAG', $_GET['tag']): define('GET_TAG', ''); -isset($_GET['uId']) ? define('GET_UID', $_GET['uId']): define('GET_UID', ''); - - -function displayTag($tag, $uId) { - $uId = ($uId==0)?NULL:$uId; // if user is nobody, NULL allows to look for every public tags - - $tag2tagservice =SemanticScuttle_Service_Factory::get('Tag2Tag'); - $output = '{ id:'.rand().', name:\''.$tag.'\''; - - $linkedTags = $tag2tagservice->getLinkedTags($tag, '>', $uId); - if(count($linkedTags) > 0) { - $output.= ', children: ['; - foreach($linkedTags as $linkedTag) { - $output.= displayTag($linkedTag, $uId); - } - $output = substr($output, 0, -1); // remove final comma avoiding IE6 Dojo bug - $output.= "]"; - } - - $output.= '},'; - return $output; +$tags = explode(' ', trim($tag)); +if (count($tags) == 1 && $tags[0] == '') { + //no tags + $tags = array(); } -?> -{ label: 'name', identifier: 'id', items: [ - -] } +function assembleLinkedTagData( + $tags, $uId, $loadParentTags, SemanticScuttle_Service_Tag2Tag $t2t +) { + $tagData = array(); + + if (count($tags) == 0) { + //no tags given -> show the 4 most used top-level tags + $orphewTags = $t2t->getOrphewTags('>', $uId, 4, 'nb'); + #$orphewTags = $t2t->getOrphewTags('>', $uId); + foreach ($orphewTags as $orphewTag) { + $tags[] = $orphewTag['tag']; + } + $loadParentTags = true; + } + + if ($loadParentTags) { + //find parent tags + append the selected tags as children afterwards + foreach ($tags as $tag) { + $parentTags = $t2t->getLinkedTags($tag, '>', $uId, true); + if (count($parentTags) > 0) { + foreach ($parentTags as $parentTag) { + $ta = createTagArray( + $parentTag, true, true, true + ); + //FIXME: find out if there are subtags + $tac = createTagArray($tag, true); + $ta['children'][] = $tac; + $tagData[] = $ta; + } + } else { + //no parent tags -> display it normally + //FIXME: find out if there are subtags + $tagData[] = createTagArray($tag, true); + } + } + } else { + //just find the linked tags + foreach ($tags as $tag) { + $linkedTags = $t2t->getLinkedTags($tag, '>', $uId); + foreach ($linkedTags as $linkedTag) { + //FIXME: find out if there are subtags + $tagData[] = createTagArray($linkedTag, true); + } + } + } + + return $tagData; +} + +/** + * Creates an jsTree json array for the given tag + * + * @param string $tag Tag name + * @param boolean $hasChildren If the tag has subtags (children) or not. + * If unsure, set it to "true". + * @param boolean $isOpen If the tag has children: Is the tree node open + * or closed? + * @param boolean $autoParent If the tag is an automatically generated parent tag + * + * @return array Array to be sent back to the browser as json + */ +function createTagArray($tag, $hasChildren = true, $isOpen = false, $autoParent = false) +{ + if ($autoParent) { + $title = '(' . $tag . ')'; + } else { + $title = $tag; + } + + $ar = array( + 'data' => array( + // attributes + 'title' => $title, + 'attr' => array( + 'href' => createUrl('tags', $tag) + ) + ), + //
  5. attributes + 'attr' => array( + 'rel' => $tag,//needed for identifying the tag in html + ), + ); + if ($hasChildren) { + //jstree needs that to show the arrows + $ar['state'] = $isOpen ? 'open' : 'closed'; + } + if ($autoParent) { + //FIXME: use css class + $ar['data']['attr']['style'] = 'color: #AAA'; + } + + return $ar; +} + + +$tagData = assembleLinkedTagData( + $tags, 0/*$uId*/, $loadParentTags, + SemanticScuttle_Service_Factory::get('Tag2Tag') +); +echo json_encode($tagData); +?> \ No newline at end of file From 48cd84921f42e409653ac34a5ba5c3d1d988c4e0 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 12:09:25 +0200 Subject: [PATCH 082/173] make the page valid --- data/templates/sidebar.block.search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/templates/sidebar.block.search.php b/data/templates/sidebar.block.search.php index f4e6b42..d3cd8a5 100644 --- a/data/templates/sidebar.block.search.php +++ b/data/templates/sidebar.block.search.php @@ -34,7 +34,7 @@ foreach ($lastSearches as $row) { echo ''; - echo $row['shTerms']; + echo htmlspecialchars($row['shTerms']); echo ''; echo ' - +]]> \ No newline at end of file diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php index 8be978f..c3cbc5d 100644 --- a/data/templates/top.inc.php +++ b/data/templates/top.inc.php @@ -1,7 +1,8 @@ + - + <?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' » ' . $pagetitle : '')); ?> diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index d1a5c29..3caeb35 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -120,7 +120,10 @@ $tplVars['userservice'] = $userservice; if (!defined('UNIT_TEST_MODE')) { //API files define that, so we need a way to support both of them if (!isset($httpContentType)) { - $httpContentType = 'text/html'; + //$httpContentType = 'text/html'; + //using that mime type makes all javascript nice in Chromium + // it also serves as test base if the pages really validate + $httpContentType = 'application/xhtml+xml'; } if ($httpContentType !== false) { header('Content-Type: ' . $httpContentType . '; charset=utf-8'); From 894011dd0fb4ba0aeee428d3460665afb71cd9d9 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 12:14:34 +0200 Subject: [PATCH 084/173] make the short date a valid ISO date format. --- data/config.default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/config.default.php b/data/config.default.php index bd67c7b..3d60b91 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -327,7 +327,7 @@ $index_sidebar_blocks = array( * @var string * @link http://php.net/date */ -$shortdate = 'd-m-Y'; +$shortdate = 'Y-m-d'; /** * Format of long dates. From 2e89b28ed9d902ac208355193e708e9b76845282 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 12:15:11 +0200 Subject: [PATCH 085/173] embed the delete link directly in html instead of using javascript --- data/templates/bookmarks.tpl.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php index 29d7248..db560f2 100644 --- a/data/templates/bookmarks.tpl.php +++ b/data/templates/bookmarks.tpl.php @@ -296,10 +296,9 @@ if ($currenttag!= '') { $edit = ' - ' . T_('Edit') . '' - . ''; + .''; } // Last update From 129926f1e77404e1c210bac4fc8b4680bf6bd5db Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 12:43:10 +0200 Subject: [PATCH 086/173] fix jstree xhtml bug --- www/js/jquery.jstree.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/js/jquery.jstree.js b/www/js/jquery.jstree.js index 5037698..bbfc355 100644 --- a/www/js/jquery.jstree.js +++ b/www/js/jquery.jstree.js @@ -2800,7 +2800,7 @@ */ (function ($) { $.vakata.context = { - cnt : $("
    "), + cnt : $("
    "), vis : false, tgt : false, par : false, From 6c859814069e58e3b314e459879c2fb8b8463cb4 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 12:53:45 +0200 Subject: [PATCH 087/173] make edit profile page valid --- data/templates/editprofile.tpl.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/data/templates/editprofile.tpl.php b/data/templates/editprofile.tpl.php index b55d250..887dce3 100644 --- a/data/templates/editprofile.tpl.php +++ b/data/templates/editprofile.tpl.php @@ -3,9 +3,7 @@ $this->includeTemplate($GLOBALS['top_include']); ?>
    - - - +

    From c7a77dcb4cd355b89ec66a273e5166f8ce449046 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 12:54:33 +0200 Subject: [PATCH 088/173] make admin page valid --- data/templates/admin.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/templates/admin.tpl.php b/data/templates/admin.tpl.php index c8d47e8..50680f6 100644 --- a/data/templates/admin.tpl.php +++ b/data/templates/admin.tpl.php @@ -11,7 +11,7 @@ foreach($users as $user) { echo '
    '; echo ''.$user->getUsername().''; - echo ' - '. $user->getNbBookmarks('public') .' / '. $user->getNbBookmarks('shared') .' / '. $user->getNbBookmarks('private') .' '. T_('bookmark(s)') .''; + echo ' - '. $user->getNbBookmarks('public') .' / '. $user->getNbBookmarks('shared') .' / '. $user->getNbBookmarks('private') .' '. T_('bookmark(s)') .''; echo '
    '; if($user->getUsername() != $currentUser->getUsername()) { From 1263a62179cca1b0bccc114d1daa7340816bcf48 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 12:57:17 +0200 Subject: [PATCH 089/173] make watchlist valid xhtml --- data/templates/sidebar.block.watchlist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/templates/sidebar.block.watchlist.php b/data/templates/sidebar.block.watchlist.php index 07b7f15..88fc928 100644 --- a/data/templates/sidebar.block.watchlist.php +++ b/data/templates/sidebar.block.watchlist.php @@ -41,7 +41,7 @@ foreach($watching as $watchuser) {
  6. isLoggedOn() && $currentUser->getUsername() == $user): ?> - - x + - x
    7. From 6bf4e76495b03ccec29fb4d9262ac871dd10a221 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 13:03:55 +0200 Subject: [PATCH 090/173] make add/del tag nav links work again --- data/templates/sidebar.block.linked.php | 3 ++- www/ajax/getlinkedtags.php | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php index 54e9260..ac864dc 100644 --- a/data/templates/sidebar.block.linked.php +++ b/data/templates/sidebar.block.linked.php @@ -30,10 +30,11 @@ if ($editingMode) { echo '

    '; } ?> +
    - - + + From 45cbe47f816281f77e8919126e6d47ad9d5073b2 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 9 Oct 2010 17:04:52 +0200 Subject: [PATCH 097/173] move jstree into a version-specific directory so we can update it more easily --- data/templates/sidebar.block.linked.php | 2 +- data/templates/sidebar.block.menu2.php | 2 +- data/templates/top.inc.php | 4 ++-- www/js/{ => jstree-1.0-rc2}/MultiComboBox.js | 0 www/js/{ => jstree-1.0-rc2}/jquery-1.4.2.js | 0 www/js/{ => jstree-1.0-rc2}/jquery-1.4.2.min.js | 0 www/js/{ => jstree-1.0-rc2}/jquery.jstree.js | 0 www/js/{ => jstree-1.0-rc2}/themes/apple/bg.jpg | Bin www/js/{ => jstree-1.0-rc2}/themes/apple/d.png | Bin .../themes/apple/dot_for_ie.gif | Bin www/js/{ => jstree-1.0-rc2}/themes/apple/style.css | 0 .../{ => jstree-1.0-rc2}/themes/apple/throbber.gif | Bin www/js/{ => jstree-1.0-rc2}/themes/classic/d.png | Bin .../themes/classic/dot_for_ie.gif | Bin .../{ => jstree-1.0-rc2}/themes/classic/style.css | 0 .../themes/classic/throbber.gif | Bin .../{ => jstree-1.0-rc2}/themes/default-rtl/d.gif | Bin .../{ => jstree-1.0-rc2}/themes/default-rtl/d.png | Bin .../themes/default-rtl/dots.gif | Bin .../themes/default-rtl/style.css | 0 .../themes/default-rtl/throbber.gif | Bin www/js/{ => jstree-1.0-rc2}/themes/default/d.gif | Bin www/js/{ => jstree-1.0-rc2}/themes/default/d.png | Bin .../{ => jstree-1.0-rc2}/themes/default/style.css | 0 .../themes/default/throbber.gif | Bin 25 files changed, 4 insertions(+), 4 deletions(-) rename www/js/{ => jstree-1.0-rc2}/MultiComboBox.js (100%) rename www/js/{ => jstree-1.0-rc2}/jquery-1.4.2.js (100%) rename www/js/{ => jstree-1.0-rc2}/jquery-1.4.2.min.js (100%) rename www/js/{ => jstree-1.0-rc2}/jquery.jstree.js (100%) rename www/js/{ => jstree-1.0-rc2}/themes/apple/bg.jpg (100%) rename www/js/{ => jstree-1.0-rc2}/themes/apple/d.png (100%) rename www/js/{ => jstree-1.0-rc2}/themes/apple/dot_for_ie.gif (100%) rename www/js/{ => jstree-1.0-rc2}/themes/apple/style.css (100%) rename www/js/{ => jstree-1.0-rc2}/themes/apple/throbber.gif (100%) rename www/js/{ => jstree-1.0-rc2}/themes/classic/d.png (100%) rename www/js/{ => jstree-1.0-rc2}/themes/classic/dot_for_ie.gif (100%) rename www/js/{ => jstree-1.0-rc2}/themes/classic/style.css (100%) rename www/js/{ => jstree-1.0-rc2}/themes/classic/throbber.gif (100%) rename www/js/{ => jstree-1.0-rc2}/themes/default-rtl/d.gif (100%) rename www/js/{ => jstree-1.0-rc2}/themes/default-rtl/d.png (100%) rename www/js/{ => jstree-1.0-rc2}/themes/default-rtl/dots.gif (100%) rename www/js/{ => jstree-1.0-rc2}/themes/default-rtl/style.css (100%) rename www/js/{ => jstree-1.0-rc2}/themes/default-rtl/throbber.gif (100%) rename www/js/{ => jstree-1.0-rc2}/themes/default/d.gif (100%) rename www/js/{ => jstree-1.0-rc2}/themes/default/d.png (100%) rename www/js/{ => jstree-1.0-rc2}/themes/default/style.css (100%) rename www/js/{ => jstree-1.0-rc2}/themes/default/throbber.gif (100%) diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php index 517705e..cd4a908 100644 --- a/data/templates/sidebar.block.linked.php +++ b/data/templates/sidebar.block.linked.php @@ -38,7 +38,7 @@ jQuery("#related-content") "theme": "default", "dots": false, "icons": true, - "url": 'js/themes/default/style.css' + "url": 'js/jstree-1.0-rc2/themes/default/style.css' }, "json_data" : { "ajax" : { diff --git a/data/templates/sidebar.block.menu2.php b/data/templates/sidebar.block.menu2.php index 8a71527..f71977c 100644 --- a/data/templates/sidebar.block.menu2.php +++ b/data/templates/sidebar.block.menu2.php @@ -46,7 +46,7 @@ jQuery("#maintagsmenu") "theme": "default", "dots": false, "icons": true, - "url": 'js/themes/default/style.css' + "url": 'js/jstree-1.0-rc2/themes/default/style.css' }, "json_data" : { "ajax" : { diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php index ebb2bb6..428f3d4 100644 --- a/data/templates/top.inc.php +++ b/data/templates/top.inc.php @@ -19,8 +19,8 @@ if (isset($rsschannels)) { ?> - - + + diff --git a/www/js/MultiComboBox.js b/www/js/jstree-1.0-rc2/MultiComboBox.js similarity index 100% rename from www/js/MultiComboBox.js rename to www/js/jstree-1.0-rc2/MultiComboBox.js diff --git a/www/js/jquery-1.4.2.js b/www/js/jstree-1.0-rc2/jquery-1.4.2.js similarity index 100% rename from www/js/jquery-1.4.2.js rename to www/js/jstree-1.0-rc2/jquery-1.4.2.js diff --git a/www/js/jquery-1.4.2.min.js b/www/js/jstree-1.0-rc2/jquery-1.4.2.min.js similarity index 100% rename from www/js/jquery-1.4.2.min.js rename to www/js/jstree-1.0-rc2/jquery-1.4.2.min.js diff --git a/www/js/jquery.jstree.js b/www/js/jstree-1.0-rc2/jquery.jstree.js similarity index 100% rename from www/js/jquery.jstree.js rename to www/js/jstree-1.0-rc2/jquery.jstree.js diff --git a/www/js/themes/apple/bg.jpg b/www/js/jstree-1.0-rc2/themes/apple/bg.jpg similarity index 100% rename from www/js/themes/apple/bg.jpg rename to www/js/jstree-1.0-rc2/themes/apple/bg.jpg diff --git a/www/js/themes/apple/d.png b/www/js/jstree-1.0-rc2/themes/apple/d.png similarity index 100% rename from www/js/themes/apple/d.png rename to www/js/jstree-1.0-rc2/themes/apple/d.png diff --git a/www/js/themes/apple/dot_for_ie.gif b/www/js/jstree-1.0-rc2/themes/apple/dot_for_ie.gif similarity index 100% rename from www/js/themes/apple/dot_for_ie.gif rename to www/js/jstree-1.0-rc2/themes/apple/dot_for_ie.gif diff --git a/www/js/themes/apple/style.css b/www/js/jstree-1.0-rc2/themes/apple/style.css similarity index 100% rename from www/js/themes/apple/style.css rename to www/js/jstree-1.0-rc2/themes/apple/style.css diff --git a/www/js/themes/apple/throbber.gif b/www/js/jstree-1.0-rc2/themes/apple/throbber.gif similarity index 100% rename from www/js/themes/apple/throbber.gif rename to www/js/jstree-1.0-rc2/themes/apple/throbber.gif diff --git a/www/js/themes/classic/d.png b/www/js/jstree-1.0-rc2/themes/classic/d.png similarity index 100% rename from www/js/themes/classic/d.png rename to www/js/jstree-1.0-rc2/themes/classic/d.png diff --git a/www/js/themes/classic/dot_for_ie.gif b/www/js/jstree-1.0-rc2/themes/classic/dot_for_ie.gif similarity index 100% rename from www/js/themes/classic/dot_for_ie.gif rename to www/js/jstree-1.0-rc2/themes/classic/dot_for_ie.gif diff --git a/www/js/themes/classic/style.css b/www/js/jstree-1.0-rc2/themes/classic/style.css similarity index 100% rename from www/js/themes/classic/style.css rename to www/js/jstree-1.0-rc2/themes/classic/style.css diff --git a/www/js/themes/classic/throbber.gif b/www/js/jstree-1.0-rc2/themes/classic/throbber.gif similarity index 100% rename from www/js/themes/classic/throbber.gif rename to www/js/jstree-1.0-rc2/themes/classic/throbber.gif diff --git a/www/js/themes/default-rtl/d.gif b/www/js/jstree-1.0-rc2/themes/default-rtl/d.gif similarity index 100% rename from www/js/themes/default-rtl/d.gif rename to www/js/jstree-1.0-rc2/themes/default-rtl/d.gif diff --git a/www/js/themes/default-rtl/d.png b/www/js/jstree-1.0-rc2/themes/default-rtl/d.png similarity index 100% rename from www/js/themes/default-rtl/d.png rename to www/js/jstree-1.0-rc2/themes/default-rtl/d.png diff --git a/www/js/themes/default-rtl/dots.gif b/www/js/jstree-1.0-rc2/themes/default-rtl/dots.gif similarity index 100% rename from www/js/themes/default-rtl/dots.gif rename to www/js/jstree-1.0-rc2/themes/default-rtl/dots.gif diff --git a/www/js/themes/default-rtl/style.css b/www/js/jstree-1.0-rc2/themes/default-rtl/style.css similarity index 100% rename from www/js/themes/default-rtl/style.css rename to www/js/jstree-1.0-rc2/themes/default-rtl/style.css diff --git a/www/js/themes/default-rtl/throbber.gif b/www/js/jstree-1.0-rc2/themes/default-rtl/throbber.gif similarity index 100% rename from www/js/themes/default-rtl/throbber.gif rename to www/js/jstree-1.0-rc2/themes/default-rtl/throbber.gif diff --git a/www/js/themes/default/d.gif b/www/js/jstree-1.0-rc2/themes/default/d.gif similarity index 100% rename from www/js/themes/default/d.gif rename to www/js/jstree-1.0-rc2/themes/default/d.gif diff --git a/www/js/themes/default/d.png b/www/js/jstree-1.0-rc2/themes/default/d.png similarity index 100% rename from www/js/themes/default/d.png rename to www/js/jstree-1.0-rc2/themes/default/d.png diff --git a/www/js/themes/default/style.css b/www/js/jstree-1.0-rc2/themes/default/style.css similarity index 100% rename from www/js/themes/default/style.css rename to www/js/jstree-1.0-rc2/themes/default/style.css diff --git a/www/js/themes/default/throbber.gif b/www/js/jstree-1.0-rc2/themes/default/throbber.gif similarity index 100% rename from www/js/themes/default/throbber.gif rename to www/js/jstree-1.0-rc2/themes/default/throbber.gif From 5e1b9533eed98da03a06cd06bb13c8143b7fc91e Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 13 Oct 2010 18:58:46 +0200 Subject: [PATCH 098/173] load minified javascript if debug mode is off; add minified version (generated with "yuicompressor --nomunge") of jstree --- data/templates/top.inc.php | 9 +++++++-- src/SemanticScuttle/constants.php | 1 + www/js/jstree-1.0-rc2/jquery.jstree.min.js | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 www/js/jstree-1.0-rc2/jquery.jstree.min.js diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php index 428f3d4..bdd4b1a 100644 --- a/data/templates/top.inc.php +++ b/data/templates/top.inc.php @@ -19,8 +19,13 @@ if (isset($rsschannels)) { ?> - - + + + + + + + diff --git a/src/SemanticScuttle/constants.php b/src/SemanticScuttle/constants.php index c76f7b2..b023840 100644 --- a/src/SemanticScuttle/constants.php +++ b/src/SemanticScuttle/constants.php @@ -45,6 +45,7 @@ if (!isset($GLOBALS['root'])) { } else { define('ROOT', $GLOBALS['root']); } +define('ROOT_JS', ROOT . 'js/jstree-1.0-rc2/'); // Error codes define('GENERAL_MESSAGE', 200); diff --git a/www/js/jstree-1.0-rc2/jquery.jstree.min.js b/www/js/jstree-1.0-rc2/jquery.jstree.min.js new file mode 100644 index 0000000..4443655 --- /dev/null +++ b/www/js/jstree-1.0-rc2/jquery.jstree.min.js @@ -0,0 +1 @@ +"use strict";(function($){$.vakata={};$.vakata.css={get_css:function(rule_name,delete_flag,sheet){rule_name=rule_name.toLowerCase();var css_rules=sheet.cssRules||sheet.rules,j=0;do{if(css_rules.length&&j>css_rules.length+5){return false}if(css_rules[j].selectorText&&css_rules[j].selectorText.toLowerCase()==rule_name){if(delete_flag===true){if(sheet.removeRule){sheet.removeRule(j)}if(sheet.deleteRule){sheet.deleteRule(j)}return true}else{return css_rules[j]}}}while(css_rules[++j]);return false},add_css:function(rule_name,sheet){if($.jstree.css.get_css(rule_name,false,sheet)){return false}if(sheet.insertRule){sheet.insertRule(rule_name+" { }",0)}else{sheet.addRule(rule_name,null,0)}return $.vakata.css.get_css(rule_name)},remove_css:function(rule_name,sheet){return $.vakata.css.get_css(rule_name,true,sheet)},add_sheet:function(opts){var tmp;if(opts.str){tmp=document.createElement("style");tmp.setAttribute("type","text/css");if(tmp.styleSheet){document.getElementsByTagName("head")[0].appendChild(tmp);tmp.styleSheet.cssText=opts.str}else{tmp.appendChild(document.createTextNode(opts.str));document.getElementsByTagName("head")[0].appendChild(tmp)}return tmp.sheet||tmp.styleSheet}if(opts.url){if(document.createStyleSheet){try{tmp=document.createStyleSheet(opts.url)}catch(e){}}else{tmp=document.createElement("link");tmp.rel="stylesheet";tmp.type="text/css";tmp.media="all";tmp.href=opts.url;document.getElementsByTagName("head")[0].appendChild(tmp);return tmp.styleSheet}}}}})(jQuery);(function($){var instances=[],focused_instance=-1,plugins={},prepared_move={},is_ie6=false;$.fn.jstree=function(settings){var isMethodCall=(typeof settings=="string"),args=Array.prototype.slice.call(arguments,1),returnValue=this;if(!isMethodCall&&$.meta){args.push($.metadata.get(this).jstree)}settings=!isMethodCall&&args.length?$.extend.apply(null,[true,settings].concat(args)):settings;if(isMethodCall&&settings.substring(0,1)=="_"){return returnValue}if(isMethodCall){this.each(function(){var instance=instances[$.data(this,"jstree-instance-id")],methodValue=(instance&&$.isFunction(instance[settings]))?instance[settings].apply(instance,args):instance;if(typeof methodValue!=="undefined"&&(settings.indexOf("is_"===0)||(methodValue!==true&&methodValue!==false))){returnValue=methodValue;return false}})}else{this.each(function(){var instance_id=$.data(this,"jstree-instance-id"),s=false;if(typeof instance_id!=="undefined"&&instances[instance_id]){instances[instance_id].destroy()}instance_id=parseInt(instances.push({}),10)-1;$.data(this,"jstree-instance-id",instance_id);if(!settings){settings={}}settings.plugins=$.isArray(settings.plugins)?settings.plugins:$.jstree.defaults.plugins;if($.inArray("core",settings.plugins)===-1){settings.plugins.unshift("core")}s=$.extend(true,{},$.jstree.defaults,settings);s.plugins=settings.plugins;$.each(plugins,function(i,val){if($.inArray(i,s.plugins)===-1){s[i]=null;delete s[i]}});instances[instance_id]=new $.jstree._instance(instance_id,$(this).addClass("jstree jstree-"+instance_id),s);$.each(instances[instance_id]._get_settings().plugins,function(i,val){instances[instance_id].data[val]={}});$.each(instances[instance_id]._get_settings().plugins,function(i,val){if(plugins[val]){plugins[val].__init.apply(instances[instance_id])}});instances[instance_id].init()})}return returnValue};$.jstree={defaults:{plugins:[]},_focused:function(){return instances[focused_instance]||null},_reference:function(needle){if(instances[needle]){return instances[needle]}var o=$(needle);if(!o.length&&typeof needle==="string"){o=$("#"+needle)}if(!o.length){return null}return instances[o.closest(".jstree").data("jstree-instance-id")]||null},_instance:function(index,container,settings){this.data={core:{}};this.get_settings=function(){return $.extend(true,{},settings)};this._get_settings=function(){return settings};this.get_index=function(){return index};this.get_container=function(){return container};this._set_settings=function(s){settings=$.extend(true,{},settings,s)}},_fn:{},plugin:function(pname,pdata){pdata=$.extend({},{__init:$.noop,__destroy:$.noop,_fn:{},defaults:false},pdata);plugins[pname]=pdata;$.jstree.defaults[pname]=pdata.defaults;$.each(pdata._fn,function(i,val){val.plugin=pname;val.old=$.jstree._fn[i];$.jstree._fn[i]=function(){var rslt,func=val,args=Array.prototype.slice.call(arguments),evnt=new $.Event("before.jstree"),rlbk=false;do{if(func&&func.plugin&&$.inArray(func.plugin,this._get_settings().plugins)!==-1){break}func=func.old}while(func);if(!func){return}rslt=this.get_container().triggerHandler(evnt,{func:i,inst:this,args:args});if(rslt===false){return}if(typeof rslt!=="undefined"){args=rslt}if(i.indexOf("_")===0){rslt=func.apply(this,args)}else{rslt=func.apply($.extend({},this,{__callback:function(data){this.get_container().triggerHandler(i+".jstree",{inst:this,args:args,rslt:data,rlbk:rlbk})},__rollback:function(){rlbk=this.get_rollback();return rlbk},__call_old:function(replace_arguments){return func.old.apply(this,(replace_arguments?Array.prototype.slice.call(arguments,1):args))}}),args)}return rslt};$.jstree._fn[i].old=val.old;$.jstree._fn[i].plugin=pname})},rollback:function(rb){if(rb){if(!$.isArray(rb)){rb=[rb]}$.each(rb,function(i,val){instances[val.i].set_rollback(val.h,val.d)})}}};$.jstree._fn=$.jstree._instance.prototype={};$(function(){var u=navigator.userAgent.toLowerCase(),v=(u.match(/.+?(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],css_string=".jstree ul, .jstree li { display:block; margin:0 0 0 0; padding:0 0 0 0; list-style-type:none; } .jstree li { display:block; min-height:18px; line-height:18px; white-space:nowrap; margin-left:18px; } .jstree-rtl li { margin-left:0; margin-right:18px; } .jstree > ul > li { margin-left:0px; } .jstree-rtl > ul > li { margin-right:0px; } .jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } .jstree a { display:inline-block; line-height:16px; height:16px; color:black; white-space:nowrap; text-decoration:none; padding:1px 2px; margin:0; } .jstree a:focus { outline: none; } .jstree a > ins { height:16px; width:16px; } .jstree a > .jstree-icon { margin-right:3px; } .jstree-rtl a > .jstree-icon { margin-left:3px; margin-right:0; } li.jstree-open > ul { display:block; } li.jstree-closed > ul { display:none; } ";if(/msie/.test(u)&&parseInt(v,10)==6){is_ie6=true;css_string+=".jstree li { height:18px; margin-left:0; margin-right:0; } .jstree li li { margin-left:18px; } .jstree-rtl li li { margin-left:0px; margin-right:18px; } li.jstree-open ul { display:block; } li.jstree-closed ul { display:none !important; } .jstree li a { display:inline; border-width:0 !important; padding:0px 2px !important; } .jstree li a ins { height:16px; width:16px; margin-right:3px; } .jstree-rtl li a ins { margin-right:0px; margin-left:3px; } "}if(/msie/.test(u)&&parseInt(v,10)==7){css_string+=".jstree li a { border-width:0 !important; padding:0px 2px !important; } "}$.vakata.css.add_sheet({str:css_string})});$.jstree.plugin("core",{__init:function(){this.data.core.to_open=$.map($.makeArray(this.get_settings().core.initially_open),function(n){return"#"+n.toString().replace(/^#/,"").replace("\\/","/").replace("/","\\/")})},defaults:{html_titles:false,animation:500,initially_open:[],rtl:false,strings:{loading:"Loading ...",new_node:"New node"}},_fn:{init:function(){this.set_focus();if(this._get_settings().core.rtl){this.get_container().addClass("jstree-rtl").css("direction","rtl")}this.get_container().html("");this.data.core.li_height=this.get_container().find("ul li.jstree-closed, ul li.jstree-leaf").eq(0).height()||18;this.get_container().delegate("li > ins","click.jstree",$.proxy(function(event){var trgt=$(event.target);if(trgt.is("ins")&&event.pageY-trgt.offset().top ul > li:first-child")}if(!obj.length){return false}if(strict){return(obj.nextAll("li").size()>0)?obj.nextAll("li:eq(0)"):false}if(obj.hasClass("jstree-open")){return obj.find("li:eq(0)")}else{if(obj.nextAll("li").size()>0){return obj.nextAll("li:eq(0)")}else{return obj.parentsUntil(".jstree","li").next("li").eq(0)}}},_get_prev:function(obj,strict){obj=this._get_node(obj);if(obj===-1){return this.get_container().find("> ul > li:last-child")}if(!obj.length){return false}if(strict){return(obj.prevAll("li").length>0)?obj.prevAll("li:eq(0)"):false}if(obj.prev("li").length){obj=obj.prev("li").eq(0);while(obj.hasClass("jstree-open")){obj=obj.children("ul:eq(0)").children("li:last")}return obj}else{var o=obj.parentsUntil(".jstree","li:eq(0)");return o.length?o:false}},_get_parent:function(obj){obj=this._get_node(obj);if(obj==-1||!obj.length){return false}var o=obj.parentsUntil(".jstree","li:eq(0)");return o.length?o:-1},_get_children:function(obj){obj=this._get_node(obj);if(obj===-1){return this.get_container().children("ul:eq(0)").children("li")}if(!obj.length){return false}return obj.children("ul:eq(0)").children("li")},get_path:function(obj,id_mode){var p=[],_this=this;obj=this._get_node(obj);if(obj===-1||!obj||!obj.length){return false}obj.parentsUntil(".jstree","li").each(function(){p.push(id_mode?this.id:_this.get_text(this))});p.reverse();p.push(id_mode?obj.attr("id"):this.get_text(obj));return p},is_open:function(obj){obj=this._get_node(obj);return obj&&obj!==-1&&obj.hasClass("jstree-open")},is_closed:function(obj){obj=this._get_node(obj);return obj&&obj!==-1&&obj.hasClass("jstree-closed")},is_leaf:function(obj){obj=this._get_node(obj);return obj&&obj!==-1&&obj.hasClass("jstree-leaf")},open_node:function(obj,callback,skip_animation){obj=this._get_node(obj);if(!obj.length){return false}if(!obj.hasClass("jstree-closed")){if(callback){callback.call()}return false}var s=skip_animation||is_ie6?0:this._get_settings().core.animation,t=this;if(!this._is_loaded(obj)){obj.children("a").addClass("jstree-loading");this.load_node(obj,function(){t.open_node(obj,callback,skip_animation)},callback)}else{if(s){obj.children("ul").css("display","none")}obj.removeClass("jstree-closed").addClass("jstree-open").children("a").removeClass("jstree-loading");if(s){obj.children("ul").stop(true).slideDown(s,function(){this.style.display=""})}this.__callback({obj:obj});if(callback){callback.call()}}},close_node:function(obj,skip_animation){obj=this._get_node(obj);var s=skip_animation||is_ie6?0:this._get_settings().core.animation;if(!obj.length||!obj.hasClass("jstree-open")){return false}if(s){obj.children("ul").attr("style","display:block !important")}obj.removeClass("jstree-open").addClass("jstree-closed");if(s){obj.children("ul").stop(true).slideUp(s,function(){this.style.display=""})}this.__callback({obj:obj})},toggle_node:function(obj){obj=this._get_node(obj);if(obj.hasClass("jstree-closed")){return this.open_node(obj)}if(obj.hasClass("jstree-open")){return this.close_node(obj)}},open_all:function(obj,original_obj){obj=obj?this._get_node(obj):this.get_container();if(!obj||obj===-1){obj=this.get_container()}if(original_obj){obj=obj.find("li.jstree-closed")}else{original_obj=obj;if(obj.is(".jstree-closed")){obj=obj.find("li.jstree-closed").andSelf()}else{obj=obj.find("li.jstree-closed")}}var _this=this;obj.each(function(){var __this=this;if(!_this._is_loaded(this)){_this.open_node(this,function(){_this.open_all(__this,original_obj)},true)}else{_this.open_node(this,false,true)}});if(original_obj.find("li.jstree-closed").length===0){this.__callback({obj:original_obj})}},close_all:function(obj){var _this=this;obj=obj?this._get_node(obj):this.get_container();if(!obj||obj===-1){obj=this.get_container()}obj.find("li.jstree-open").andSelf().each(function(){_this.close_node(this)});this.__callback({obj:obj})},clean_node:function(obj){obj=obj&&obj!=-1?$(obj):this.get_container();obj=obj.is("li")?obj.find("li").andSelf():obj.find("li");obj.removeClass("jstree-last").filter("li:last-child").addClass("jstree-last").end().filter(":has(li)").not(".jstree-open").removeClass("jstree-leaf").addClass("jstree-closed");obj.not(".jstree-open, .jstree-closed").addClass("jstree-leaf").children("ul").remove();this.__callback({obj:obj})},get_rollback:function(){this.__callback();return{i:this.get_index(),h:this.get_container().children("ul").clone(true),d:this.data}},set_rollback:function(html,data){this.get_container().empty().append(html);this.data=data;this.__callback()},load_node:function(obj,s_call,e_call){this.__callback({obj:obj})},_is_loaded:function(obj){return true},create_node:function(obj,position,js,callback,is_loaded){obj=this._get_node(obj);position=typeof position==="undefined"?"last":position;var d=$("
  7. "),s=this._get_settings().core,tmp;if(obj!==-1&&!obj.length){return false}if(!is_loaded&&!this._is_loaded(obj)){this.load_node(obj,function(){this.create_node(obj,position,js,callback,true)});return false}this.__rollback();if(typeof js==="string"){js={data:js}}if(!js){js={}}if(js.attr){d.attr(js.attr)}if(js.state){d.addClass("jstree-"+js.state)}if(!js.data){js.data=s.strings.new_node}if(!$.isArray(js.data)){tmp=js.data;js.data=[];js.data.push(tmp)}$.each(js.data,function(i,m){tmp=$("");if($.isFunction(m)){m=m.call(this,js)}if(typeof m=="string"){tmp.attr("href","#")[s.html_titles?"html":"text"](m)}else{if(!m.attr){m.attr={}}if(!m.attr.href){m.attr.href="#"}tmp.attr(m.attr)[s.html_titles?"html":"text"](m.title);if(m.language){tmp.addClass(m.language)}}tmp.prepend(" ");if(m.icon){if(m.icon.indexOf("/")===-1){tmp.children("ins").addClass(m.icon)}else{tmp.children("ins").css("background","url('"+m.icon+"') center center no-repeat")}}d.append(tmp)});d.prepend(" ");if(obj===-1){obj=this.get_container();if(position==="before"){position="first"}if(position==="after"){position="last"}}switch(position){case"before":obj.before(d);tmp=this._get_parent(obj);break;case"after":obj.after(d);tmp=this._get_parent(obj);break;case"inside":case"first":if(!obj.children("ul").length){obj.append("
      ")}obj.children("ul").prepend(d);tmp=obj;break;case"last":if(!obj.children("ul").length){obj.append("
        ")}obj.children("ul").append(d);tmp=obj;break;default:if(!obj.children("ul").length){obj.append("
          ")}if(!position){position=0}tmp=obj.children("ul").children("li").eq(position);if(tmp.length){tmp.before(d)}else{obj.children("ul").append(d)}tmp=obj;break}if(tmp===-1||tmp.get(0)===this.get_container().get(0)){tmp=-1}this.clean_node(tmp);this.__callback({obj:d,parent:tmp});if(callback){callback.call(this,d)}return d},get_text:function(obj){obj=this._get_node(obj);if(!obj.length){return false}var s=this._get_settings().core.html_titles;obj=obj.children("a:eq(0)");if(s){obj=obj.clone();obj.children("INS").remove();return obj.html()}else{obj=obj.contents().filter(function(){return this.nodeType==3})[0];return obj.nodeValue}},set_text:function(obj,val){obj=this._get_node(obj);if(!obj.length){return false}obj=obj.children("a:eq(0)");if(this._get_settings().core.html_titles){var tmp=obj.children("INS").clone();obj.html(val).prepend(tmp);this.__callback({obj:obj,name:val});return true}else{obj=obj.contents().filter(function(){return this.nodeType==3})[0];this.__callback({obj:obj,name:val});return(obj.nodeValue=val)}},rename_node:function(obj,val){obj=this._get_node(obj);this.__rollback();if(obj&&obj.length&&this.set_text.apply(this,Array.prototype.slice.call(arguments))){this.__callback({obj:obj,name:val})}},delete_node:function(obj){obj=this._get_node(obj);if(!obj.length){return false}this.__rollback();var p=this._get_parent(obj),prev=this._get_prev(obj);obj=obj.remove();if(p!==-1&&p.find("> ul > li").length===0){p.removeClass("jstree-open jstree-closed").addClass("jstree-leaf")}this.clean_node(p);this.__callback({obj:obj,prev:prev});return obj},prepare_move:function(o,r,pos,cb,is_cb){var p={};p.ot=$.jstree._reference(p.o)||this;p.o=p.ot._get_node(o);p.r=r===-1?-1:this._get_node(r);p.p=(typeof p==="undefined")?"last":pos;if(!is_cb&&prepared_move.o&&prepared_move.o[0]===p.o[0]&&prepared_move.r[0]===p.r[0]&&prepared_move.p===p.p){this.__callback(prepared_move);if(cb){cb.call(this,prepared_move)}return}p.ot=$.jstree._reference(p.o)||this;p.rt=r===-1?p.ot:$.jstree._reference(p.r)||this;if(p.r===-1){p.cr=-1;switch(p.p){case"first":case"before":case"inside":p.cp=0;break;case"after":case"last":p.cp=p.rt.get_container().find(" > ul > li").length;break;default:p.cp=p.p;break}}else{if(!/^(before|after)$/.test(p.p)&&!this._is_loaded(p.r)){return this.load_node(p.r,function(){this.prepare_move(o,r,pos,cb,true)})}switch(p.p){case"before":p.cp=p.r.index();p.cr=p.rt._get_parent(p.r);break;case"after":p.cp=p.r.index()+1;p.cr=p.rt._get_parent(p.r);break;case"inside":case"first":p.cp=0;p.cr=p.r;break;case"last":p.cp=p.r.find(" > ul > li").length;p.cr=p.r;break;default:p.cp=p.p;p.cr=p.r;break}}p.np=p.cr==-1?p.rt.get_container():p.cr;p.op=p.ot._get_parent(p.o);p.or=p.np.find(" > ul > li:nth-child("+(p.cp+1)+")");prepared_move=p;this.__callback(prepared_move);if(cb){cb.call(this,prepared_move)}},check_move:function(){var obj=prepared_move,ret=true;if(obj.or[0]===obj.o[0]){return false}obj.o.each(function(){if(obj.r.parentsUntil(".jstree").andSelf().filter("li").index(this)!==-1){ret=false;return false}});return ret},move_node:function(obj,ref,position,is_copy,is_prepared,skip_check){if(!is_prepared){return this.prepare_move(obj,ref,position,function(p){this.move_node(p,false,false,is_copy,true,skip_check)})}if(!skip_check&&!this.check_move()){return false}this.__rollback();var o=false;if(is_copy){o=obj.o.clone();o.find("*[id]").andSelf().each(function(){if(this.id){this.id="copy_"+this.id}})}else{o=obj.o}if(obj.or.length){obj.or.before(o)}else{if(!obj.np.children("ul").length){$("
            ").appendTo(obj.np)}obj.np.children("ul:eq(0)").append(o)}try{obj.ot.clean_node(obj.op);obj.rt.clean_node(obj.np);if(!obj.op.find("> ul > li").length){obj.op.removeClass("jstree-open jstree-closed").addClass("jstree-leaf").children("ul").remove()}}catch(e){}if(is_copy){prepared_move.cy=true;prepared_move.oc=o}this.__callback(prepared_move);return prepared_move},_get_move:function(){return prepared_move}}})})(jQuery);(function($){$.jstree.plugin("ui",{__init:function(){this.data.ui.selected=$();this.data.ui.last_selected=false;this.data.ui.hovered=null;this.data.ui.to_select=this.get_settings().ui.initially_select;this.get_container().delegate("a","click.jstree",$.proxy(function(event){event.preventDefault();this.select_node(event.currentTarget,true,event)},this)).delegate("a","mouseenter.jstree",$.proxy(function(event){this.hover_node(event.target)},this)).delegate("a","mouseleave.jstree",$.proxy(function(event){this.dehover_node(event.target)},this)).bind("reopen.jstree",$.proxy(function(){this.reselect()},this)).bind("get_rollback.jstree",$.proxy(function(){this.dehover_node();this.save_selected()},this)).bind("set_rollback.jstree",$.proxy(function(){this.reselect()},this)).bind("close_node.jstree",$.proxy(function(event,data){var s=this._get_settings().ui,obj=this._get_node(data.rslt.obj),clk=(obj&&obj.length)?obj.children("ul").find(".jstree-clicked"):$(),_this=this;if(s.selected_parent_close===false||!clk.length){return}clk.each(function(){_this.deselect_node(this);if(s.selected_parent_close==="select_parent"){_this.select_node(obj)}})},this)).bind("delete_node.jstree",$.proxy(function(event,data){var s=this._get_settings().ui.select_prev_on_delete,obj=this._get_node(data.rslt.obj),clk=(obj&&obj.length)?obj.find(".jstree-clicked"):[],_this=this;clk.each(function(){_this.deselect_node(this)});if(s&&clk.length){this.select_node(data.rslt.prev)}},this)).bind("move_node.jstree",$.proxy(function(event,data){if(data.rslt.cy){data.rslt.oc.find(".jstree-clicked").removeClass("jstree-clicked")}},this))},defaults:{select_limit:-1,select_multiple_modifier:"ctrl",selected_parent_close:"select_parent",select_prev_on_delete:true,disable_selecting_children:false,initially_select:[]},_fn:{_get_node:function(obj,allow_multiple){if(typeof obj==="undefined"||obj===null){return allow_multiple?this.data.ui.selected:this.data.ui.last_selected}var $obj=$(obj,this.get_container());if($obj.is(".jstree")||obj==-1){return -1}$obj=$obj.closest("li",this.get_container());return $obj.length?$obj:false},save_selected:function(){var _this=this;this.data.ui.to_select=[];this.data.ui.selected.each(function(){_this.data.ui.to_select.push("#"+this.id.toString().replace(/^#/,"").replace("\\/","/").replace("/","\\/"))});this.__callback(this.data.ui.to_select)},reselect:function(){var _this=this,s=this.data.ui.to_select;s=$.map($.makeArray(s),function(n){return"#"+n.toString().replace(/^#/,"").replace("\\/","/").replace("/","\\/")});this.deselect_all();$.each(s,function(i,val){if(val&&val!=="#"){_this.select_node(val)}});this.__callback()},refresh:function(obj){this.save_selected();return this.__call_old()},hover_node:function(obj){obj=this._get_node(obj);if(!obj.length){return false}if(!obj.hasClass("jstree-hovered")){this.dehover_node()}this.data.ui.hovered=obj.children("a").addClass("jstree-hovered").parent();this.__callback({obj:obj})},dehover_node:function(){var obj=this.data.ui.hovered,p;if(!obj||!obj.length){return false}p=obj.children("a").removeClass("jstree-hovered").parent();if(this.data.ui.hovered[0]===p[0]){this.data.ui.hovered=null}this.__callback({obj:obj})},select_node:function(obj,check,e){obj=this._get_node(obj);if(obj==-1||!obj||!obj.length){return false}var s=this._get_settings().ui,is_multiple=(s.select_multiple_modifier=="on"||(s.select_multiple_modifier!==false&&e&&e[s.select_multiple_modifier+"Key"])),is_selected=this.is_selected(obj),proceed=true;if(check){if(s.disable_selecting_children&&is_multiple&&obj.parents("li",this.get_container()).children(".jstree-clicked").length){return false}proceed=false;switch(!0){case (is_selected&&!is_multiple):this.deselect_all();is_selected=false;proceed=true;break;case (!is_selected&&!is_multiple):if(s.select_limit==-1||s.select_limit>0){this.deselect_all();proceed=true}break;case (is_selected&&is_multiple):this.deselect_node(obj);break;case (!is_selected&&is_multiple):if(s.select_limit==-1||this.data.ui.selected.length+1<=s.select_limit){proceed=true}break}}if(proceed&&!is_selected){obj.children("a").addClass("jstree-clicked");this.data.ui.selected=this.data.ui.selected.add(obj);this.data.ui.last_selected=obj;this.__callback({obj:obj})}},deselect_node:function(obj){obj=this._get_node(obj);if(!obj.length){return false}if(this.is_selected(obj)){obj.children("a").removeClass("jstree-clicked");this.data.ui.selected=this.data.ui.selected.not(obj);if(this.data.ui.last_selected.get(0)===obj.get(0)){this.data.ui.last_selected=this.data.ui.selected.eq(0)}this.__callback({obj:obj})}},toggle_select:function(obj){obj=this._get_node(obj);if(!obj.length){return false}if(this.is_selected(obj)){this.deselect_node(obj)}else{this.select_node(obj)}},is_selected:function(obj){return this.data.ui.selected.index(this._get_node(obj))>=0},get_selected:function(context){return context?$(context).find(".jstree-clicked").parent():this.data.ui.selected},deselect_all:function(context){if(context){$(context).find(".jstree-clicked").removeClass("jstree-clicked")}else{this.get_container().find(".jstree-clicked").removeClass("jstree-clicked")}this.data.ui.selected=$([]);this.data.ui.last_selected=false;this.__callback()}}});$.jstree.defaults.plugins.push("ui")})(jQuery);(function($){$.jstree.plugin("crrm",{__init:function(){this.get_container().bind("move_node.jstree",$.proxy(function(e,data){if(this._get_settings().crrm.move.open_onmove){var t=this;data.rslt.np.parentsUntil(".jstree").andSelf().filter(".jstree-closed").each(function(){t.open_node(this,false,true)})}},this))},defaults:{input_width_limit:200,move:{always_copy:false,open_onmove:true,default_position:"last",check_move:function(m){return true}}},_fn:{_show_input:function(obj,callback){obj=this._get_node(obj);var rtl=this._get_settings().core.rtl,w=this._get_settings().crrm.input_width_limit,w1=obj.children("ins").width(),w2=obj.find("> a:visible > ins").width()*obj.find("> a:visible > ins").length,t=this.get_text(obj),h1=$("
            ",{css:{position:"absolute",top:"-200px",left:(rtl?"0px":"-1000px"),visibility:"hidden"}}).appendTo("body"),h2=obj.css("position","relative").append($("",{value:t,css:{padding:"0",border:"1px solid silver",position:"absolute",left:(rtl?"auto":(w1+w2+4)+"px"),right:(rtl?(w1+w2+4)+"px":"auto"),top:"0px",height:(this.data.core.li_height-2)+"px",lineHeight:(this.data.core.li_height-2)+"px",width:"150px"},blur:$.proxy(function(){var i=obj.children("input"),v=i.val();if(v===""){v=t}i.remove();this.set_text(obj,t);this.rename_node(obj,v);callback.call(this,obj,v,t);obj.css("position","")},this),keyup:function(event){var key=event.keyCode||event.which;if(key==27){this.value=t;this.blur();return}else{if(key==13){this.blur();return}else{h2.width(Math.min(h1.text("pW"+this.value).width(),w))}}}})).children("input");this.set_text(obj,"");h1.css({fontFamily:h2.css("fontFamily")||"",fontSize:h2.css("fontSize")||"",fontWeight:h2.css("fontWeight")||"",fontStyle:h2.css("fontStyle")||"",fontStretch:h2.css("fontStretch")||"",fontVariant:h2.css("fontVariant")||"",letterSpacing:h2.css("letterSpacing")||"",wordSpacing:h2.css("wordSpacing")||""});h2.width(Math.min(h1.text("pW"+h2[0].value).width(),w))[0].select()},rename:function(obj){obj=this._get_node(obj);this.__rollback();var f=this.__callback;this._show_input(obj,function(obj,new_name,old_name){f.call(this,{obj:obj,new_name:new_name,old_name:old_name})})},create:function(obj,position,js,callback,skip_rename){var t,_this=this;obj=this._get_node(obj);if(!obj){obj=-1}this.__rollback();t=this.create_node(obj,position,js,function(t){var p=this._get_parent(t),pos=$(t).index();if(callback){callback.call(this,t)}if(p.length&&p.hasClass("jstree-closed")){this.open_node(p,false,true)}if(!skip_rename){this._show_input(t,function(obj,new_name,old_name){_this.__callback({obj:obj,name:new_name,parent:p,position:pos})})}else{_this.__callback({obj:t,name:this.get_text(t),parent:p,position:pos})}});return t},remove:function(obj){obj=this._get_node(obj,true);this.__rollback();this.delete_node(obj);this.__callback({obj:obj})},check_move:function(){if(!this.__call_old()){return false}var s=this._get_settings().crrm.move;if(!s.check_move.call(this,this._get_move())){return false}return true},move_node:function(obj,ref,position,is_copy,is_prepared,skip_check){var s=this._get_settings().crrm.move;if(!is_prepared){if(!position){position=s.default_position}if(position==="inside"&&!s.default_position.match(/^(before|after)$/)){position=s.default_position}return this.__call_old(true,obj,ref,position,is_copy,false,skip_check)}if(s.always_copy===true||(s.always_copy==="multitree"&&obj.rt.get_index()!==obj.ot.get_index())){is_copy=true}this.__call_old(true,obj,ref,position,is_copy,true,skip_check)},cut:function(obj){obj=this._get_node(obj);this.data.crrm.cp_nodes=false;this.data.crrm.ct_nodes=false;if(!obj||!obj.length){return false}this.data.crrm.ct_nodes=obj},copy:function(obj){obj=this._get_node(obj);this.data.crrm.cp_nodes=false;this.data.crrm.ct_nodes=false;if(!obj||!obj.length){return false}this.data.crrm.cp_nodes=obj},paste:function(obj){obj=this._get_node(obj);if(!obj||!obj.length){return false}if(!this.data.crrm.ct_nodes&&!this.data.crrm.cp_nodes){return false}if(this.data.crrm.ct_nodes){this.move_node(this.data.crrm.ct_nodes,obj)}if(this.data.crrm.cp_nodes){this.move_node(this.data.crrm.cp_nodes,obj,false,true)}this.data.crrm.cp_nodes=false;this.data.crrm.ct_nodes=false}}});$.jstree.defaults.plugins.push("crrm")})(jQuery);(function($){var themes_loaded=[];$.jstree._themes=false;$.jstree.plugin("themes",{__init:function(){this.get_container().bind("init.jstree",$.proxy(function(){var s=this._get_settings().themes;this.data.themes.dots=s.dots;this.data.themes.icons=s.icons;this.set_theme(s.theme,s.url)},this)).bind("loaded.jstree",$.proxy(function(){if(!this.data.themes.dots){this.hide_dots()}else{this.show_dots()}if(!this.data.themes.icons){this.hide_icons()}else{this.show_icons()}},this))},defaults:{theme:"default",url:false,dots:true,icons:true},_fn:{set_theme:function(theme_name,theme_url){if(!theme_name){return false}if(!theme_url){theme_url=$.jstree._themes+theme_name+"/style.css"}if($.inArray(theme_url,themes_loaded)==-1){$.vakata.css.add_sheet({url:theme_url,rel:"jstree"});themes_loaded.push(theme_url)}if(this.data.themes.theme!=theme_name){this.get_container().removeClass("jstree-"+this.data.themes.theme);this.data.themes.theme=theme_name}this.get_container().addClass("jstree-"+theme_name);if(!this.data.themes.dots){this.hide_dots()}else{this.show_dots()}if(!this.data.themes.icons){this.hide_icons()}else{this.show_icons()}this.__callback()},get_theme:function(){return this.data.themes.theme},show_dots:function(){this.data.themes.dots=true;this.get_container().children("ul").removeClass("jstree-no-dots")},hide_dots:function(){this.data.themes.dots=false;this.get_container().children("ul").addClass("jstree-no-dots")},toggle_dots:function(){if(this.data.themes.dots){this.hide_dots()}else{this.show_dots()}},show_icons:function(){this.data.themes.icons=true;this.get_container().children("ul").removeClass("jstree-no-icons")},hide_icons:function(){this.data.themes.icons=false;this.get_container().children("ul").addClass("jstree-no-icons")},toggle_icons:function(){if(this.data.themes.icons){this.hide_icons()}else{this.show_icons()}}}});$(function(){if($.jstree._themes===false){$("script").each(function(){if(this.src.toString().match(/jquery\.jstree[^\/]*?\.js(\?.*)?$/)){$.jstree._themes=this.src.toString().replace(/jquery\.jstree[^\/]*?\.js(\?.*)?$/,"")+"themes/";return false}})}if($.jstree._themes===false){$.jstree._themes="themes/"}});$.jstree.defaults.plugins.push("themes")})(jQuery);(function($){var bound=[];function exec(i,event){var f=$.jstree._focused(),tmp;if(f&&f.data&&f.data.hotkeys&&f.data.hotkeys.enabled){tmp=f._get_settings().hotkeys[i];if(tmp){return tmp.call(f,event)}}}$.jstree.plugin("hotkeys",{__init:function(){if(typeof $.hotkeys==="undefined"){throw"jsTree hotkeys: jQuery hotkeys plugin not included."}if(!this.data.ui){throw"jsTree hotkeys: jsTree UI plugin not included."}$.each(this._get_settings().hotkeys,function(i,val){if($.inArray(i,bound)==-1){$(document).bind("keydown",i,function(event){return exec(i,event)});bound.push(i)}});this.enable_hotkeys()},defaults:{up:function(){var o=this.data.ui.hovered||this.data.ui.last_selected||-1;this.hover_node(this._get_prev(o));return false},down:function(){var o=this.data.ui.hovered||this.data.ui.last_selected||-1;this.hover_node(this._get_next(o));return false},left:function(){var o=this.data.ui.hovered||this.data.ui.last_selected;if(o){if(o.hasClass("jstree-open")){this.close_node(o)}else{this.hover_node(this._get_prev(o))}}return false},right:function(){var o=this.data.ui.hovered||this.data.ui.last_selected;if(o&&o.length){if(o.hasClass("jstree-closed")){this.open_node(o)}else{this.hover_node(this._get_next(o))}}return false},space:function(){if(this.data.ui.hovered){this.data.ui.hovered.children("a:eq(0)").click()}return false},"ctrl+space":function(event){event.type="click";if(this.data.ui.hovered){this.data.ui.hovered.children("a:eq(0)").trigger(event)}return false},f2:function(){this.rename(this.data.ui.hovered||this.data.ui.last_selected)},del:function(){this.remove(this.data.ui.hovered||this._get_node(null))}},_fn:{enable_hotkeys:function(){this.data.hotkeys.enabled=true},disable_hotkeys:function(){this.data.hotkeys.enabled=false}}})})(jQuery);(function($){$.jstree.plugin("json_data",{defaults:{data:false,ajax:false,correct_state:true,progressive_render:false},_fn:{load_node:function(obj,s_call,e_call){var _this=this;this.load_node_json(obj,function(){_this.__callback({obj:obj});s_call.call(this)},e_call)},_is_loaded:function(obj){var s=this._get_settings().json_data,d;obj=this._get_node(obj);if(obj&&obj!==-1&&s.progressive_render&&!obj.is(".jstree-open, .jstree-leaf")&&obj.children("ul").children("li").length===0&&obj.data("jstree-children")){d=this._parse_json(obj.data("jstree-children"));if(d){obj.append(d);$.removeData(obj,"jstree-children")}this.clean_node(obj);return true}return obj==-1||!obj||!s.ajax||obj.is(".jstree-open, .jstree-leaf")||obj.children("ul").children("li").size()>0},load_node_json:function(obj,s_call,e_call){var s=this.get_settings().json_data,d,error_func=function(){},success_func=function(){};obj=this._get_node(obj);if(obj&&obj!==-1){if(obj.data("jstree-is-loading")){return}else{obj.data("jstree-is-loading",true)}}switch(!0){case (!s.data&&!s.ajax):throw"Neither data nor ajax settings supplied.";case (!!s.data&&!s.ajax)||(!!s.data&&!!s.ajax&&(!obj||obj===-1)):if(!obj||obj==-1){d=this._parse_json(s.data);if(d){this.get_container().children("ul").empty().append(d.children());this.clean_node()}else{if(s.correct_state){this.get_container().children("ul").empty()}}}if(s_call){s_call.call(this)}break;case (!s.data&&!!s.ajax)||(!!s.data&&!!s.ajax&&obj&&obj!==-1):error_func=function(x,t,e){var ef=this.get_settings().json_data.ajax.error;if(ef){ef.call(this,x,t,e)}if(obj!=-1&&obj.length){obj.children(".jstree-loading").removeClass("jstree-loading");obj.data("jstree-is-loading",false);if(t==="success"&&s.correct_state){obj.removeClass("jstree-open jstree-closed").addClass("jstree-leaf")}}else{if(t==="success"&&s.correct_state){this.get_container().children("ul").empty()}}if(e_call){e_call.call(this)}};success_func=function(d,t,x){var sf=this.get_settings().json_data.ajax.success;if(sf){d=sf.call(this,d,t,x)||d}if(d===""||(!$.isArray(d)&&!$.isPlainObject(d))){return error_func.call(this,x,t,"")}d=this._parse_json(d);if(d){if(obj===-1||!obj){this.get_container().children("ul").empty().append(d.children())}else{obj.append(d).children(".jstree-loading").removeClass("jstree-loading");obj.data("jstree-is-loading",false)}this.clean_node(obj);if(s_call){s_call.call(this)}}else{if(obj===-1||!obj){if(s.correct_state){this.get_container().children("ul").empty();if(s_call){s_call.call(this)}}}else{obj.children(".jstree-loading").removeClass("jstree-loading");obj.data("jstree-is-loading",false);if(s.correct_state){obj.removeClass("jstree-open jstree-closed").addClass("jstree-leaf");if(s_call){s_call.call(this)}}}}};s.ajax.context=this;s.ajax.error=error_func;s.ajax.success=success_func;if(!s.ajax.dataType){s.ajax.dataType="json"}if($.isFunction(s.ajax.url)){s.ajax.url=s.ajax.url.call(this,obj)}if($.isFunction(s.ajax.data)){s.ajax.data=s.ajax.data.call(this,obj)}$.ajax(s.ajax);break}},_parse_json:function(js,is_callback){var d=false,p=this._get_settings(),s=p.json_data,t=p.core.html_titles,tmp,i,j,ul1,ul2;if(!js){return d}if($.isFunction(js)){js=js.call(this)}if($.isArray(js)){d=$();if(!js.length){return false}for(i=0,j=js.length;i");if(js.attr){d.attr(js.attr)}if(js.metadata){d.data("jstree",js.metadata)}if(js.state){d.addClass("jstree-"+js.state)}if(!$.isArray(js.data)){tmp=js.data;js.data=[];js.data.push(tmp)}$.each(js.data,function(i,m){tmp=$("");if($.isFunction(m)){m=m.call(this,js)}if(typeof m=="string"){tmp.attr("href","#")[t?"html":"text"](m)}else{if(!m.attr){m.attr={}}if(!m.attr.href){m.attr.href="#"}tmp.attr(m.attr)[t?"html":"text"](m.title);if(m.language){tmp.addClass(m.language)}}tmp.prepend(" ");if(!m.icon&&js.icon){m.icon=js.icon}if(m.icon){if(m.icon.indexOf("/")===-1){tmp.children("ins").addClass(m.icon)}else{tmp.children("ins").css("background","url('"+m.icon+"') center center no-repeat")}}d.append(tmp)});d.prepend(" ");if(js.children){if(s.progressive_render&&js.state!=="open"){d.addClass("jstree-closed").data("jstree-children",js.children)}else{if($.isFunction(js.children)){js.children=js.children.call(this,js)}if($.isArray(js.children)&&js.children.length){tmp=this._parse_json(js.children,true);if(tmp.length){ul2=$("
              ");ul2.append(tmp);d.append(ul2)}}}}}if(!is_callback){ul1=$("
                ");ul1.append(d);d=ul1}return d},get_json:function(obj,li_attr,a_attr,is_callback){var result=[],s=this._get_settings(),_this=this,tmp1,tmp2,li,a,t,lang;obj=this._get_node(obj);if(!obj||obj===-1){obj=this.get_container().find("> ul > li")}li_attr=$.isArray(li_attr)?li_attr:["id","class"];if(!is_callback&&this.data.types){li_attr.push(s.types.type_attr)}a_attr=$.isArray(a_attr)?a_attr:[];obj.each(function(){li=$(this);tmp1={data:[]};if(li_attr.length){tmp1.attr={}}$.each(li_attr,function(i,v){tmp2=li.attr(v);if(tmp2&&tmp2.length&&tmp2.replace(/jstree[^ ]*|$/ig,"").length){tmp1.attr[v]=tmp2.replace(/jstree[^ ]*|$/ig,"")}});if(li.hasClass("jstree-open")){tmp1.state="open"}if(li.hasClass("jstree-closed")){tmp1.state="closed"}a=li.children("a");a.each(function(){t=$(this);if(a_attr.length||$.inArray("languages",s.plugins)!==-1||t.children("ins").get(0).style.backgroundImage.length||(t.children("ins").get(0).className&&t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,"").length)){lang=false;if($.inArray("languages",s.plugins)!==-1&&$.isArray(s.languages)&&s.languages.length){$.each(s.languages,function(l,lv){if(t.hasClass(lv)){lang=lv;return false}})}tmp2={attr:{},title:_this.get_text(t,lang)};$.each(a_attr,function(k,z){tmp1.attr[z]=(t.attr(z)||"").replace(/jstree[^ ]*|$/ig,"")});$.each(s.languages,function(k,z){if(t.hasClass(z)){tmp2.language=z;return true}});if(t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,"").replace(/^\s+$/ig,"").length){tmp2.icon=t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,"").replace(/^\s+$/ig,"")}if(t.children("ins").get(0).style.backgroundImage.length){tmp2.icon=t.children("ins").get(0).style.backgroundImage.replace("url(","").replace(")","")}}else{tmp2=_this.get_text(t)}if(a.length>1){tmp1.data.push(tmp2)}else{tmp1.data=tmp2}});li=li.find("> ul > li");if(li.length){tmp1.children=_this.get_json(li,li_attr,a_attr,true)}result.push(tmp1)});return result}}})})(jQuery);(function($){$.jstree.plugin("languages",{__init:function(){this._load_css()},defaults:[],_fn:{set_lang:function(i){var langs=this._get_settings().languages,st=false,selector=".jstree-"+this.get_index()+" a";if(!$.isArray(langs)||langs.length===0){return false}if($.inArray(i,langs)==-1){if(!!langs[i]){i=langs[i]}else{return false}}if(i==this.data.languages.current_language){return true}st=$.vakata.css.get_css(selector+"."+this.data.languages.current_language,false,this.data.languages.language_css);if(st!==false){st.style.display="none"}st=$.vakata.css.get_css(selector+"."+i,false,this.data.languages.language_css);if(st!==false){st.style.display=""}this.data.languages.current_language=i;this.__callback(i);return true},get_lang:function(){return this.data.languages.current_language},get_text:function(obj,lang){obj=this._get_node(obj)||this.data.ui.last_selected;if(!obj.size()){return false}var langs=this._get_settings().languages,s=this._get_settings().core.html_titles;if($.isArray(langs)&&langs.length){lang=(lang&&$.inArray(lang,langs)!=-1)?lang:this.data.languages.current_language;obj=obj.children("a."+lang)}else{obj=obj.children("a:eq(0)")}if(s){obj=obj.clone();obj.children("INS").remove();return obj.html()}else{obj=obj.contents().filter(function(){return this.nodeType==3})[0];return obj.nodeValue}},set_text:function(obj,val,lang){obj=this._get_node(obj)||this.data.ui.last_selected;if(!obj.size()){return false}var langs=this._get_settings().languages,s=this._get_settings().core.html_titles,tmp;if($.isArray(langs)&&langs.length){lang=(lang&&$.inArray(lang,langs)!=-1)?lang:this.data.languages.current_language;obj=obj.children("a."+lang)}else{obj=obj.children("a:eq(0)")}if(s){tmp=obj.children("INS").clone();obj.html(val).prepend(tmp);this.__callback({obj:obj,name:val,lang:lang});return true}else{obj=obj.contents().filter(function(){return this.nodeType==3})[0];this.__callback({obj:obj,name:val,lang:lang});return(obj.nodeValue=val)}},_load_css:function(){var langs=this._get_settings().languages,str="/* languages css */",selector=".jstree-"+this.get_index()+" a",ln;if($.isArray(langs)&&langs.length){this.data.languages.current_language=langs[0];for(ln=0;lnthis.get_text(b)?1:-1},_fn:{sort:function(obj){var s=this._get_settings().sort,t=this;obj.append($.makeArray(obj.children("li")).sort($.proxy(s,t)));obj.find("> li > ul").each(function(){t.sort($(this))});this.clean_node(obj)}}})})(jQuery);(function($){var o=false,r=false,m=false,sli=false,sti=false,dir1=false,dir2=false;$.vakata.dnd={is_down:false,is_drag:false,helper:false,scroll_spd:10,init_x:0,init_y:0,threshold:5,user_data:{},drag_start:function(e,data,html){if($.vakata.dnd.is_drag){$.vakata.drag_stop({})}try{e.currentTarget.unselectable="on";e.currentTarget.onselectstart=function(){return false};if(e.currentTarget.style){e.currentTarget.style.MozUserSelect="none"}}catch(err){}$.vakata.dnd.init_x=e.pageX;$.vakata.dnd.init_y=e.pageY;$.vakata.dnd.user_data=data;$.vakata.dnd.is_down=true;$.vakata.dnd.helper=$("
                ").html(html).css("opacity","0.75");$(document).bind("mousemove",$.vakata.dnd.drag);$(document).bind("mouseup",$.vakata.dnd.drag_stop);return false},drag:function(e){if(!$.vakata.dnd.is_down){return}if(!$.vakata.dnd.is_drag){if(Math.abs(e.pageX-$.vakata.dnd.init_x)>5||Math.abs(e.pageY-$.vakata.dnd.init_y)>5){$.vakata.dnd.helper.appendTo("body");$.vakata.dnd.is_drag=true;$(document).triggerHandler("drag_start.vakata",{event:e,data:$.vakata.dnd.user_data})}else{return}}if(e.type==="mousemove"){var d=$(document),t=d.scrollTop(),l=d.scrollLeft();if(e.pageY-t<20){if(sti&&dir1==="down"){clearInterval(sti);sti=false}if(!sti){dir1="up";sti=setInterval(function(){$(document).scrollTop($(document).scrollTop()-$.vakata.dnd.scroll_spd)},150)}}else{if(sti&&dir1==="up"){clearInterval(sti);sti=false}}if($(window).height()-(e.pageY-t)<20){if(sti&&dir1==="up"){clearInterval(sti);sti=false}if(!sti){dir1="down";sti=setInterval(function(){$(document).scrollTop($(document).scrollTop()+$.vakata.dnd.scroll_spd)},150)}}else{if(sti&&dir1==="down"){clearInterval(sti);sti=false}}if(e.pageX-l<20){if(sli&&dir2==="right"){clearInterval(sli);sli=false}if(!sli){dir2="left";sli=setInterval(function(){$(document).scrollLeft($(document).scrollLeft()-$.vakata.dnd.scroll_spd)},150)}}else{if(sli&&dir2==="left"){clearInterval(sli);sli=false}}if($(window).width()-(e.pageX-l)<20){if(sli&&dir2==="left"){clearInterval(sli);sli=false}if(!sli){dir2="right";sli=setInterval(function(){$(document).scrollLeft($(document).scrollLeft()+$.vakata.dnd.scroll_spd)},150)}}else{if(sli&&dir2==="right"){clearInterval(sli);sli=false}}}$.vakata.dnd.helper.css({left:(e.pageX+5)+"px",top:(e.pageY+10)+"px"});$(document).triggerHandler("drag.vakata",{event:e,data:$.vakata.dnd.user_data})},drag_stop:function(e){$(document).unbind("mousemove",$.vakata.dnd.drag);$(document).unbind("mouseup",$.vakata.dnd.drag_stop);$(document).triggerHandler("drag_stop.vakata",{event:e,data:$.vakata.dnd.user_data});$.vakata.dnd.helper.remove();$.vakata.dnd.init_x=0;$.vakata.dnd.init_y=0;$.vakata.dnd.user_data={};$.vakata.dnd.is_down=false;$.vakata.dnd.is_drag=false}};$(function(){var css_string="#vakata-dragged { display:block; margin:0 0 0 0; padding:4px 4px 4px 24px; position:absolute; top:-2000px; line-height:16px; z-index:10000; } ";$.vakata.css.add_sheet({str:css_string})});$.jstree.plugin("dnd",{__init:function(){this.data.dnd={active:false,after:false,inside:false,before:false,off:false,prepared:false,w:0,to1:false,to2:false,cof:false,cw:false,ch:false,i1:false,i2:false};this.get_container().bind("mouseenter.jstree",$.proxy(function(){if($.vakata.dnd.is_drag&&$.vakata.dnd.user_data.jstree&&this.data.themes){m.attr("class","jstree-"+this.data.themes.theme);$.vakata.dnd.helper.attr("class","jstree-dnd-helper jstree-"+this.data.themes.theme)}},this)).bind("mouseleave.jstree",$.proxy(function(){if($.vakata.dnd.is_drag&&$.vakata.dnd.user_data.jstree){if(this.data.dnd.i1){clearInterval(this.data.dnd.i1)}if(this.data.dnd.i2){clearInterval(this.data.dnd.i2)}}},this)).bind("mousemove.jstree",$.proxy(function(e){if($.vakata.dnd.is_drag&&$.vakata.dnd.user_data.jstree){var cnt=this.get_container()[0];if(e.pageX+24>this.data.dnd.cof.left+this.data.dnd.cw){if(this.data.dnd.i1){clearInterval(this.data.dnd.i1)}this.data.dnd.i1=setInterval($.proxy(function(){this.scrollLeft+=$.vakata.dnd.scroll_spd},cnt),100)}else{if(e.pageX-24this.data.dnd.cof.top+this.data.dnd.ch){if(this.data.dnd.i2){clearInterval(this.data.dnd.i2)}this.data.dnd.i2=setInterval($.proxy(function(){this.scrollTop+=$.vakata.dnd.scroll_spd},cnt),100)}else{if(e.pageY-24"+$(e.target).text());if(this.data.themes){m.attr("class","jstree-"+this.data.themes.theme);$.vakata.dnd.helper.attr("class","jstree-dnd-helper jstree-"+this.data.themes.theme)}$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");var cnt=this.get_container();this.data.dnd.cof=cnt.offset();this.data.dnd.cw=parseInt(cnt.width(),10);this.data.dnd.ch=parseInt(cnt.height(),10);this.data.dnd.foreign=true;return false},this))}if(s.drop_target){$(document).delegate(s.drop_target,"mouseenter.jstree",$.proxy(function(e){if(this.data.dnd.active&&this._get_settings().dnd.drop_check.call(this,{o:o,r:$(e.target)})){$.vakata.dnd.helper.children("ins").attr("class","jstree-ok")}},this)).delegate(s.drop_target,"mouseleave.jstree",$.proxy(function(e){if(this.data.dnd.active){$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid")}},this)).delegate(s.drop_target,"mouseup.jstree",$.proxy(function(e){if(this.data.dnd.active&&$.vakata.dnd.helper.children("ins").hasClass("jstree-ok")){this._get_settings().dnd.drop_finish.call(this,{o:o,r:$(e.target)})}},this))}},defaults:{copy_modifier:"ctrl",check_timeout:200,open_timeout:500,drop_target:".jstree-drop",drop_check:function(data){return true},drop_finish:$.noop,drag_target:".jstree-draggable",drag_finish:$.noop,drag_check:function(data){return{after:false,before:false,inside:true}}},_fn:{dnd_prepare:function(){if(!r||!r.length){return}this.data.dnd.off=r.offset();if(this._get_settings().core.rtl){this.data.dnd.off.right=this.data.dnd.off.left+r.width()}if(this.data.dnd.foreign){var a=this._get_settings().dnd.drag_check.call(this,{o:o,r:r});this.data.dnd.after=a.after;this.data.dnd.before=a.before;this.data.dnd.inside=a.inside;this.data.dnd.prepared=true;return this.dnd_show()}this.prepare_move(o,r,"before");this.data.dnd.before=this.check_move();this.prepare_move(o,r,"after");this.data.dnd.after=this.check_move();if(this._is_loaded(r)){this.prepare_move(o,r,"inside");this.data.dnd.inside=this.check_move()}else{this.data.dnd.inside=false}this.data.dnd.prepared=true;return this.dnd_show()},dnd_show:function(){if(!this.data.dnd.prepared){return}var o=["before","inside","after"],r=false,rtl=this._get_settings().core.rtl,pos;if(this.data.dnd.w"+(o.length>1?"Multiple selection":this.get_text(o)));if(this.data.themes){m.attr("class","jstree-"+this.data.themes.theme);$.vakata.dnd.helper.attr("class","jstree-dnd-helper jstree-"+this.data.themes.theme)}var cnt=this.get_container();this.data.dnd.cof=cnt.children("ul").offset();this.data.dnd.cw=parseInt(cnt.width(),10);this.data.dnd.ch=parseInt(cnt.height(),10);this.data.dnd.active=true}}});$(function(){var css_string="#vakata-dragged ins { display:block; text-decoration:none; width:16px; height:16px; margin:0 0 0 0; padding:0; position:absolute; top:4px; left:4px; } #vakata-dragged .jstree-ok { background:green; } #vakata-dragged .jstree-invalid { background:red; } #jstree-marker { padding:0; margin:0; line-height:12px; font-size:1px; overflow:hidden; height:12px; width:8px; position:absolute; top:-30px; z-index:10000; background-repeat:no-repeat; display:none; background-color:silver; } ";$.vakata.css.add_sheet({str:css_string});m=$("
                ").attr({id:"jstree-marker"}).hide().appendTo("body");$(document).bind("drag_start.vakata",function(e,data){if(data.data.jstree){m.show()}});$(document).bind("drag_stop.vakata",function(e,data){if(data.data.jstree){m.hide()}})})})(jQuery);(function($){$.jstree.plugin("checkbox",{__init:function(){this.select_node=this.deselect_node=this.deselect_all=$.noop;this.get_selected=this.get_checked;this.get_container().bind("open_node.jstree create_node.jstree clean_node.jstree",$.proxy(function(e,data){this._prepare_checkboxes(data.rslt.obj)},this)).bind("loaded.jstree",$.proxy(function(e){this._prepare_checkboxes()},this)).delegate("a","click.jstree",$.proxy(function(e){if(this._get_node(e.target).hasClass("jstree-checked")){this.uncheck_node(e.target)}else{this.check_node(e.target)}if(this.data.ui){this.save_selected()}if(this.data.cookies){this.save_cookie("select_node")}e.preventDefault()},this))},__destroy:function(){this.get_container().find(".jstree-checkbox").remove()},_fn:{_prepare_checkboxes:function(obj){obj=!obj||obj==-1?this.get_container():this._get_node(obj);var c,_this=this,t;obj.each(function(){t=$(this);c=t.is("li")&&t.hasClass("jstree-checked")?"jstree-checked":"jstree-unchecked";t.find("a").not(":has(.jstree-checkbox)").prepend(" ").parent().not(".jstree-checked, .jstree-unchecked").addClass(c)});if(obj.is("li")){this._repair_state(obj)}else{obj.find("> ul > li").each(function(){_this._repair_state(this)})}},change_state:function(obj,state){obj=this._get_node(obj);state=(state===false||state===true)?state:obj.hasClass("jstree-checked");if(state){obj.find("li").andSelf().removeClass("jstree-checked jstree-undetermined").addClass("jstree-unchecked")}else{obj.find("li").andSelf().removeClass("jstree-unchecked jstree-undetermined").addClass("jstree-checked");if(this.data.ui){this.data.ui.last_selected=obj}this.data.checkbox.last_selected=obj}obj.parentsUntil(".jstree","li").each(function(){var $this=$(this);if(state){if($this.children("ul").children(".jstree-checked, .jstree-undetermined").length){$this.parentsUntil(".jstree","li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");return false}else{$this.removeClass("jstree-checked jstree-undetermined").addClass("jstree-unchecked")}}else{if($this.children("ul").children(".jstree-unchecked, .jstree-undetermined").length){$this.parentsUntil(".jstree","li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");return false}else{$this.removeClass("jstree-unchecked jstree-undetermined").addClass("jstree-checked")}}});if(this.data.ui){this.data.ui.selected=this.get_checked()}this.__callback(obj)},check_node:function(obj){this.change_state(obj,false)},uncheck_node:function(obj){this.change_state(obj,true)},check_all:function(){var _this=this;this.get_container().children("ul").children("li").each(function(){_this.check_node(this,false)})},uncheck_all:function(){var _this=this;this.get_container().children("ul").children("li").each(function(){_this.change_state(this,true)})},is_checked:function(obj){obj=this._get_node(obj);return obj.length?obj.is(".jstree-checked"):false},get_checked:function(obj){obj=!obj||obj===-1?this.get_container():this._get_node(obj);return obj.find("> ul > .jstree-checked, .jstree-undetermined > ul > .jstree-checked")},get_unchecked:function(obj){obj=!obj||obj===-1?this.get_container():this._get_node(obj);return obj.find("> ul > .jstree-unchecked, .jstree-undetermined > ul > .jstree-unchecked")},show_checkboxes:function(){this.get_container().children("ul").removeClass("jstree-no-checkboxes")},hide_checkboxes:function(){this.get_container().children("ul").addClass("jstree-no-checkboxes")},_repair_state:function(obj){obj=this._get_node(obj);if(!obj.length){return}var a=obj.find("> ul > .jstree-checked").length,b=obj.find("> ul > .jstree-undetermined").length,c=obj.find("> ul > li").length;if(c===0){if(obj.hasClass("jstree-undetermined")){this.check_node(obj)}}else{if(a===0&&b===0){this.uncheck_node(obj)}else{if(a===c){this.check_node(obj)}else{obj.parentsUntil(".jstree","li").removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined")}}}},reselect:function(){if(this.data.ui){var _this=this,s=this.data.ui.to_select;s=$.map($.makeArray(s),function(n){return"#"+n.toString().replace(/^#/,"").replace("\\/","/").replace("/","\\/")});this.deselect_all();$.each(s,function(i,val){_this.check_node(val)});this.__callback()}}}})})(jQuery);(function($){$.vakata.xslt=function(xml,xsl,callback){var rs="",xm,xs,processor,support;if(document.recalc){xm=document.createElement("xml");xs=document.createElement("xml");xm.innerHTML=xml;xs.innerHTML=xsl;$("body").append(xm).append(xs);setTimeout((function(xm,xs,callback){return function(){callback.call(null,xm.transformNode(xs.XMLDocument));setTimeout((function(xm,xs){return function(){jQuery("body").remove(xm).remove(xs)}})(xm,xs),200)}})(xm,xs,callback),100);return true}if(typeof window.DOMParser!=="undefined"&&typeof window.XMLHttpRequest!=="undefined"&&typeof window.XSLTProcessor!=="undefined"){processor=new XSLTProcessor();support=$.isFunction(processor.transformDocument)?(typeof window.XMLSerializer!=="undefined"):true;if(!support){return false}xml=new DOMParser().parseFromString(xml,"text/xml");xsl=new DOMParser().parseFromString(xsl,"text/xml");if($.isFunction(processor.transformDocument)){rs=document.implementation.createDocument("","",null);processor.transformDocument(xml,xsl,rs,null);callback.call(null,XMLSerializer().serializeToString(rs));return true}else{processor.importStylesheet(xsl);rs=processor.transformToFragment(xml,document);callback.call(null,$("
                ").append(rs).html());return true}}return false};var xsl={nest:' ',flat:'
              • jstree-last jstree-open jstree-closed jstree-leaf   # jstree-icon background:url() center center no-repeat;  
                • '};$.jstree.plugin("xml_data",{defaults:{data:false,ajax:false,xsl:"flat",clean_node:false,correct_state:true},_fn:{load_node:function(obj,s_call,e_call){var _this=this;this.load_node_xml(obj,function(){_this.__callback({obj:obj});s_call.call(this)},e_call)},_is_loaded:function(obj){var s=this._get_settings().xml_data;obj=this._get_node(obj);return obj==-1||!obj||!s.ajax||obj.is(".jstree-open, .jstree-leaf")||obj.children("ul").children("li").size()>0},load_node_xml:function(obj,s_call,e_call){var s=this.get_settings().xml_data,error_func=function(){},success_func=function(){};obj=this._get_node(obj);if(obj&&obj!==-1){if(obj.data("jstree-is-loading")){return}else{obj.data("jstree-is-loading",true)}}switch(!0){case (!s.data&&!s.ajax):throw"Neither data nor ajax settings supplied.";case (!!s.data&&!s.ajax)||(!!s.data&&!!s.ajax&&(!obj||obj===-1)):if(!obj||obj==-1){this.parse_xml(s.data,$.proxy(function(d){if(d){d=d.replace(/ ?xmlns="[^"]*"/ig,"");if(d.length>10){d=$(d);this.get_container().children("ul").empty().append(d.children());if(s.clean_node){this.clean_node(obj)}if(s_call){s_call.call(this)}}}else{if(s.correct_state){this.get_container().children("ul").empty();if(s_call){s_call.call(this)}}}},this))}break;case (!s.data&&!!s.ajax)||(!!s.data&&!!s.ajax&&obj&&obj!==-1):error_func=function(x,t,e){var ef=this.get_settings().xml_data.ajax.error;if(ef){ef.call(this,x,t,e)}if(obj!==-1&&obj.length){obj.children(".jstree-loading").removeClass("jstree-loading");obj.data("jstree-is-loading",false);if(t==="success"&&s.correct_state){obj.removeClass("jstree-open jstree-closed").addClass("jstree-leaf")}}else{if(t==="success"&&s.correct_state){this.get_container().children("ul").empty()}}if(e_call){e_call.call(this)}};success_func=function(d,t,x){d=x.responseText;var sf=this.get_settings().xml_data.ajax.success;if(sf){d=sf.call(this,d,t,x)||d}if(d==""){return error_func.call(this,x,t,"")}this.parse_xml(d,$.proxy(function(d){if(d){d=d.replace(/ ?xmlns="[^"]*"/ig,"");if(d.length>10){d=$(d);if(obj===-1||!obj){this.get_container().children("ul").empty().append(d.children())}else{obj.children(".jstree-loading").removeClass("jstree-loading");obj.append(d);obj.data("jstree-is-loading",false)}if(s.clean_node){this.clean_node(obj)}if(s_call){s_call.call(this)}}else{if(obj&&obj!==-1){obj.children(".jstree-loading").removeClass("jstree-loading");obj.data("jstree-is-loading",false);if(s.correct_state){obj.removeClass("jstree-open jstree-closed").addClass("jstree-leaf");if(s_call){s_call.call(this)}}}else{if(s.correct_state){this.get_container().children("ul").empty();if(s_call){s_call.call(this)}}}}}},this))};s.ajax.context=this;s.ajax.error=error_func;s.ajax.success=success_func;if(!s.ajax.dataType){s.ajax.dataType="xml"}if($.isFunction(s.ajax.url)){s.ajax.url=s.ajax.url.call(this,obj)}if($.isFunction(s.ajax.data)){s.ajax.data=s.ajax.data.call(this,obj)}$.ajax(s.ajax);break}},parse_xml:function(xml,callback){var s=this._get_settings().xml_data;$.vakata.xslt(xml,xsl[s.xsl],callback)},get_xml:function(tp,obj,li_attr,a_attr,is_callback){var result="",s=this._get_settings(),_this=this,tmp1,tmp2,li,a,lang;if(!tp){tp="flat"}if(!is_callback){is_callback=0}obj=this._get_node(obj);if(!obj||obj===-1){obj=this.get_container().find("> ul > li")}li_attr=$.isArray(li_attr)?li_attr:["id","class"];if(!is_callback&&this.data.types&&$.inArray(s.types.type_attr,li_attr)===-1){li_attr.push(s.types.type_attr)}a_attr=$.isArray(a_attr)?a_attr:[];if(!is_callback){result+=""}obj.each(function(){result+="";result+=""});result+="";tmp2=li[0].id;li=li.find("> ul > li");if(li.length){tmp2=_this.get_xml(tp,li,li_attr,a_attr,tmp2)}else{tmp2=""}if(tp=="nest"){result+=tmp2}result+="";if(tp=="flat"){result+=tmp2}});if(!is_callback){result+=""}return result}}})})(jQuery);(function($){$.expr[":"].jstree_contains=function(a,i,m){return(a.textContent||a.innerText||"").toLowerCase().indexOf(m[3].toLowerCase())>=0};$.jstree.plugin("search",{__init:function(){this.data.search.str="";this.data.search.result=$()},defaults:{ajax:false,case_insensitive:false},_fn:{search:function(str,skip_async){if(str===""){return}var s=this.get_settings().search,t=this,error_func=function(){},success_func=function(){};this.data.search.str=str;if(!skip_async&&s.ajax!==false&&this.get_container().find(".jstree-closed:eq(0)").length>0){this.search.supress_callback=true;error_func=function(){};success_func=function(d,t,x){var sf=this.get_settings().search.ajax.success;if(sf){d=sf.call(this,d,t,x)||d}this.data.search.to_open=d;this._search_open()};s.ajax.context=this;s.ajax.error=error_func;s.ajax.success=success_func;if($.isFunction(s.ajax.url)){s.ajax.url=s.ajax.url.call(this,str)}if($.isFunction(s.ajax.data)){s.ajax.data=s.ajax.data.call(this,str)}if(!s.ajax.data){s.ajax.data={search_string:str}}if(!s.ajax.dataType||/^json/.exec(s.ajax.dataType)){s.ajax.dataType="json"}$.ajax(s.ajax);return}if(this.data.search.result.length){this.clear_search()}this.data.search.result=this.get_container().find("a"+(this.data.languages?"."+this.get_lang():"")+":"+(s.case_insensitive?"jstree_contains":"contains")+"("+this.data.search.str+")");this.data.search.result.addClass("jstree-search").parents(".jstree-closed").each(function(){t.open_node(this,false,true)});this.__callback({nodes:this.data.search.result,str:str})},clear_search:function(str){this.data.search.result.removeClass("jstree-search");this.__callback(this.data.search.result);this.data.search.result=$()},_search_open:function(is_callback){var _this=this,done=true,current=[],remaining=[];if(this.data.search.to_open.length){$.each(this.data.search.to_open,function(i,val){if(val=="#"){return true}if($(val).length&&$(val).is(".jstree-closed")){current.push(val)}else{remaining.push(val)}});if(current.length){this.data.search.to_open=remaining;$.each(current,function(i,val){_this.open_node(val,function(){_this._search_open(true)})});done=false}}if(done){this.search(this.data.search.str,true)}}}})})(jQuery);(function($){$.vakata.context={cnt:$("
                "),vis:false,tgt:false,par:false,func:false,data:false,show:function(s,t,x,y,d,p){var html=$.vakata.context.parse(s),h,w;if(!html){return}$.vakata.context.vis=true;$.vakata.context.tgt=t;$.vakata.context.par=p||t||null;$.vakata.context.data=d||null;$.vakata.context.cnt.html(html).css({visibility:"hidden",display:"block",left:0,top:0});h=$.vakata.context.cnt.height();w=$.vakata.context.cnt.width();if(x+w>$(document).width()){x=$(document).width()-(w+5);$.vakata.context.cnt.find("li > ul").addClass("right")}if(y+h>$(document).height()){y=y-(h+t[0].offsetHeight);$.vakata.context.cnt.find("li > ul").addClass("bottom")}$.vakata.context.cnt.css({left:x,top:y}).find("li:has(ul)").bind("mouseenter",function(e){var w=$(document).width(),h=$(document).height(),ul=$(this).children("ul").show();if(w!==$(document).width()){ul.toggleClass("right")}if(h!==$(document).height()){ul.toggleClass("bottom")}}).bind("mouseleave",function(e){$(this).children("ul").hide()}).end().css({visibility:"visible"}).show();$(document).triggerHandler("context_show.vakata")},hide:function(){$.vakata.context.vis=false;$.vakata.context.cnt.attr("class","").hide();$(document).triggerHandler("context_hide.vakata")},parse:function(s,is_callback){if(!s){return false}var str="",tmp=false,was_sep=true;if(!is_callback){$.vakata.context.func={}}str+="
                  ";$.each(s,function(i,val){if(!val){return true}$.vakata.context.func[i]=val.action;if(!was_sep&&val.separator_before){str+="
                • "}was_sep=false;str+="
                • ";if(val.submenu){str+="»"}str+=val.label+"";if(val.submenu){tmp=$.vakata.context.parse(val.submenu,true);if(tmp){str+=tmp}}str+="
                  • ";if(val.separator_after){str+="
                • ";was_sep=true}});str=str.replace(/
                • <\/li\>$/,"");str+="
                ";return str.length>10?str:false},exec:function(i){if($.isFunction($.vakata.context.func[i])){$.vakata.context.func[i].call($.vakata.context.data,$.vakata.context.par);return true}else{return false}}};$(function(){var css_string="#vakata-contextmenu { display:none; position:absolute; margin:0; padding:0; min-width:180px; background:#ebebeb; border:1px solid silver; z-index:10000; *width:180px; } #vakata-contextmenu ul { min-width:180px; *width:180px; } #vakata-contextmenu ul, #vakata-contextmenu li { margin:0; padding:0; list-style-type:none; display:block; } #vakata-contextmenu li { line-height:20px; min-height:20px; position:relative; padding:0px; } #vakata-contextmenu li a { padding:1px 6px; line-height:17px; display:block; text-decoration:none; margin:1px 1px 0 1px; } #vakata-contextmenu li ins { float:left; width:16px; height:16px; text-decoration:none; margin-right:2px; } #vakata-contextmenu li a:hover, #vakata-contextmenu li.vakata-hover > a { background:gray; color:white; } #vakata-contextmenu li ul { display:none; position:absolute; top:-2px; left:100%; background:#ebebeb; border:1px solid gray; } #vakata-contextmenu .right { right:100%; left:auto; } #vakata-contextmenu .bottom { bottom:-1px; top:auto; } #vakata-contextmenu li.vakata-separator { min-height:0; height:1px; line-height:1px; font-size:1px; overflow:hidden; margin:0 2px; background:silver; /* border-top:1px solid #fefefe; */ padding:0; } ";$.vakata.css.add_sheet({str:css_string});$.vakata.context.cnt.delegate("a","click",function(e){e.preventDefault()}).delegate("a","mouseup",function(e){if(!$(this).parent().hasClass("jstree-contextmenu-disabled")&&$.vakata.context.exec($(this).attr("rel"))){$.vakata.context.hide()}else{$(this).blur()}}).delegate("a","mouseover",function(){$.vakata.context.cnt.find(".vakata-hover").removeClass("vakata-hover")}).appendTo("body");$(document).bind("mousedown",function(e){if($.vakata.context.vis&&!$.contains($.vakata.context.cnt[0],e.target)){$.vakata.context.hide()}});if(typeof $.hotkeys!=="undefined"){$(document).bind("keydown","up",function(e){if($.vakata.context.vis){var o=$.vakata.context.cnt.find("ul:visible").last().children(".vakata-hover").removeClass("vakata-hover").prevAll("li:not(.vakata-separator)").first();if(!o.length){o=$.vakata.context.cnt.find("ul:visible").last().children("li:not(.vakata-separator)").last()}o.addClass("vakata-hover");e.stopImmediatePropagation();e.preventDefault()}}).bind("keydown","down",function(e){if($.vakata.context.vis){var o=$.vakata.context.cnt.find("ul:visible").last().children(".vakata-hover").removeClass("vakata-hover").nextAll("li:not(.vakata-separator)").first();if(!o.length){o=$.vakata.context.cnt.find("ul:visible").last().children("li:not(.vakata-separator)").first()}o.addClass("vakata-hover");e.stopImmediatePropagation();e.preventDefault()}}).bind("keydown","right",function(e){if($.vakata.context.vis){$.vakata.context.cnt.find(".vakata-hover").children("ul").show().children("li:not(.vakata-separator)").removeClass("vakata-hover").first().addClass("vakata-hover");e.stopImmediatePropagation();e.preventDefault()}}).bind("keydown","left",function(e){if($.vakata.context.vis){$.vakata.context.cnt.find(".vakata-hover").children("ul").hide().children(".vakata-separator").removeClass("vakata-hover");e.stopImmediatePropagation();e.preventDefault()}}).bind("keydown","esc",function(e){$.vakata.context.hide();e.preventDefault()}).bind("keydown","space",function(e){$.vakata.context.cnt.find(".vakata-hover").last().children("a").click();e.preventDefault()})}});$.jstree.plugin("contextmenu",{__init:function(){this.get_container().delegate("a","contextmenu.jstree",$.proxy(function(e){e.preventDefault();this.show_contextmenu(e.currentTarget,e.pageX,e.pageY)},this)).bind("destroy.jstree",$.proxy(function(){if(this.data.contextmenu){$.vakata.context.hide()}},this));$(document).bind("context_hide.vakata",$.proxy(function(){this.data.contextmenu=false},this))},defaults:{select_node:false,show_at_node:true,items:{create:{separator_before:false,separator_after:true,label:"Create",action:function(obj){this.create(obj)}},rename:{separator_before:false,separator_after:false,label:"Rename",action:function(obj){this.rename(obj)}},remove:{separator_before:false,icon:false,separator_after:false,label:"Delete",action:function(obj){this.remove(obj)}},ccp:{separator_before:true,icon:false,separator_after:false,label:"Edit",action:false,submenu:{cut:{separator_before:false,separator_after:false,label:"Cut",action:function(obj){this.cut(obj)}},copy:{separator_before:false,icon:false,separator_after:false,label:"Copy",action:function(obj){this.copy(obj)}},paste:{separator_before:false,icon:false,separator_after:false,label:"Paste",action:function(obj){this.paste(obj)}}}}}},_fn:{show_contextmenu:function(obj,x,y){obj=this._get_node(obj);var s=this.get_settings().contextmenu,a=obj.children("a:visible:eq(0)"),o=false;if(s.select_node&&this.data.ui&&!this.is_selected(obj)){this.deselect_all();this.select_node(obj,true)}if(s.show_at_node||typeof x==="undefined"||typeof y==="undefined"){o=a.offset();x=o.left;y=o.top+this.data.core.li_height}if($.isFunction(s.items)){s.items=s.items.call(this,obj)}this.data.contextmenu=true;$.vakata.context.show(s.items,a,x,y,this,obj);if(this.data.themes){$.vakata.context.cnt.attr("class","jstree-"+this.data.themes.theme+"-context")}}}})})(jQuery);(function($){$.jstree.plugin("types",{__init:function(){var s=this._get_settings().types;this.data.types.attach_to=[];this.get_container().bind("init.jstree",$.proxy(function(){var types=s.types,attr=s.type_attr,icons_css="",_this=this;$.each(types,function(i,tp){$.each(tp,function(k,v){if(!/^(max_depth|max_children|icon|valid_children)$/.test(k)){_this.data.types.attach_to.push(k)}});if(!tp.icon){return true}if(tp.icon.image||tp.icon.position){if(i=="default"){icons_css+=".jstree-"+_this.get_index()+" a > .jstree-icon { "}else{icons_css+=".jstree-"+_this.get_index()+" li["+attr+"="+i+"] > a > .jstree-icon { "}if(tp.icon.image){icons_css+=" background-image:url("+tp.icon.image+"); "}if(tp.icon.position){icons_css+=" background-position:"+tp.icon.position+"; "}else{icons_css+=" background-position:0 0; "}icons_css+="} "}});if(icons_css!=""){$.vakata.css.add_sheet({str:icons_css})}},this)).bind("before.jstree",$.proxy(function(e,data){if($.inArray(data.func,this.data.types.attach_to)!==-1){var s=this._get_settings().types.types,t=this._get_type(data.args[0]);if(((s[t]&&typeof s[t][data.func]!=="undefined")||(s["default"]&&typeof s["default"][data.func]!=="undefined"))&&!this._check(data.func,data.args[0])){e.stopImmediatePropagation();return false}}},this))},defaults:{max_children:-1,max_depth:-1,valid_children:"all",type_attr:"rel",types:{"default":{max_children:-1,max_depth:-1,valid_children:"all"}}},_fn:{_get_type:function(obj){obj=this._get_node(obj);return(!obj||!obj.length)?false:obj.attr(this._get_settings().types.type_attr)||"default"},set_type:function(str,obj){obj=this._get_node(obj);return(!obj.length||!str)?false:obj.attr(this._get_settings().types.type_attr,str)},_check:function(rule,obj,opts){var v=false,t=this._get_type(obj),d=0,_this=this,s=this._get_settings().types;if(obj===-1){if(!!s[rule]){v=s[rule]}else{return}}else{if(t===false){return}if(!!s.types[t]&&!!s.types[t][rule]){v=s.types[t][rule]}else{if(!!s.types["default"]&&!!s.types["default"][rule]){v=s.types["default"][rule]}}}if($.isFunction(v)){v=v.call(this,obj)}if(rule==="max_depth"&&obj!==-1&&opts!==false&&s.max_depth!==-2&&v!==0){this._get_node(obj).children("a:eq(0)").parentsUntil(".jstree","li").each(function(i){if(s.max_depth!==-1&&s.max_depth-(i+1)<=0){v=0;return false}d=(i===0)?v:_this._check(rule,this,false);if(d!==-1&&d-(i+1)<=0){v=0;return false}if(d>=0&&(d-(i+1)=0&&(s.max_depth-(i+1) ul > li").not(m.o).length:m.cr.children("> ul > li").not(m.o).length;if(ch+m.o.length>mc){return false}}if(s.max_depth!==-2&&md!==-1){d=0;if(md===0){return false}if(typeof m.o.d==="undefined"){t=m.o;while(t.length>0){t=t.find("> ul > li");d++}m.o.d=d}if(md-m.o.d<0){return false}}return true},create_node:function(obj,position,js,callback,is_loaded,skip_check){if(!skip_check&&(is_loaded||this._is_loaded(obj))){var p=(position&&position.match(/^before|after$/i)&&obj!==-1)?this._get_parent(obj):this._get_node(obj),s=this._get_settings().types,mc=this._check("max_children",p),md=this._check("max_depth",p),vc=this._check("valid_children",p),ch;if(!js){js={}}if(vc==="none"){return false}if($.isArray(vc)){if(!js.attr||!js.attr[s.type_attr]){if(!js.attr){js.attr={}}js.attr[s.type_attr]=vc[0]}else{if($.inArray(js.attr[s.type_attr],vc)===-1){return false}}}if(s.max_children!==-2&&mc!==-1){ch=p===-1?this.get_container().children("> ul > li").length:p.children("> ul > li").length;if(ch+1>mc){return false}}if(s.max_depth!==-2&&md!==-1&&(md-1)<0){return false}}return this.__call_old(true,obj,position,js,callback,is_loaded,skip_check)}}})})(jQuery);(function($){$.jstree.plugin("html_data",{__init:function(){this.data.html_data.original_container_html=this.get_container().find(" > ul > li").clone(true);this.data.html_data.original_container_html.find("li").andSelf().contents().filter(function(){return this.nodeType==3}).remove()},defaults:{data:false,ajax:false,correct_state:true},_fn:{load_node:function(obj,s_call,e_call){var _this=this;this.load_node_html(obj,function(){_this.__callback({obj:obj});s_call.call(this)},e_call)},_is_loaded:function(obj){obj=this._get_node(obj);return obj==-1||!obj||!this._get_settings().html_data.ajax||obj.is(".jstree-open, .jstree-leaf")||obj.children("ul").children("li").size()>0},load_node_html:function(obj,s_call,e_call){var d,s=this.get_settings().html_data,error_func=function(){},success_func=function(){};obj=this._get_node(obj);if(obj&&obj!==-1){if(obj.data("jstree-is-loading")){return}else{obj.data("jstree-is-loading",true)}}switch(!0){case (!s.data&&!s.ajax):if(!obj||obj==-1){this.get_container().children("ul").empty().append(this.data.html_data.original_container_html).find("li, a").filter(function(){return this.firstChild.tagName!=="INS"}).prepend(" ").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");this.clean_node()}if(s_call){s_call.call(this)}break;case (!!s.data&&!s.ajax)||(!!s.data&&!!s.ajax&&(!obj||obj===-1)):if(!obj||obj==-1){d=$(s.data);if(!d.is("ul")){d=$("
                  ").append(d)}this.get_container().children("ul").empty().append(d.children()).find("li, a").filter(function(){return this.firstChild.tagName!=="INS"}).prepend(" ").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");this.clean_node()}if(s_call){s_call.call(this)}break;case (!s.data&&!!s.ajax)||(!!s.data&&!!s.ajax&&obj&&obj!==-1):obj=this._get_node(obj);error_func=function(x,t,e){var ef=this.get_settings().html_data.ajax.error;if(ef){ef.call(this,x,t,e)}if(obj!=-1&&obj.length){obj.children(".jstree-loading").removeClass("jstree-loading");obj.data("jstree-is-loading",false);if(t==="success"&&s.correct_state){obj.removeClass("jstree-open jstree-closed").addClass("jstree-leaf")}}else{if(t==="success"&&s.correct_state){this.get_container().children("ul").empty()}}if(e_call){e_call.call(this)}};success_func=function(d,t,x){var sf=this.get_settings().html_data.ajax.success;if(sf){d=sf.call(this,d,t,x)||d}if(d==""){return error_func.call(this,x,t,"")}if(d){d=$(d);if(!d.is("ul")){d=$("
                    ").append(d)}if(obj==-1||!obj){this.get_container().children("ul").empty().append(d.children()).find("li, a").filter(function(){return this.firstChild.tagName!=="INS"}).prepend(" ").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon")}else{obj.children(".jstree-loading").removeClass("jstree-loading");obj.append(d).find("li, a").filter(function(){return this.firstChild.tagName!=="INS"}).prepend(" ").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");obj.data("jstree-is-loading",false)}this.clean_node(obj);if(s_call){s_call.call(this)}}else{if(obj&&obj!==-1){obj.children(".jstree-loading").removeClass("jstree-loading");obj.data("jstree-is-loading",false);if(s.correct_state){obj.removeClass("jstree-open jstree-closed").addClass("jstree-leaf");if(s_call){s_call.call(this)}}}else{if(s.correct_state){this.get_container().children("ul").empty();if(s_call){s_call.call(this)}}}}};s.ajax.context=this;s.ajax.error=error_func;s.ajax.success=success_func;if(!s.ajax.dataType){s.ajax.dataType="html"}if($.isFunction(s.ajax.url)){s.ajax.url=s.ajax.url.call(this,obj)}if($.isFunction(s.ajax.data)){s.ajax.data=s.ajax.data.call(this,obj)}$.ajax(s.ajax);break}}}});$.jstree.defaults.plugins.push("html_data")})(jQuery);(function($){$.jstree.plugin("themeroller",{__init:function(){var s=this._get_settings().themeroller;this.get_container().addClass("ui-widget-content").delegate("a","mouseenter.jstree",function(){$(this).addClass(s.item_h)}).delegate("a","mouseleave.jstree",function(){$(this).removeClass(s.item_h)}).bind("open_node.jstree create_node.jstree",$.proxy(function(e,data){this._themeroller(data.rslt.obj)},this)).bind("loaded.jstree refresh.jstree",$.proxy(function(e){this._themeroller()},this)).bind("close_node.jstree",$.proxy(function(e,data){data.rslt.obj.children("ins").removeClass(s.opened).addClass(s.closed)},this)).bind("select_node.jstree",$.proxy(function(e,data){data.rslt.obj.children("a").addClass(s.item_a)},this)).bind("deselect_node.jstree deselect_all.jstree",$.proxy(function(e,data){this.get_container().find("."+s.item_a).removeClass(s.item_a).end().find(".jstree-clicked").addClass(s.item_a)},this)).bind("move_node.jstree",$.proxy(function(e,data){this._themeroller(data.rslt.o)},this))},__destroy:function(){var s=this._get_settings().themeroller,c=["ui-icon"];$.each(s,function(i,v){v=v.split(" ");if(v.length){c=c.concat(v)}});this.get_container().removeClass("ui-widget-content").find("."+c.join(", .")).removeClass(c.join(" "))},_fn:{_themeroller:function(obj){var s=this._get_settings().themeroller;obj=!obj||obj==-1?this.get_container():this._get_node(obj).parent();obj.find("li.jstree-closed > ins.jstree-icon").removeClass(s.opened).addClass("ui-icon "+s.closed).end().find("li.jstree-open > ins.jstree-icon").removeClass(s.closed).addClass("ui-icon "+s.opened).end().find("a").addClass(s.item).children("ins.jstree-icon").addClass("ui-icon "+s.item_icon)}},defaults:{opened:"ui-icon-triangle-1-se",closed:"ui-icon-triangle-1-e",item:"ui-state-default",item_h:"ui-state-hover",item_a:"ui-state-active",item_icon:"ui-icon-folder-collapsed"}});$(function(){var css_string=".jstree .ui-icon { overflow:visible; } .jstree a { padding:0 2px; }";$.vakata.css.add_sheet({str:css_string})})})(jQuery);(function($){$.jstree.plugin("unique",{__init:function(){this.get_container().bind("before.jstree",$.proxy(function(e,data){var nms=[],res=true,p,t;if(data.func=="move_node"){if(data.args[4]===true){if(data.args[0].o&&data.args[0].o.length){data.args[0].o.children("a").each(function(){nms.push($(this).text().replace(/^\s+/g,""))});res=this._check_unique(nms,data.args[0].np.find("> ul > li").not(data.args[0].o))}}}if(data.func=="create_node"){if(data.args[4]||this._is_loaded(data.args[0])){p=this._get_node(data.args[0]);if(data.args[1]&&(data.args[1]==="before"||data.args[1]==="after")){p=this._get_parent(data.args[0]);if(!p||p===-1){p=this.get_container()}}if(typeof data.args[2]==="string"){nms.push(data.args[2])}else{if(!data.args[2]||!data.args[2].data){nms.push(this._get_settings().core.strings.new_node)}else{nms.push(data.args[2].data)}}res=this._check_unique(nms,p.find("> ul > li"))}}if(data.func=="rename_node"){nms.push(data.args[1]);t=this._get_node(data.args[0]);p=this._get_parent(t);if(!p||p===-1){p=this.get_container()}res=this._check_unique(nms,p.find("> ul > li").not(t))}if(!res){e.stopPropagation();return false}},this))},_fn:{_check_unique:function(nms,p){var cnms=[];p.children("a").each(function(){cnms.push($(this).text().replace(/^\s+/g,""))});if(!cnms.length||!nms.length){return true}cnms=cnms.sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(",");if((cnms.length+nms.length)!=cnms.concat(nms).sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(",").length){return false}return true},check_move:function(){if(!this.__call_old()){return false}var p=this._get_move(),nms=[];if(p.o&&p.o.length){p.o.children("a").each(function(){nms.push($(this).text().replace(/^\s+/g,""))});return this._check_unique(nms,p.np.find("> ul > li").not(p.o))}return true}}})})(jQuery); \ No newline at end of file From 69cac0dd849cffc2f2eacda323d29c5fe06305c9 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 13 Oct 2010 19:01:49 +0200 Subject: [PATCH 099/173] use ROOT_JS for jstree theme includes --- data/templates/sidebar.block.linked.php | 2 +- data/templates/sidebar.block.menu2.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php index cd4a908..558059d 100644 --- a/data/templates/sidebar.block.linked.php +++ b/data/templates/sidebar.block.linked.php @@ -38,7 +38,7 @@ jQuery("#related-content") "theme": "default", "dots": false, "icons": true, - "url": 'js/jstree-1.0-rc2/themes/default/style.css' + "url": 'themes/default/style.css' }, "json_data" : { "ajax" : { diff --git a/data/templates/sidebar.block.menu2.php b/data/templates/sidebar.block.menu2.php index f71977c..1c177a5 100644 --- a/data/templates/sidebar.block.menu2.php +++ b/data/templates/sidebar.block.menu2.php @@ -46,7 +46,7 @@ jQuery("#maintagsmenu") "theme": "default", "dots": false, "icons": true, - "url": 'js/jstree-1.0-rc2/themes/default/style.css' + "url": 'themes/default/style.css' }, "json_data" : { "ajax" : { From 52e65759bd8cd776b0b345910e182d29b7946879 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 13 Oct 2010 19:18:42 +0200 Subject: [PATCH 100/173] make linked tags work on opera - "parent" is apparently a reserved word --- data/templates/sidebar.block.linked.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php index 558059d..199cf4c 100644 --- a/data/templates/sidebar.block.linked.php +++ b/data/templates/sidebar.block.linked.php @@ -44,16 +44,18 @@ jQuery("#related-content") "ajax" : { "url": function(node) { //-1 is root - parent = ""; + parentparam = ""; if (node == -1 ) { node = ; - parent = "&parent=true"; + parentparam = "&parent=true"; } else if (node.attr('rel')) { node = node.attr('rel'); } else { return; } - return "ajax/getlinkedtags.php?tag=" + node + parent; + + return "ajax/getlinkedtags.php?tag=" + node + + parentparam; } } }, From 8fd61c0d8d27a905b79667f033a3dcfadd5194fa Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 14 Oct 2010 08:21:13 +0200 Subject: [PATCH 101/173] make sidebar work with chrome and opera in non-strict mode --- data/templates/sidebar.block.linked.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php index 199cf4c..b9a8135 100644 --- a/data/templates/sidebar.block.linked.php +++ b/data/templates/sidebar.block.linked.php @@ -31,7 +31,7 @@ if ($editingMode) { } ?>
                    - +//]]> +
                    \ No newline at end of file From c2875e45ab9c51bdc193b0b9016c2c6d043a0e09 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 14 Oct 2010 08:23:40 +0200 Subject: [PATCH 102/173] makde linked block look nice in non-strict mode in opera and chrome --- data/templates/sidebar.block.linked.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/templates/sidebar.block.linked.php b/data/templates/sidebar.block.linked.php index b9a8135..9aa3cc0 100644 --- a/data/templates/sidebar.block.linked.php +++ b/data/templates/sidebar.block.linked.php @@ -30,8 +30,8 @@ if ($editingMode) { echo '

                    '; } ?> -
                    - - @@ -73,17 +62,21 @@ function jsEscTitle($title) - + - + @@ -124,13 +117,28 @@ function jsEscTitle($title) ?> - -
                    + + + ←
                    " to include one tag in another. e.g.: europe>france>paris')?>" to include one tag in another. e.g.: europe>france>paris'))?>
                    + + + + + + + + + + + includeTemplate('dynamictags.inc'); + //FIXME$this->includeTemplate('dynamictags.inc'); // Bookmarklets and import links if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) { @@ -139,17 +147,18 @@ if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) {

                    +:

                    +

                    diff --git a/www/js/jqueryui-1.8.5/jquery.ui.autocomplete.js b/www/js/jqueryui-1.8.5/jquery.ui.autocomplete.js deleted file mode 100644 index 105f7ca..0000000 --- a/www/js/jqueryui-1.8.5/jquery.ui.autocomplete.js +++ /dev/null @@ -1,555 +0,0 @@ -/* - * jQuery UI Autocomplete 1.8.5 - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Autocomplete - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - * jquery.ui.position.js - */ -(function( $, undefined ) { - -$.widget( "ui.autocomplete", { - options: { - appendTo: "body", - delay: 300, - minLength: 1, - position: { - my: "left top", - at: "left bottom", - collision: "none" - }, - source: null - }, - _create: function() { - var self = this, - doc = this.element[ 0 ].ownerDocument; - this.element - .addClass( "ui-autocomplete-input" ) - .attr( "autocomplete", "off" ) - // TODO verify these actually work as intended - .attr({ - role: "textbox", - "aria-autocomplete": "list", - "aria-haspopup": "true" - }) - .bind( "keydown.autocomplete", function( event ) { - if ( self.options.disabled ) { - return; - } - - var keyCode = $.ui.keyCode; - switch( event.keyCode ) { - case keyCode.PAGE_UP: - self._move( "previousPage", event ); - break; - case keyCode.PAGE_DOWN: - self._move( "nextPage", event ); - break; - case keyCode.UP: - self._move( "previous", event ); - // prevent moving cursor to beginning of text field in some browsers - event.preventDefault(); - break; - case keyCode.DOWN: - self._move( "next", event ); - // prevent moving cursor to end of text field in some browsers - event.preventDefault(); - break; - case keyCode.ENTER: - case keyCode.NUMPAD_ENTER: - // when menu is open or has focus - if ( self.menu.element.is( ":visible" ) ) { - event.preventDefault(); - } - //passthrough - ENTER and TAB both select the current element - case keyCode.TAB: - if ( !self.menu.active ) { - return; - } - self.menu.select( event ); - break; - case keyCode.ESCAPE: - self.element.val( self.term ); - self.close( event ); - break; - default: - // keypress is triggered before the input value is changed - clearTimeout( self.searching ); - self.searching = setTimeout(function() { - // only search if the value has changed - if ( self.term != self.element.val() ) { - self.selectedItem = null; - self.search( null, event ); - } - }, self.options.delay ); - break; - } - }) - .bind( "focus.autocomplete", function() { - if ( self.options.disabled ) { - return; - } - - self.selectedItem = null; - self.previous = self.element.val(); - }) - .bind( "blur.autocomplete", function( event ) { - if ( self.options.disabled ) { - return; - } - - clearTimeout( self.searching ); - // clicks on the menu (or a button to trigger a search) will cause a blur event - self.closing = setTimeout(function() { - self.close( event ); - self._change( event ); - }, 150 ); - }); - this._initSource(); - this.response = function() { - return self._response.apply( self, arguments ); - }; - this.menu = $( "
                      " ) - .addClass( "ui-autocomplete" ) - .appendTo( $( this.options.appendTo || "body", doc )[0] ) - // prevent the close-on-blur in case of a "slow" click on the menu (long mousedown) - .mousedown(function( event ) { - // clicking on the scrollbar causes focus to shift to the body - // but we can't detect a mouseup or a click immediately afterward - // so we have to track the next mousedown and close the menu if - // the user clicks somewhere outside of the autocomplete - var menuElement = self.menu.element[ 0 ]; - if ( event.target === menuElement ) { - setTimeout(function() { - $( document ).one( 'mousedown', function( event ) { - if ( event.target !== self.element[ 0 ] && - event.target !== menuElement && - !$.ui.contains( menuElement, event.target ) ) { - self.close(); - } - }); - }, 1 ); - } - - // use another timeout to make sure the blur-event-handler on the input was already triggered - setTimeout(function() { - clearTimeout( self.closing ); - }, 13); - }) - .menu({ - focus: function( event, ui ) { - var item = ui.item.data( "item.autocomplete" ); - if ( false !== self._trigger( "focus", null, { item: item } ) ) { - // use value to match what will end up in the input, if it was a key event - if ( /^key/.test(event.originalEvent.type) ) { - self.element.val( item.value ); - } - } - }, - selected: function( event, ui ) { - var item = ui.item.data( "item.autocomplete" ), - previous = self.previous; - - // only trigger when focus was lost (click on menu) - if ( self.element[0] !== doc.activeElement ) { - self.element.focus(); - self.previous = previous; - } - - if ( false !== self._trigger( "select", event, { item: item } ) ) { - self.term = item.value; - self.element.val( item.value ); - } - - self.close( event ); - self.selectedItem = item; - }, - blur: function( event, ui ) { - // don't set the value of the text field if it's already correct - // this prevents moving the cursor unnecessarily - if ( self.menu.element.is(":visible") && - ( self.element.val() !== self.term ) ) { - self.element.val( self.term ); - } - } - }) - .zIndex( this.element.zIndex() + 1 ) - // workaround for jQuery bug #5781 http://dev.jquery.com/ticket/5781 - .css({ top: 0, left: 0 }) - .hide() - .data( "menu" ); - if ( $.fn.bgiframe ) { - this.menu.element.bgiframe(); - } - }, - - destroy: function() { - this.element - .removeClass( "ui-autocomplete-input" ) - .removeAttr( "autocomplete" ) - .removeAttr( "role" ) - .removeAttr( "aria-autocomplete" ) - .removeAttr( "aria-haspopup" ); - this.menu.element.remove(); - $.Widget.prototype.destroy.call( this ); - }, - - _setOption: function( key, value ) { - $.Widget.prototype._setOption.apply( this, arguments ); - if ( key === "source" ) { - this._initSource(); - } - if ( key === "appendTo" ) { - this.menu.element.appendTo( $( value || "body", this.element[0].ownerDocument )[0] ) - } - }, - - _initSource: function() { - var self = this, - array, - url; - if ( $.isArray(this.options.source) ) { - array = this.options.source; - this.source = function( request, response ) { - response( $.ui.autocomplete.filter(array, request.term) ); - }; - } else if ( typeof this.options.source === "string" ) { - url = this.options.source; - this.source = function( request, response ) { - if (self.xhr) { - self.xhr.abort(); - } - self.xhr = $.getJSON( url, request, function( data, status, xhr ) { - if ( xhr === self.xhr ) { - response( data ); - } - self.xhr = null; - }); - }; - } else { - this.source = this.options.source; - } - }, - - search: function( value, event ) { - value = value != null ? value : this.element.val(); - - // always save the actual value, not the one passed as an argument - this.term = this.element.val(); - - if ( value.length < this.options.minLength ) { - return this.close( event ); - } - - clearTimeout( this.closing ); - if ( this._trigger("search") === false ) { - return; - } - - return this._search( value ); - }, - - _search: function( value ) { - this.element.addClass( "ui-autocomplete-loading" ); - - this.source( { term: value }, this.response ); - }, - - _response: function( content ) { - if ( content.length ) { - content = this._normalize( content ); - this._suggest( content ); - this._trigger( "open" ); - } else { - this.close(); - } - this.element.removeClass( "ui-autocomplete-loading" ); - }, - - close: function( event ) { - clearTimeout( this.closing ); - if ( this.menu.element.is(":visible") ) { - this._trigger( "close", event ); - this.menu.element.hide(); - this.menu.deactivate(); - } - }, - - _change: function( event ) { - if ( this.previous !== this.element.val() ) { - this._trigger( "change", event, { item: this.selectedItem } ); - } - }, - - _normalize: function( items ) { - // assume all items have the right format when the first item is complete - if ( items.length && items[0].label && items[0].value ) { - return items; - } - return $.map( items, function(item) { - if ( typeof item === "string" ) { - return { - label: item, - value: item - }; - } - return $.extend({ - label: item.label || item.value, - value: item.value || item.label - }, item ); - }); - }, - - _suggest: function( items ) { - var ul = this.menu.element - .empty() - .zIndex( this.element.zIndex() + 1 ), - menuWidth, - textWidth; - this._renderMenu( ul, items ); - // TODO refresh should check if the active item is still in the dom, removing the need for a manual deactivate - this.menu.deactivate(); - this.menu.refresh(); - this.menu.element.show().position( $.extend({ - of: this.element - }, this.options.position )); - - menuWidth = ul.width( "" ).outerWidth(); - textWidth = this.element.outerWidth(); - ul.outerWidth( Math.max( menuWidth, textWidth ) ); - }, - - _renderMenu: function( ul, items ) { - var self = this; - $.each( items, function( index, item ) { - self._renderItem( ul, item ); - }); - }, - - _renderItem: function( ul, item) { - return $( "
                    • " ) - .data( "item.autocomplete", item ) - .append( $( "" ).text( item.label ) ) - .appendTo( ul ); - }, - - _move: function( direction, event ) { - if ( !this.menu.element.is(":visible") ) { - this.search( null, event ); - return; - } - if ( this.menu.first() && /^previous/.test(direction) || - this.menu.last() && /^next/.test(direction) ) { - this.element.val( this.term ); - this.menu.deactivate(); - return; - } - this.menu[ direction ]( event ); - }, - - widget: function() { - return this.menu.element; - } -}); - -$.extend( $.ui.autocomplete, { - escapeRegex: function( value ) { - return value.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"); - }, - filter: function(array, term) { - var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" ); - return $.grep( array, function(value) { - return matcher.test( value.label || value.value || value ); - }); - } -}); - -}( jQuery )); - -/* - * jQuery UI Menu (not officially released) - * - * This widget isn't yet finished and the API is subject to change. We plan to finish - * it for the next release. You're welcome to give it a try anyway and give us feedback, - * as long as you're okay with migrating your code later on. We can help with that, too. - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Menu - * - * Depends: - * jquery.ui.core.js - * jquery.ui.widget.js - */ -(function($) { - -$.widget("ui.menu", { - _create: function() { - var self = this; - this.element - .addClass("ui-menu ui-widget ui-widget-content ui-corner-all") - .attr({ - role: "listbox", - "aria-activedescendant": "ui-active-menuitem" - }) - .click(function( event ) { - if ( !$( event.target ).closest( ".ui-menu-item a" ).length ) { - return; - } - // temporary - event.preventDefault(); - self.select( event ); - }); - this.refresh(); - }, - - refresh: function() { - var self = this; - - // don't refresh list items that are already adapted - var items = this.element.children("li:not(.ui-menu-item):has(a)") - .addClass("ui-menu-item") - .attr("role", "menuitem"); - - items.children("a") - .addClass("ui-corner-all") - .attr("tabindex", -1) - // mouseenter doesn't work with event delegation - .mouseenter(function( event ) { - self.activate( event, $(this).parent() ); - }) - .mouseleave(function() { - self.deactivate(); - }); - }, - - activate: function( event, item ) { - this.deactivate(); - if (this.hasScroll()) { - var offset = item.offset().top - this.element.offset().top, - scroll = this.element.attr("scrollTop"), - elementHeight = this.element.height(); - if (offset < 0) { - this.element.attr("scrollTop", scroll + offset); - } else if (offset >= elementHeight) { - this.element.attr("scrollTop", scroll + offset - elementHeight + item.height()); - } - } - this.active = item.eq(0) - .children("a") - .addClass("ui-state-hover") - .attr("id", "ui-active-menuitem") - .end(); - this._trigger("focus", event, { item: item }); - }, - - deactivate: function() { - if (!this.active) { return; } - - this.active.children("a") - .removeClass("ui-state-hover") - .removeAttr("id"); - this._trigger("blur"); - this.active = null; - }, - - next: function(event) { - this.move("next", ".ui-menu-item:first", event); - }, - - previous: function(event) { - this.move("prev", ".ui-menu-item:last", event); - }, - - first: function() { - return this.active && !this.active.prevAll(".ui-menu-item").length; - }, - - last: function() { - return this.active && !this.active.nextAll(".ui-menu-item").length; - }, - - move: function(direction, edge, event) { - if (!this.active) { - this.activate(event, this.element.children(edge)); - return; - } - var next = this.active[direction + "All"](".ui-menu-item").eq(0); - if (next.length) { - this.activate(event, next); - } else { - this.activate(event, this.element.children(edge)); - } - }, - - // TODO merge with previousPage - nextPage: function(event) { - if (this.hasScroll()) { - // TODO merge with no-scroll-else - if (!this.active || this.last()) { - this.activate(event, this.element.children(":first")); - return; - } - var base = this.active.offset().top, - height = this.element.height(), - result = this.element.children("li").filter(function() { - var close = $(this).offset().top - base - height + $(this).height(); - // TODO improve approximation - return close < 10 && close > -10; - }); - - // TODO try to catch this earlier when scrollTop indicates the last page anyway - if (!result.length) { - result = this.element.children(":last"); - } - this.activate(event, result); - } else { - this.activate(event, this.element.children(!this.active || this.last() ? ":first" : ":last")); - } - }, - - // TODO merge with nextPage - previousPage: function(event) { - if (this.hasScroll()) { - // TODO merge with no-scroll-else - if (!this.active || this.first()) { - this.activate(event, this.element.children(":last")); - return; - } - - var base = this.active.offset().top, - height = this.element.height(); - result = this.element.children("li").filter(function() { - var close = $(this).offset().top - base + height - $(this).height(); - // TODO improve approximation - return close < 10 && close > -10; - }); - - // TODO try to catch this earlier when scrollTop indicates the last page anyway - if (!result.length) { - result = this.element.children(":first"); - } - this.activate(event, result); - } else { - this.activate(event, this.element.children(!this.active || this.first() ? ":last" : ":first")); - } - }, - - hasScroll: function() { - return this.element.height() < this.element.attr("scrollHeight"); - }, - - select: function( event ) { - this._trigger("selected", event, { item: this.active }); - } -}); - -}(jQuery)); diff --git a/www/js/jqueryui-1.8.5/jquery.ui.core.js b/www/js/jqueryui-1.8.5/jquery.ui.core.js deleted file mode 100644 index 2295bd5..0000000 --- a/www/js/jqueryui-1.8.5/jquery.ui.core.js +++ /dev/null @@ -1,307 +0,0 @@ -/*! - * jQuery UI 1.8.5 - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI - */ -(function( $, undefined ) { - -// prevent duplicate loading -// this is only a problem because we proxy existing functions -// and we don't want to double proxy them -$.ui = $.ui || {}; -if ( $.ui.version ) { - return; -} - -$.extend( $.ui, { - version: "1.8.5", - - keyCode: { - ALT: 18, - BACKSPACE: 8, - CAPS_LOCK: 20, - COMMA: 188, - COMMAND: 91, - COMMAND_LEFT: 91, // COMMAND - COMMAND_RIGHT: 93, - CONTROL: 17, - DELETE: 46, - DOWN: 40, - END: 35, - ENTER: 13, - ESCAPE: 27, - HOME: 36, - INSERT: 45, - LEFT: 37, - MENU: 93, // COMMAND_RIGHT - NUMPAD_ADD: 107, - NUMPAD_DECIMAL: 110, - NUMPAD_DIVIDE: 111, - NUMPAD_ENTER: 108, - NUMPAD_MULTIPLY: 106, - NUMPAD_SUBTRACT: 109, - PAGE_DOWN: 34, - PAGE_UP: 33, - PERIOD: 190, - RIGHT: 39, - SHIFT: 16, - SPACE: 32, - TAB: 9, - UP: 38, - WINDOWS: 91 // COMMAND - } -}); - -// plugins -$.fn.extend({ - _focus: $.fn.focus, - focus: function( delay, fn ) { - return typeof delay === "number" ? - this.each(function() { - var elem = this; - setTimeout(function() { - $( elem ).focus(); - if ( fn ) { - fn.call( elem ); - } - }, delay ); - }) : - this._focus.apply( this, arguments ); - }, - - scrollParent: function() { - var scrollParent; - if (($.browser.msie && (/(static|relative)/).test(this.css('position'))) || (/absolute/).test(this.css('position'))) { - scrollParent = this.parents().filter(function() { - return (/(relative|absolute|fixed)/).test($.curCSS(this,'position',1)) && (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1)); - }).eq(0); - } else { - scrollParent = this.parents().filter(function() { - return (/(auto|scroll)/).test($.curCSS(this,'overflow',1)+$.curCSS(this,'overflow-y',1)+$.curCSS(this,'overflow-x',1)); - }).eq(0); - } - - return (/fixed/).test(this.css('position')) || !scrollParent.length ? $(document) : scrollParent; - }, - - zIndex: function( zIndex ) { - if ( zIndex !== undefined ) { - return this.css( "zIndex", zIndex ); - } - - if ( this.length ) { - var elem = $( this[ 0 ] ), position, value; - while ( elem.length && elem[ 0 ] !== document ) { - // Ignore z-index if position is set to a value where z-index is ignored by the browser - // This makes behavior of this function consistent across browsers - // WebKit always returns auto if the element is positioned - position = elem.css( "position" ); - if ( position === "absolute" || position === "relative" || position === "fixed" ) { - // IE returns 0 when zIndex is not specified - // other browsers return a string - // we ignore the case of nested elements with an explicit value of 0 - //
                      - value = parseInt( elem.css( "zIndex" ) ); - if ( !isNaN( value ) && value != 0 ) { - return value; - } - } - elem = elem.parent(); - } - } - - return 0; - }, - - disableSelection: function() { - return this.bind( - "mousedown.ui-disableSelection selectstart.ui-disableSelection", - function( event ) { - event.preventDefault(); - }); - }, - - enableSelection: function() { - return this.unbind( ".ui-disableSelection" ); - } -}); - -$.each( [ "Width", "Height" ], function( i, name ) { - var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ], - type = name.toLowerCase(), - orig = { - innerWidth: $.fn.innerWidth, - innerHeight: $.fn.innerHeight, - outerWidth: $.fn.outerWidth, - outerHeight: $.fn.outerHeight - }; - - function reduce( elem, size, border, margin ) { - $.each( side, function() { - size -= parseFloat( $.curCSS( elem, "padding" + this, true) ) || 0; - if ( border ) { - size -= parseFloat( $.curCSS( elem, "border" + this + "Width", true) ) || 0; - } - if ( margin ) { - size -= parseFloat( $.curCSS( elem, "margin" + this, true) ) || 0; - } - }); - return size; - } - - $.fn[ "inner" + name ] = function( size ) { - if ( size === undefined ) { - return orig[ "inner" + name ].call( this ); - } - - return this.each(function() { - $.style( this, type, reduce( this, size ) + "px" ); - }); - }; - - $.fn[ "outer" + name] = function( size, margin ) { - if ( typeof size !== "number" ) { - return orig[ "outer" + name ].call( this, size ); - } - - return this.each(function() { - $.style( this, type, reduce( this, size, true, margin ) + "px" ); - }); - }; -}); - -// selectors -function visible( element ) { - return !$( element ).parents().andSelf().filter(function() { - return $.curCSS( this, "visibility" ) === "hidden" || - $.expr.filters.hidden( this ); - }).length; -} - -$.extend( $.expr[ ":" ], { - data: function( elem, i, match ) { - return !!$.data( elem, match[ 3 ] ); - }, - - focusable: function( element ) { - var nodeName = element.nodeName.toLowerCase(), - tabIndex = $.attr( element, "tabindex" ); - if ( "area" === nodeName ) { - var map = element.parentNode, - mapName = map.name, - img; - if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) { - return false; - } - img = $( "img[usemap=#" + mapName + "]" )[0]; - return !!img && visible( img ); - } - return ( /input|select|textarea|button|object/.test( nodeName ) - ? !element.disabled - : "a" == nodeName - ? element.href || !isNaN( tabIndex ) - : !isNaN( tabIndex )) - // the element and all of its ancestors must be visible - && visible( element ); - }, - - tabbable: function( element ) { - var tabIndex = $.attr( element, "tabindex" ); - return ( isNaN( tabIndex ) || tabIndex >= 0 ) && $( element ).is( ":focusable" ); - } -}); - -// support -$(function() { - var div = document.createElement( "div" ), - body = document.body; - - $.extend( div.style, { - minHeight: "100px", - height: "auto", - padding: 0, - borderWidth: 0 - }); - - $.support.minHeight = body.appendChild( div ).offsetHeight === 100; - // set display to none to avoid a layout bug in IE - // http://dev.jquery.com/ticket/4014 - body.removeChild( div ).style.display = "none"; -}); - - - - - -// deprecated -$.extend( $.ui, { - // $.ui.plugin is deprecated. Use the proxy pattern instead. - plugin: { - add: function( module, option, set ) { - var proto = $.ui[ module ].prototype; - for ( var i in set ) { - proto.plugins[ i ] = proto.plugins[ i ] || []; - proto.plugins[ i ].push( [ option, set[ i ] ] ); - } - }, - call: function( instance, name, args ) { - var set = instance.plugins[ name ]; - if ( !set || !instance.element[ 0 ].parentNode ) { - return; - } - - for ( var i = 0; i < set.length; i++ ) { - if ( instance.options[ set[ i ][ 0 ] ] ) { - set[ i ][ 1 ].apply( instance.element, args ); - } - } - } - }, - - // will be deprecated when we switch to jQuery 1.4 - use jQuery.contains() - contains: function( a, b ) { - return document.compareDocumentPosition ? - a.compareDocumentPosition( b ) & 16 : - a !== b && a.contains( b ); - }, - - // only used by resizable - hasScroll: function( el, a ) { - - //If overflow is hidden, the element might have extra content, but the user wants to hide it - if ( $( el ).css( "overflow" ) === "hidden") { - return false; - } - - var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop", - has = false; - - if ( el[ scroll ] > 0 ) { - return true; - } - - // TODO: determine which cases actually cause this to happen - // if the element doesn't have the scroll set, see if it's possible to - // set the scroll - el[ scroll ] = 1; - has = ( el[ scroll ] > 0 ); - el[ scroll ] = 0; - return has; - }, - - // these are odd functions, fix the API or move into individual plugins - isOverAxis: function( x, reference, size ) { - //Determines when x coordinate is over "b" element axis - return ( x > reference ) && ( x < ( reference + size ) ); - }, - isOver: function( y, x, top, left, height, width ) { - //Determines when x, y coordinates is over "b" element - return $.ui.isOverAxis( y, top, height ) && $.ui.isOverAxis( x, left, width ); - } -}); - -})( jQuery ); diff --git a/www/js/jqueryui-1.8.5/jquery.ui.position.js b/www/js/jqueryui-1.8.5/jquery.ui.position.js deleted file mode 100644 index 73092d4..0000000 --- a/www/js/jqueryui-1.8.5/jquery.ui.position.js +++ /dev/null @@ -1,251 +0,0 @@ -/* - * jQuery UI Position 1.8.5 - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Position - */ -(function( $, undefined ) { - -$.ui = $.ui || {}; - -var horizontalPositions = /left|center|right/, - verticalPositions = /top|center|bottom/, - center = "center", - _position = $.fn.position, - _offset = $.fn.offset; - -$.fn.position = function( options ) { - if ( !options || !options.of ) { - return _position.apply( this, arguments ); - } - - // make a copy, we don't want to modify arguments - options = $.extend( {}, options ); - - var target = $( options.of ), - targetElem = target[0], - collision = ( options.collision || "flip" ).split( " " ), - offset = options.offset ? options.offset.split( " " ) : [ 0, 0 ], - targetWidth, - targetHeight, - basePosition; - - if ( targetElem.nodeType === 9 ) { - targetWidth = target.width(); - targetHeight = target.height(); - basePosition = { top: 0, left: 0 }; - } else if ( targetElem.scrollTo && targetElem.document ) { - targetWidth = target.width(); - targetHeight = target.height(); - basePosition = { top: target.scrollTop(), left: target.scrollLeft() }; - } else if ( targetElem.preventDefault ) { - // force left top to allow flipping - options.at = "left top"; - targetWidth = targetHeight = 0; - basePosition = { top: options.of.pageY, left: options.of.pageX }; - } else { - targetWidth = target.outerWidth(); - targetHeight = target.outerHeight(); - basePosition = target.offset(); - } - - // force my and at to have valid horizontal and veritcal positions - // if a value is missing or invalid, it will be converted to center - $.each( [ "my", "at" ], function() { - var pos = ( options[this] || "" ).split( " " ); - if ( pos.length === 1) { - pos = horizontalPositions.test( pos[0] ) ? - pos.concat( [center] ) : - verticalPositions.test( pos[0] ) ? - [ center ].concat( pos ) : - [ center, center ]; - } - pos[ 0 ] = horizontalPositions.test( pos[0] ) ? pos[ 0 ] : center; - pos[ 1 ] = verticalPositions.test( pos[1] ) ? pos[ 1 ] : center; - options[ this ] = pos; - }); - - // normalize collision option - if ( collision.length === 1 ) { - collision[ 1 ] = collision[ 0 ]; - } - - // normalize offset option - offset[ 0 ] = parseInt( offset[0], 10 ) || 0; - if ( offset.length === 1 ) { - offset[ 1 ] = offset[ 0 ]; - } - offset[ 1 ] = parseInt( offset[1], 10 ) || 0; - - if ( options.at[0] === "right" ) { - basePosition.left += targetWidth; - } else if (options.at[0] === center ) { - basePosition.left += targetWidth / 2; - } - - if ( options.at[1] === "bottom" ) { - basePosition.top += targetHeight; - } else if ( options.at[1] === center ) { - basePosition.top += targetHeight / 2; - } - - basePosition.left += offset[ 0 ]; - basePosition.top += offset[ 1 ]; - - return this.each(function() { - var elem = $( this ), - elemWidth = elem.outerWidth(), - elemHeight = elem.outerHeight(), - marginLeft = parseInt( $.curCSS( this, "marginLeft", true ) ) || 0, - marginTop = parseInt( $.curCSS( this, "marginTop", true ) ) || 0, - collisionWidth = elemWidth + marginLeft + - parseInt( $.curCSS( this, "marginRight", true ) ) || 0, - collisionHeight = elemHeight + marginTop + - parseInt( $.curCSS( this, "marginBottom", true ) ) || 0, - position = $.extend( {}, basePosition ), - collisionPosition; - - if ( options.my[0] === "right" ) { - position.left -= elemWidth; - } else if ( options.my[0] === center ) { - position.left -= elemWidth / 2; - } - - if ( options.my[1] === "bottom" ) { - position.top -= elemHeight; - } else if ( options.my[1] === center ) { - position.top -= elemHeight / 2; - } - - // prevent fractions (see #5280) - position.left = parseInt( position.left ); - position.top = parseInt( position.top ); - - collisionPosition = { - left: position.left - marginLeft, - top: position.top - marginTop - }; - - $.each( [ "left", "top" ], function( i, dir ) { - if ( $.ui.position[ collision[i] ] ) { - $.ui.position[ collision[i] ][ dir ]( position, { - targetWidth: targetWidth, - targetHeight: targetHeight, - elemWidth: elemWidth, - elemHeight: elemHeight, - collisionPosition: collisionPosition, - collisionWidth: collisionWidth, - collisionHeight: collisionHeight, - offset: offset, - my: options.my, - at: options.at - }); - } - }); - - if ( $.fn.bgiframe ) { - elem.bgiframe(); - } - elem.offset( $.extend( position, { using: options.using } ) ); - }); -}; - -$.ui.position = { - fit: { - left: function( position, data ) { - var win = $( window ), - over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft(); - position.left = over > 0 ? position.left - over : Math.max( position.left - data.collisionPosition.left, position.left ); - }, - top: function( position, data ) { - var win = $( window ), - over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop(); - position.top = over > 0 ? position.top - over : Math.max( position.top - data.collisionPosition.top, position.top ); - } - }, - - flip: { - left: function( position, data ) { - if ( data.at[0] === center ) { - return; - } - var win = $( window ), - over = data.collisionPosition.left + data.collisionWidth - win.width() - win.scrollLeft(), - myOffset = data.my[ 0 ] === "left" ? - -data.elemWidth : - data.my[ 0 ] === "right" ? - data.elemWidth : - 0, - atOffset = data.at[ 0 ] === "left" ? - data.targetWidth : - -data.targetWidth, - offset = -2 * data.offset[ 0 ]; - position.left += data.collisionPosition.left < 0 ? - myOffset + atOffset + offset : - over > 0 ? - myOffset + atOffset + offset : - 0; - }, - top: function( position, data ) { - if ( data.at[1] === center ) { - return; - } - var win = $( window ), - over = data.collisionPosition.top + data.collisionHeight - win.height() - win.scrollTop(), - myOffset = data.my[ 1 ] === "top" ? - -data.elemHeight : - data.my[ 1 ] === "bottom" ? - data.elemHeight : - 0, - atOffset = data.at[ 1 ] === "top" ? - data.targetHeight : - -data.targetHeight, - offset = -2 * data.offset[ 1 ]; - position.top += data.collisionPosition.top < 0 ? - myOffset + atOffset + offset : - over > 0 ? - myOffset + atOffset + offset : - 0; - } - } -}; - -// offset setter from jQuery 1.4 -if ( !$.offset.setOffset ) { - $.offset.setOffset = function( elem, options ) { - // set position first, in-case top/left are set even on static elem - if ( /static/.test( $.curCSS( elem, "position" ) ) ) { - elem.style.position = "relative"; - } - var curElem = $( elem ), - curOffset = curElem.offset(), - curTop = parseInt( $.curCSS( elem, "top", true ), 10 ) || 0, - curLeft = parseInt( $.curCSS( elem, "left", true ), 10) || 0, - props = { - top: (options.top - curOffset.top) + curTop, - left: (options.left - curOffset.left) + curLeft - }; - - if ( 'using' in options ) { - options.using.call( elem, props ); - } else { - curElem.css( props ); - } - }; - - $.fn.offset = function( options ) { - var elem = this[ 0 ]; - if ( !elem || !elem.ownerDocument ) { return null; } - if ( options ) { - return this.each(function() { - $.offset.setOffset( this, options ); - }); - } - return _offset.call( this ); - }; -} - -}( jQuery )); diff --git a/www/js/jqueryui-1.8.5/jquery.ui.widget.js b/www/js/jqueryui-1.8.5/jquery.ui.widget.js deleted file mode 100644 index 6c0ac0e..0000000 --- a/www/js/jqueryui-1.8.5/jquery.ui.widget.js +++ /dev/null @@ -1,249 +0,0 @@ -/*! - * jQuery UI Widget 1.8.5 - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Widget - */ -(function( $, undefined ) { - -// jQuery 1.4+ -if ( $.cleanData ) { - var _cleanData = $.cleanData; - $.cleanData = function( elems ) { - for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) { - $( elem ).triggerHandler( "remove" ); - } - _cleanData( elems ); - }; -} else { - var _remove = $.fn.remove; - $.fn.remove = function( selector, keepData ) { - return this.each(function() { - if ( !keepData ) { - if ( !selector || $.filter( selector, [ this ] ).length ) { - $( "*", this ).add( [ this ] ).each(function() { - $( this ).triggerHandler( "remove" ); - }); - } - } - return _remove.call( $(this), selector, keepData ); - }); - }; -} - -$.widget = function( name, base, prototype ) { - var namespace = name.split( "." )[ 0 ], - fullName; - name = name.split( "." )[ 1 ]; - fullName = namespace + "-" + name; - - if ( !prototype ) { - prototype = base; - base = $.Widget; - } - - // create selector for plugin - $.expr[ ":" ][ fullName ] = function( elem ) { - return !!$.data( elem, name ); - }; - - $[ namespace ] = $[ namespace ] || {}; - $[ namespace ][ name ] = function( options, element ) { - // allow instantiation without initializing for simple inheritance - if ( arguments.length ) { - this._createWidget( options, element ); - } - }; - - var basePrototype = new base(); - // we need to make the options hash a property directly on the new instance - // otherwise we'll modify the options hash on the prototype that we're - // inheriting from -// $.each( basePrototype, function( key, val ) { -// if ( $.isPlainObject(val) ) { -// basePrototype[ key ] = $.extend( {}, val ); -// } -// }); - basePrototype.options = $.extend( true, {}, basePrototype.options ); - $[ namespace ][ name ].prototype = $.extend( true, basePrototype, { - namespace: namespace, - widgetName: name, - widgetEventPrefix: $[ namespace ][ name ].prototype.widgetEventPrefix || name, - widgetBaseClass: fullName - }, prototype ); - - $.widget.bridge( name, $[ namespace ][ name ] ); -}; - -$.widget.bridge = function( name, object ) { - $.fn[ name ] = function( options ) { - var isMethodCall = typeof options === "string", - args = Array.prototype.slice.call( arguments, 1 ), - returnValue = this; - - // allow multiple hashes to be passed on init - options = !isMethodCall && args.length ? - $.extend.apply( null, [ true, options ].concat(args) ) : - options; - - // prevent calls to internal methods - if ( isMethodCall && options.substring( 0, 1 ) === "_" ) { - return returnValue; - } - - if ( isMethodCall ) { - this.each(function() { - var instance = $.data( this, name ); - if ( !instance ) { - throw "cannot call methods on " + name + " prior to initialization; " + - "attempted to call method '" + options + "'"; - } - if ( !$.isFunction( instance[options] ) ) { - throw "no such method '" + options + "' for " + name + " widget instance"; - } - var methodValue = instance[ options ].apply( instance, args ); - if ( methodValue !== instance && methodValue !== undefined ) { - returnValue = methodValue; - return false; - } - }); - } else { - this.each(function() { - var instance = $.data( this, name ); - if ( instance ) { - instance.option( options || {} )._init(); - } else { - $.data( this, name, new object( options, this ) ); - } - }); - } - - return returnValue; - }; -}; - -$.Widget = function( options, element ) { - // allow instantiation without initializing for simple inheritance - if ( arguments.length ) { - this._createWidget( options, element ); - } -}; - -$.Widget.prototype = { - widgetName: "widget", - widgetEventPrefix: "", - options: { - disabled: false - }, - _createWidget: function( options, element ) { - // $.widget.bridge stores the plugin instance, but we do it anyway - // so that it's stored even before the _create function runs - $.data( element, this.widgetName, this ); - this.element = $( element ); - this.options = $.extend( true, {}, - this.options, - $.metadata && $.metadata.get( element )[ this.widgetName ], - options ); - - var self = this; - this.element.bind( "remove." + this.widgetName, function() { - self.destroy(); - }); - - this._create(); - this._init(); - }, - _create: function() {}, - _init: function() {}, - - destroy: function() { - this.element - .unbind( "." + this.widgetName ) - .removeData( this.widgetName ); - this.widget() - .unbind( "." + this.widgetName ) - .removeAttr( "aria-disabled" ) - .removeClass( - this.widgetBaseClass + "-disabled " + - "ui-state-disabled" ); - }, - - widget: function() { - return this.element; - }, - - option: function( key, value ) { - var options = key, - self = this; - - if ( arguments.length === 0 ) { - // don't return a reference to the internal hash - return $.extend( {}, self.options ); - } - - if (typeof key === "string" ) { - if ( value === undefined ) { - return this.options[ key ]; - } - options = {}; - options[ key ] = value; - } - - $.each( options, function( key, value ) { - self._setOption( key, value ); - }); - - return self; - }, - _setOption: function( key, value ) { - this.options[ key ] = value; - - if ( key === "disabled" ) { - this.widget() - [ value ? "addClass" : "removeClass"]( - this.widgetBaseClass + "-disabled" + " " + - "ui-state-disabled" ) - .attr( "aria-disabled", value ); - } - - return this; - }, - - enable: function() { - return this._setOption( "disabled", false ); - }, - disable: function() { - return this._setOption( "disabled", true ); - }, - - _trigger: function( type, event, data ) { - var callback = this.options[ type ]; - - event = $.Event( event ); - event.type = ( type === this.widgetEventPrefix ? - type : - this.widgetEventPrefix + type ).toLowerCase(); - data = data || {}; - - // copy original event properties over to the new event - // this would happen if we could call $.event.fix instead of $.Event - // but we don't have a way to force an event to be fixed multiple times - if ( event.originalEvent ) { - for ( var i = $.event.props.length, prop; i; ) { - prop = $.event.props[ --i ]; - event[ prop ] = event.originalEvent[ prop ]; - } - } - - this.element.trigger( event, data ); - - return !( $.isFunction(callback) && - callback.call( this.element[0], event, data ) === false || - event.isDefaultPrevented() ); - } -}; - -})( jQuery ); diff --git a/www/js/jqueryui-1.8.5/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png b/www/js/jqueryui-1.8.5/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png deleted file mode 100644 index 5b5dab2ab7b1c50dea9cfe73dc5a269a92d2d4b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FscKIb$B>N1x91EQ4=4yQ7#`R^ z$vje}bP0l+XkK DSH>_4 diff --git a/www/js/jqueryui-1.8.5/themes/base/images/ui-bg_flat_75_ffffff_40x100.png b/www/js/jqueryui-1.8.5/themes/base/images/ui-bg_flat_75_ffffff_40x100.png deleted file mode 100644 index ac8b229af950c29356abf64a6c4aa894575445f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^8bF-F!3HG1q!d*FsY*{5$B>N1x91EQ4=4yQYz+E8 zPo9&<{J;c_6SHRil>2s{Zw^OT)6@jj2u|u!(plXsM>LJD`vD!n;OXk;vd$@?2>^GI BH@yG= diff --git a/www/js/jqueryui-1.8.5/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png b/www/js/jqueryui-1.8.5/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png deleted file mode 100644 index ad3d6346e00f246102f72f2e026ed0491988b394..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnour0hLi978O6-<~(*I$*%ybaDOn z{W;e!B}_MSUQoPXhYd^Y6RUoS1yepnPx`2Kz)7OXQG!!=-jY=F+d2OOy?#DnJ32>z UEim$g7SJdLPgg&ebxsLQ09~*s;{X5v diff --git a/www/js/jqueryui-1.8.5/themes/base/images/ui-bg_glass_65_ffffff_1x400.png b/www/js/jqueryui-1.8.5/themes/base/images/ui-bg_glass_65_ffffff_1x400.png deleted file mode 100644 index 42ccba269b6e91bef12ad0fa18be651b5ef0ee68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouqzpV=978O6-=0?FV^9z|eBtf= z|7WztIJ;WT>{+tN>ySr~=F{k$>;_x^_y?afmf9pRKH0)6?eSP?3s5hEr>mdKI;Vst E0O;M1& diff --git a/www/js/jqueryui-1.8.5/themes/base/images/ui-bg_glass_75_dadada_1x400.png b/www/js/jqueryui-1.8.5/themes/base/images/ui-bg_glass_75_dadada_1x400.png deleted file mode 100644 index 5a46b47cb16631068aee9e0bd61269fc4e95e5cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^j6gJjgAK^akKnouq|7{B978O6lPf+wIa#m9#>Unb zm^4K~wN3Zq+uP{vDV26o)#~38k_!`W=^oo1w6ixmPC4R1b Tyd6G3lNdZ*{an^LB{Ts5`idse diff --git a/www/js/jqueryui-1.8.5/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/www/js/jqueryui-1.8.5/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png deleted file mode 100644 index 7c9fa6c6edcfcdd3e5b77e6f547b719e6fc66e30..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i!3HGVb)pi0l#Zv1V~E7mI3`<(O3xvulR&VAkQJHZBho(m=l0{{SA7UpJl008iB z3Rqvn`1P1SiomLXkg776;)RSXXXV1Iqu_@e2%8dEPZ*NvG6-d*$oWlBXKKg zV({l@ll0gM+F;pm#SBg*2mQ!Rn_HBhT&5w_d`jyG6+_vuxMHXoKj|Yh2EGJ-B`N+E z$pmy>sA-*C0S`BfHv`&Y>Z626r?uZY8?`zzbXj7u1}` z;TS<~e1eY(jD4j)wElgyeR*V7`qdhf3S5Vcdq_R*a&F^r|9|M*i>!yeL)xMH?-6M_ zJjl&7(M|RQJ2z;fI7;E!$?Pfq$usWpjLxzlazT~K6v`ft@@P32;&o$5@b}Yj#d~r) z9^2%vhdyIgOXOGiCNOR_sjx3j8*01pUqQBn7r}I@E53HUy&DusRETO9wG~Rdfx=Ta zwD>0smtXx6l#X>f`lTc3c!pmLbwTP$Zfe7s__87<&i+s33P`Udim99RAA$T_Y7T3^ z>vV9wL8Sc0x! z_eRl4cEFZ`EXPfL3omdIIY|MS@P4-79I_Af%(!ONP=msk&*mFs^(0gOj->4HEJ}Ca zL(HZSEXEQH#fbJDfQ^RQnvtlx$kD>NeLhPB+yUp!E5O$&?fP1}JdI;l4(=H(hEfAQ zNRU;>uU@{f`2)^*UI^NA8VHraDlXrE*?OWOs z7D#P(ftiy|@ab?=t923@#mR}=S6GNj1 z?mTR4hby}vE*2>Wg7-X!KAz3vwvJ)qVMtB~**$wrQ^&0>;8UR6E7imZV-)iH?Tt~> zX-EGVhMYWVxX}dU)MQaN+jv0*8;3JBy*az#1aW|^_4%i?mlU$yRTy>-wCJJVC==P> zEx=B7cZ&E7jJ@{Z{CG+0A-lAG;ovs3FALs8|JLq?o#M-to~~wx^JI)GhP%l=X?-mS zEbfx}Nj)D74<>(1{)gt2^%v7UAlLYp6gO$gsv=`$#2)3F9ed8@mcK6i!h@mGQqU}e zyItCAfl~4IqG~(AU2lV?`)nu#S5+1BrCJv>QmoI?LyuLj8e^o>li?U6OMey{r_T(* zY8RG<@x>cK$(nNMlhy)E`{;|c6$@%L*hZEYs{mUmt$8-u8m?YV3{83m{YAwB%6Y{L z6k9V^jd0tnd%q4+xwp&Yfr#>WqoooH9K5xYM|V_s8{16~N?TcuYd@6+y1_aS;c{q^(Kyv6DZcFd zd@RkCqyC{5yX5E=oHd-`WBQ0I>9_&^<}<7793`JA=$mRuSrr}iQyzxG9T)%=Xp2g4 zkFI*p1^XIjQQE0yQNGyZNn{h@1;N1>r@)!(21u5LGg2Ob1==Thh`ZXost~Y05y+XE zrc7k%zx|Fxe^LX9HhqjcV~P|W`3AXYj%WAaFNz@uZ-xRmf!NHrNh4zKSO1WrwFL6P zXM}G=*p9v_k=mUmpg-$Y6I7Mt4@y2D+ys?c;_C@aVePnKabqAS%y%AoFzKI#JaeQxo%Il=}>GqqqxhG8cPyu>P?R=}Ol7vhvDcW{Z8i0Zn zzm^YCS5qT4m#*SycTaxzIpnMMHwFrEO>lJzqr0i6lGn6M7x;$7B7Iy)6renY$OiZc zMEFF-;Ff)@RWrYEodz{P?avD?^RtUsN$GEP>xrgxlbtd22`L1q+Vm;zyBzLIj#2fp zQZS2sUF)*%MR5S(jid&TIT<2`Js!yUdi}%lzzxkuKjf|bHvGZz#1l5%O0plla6C28K&%)=R}0F6xRI>HvM|=4x#=-to|lSN^N9P6&xIP z2dq0{CX-Xc&YJNeXXD#dn;c9feR-*P_CfUEp8(wN{z!yEZrI*MPs**fh@b|xe*S&i zHc8i5C2XFuJ)xhg7K~%2H`zsX?JhZT+>};UB5HaE$E92V@>aXAPbP zjHGY7LH_&c+;-7yblDf5tKrky!+N>Vx>?)QZi1hm1Aea(92RyRiFczw&w7)GT*KddVhT(T~0Egdo9qyLRosyG6?!=QbqPzk^x9!b!;O zjEYZ(YM2+oYg-TrJTt9??(26|bMF?&#cgl&%SzC;-tOToW%SoAmvaoExO%bz%?xjk zc(|{^J<~z4;>Loltn&Q#cD-zLlA0oFa(P1*5{sdl$v0#75<`$?CT{uv?urEF5%l#% z1*lLBO|PYH2z}OUCDP!56T6(s<{oG|TOAmiP3Z95>EKzFu=~wRiHd}%-yn`p^?J6( zih27|xpMpU0(-^Ma=J7`xm^&DhSqXkjnQt=LQjM?m_ss!!0cIcfgCXk7TijCGz5At zUKx0OZ(Pc2owm3zR5RS0N)Y#iMfl$WQCVB&sa%OY<#3FtYF&H{`S5{&n#aQKe2Se9 zB?KD>qbcT%&$2w0lfgg>hoa-{bj}D!0GrB0(o9%dP6Pxsw8y%(rU7O|*#fSHYBm2h zyytq$C(2?`j}W=ORiP$Y;41*}G=Y$(2OhqHVfd_b2NmhSboLunMtOr5!~U=jF_g7g zx!U^R$M++HtM%nJWA0HW6A->{j|_B;D@i9waP$)>{6HyW zi?%Q-uGS3xs5_COdmgZjld7Pfo4dBxil@eQDw4^F*Vcb}d)bfW?|OD#N(nd^;T^jB zZea;L9}obXL9cH4o}9qQv(@ovFw_meU5D94g#m>tZ>F(pY-+sVc~p1lWWYncfsZBD zlLUulh#8ZKbJZaXx~7T%9*9kCI?ptUWNtB6zk6wB?Esa@U>adq3-GJsAap@@buxd8 zEh*0kH65g*0pwfcCE82`98Gls@jB5(U`@lWMLxq4sPDlmq!Rv*Vp(zSX$437XGBPqZRXNva3-1V4LK`FF19js@6mZK*48gf-Z-ZNB zLM=}?fKd18YCyN<3I%#wqeFjR9^PLn0C|nbyn1-&Ph!re@O0EEp`97_ouN^T>luaA zQbRd68s2B-M1Q}bL`59M`{jC(<_`P4m+_LOgr`2Gt(Rm4y+wDaGcvik0$;t-0c3C{ zKhx0TB~7CpakFn?r9>!&+;ccIO!hd{$-sX1k+O&#=VmV@?^gOz?c=kZ*8x}L)H)dP zYzhfqNU`(IVUtd)A!)GN@5UL@&OX&+@1C?lb`+!>)>=w1JnE$X>Lw#Yjk7&t)#5>X#Cjs|&jQ!X46aWn?QOjkKm*1G ztbhAifM)AKF=tIbp&vSIPqX&9FQ`BEN|??$UXR)85VQkj*P`!)ht-9)fQ|t&EI}c) zY_Dp0Km2C(q8potDF7er6kZ;VOs*dAVznYFU=Tj)$Gq2%pheYQJdTMt)xV?d0aA0f zf!9BB;E?X!!FWTWHx>8q_1{a`32+aVn2QqF4@>>wO;ea#m&96EhNkjIR(#vwq%yr` zfH0w))fHpM%M^W;nW$_)tb@EVVvhrYi*g_wUlF^|U`HFf<~&JOeBOMX&56=R~^VwL+|j!Ca?>Tx==&$#g^C#2+mS?tyG29g?7BC;5|* zhNhNJ?*-LgdlM)3Jx?L+w7;FK4mFXC;;XzQ429NM`AD>QNUJVX`T3s9}m~hbK7csE0P(!l|C~FWjU=g#?C}12ipKQAA~kz3%msO zg2N0*dRqd|SG=WcPVM-2UAcd>w1y8d%zsl=9Z^nq83TK_9xPH=!{}}AuqY7aaFPnP l;BjQ_^4`vQQuBMqxOYB4T*@HG=I>V@U~v|0R%wcf{y%IJ0Z9M= diff --git a/www/js/jqueryui-1.8.5/themes/base/images/ui-icons_2e83ff_256x240.png b/www/js/jqueryui-1.8.5/themes/base/images/ui-icons_2e83ff_256x240.png deleted file mode 100644 index 45e8928e5284adacea3f9ec07b9b50667d2ac65f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4369 zcmd^?`8O2)_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~GmFhwsn)TR1w<4t)tA3_robX4CdCOHJC|7j+vW z%J-EMX&`87enIluaSc0_SnYUx$GzUc?vrNXt&I`o?~7C3RJ>C-Ajq!3AfU8Dx90^_ zp3}MKjJzYC+`T(&egFXQ#9Ek{*oVAaa!zrZtmlRFnwQPRJXH<%pkK2*eP`pT=lwD7 zifq+4BY_rUTa+U|2#&?i7>PVvD?7R4ZfOLPT{e9G~G!Ls3s8JtQE`jMM9wl2V9&Q+K2DHW0M+uQmEr%nYJ^7cK?uIpU-)=wn71ZZ-=@ar0;3^AY z5+TI{2b(e%t{2PZ^HKF*vu@+Xr&BAc@2BC4 z_vCgww#i=)ea5Vo$glEEVBBg_VPBj!)OO>)f@}#dg6ULOeC>LBHz<;*5Y;YfE0lNx zg{N+4@lO~ozxpF69qV@VOGnc248Iuag4C1T)P^(hWkpP!{h!JekX}m^Q#b2B4f1oT zIjsGz)4}-$rQ*-tSuc%qG>%<4xM#E& zN)7lRK~^2VdiloY4>;#}A!yHOAXEmEi^+eA#05pawGXs>!z)gSoDuI#>bRCq-qjJe zZ)r=A`*EMX6+)~er1kdv1L^)0-PsAEM7JF$O6G8>496$24lkOSR^RTfUuIz%iSfn5b-t!##cs7sQI);gdAvqmn_v|%I9k;fCPl0Z)R1+hNQONJN zH%3jT9sOq*a`LF*MiY=zlSSQZ;{_FL9M07A=In+O!~wR}=bzGEQpk2!Vc0p)qKAH? zOk{(%06W#)DdICQ_S%Q@<0Y+!?9%#$gWJ%)EO->^YZP{<`oB4~9xh zL9-0*c4@B#O2ylYs_g`Ky$zb~v!M`NRaMNFYF*Gsu|7)=JyyMHjFC=HhGUE@{aI|B zJ~ITXU052%7jFb5Ys#fhS_?4kqc7H0EU49B8(Chg0&JzU=Gka#xOz1)H0d4m7ZnRA z=M^tdY|U6T!fmte{W?_r8H~qdq|q{5AMU_2It1I4143n~xL?4&K#BOB48l9_Rdm!(c^C?JU;tF0 zEh@o1y6Qa_>}#AwX{VY+`C^kNkxhgb1P5cB0%xupAXyg9NO=SnXrJUE?rQg{Lcsn+ zAZKctGLfbK_B#^&Nev|0^fB&?DN=ak8|0!np524LD25=s84BP8Vl(3=jflNp{X>e@ z637Ri5xx;&JNl+XYImA|{;XR~P*svYDEWYJ6I5!6uO~2twFC1ZQevB7#3z~(apxn& z^J@>Mc`>PJair{yT`iuan-V+i%|Ho-pA<1?V-k^R2Q<5;Co%XxmL` z018t4T0TTwO^w)Gx{9OSJ^9_|kgwX`7%0Rw!PO~@?xvnfUehvN;2Rc;^l>3kfbtk3 z8{j7p;S&{uTlTe9&HTc38q@%_KQFk<&n{vmrN7y&Cz{etcE->rq!6HL)2F!aa=0%! zM%Bwo!7TQ5t;@a_#Q}sjk{UebWQZ8{cp&HN^$*JfH#8spkhk{R@CVBiPuP@yEhu{} zsQfuhTqV%rioATpEphMfhyRYbVfVW`YwLFXUWm-===J(byMf!5;W^CV1g~2194Xx) zFK|z{pm%n-)-DRe{Qhk(d!QaoI*y%Wn6h7<6A{i*Sob&B^y|Spg!&J$`kN>zwUJ3x zaB$ciu*0FJKg}T ztgnh)ASF8njz5>h6?f#{c=*Yr4W_34$GmVIo8OLWjcZK4a0`+Yv-!*}9 zBwKm;DAsA(nDI-`iH@;`=gP+m{lgFLHK3m$W@?)&dGhDA_Z2xOzI0$p(ZJtH$vCxE zj>+kYNBJzs-TlSx!tSH}%I9fQv)mc!C7X0bKlZv4f&}C3+O-4k7AmVO|KYZ9ydP%(N1^uisV8y;~p`x4qFXD?!_OyN9=w(Od6W; zGrT?G;l2v@Ob5k^8w<9w%Jbjb^|H}PYKo}I~bobd!XrTbzp2Zp~H8lgJ)I3?l&(bDiWf8gE&6b z>)9GB=Iu-6%I((+>=jGP>CzD8c0oWITFZGgM!Q7|JrUYq4#^Y(vuDu-a>OWDa4Y4} z5a_*lW#IL_aVf8L+Ty}c&2VojLEIA-;eQK6Wo?xAuK>i;1VWx3c=!s2;j_*iRHOsb*>6-CgcYP+Ho=L@XLd*j~2ln-;WHg)|cCixksH$K={5rGSD@yB%LI|(NCc8 z1Er8H+QO)~S~K{g?nH|2dB8SKs)BxQ?%G}}o*LV!NG2m*TmR|pWj~g`>)ClJCE#F$ zcj)fBg(dKOKmc$Cy}IRlasngIR>z~kP&WW~9cC951{AKmnZ~ZMsqup6QQf7J0T1;C zK9*Qd5*(HxW=tl|RfjO>nkoW#AU3t>JkuzWxy4-l?xmTv15_r1X@p@dz^{&j&;{Mq z$^0$0q&y?kbdZh)kZ+NfXfqLTG}Q^j>qHlUH4VEK`3y^-z6Y<6O88Hf4v^;}!{t-a zDWg;znYu%6zA1~A5~w?fxO~i8-Ib(^02{c4pXjhDI^2 zXB1LP4dvWuc%PXQ{r!d#6>${rm+M8EJM8yf#!H$Kp8AxwUXm5`7Tu-J$mHeCG>vw|&Ay415}_1w&*9K8+2d3v1N+@a$|820o4u60Tj@u&kI!~q2V9X; z>tMvQDI|O$#m+m2O**ZHq`_{#8)ry6`&5s~2k{O4Du16Fn0P;&_(0!e5%Bel){nU0 zJX~<8U6hoI%yx}qGY_1Tq7YKDJ)ETOCs&W)TiCrK*1%DE*vXdD-7hwE*LUgjeHRM` z&@pkhTi>m#Kc+QIK+2Ybn9-sFVKNHyIgfob4H_77yYh))Rq$7Pw|+aD6&yZ|ki9 z8Zb6s{oBt1G+PgfIcxd}{m@~1nzhe;LH)5;!gS8@ddyabpdBc?7JVl?tS+<#bPSMT z2@0uYdsWN(;Ww)n-PlA-0r+62@bYkEa`k{0s})fJgYZ#5=DmIdEvok7aZJRi{w-|} zkea&6X}ZA3b7&vbDb7)v8CuI(+zzSf3z&P2eOrPNP?D~ zf zn0@)0h;~5F&BG5vOFU!=woW&ZSl~nrs{?1w>nWfW_dnpTd z4qvLDYJ*ft>Sp%M(^_xCZpNBnc66JX}A|ZL9IENM`U>`ph7d<+RQiI}@E8Y)70s zMC*_&))}GlmR}@{v9*nm)29-=rn`Q$rc^4G)GVQHlTr6BpGxtHuU(8AF7Ffh54?5w zj+EYT9>x)PWL-iQ@RNmT?R+|c@=FOmj)5Za6_ z@DkVy4l^L>Z3#SI@s_eVwd3D)<^Ivq8a~J{|4mhOL^<7M4D8){ut;GIqqn`oqCk|x pNh;Wa$C0(mdpqYz&F>xK-uVD=DT5%Jzh8ZT#aXmjr70%*{{S|9XD$E$ diff --git a/www/js/jqueryui-1.8.5/themes/base/images/ui-icons_454545_256x240.png b/www/js/jqueryui-1.8.5/themes/base/images/ui-icons_454545_256x240.png deleted file mode 100644 index 7ec70d11bfb2f77374dfd00ef61ba0c3647b5a0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4369 zcmd^?`8yPD_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~GmI3`<(O3xvulR&VAkQJHZBho(m=l0{{SA7UpJl008iB z3RqC-Ajq!3AfU8Dx90^_p3}MK zjJzYC+`T(&egFXQ#9Ek{*oVAaa!zrZtmlRFnwQPRJXH<%pkK2*eP`pT=lwD7ifq+4 zBY_rUTa+U|2#&?i7>PVvD?7R4ZfOLPT{e9G~G!Ls3s8JtQE`jMM9wl2V9&Q+K2DHW0M+uQmEr%nYJ^7cK?uIpU-)=wn71ZZ-=@ar0;3^AY5+TI{ z2b(e%t{2PZ^HKF*vu@+Xr&BAc@2BC4_vCgw zw#i=)ea5Vo$glEEVBBg_VPBj!)OO>)f@}#dg6ULOeC>LBHz<;*5Y;YfE0lNxg{N+4 z@lO~ozxpF69qV@VOGnc248Iuag4C1T)P^(hWkpP!{h!JekX}m^Q#b2B0{OYr9M*o< z>EL{WQt@Z+Ea-hxX0}nTSZxnpi^#Kn8Ox8FgIS|hc}KJQ4tm*HO16ui{(O9}1YN)G zjiQt6fGq`Cj+^`zUf?8hk^(T{{cOQGWFP98am}is28A!5%{R#ENv8fCN!j69lMEK(2z?|BY=Je$XD9mB-Kkem*(d-j^9j$2#6r$Dz?s)-TCDCGCs8>6Pv zj{Y+YIeFA@qY22V$)awy@q!9A4rgk5b9TcC;s9Ig^G|6nDP+5=Fzg&?(L=vcCbGd> zfSu~@6!94td+o#d@sid!EIX$rx7*cawe6`dScJ z+$HssdOjE)O#Ybs56vm-FQ$7yuJJD^Zqk%hMaIgAJ<2yb_MFQte_i;62ScT$pjifY zyR_E=rQ+>H)pmlr-Udzg*-!|ssw(D7wJvC+Sf8bb9;;q8#z?0p!!bsd{wy|5pBaMH zE-Ve>i#LLjHRaMLtp%9&(HCng7Sw96jVv!#0k%?F^K7&=T)mnYn)D9(i;4x5^NJTJ zwq~pv;kH@#ejTd*48~(J(r6j34|m`h9fEDj0im)~+%I5XphWymhT;_Zty|Q&zjPg# z-ufAHZ1M*Gccw?Kf|8Pnhtb0`!{N`Bqsa37J+>wC$!e00k+2 zEgzz;rbcWoUB%Jvp8W1}$XD%e3>4y;;OZ1ccT-O#uW6Ys@C}Pa`nZrNKzR(24e%3) z@QI4SE&E!lW`5y14QhbepBG%_XBV-O(%5tj)@9#|;sC-MNev!zGDHk}JdpGC`iJF#8=8-P$Xoku_=Dw%Cv3{U7L>gfRQ?<$ zt`cZ*MP5GQmbmx#!++P@u>0MewRO9GFGS{b^m_fJ-N0?j@EqoFf>$khj+E|@7r3We z&^tR^YZrxKe*d22agXqCO0l44&kqCv{u)T|(lv`~PK@DvE{QI_T zlCH5z*gR!>LO)k67{^R+vWx24U2^2ODXpwT;6y+6+$5m)_*w4WY&#do9dCeE)>p+Y zkdhq($DhmMiaYXey!_kiL26uz($aJ!QT{B^Wu}U$^9e#5)=c+XF9@Ill?ZmMlNgHi zz*9!vDc&uxOo;ZVxb`Q!Sk0*gnfxWzmbZh4(=%CD%qP?0=);n$&zaW_$UKV98axdc zN#AyZ{P)wj?V{P}vM)YY!>6@}^>U+iv$`9>nMTCPjN>z%yF&3yf%>+T@0vh4lC8Xa z6zeo?%=o3}M8{aebLHcO{^1Ar8qiM=Gquf?Jo)q5`-+?sUpg?QXyEUpWSm+n$K-Uy zqkIwHLquru~o(OF)hhz$Y*|X>ZIbswnxRvr~2=rdO zGVuD|xRlpAZE<0!X1F(%Anpl^@V^D3vbM}qxe|NI;TTiZy7(IM;R69RkA>a&6gwYE z2sREzQ_LHmWqB+ogMk(fMaSFeoDq-!HkFB_nXt5+2ncFuk9BQL1I&oB1zZi)YW{6_ z&-Ip1l*OVRA##1ILQS;5R{-K^0wGTiJbVSi@LA^$D$;@J>^G{6@&+%4{b3(sC~LEH ziTv(0b#zxt?YJ0r_~pUZM~mQ(??(n#>&tD%+@nq=Abj5*8R!~Ul1`G~=qFJ4fl|m8 zZDCYgtr`4LcOpgiJYX9qRY5;DcWti~PmS$VB$E-Zt^f4)vLDOe_3XTq5^ylWJ9PKm z!V-8sAOJXnUfuFNIf0R9tK-pNs2hO04zr620}5B(Ok>yB)Of-3sP59qfQNbmA4{w! z2@cB;GbR(~szVrbO%(w=5S!X`o@o@x++wbN_tMPT0Vc)*I;Fgsbf^*g02Di?H zTApwKq3+YwfNsqd3iP%{hyK1iyuVZc@*0tO_3+N0#GFsz>8MjeJ2UJ%L!%hiGYYAt zhH`E+ywA*u{(eJ=ia3h*%k?779rk-K<0VZAPkl;TFUbmei|$fqWO8!_zIvqt$ly$V zrlH46nnpX~X5Yk0iBJl;=WuA4>~X4-f&K0yWf42h&0b30t@NYX$7egQ1Fp!abui-D z6cWCWV&|R1CY@G8(qOmWjWeX3eX7UggZPGimA}soOuQdXe4uZ#2>5zN>qlI09xk}l zE=tNpX1m6*nFr2EQ3xs79!^sCldDJYE$m(qYv3q7>}1R7?iZW7>$~*%zKaC|=$N?M zE$>#+%T&MZC`dW1wUl6Z)JgxkeN920S>e@EK`q~>k| zuYcsgA>F%!@rFciD(>Iwzn8KT;2tb77bUPCmioh+rZBfIiM6f_P34cQ__o1GWqQp3 zVL~~pE5?qODf%iiQQ3f42YF@09tQ*$4v_EKUx;t1KCPCBtgqg@+Tn; zO)a0uky_%jm+WjNB?=~VyH>V#L!*=l*@OSMSVyt_UEH&NA=?V2stHPyKkVN!&jg<#cjros){#ji)dK%)We0 zL_478=HZ8-@xnwsKrWs8)x`MB;(Y`Cmu2c-&SH(vN-F(*e`l?c%+l$|y_AJJhcDGn zwLvN+bu;_sX|1AiePhx@u&%P$hf*xE+O=~D?_(_KGWQ!158YL-y9$*6mmPo;Rp*Dl5lm-mVM2i`h-M@nxv z590_tvMwPD_{l=b$iOm|+|S{D9&P%zeT$GgX6Akl-tfUF>tL@Ld!B&{pN39tH>3V> zqksMAYul+jb7UiouWVGPNsxX7Ueba+9|~dz?d*QM$ng0DZfO0`7fAy?2yMm|cnRzU zhZ&IcwgjH9cuU!w+VStYa{p*)4IgBf|E8)sqMYtB2KH_}SfsFq(c9i(Q6S3UBo%DI k*Kv;w;*%(i9W@fAqs5i2wiq diff --git a/www/js/jqueryui-1.8.5/themes/base/images/ui-icons_888888_256x240.png b/www/js/jqueryui-1.8.5/themes/base/images/ui-icons_888888_256x240.png deleted file mode 100644 index 5ba708c39172a69e069136bd1309c4322c61f571..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4369 zcmd^?`8yPD_s3^phOrG}UnfiUEn8(9QW1?MNkxXVDEpFin2{xWrLx5kBC;k~GmI3`<(O3xvulR&VAkQJHZBho(m=l0{{SA7UpJl008iB z3RqU$@Wfh}nb?QCTyjovo2=)B^qQB=#XMCF_n=?1Jbh>5sptJM?}}{I zHzR=-V_TFXKM0P+&lrh3TPr)c<8EmLl3g~EY}W@od*0X6Ljv>L(67bjz58EDypsu&ddu2a@@x)`5aA^S^DxkW8rs_vKtu8N8(o0 z#Nf}*Ch4&iw866BiW!_r4*HRsHn%80xlBW<`IOcXDu%LQam7$Ge$q#1415XvN>cnS zk_qU%P}4fO0v>J{Zw9o*)JF-CPA!KcpFR1Pn(l@*bKh=1_!ZRWb?FoG5a22cVG<$5 z0|%Qj7p@n}=Hrkk`BkD99I57h7_+lQ-AZ-?fETz5E~q(= z!!d%~_yivn82d_pX#M+Y`|`-F^s6-{6}S!?_mFzr<=n>M{{PUq7g-N`hqOcY-y_m= zc#xZEqMPgqc5cu{ag@Tdli5@JlV{xH8J%TA}P<$=Qej`5Hq>_Gzk+NDFM{b*SA6Yydp9VOs1VgIYAcj@1BIt< zXz@=NF2DLCC>`r|^h-z5@eIEh>Vnjh+|-6M@nuC!oc*856_8#_6jL|rKLYu=)Ew4+ z*XiJVgHrKl?=0wjQ)aeNu2^jkUW>@Hei_S;nuA%RRe49V`VM;8SxUBxpZPe>l9ZA{YS(NU; zhnP(vSd1kYiV^KQ02>XpH6u}Xk)wrk`+SxNxC73cSAefm+V!<`c^b#A9NaTn45bEq zkRYp$U%h-|^9P*syb!eKG!QC-$;IS9MdE^@-`WRSzTp+8M9zqJCUsoPC-3Tr+qbkO z$o;ra-wGjC64H8m{(*FVitg+LQKH+96D4!FREFb|Scex)lw()`rHV$WMdUJNe3E}`->+?@(FDYcZt1#>wXwgHzQ6{p% zTY#PF?iBGE7<=u*`SFt0Lw0HX!oh85UlzQH{;k~&JH?kPJzdQX=gAmX40n@#()wBu zSllJ`lX^ZF9!&n2{1443>o2BzK(6sGDQ?n~RYk_ih&{?TJNBH*Eq`73g$F~WrJz{` zce}LL0;S^ZMb&nKyWR#(_t{VguBs~LOSLX&q*$M&haRh5HO5G%C&MvDmi{a@PM;Zq z)h;XzD;Cshu#GG)RsptBTJvnQHC(-#7@G7B`iqJMl=F%g zD7I#-8sWBC_kJC!{tU)rGSX-nt`B$M86ARc$^oIWRNOCMU!X+%PKM$X`mI~kxxaKB znBMvsb8nZ)0}JBmidn3FUeG@ZcdpwZy_4oi*b{&c?T^HaVC|`tnlo?1SjRKLNPk{gDWT+_1fio|Ic{5kU=X{rvm3 zZIZ6BO4vMQdqO`~Ef~j4Z?cQ(+Ff$wxGAlyMBqd}_S__(_xM@v-fTM;$Q^HhR@PU= zE|8KP1IM4s;)*-+Z@m25>p^N(PgHJsq+a!8`ezsTQ3Np0+k4Mtdkgu z^}tg`-YMQKuuO>dsJQkgyjabt1)2OM)|R(}hto4zSIj5V;^@PYtIwI&4#+%;&Kf)o z7)jrDgZ%f?x$UCa=&~<9SHq{ZhxKx!b+ft~!I?(H$&BMOox4KuOo95gl<%5AIg+is zd=%?6ZOr(k=S0U?!*k{1h5q3O_ZrYo5Hq#Sl|1?L+WU%}6JI(orD)*qq-300E63z? z#iM){^ff?RwehBsE3Uh)}m z74!C`a^?2x1@?-i<#cI?a=RcP4Xx$88l&B!g`Nm)Fo$Fcf!VX@0y$z7EVz~OXbALP zyfX0m-nf+4I&E=bsAjk~l_2g3i}1e%qO!KkQ@Ij*%HbGO)w=i^^5FvkHIIee`4l@J zN(eR%MpMiipJjP0Cxd|&4n@b?>6{Ue05+A0q?xd^oCpYNXpePmO#{q`vISfX)oT82 zc+d5gPn5-?9wBmlt3pk*z*hj`X#ycn4?KJY!|++>4l2@t>FhVEjPeFAhW%k5Vkm2~ zbcy`#HFb1XOYOKAcKGGN*GG%skMBnYSL@4d#@wS$CLny@9vSEwSCUSW;OHk%_<>T$ z7HwfvT&)@WQFkIm_dH-5Csjc|H+OBX6;F-rR3wuTudV;|_Oc(#-}UUgloD_-!aH>L z-NF)hJ|F-%gI?Y8Jvo7qXRG7UV5l2_yAHF93IhsP-b`cH*wlEz^Qi99$$*D?10PGQ zCkYPA5Hltd=c+>(bWIfjJP@1Obe?Gx$=qVDe)rPM+5sw)!8F3K7T{OMLFj_+>SX>F zTT-48YC1?q1IV|?OSG8?IGXAN;&q~nz?z0#i+qM9P~U@BNG1FyO9#kvk>T>G=#)_^ zj!fMlH{X;+ONmr!LsJx(j*b2&WMpJ+s&cN;7Tyu8gf>RT2kOR+DBzZr7=m-v-UheM zgj$|(0HN;F)qrlz6$FyVsy6e02`M!$<1L&Bz z+b!=_(#ur8?I=h&thJP2c+^S%)lEi*8fSaPs>Or&i1kF^p9QX&8C;)E+S__7fCh{W zSpW930L|8eV$Pa=LO*oao@VWHUr>MSl`x%iydJaFA!rB6u0`Jo5337p0UZNmSb{=o z*%W(>6W|^!F&8DUAC~&Vo2D?gE{V0S3{B;atoXLUNo9J? z0AWHot1HHimnr%xGf~-qSOO6>z*MtHe(EIN3<7@k-U&gFD+Xq}Ua*o~(!1kApC zO+-7O=jP#uq4B~*JwPs<`_;tw%;J3m{g-9xU(RBU&q^x&eSc@Ik<8NR$i0+>JBKgT zPqjfRC3Q3V=4q|BVK-yVuyUMByvXqR1a4^k&=*MqJ_v2b7I+El z1&0}s^tJ?^uXsz@oZ9j4x^n+$X$>D_nE$4#I-;EJG6wc;Jy@i$hSA&JVNoE;;UpDo l!Q;r<<-MKrq~`aIaqoP9xRgPV&EKy+z~U_0tkM({{ePlYU?u&Z`mr_kcwz5Nh&g=McJ3E!;CE1E0ryV5Ro;>nvty8 zA{omJnn+{p4952Let*87zvA;auXFF~{<`_uPA4&sV%P>LMpp1PTBEIL*yWZ2%{t3Pe;FXZ3XmxI8(D_g57_$Zil~sY6d4T}-hu9_Wqp4C0AMO{-e2$W~1A}=8 z?24)=?B)4HUDo_oXckN%okP)HFJjaB4*3_SNpKaf;yPT}KqfS{2x7`d{0xbPErH%h zh`mQJ03DaATP9aP!}a4$fY#``NI~M6&RljED)8z}hhWxrNbxIBlTxG^j z!X>$3AQQ&I%_5mRECOjaGwR-GHmde})^)t-3_~aFM1G_L#mpCNdcLqr(RKjv3R}(z zG2^yBftMYh;H3a#-slaj|5$BX9+{PTv&NtR*P-L?l21FGTG`$H9~##p%VE!uR>=NG zc&auxVl!1_lP%uX71AJvlz(wLYl?63oLd~dqjZRrU#UEWw8J6Yn-7L~T$$tjeAQiW z9$XG5Hu>rxFBnzgd6ho#^gE5pY>U$dTCRN85Y1tQQ0=Pn{?7OJ10x9Xk!>P2f(f^f zILd}5--N;Po4*25F|J3ywIv+R@rfcYNj}R-sXrH2TFAiK{jFGG(ru1p=w$wR;IXQwAX*S~oiEK{g;kZPW;YE|!QY|g^2`dMS{&1Fr zkf?!sj~m)xO3v`hh4KQRJ&&Q!=X1HNq8T_Sg2P^B&rZX{VQUNc9O(K+B_Z4hiTH7M zW7K5Y!Ec5xD~B9zFlKUWG_Rd)xTK7U#hRGhp51T++e6oS{gT^?3s~>V4?6{zchhc_ z3UBb_W2U+~guMsG-g=@#aWPSFypk)5jIUTxFiM zycGZzbxQuCTnvH*kv=E=LsRnltLbhgm$=ttS1IzU0)1t~4(XE>bHVwJpAPKOqoI-# zrdc{yo0R7Qx%~ZQl{UPa?gmxo#ZWM|vNHNxl@8NLksfn5Ek>C${w=x~pekl%gfwaLwWspL{af)?f zTOBmhTyU&3;}QeF&VLwhJ>Dezu>~P zc+$aFxKDWKj-CmD(v`}uH|ts*SefX@lyrc<%~WE6tHU#dv;y+LlA@cTgl8J!u@@u6 z@@fvJdC)1TvBa$QT@ck`rUxF**7w4Yh0!vZUsGu%Lm(cl(l#QPpmoOH3JC>FMe07G zq0kl#K+GLndyoOx8{t9g8JiLs#`pH8JWqR_ZM%J!Yr>cp>95<^#=FWQfzPm%q;5B+ z0>}ul8+l+gRaHV$$tsq5|MU;?AJ~m-XNxjW3U6JH2k`tOXAqi)yGI@^uA&dQ% zZCJIe7{qK>+p_F)Sqy-GC!x-5MgogsP6lwiUH`N^a7*LKPdO{!4L^_^;goe*e}3s( z0i~~@V#)#L*W~2F?}&N*IQ)0a4Z1$uTU)p7^Mq&IM6K6d*$vpX2+L*+$9vY0=7?$b zxdD4R`8~74HMWsx#*goNSp#(_;z`UT-GuGxoUl-){JNk1rf)aSKE!W`#m`t#v6V!u zgn>fufpkVprL(KqSkhl*Z+yRQosF)bEiV<#K8hOr>yQ1@7Xg>g3EjKwLB7)(9$3%X z$G30OD&Z2Nh{;v5!}oF4fUu0TM%&2F-6aS1+fqu3cn;K4k4-#kkB|BO?bZtcTygp+ zB|R0)0x`)UVEm;Fwx~Vt*6ZV3k5Xcj6_=(X2y*8M&NGz^?Jr>Jutu8idcHpesED^^ znM9MV2AcX%oppm45TS9yYBtteX?1liAe($}l8Mrk|YY*cFUp@Yl5_|Ih%+ z5^dz*^BpQ&l8;Le-Z+E?J1_|}dtK>`0HCSg@u z*e9pUpX4zkcJ~*%3c8N=D_*8f&2puu6>riMeA#MG3E+*kYt|0Dnl;U^u0x`IJLnY* zjELAyFaL6=ihd=uwgnc)F;a_ZKEBsA_UuVc$NS1$GwozcE)2-hGS_c!*V9@%u`#?lhbMR;p$MXpbUS7*AsAt5?3(xQtcatZ zK;B-KhX__vb(?F4Q0GloBJ>|QvdJoM?lDbgsR3iM@a;Z3?cA&4wtslYkr80ETZHkc z9*>q7Q7<0~XHK7PK#yo@cBi@smopq(-%`e-KH4Qx-~rbHu}dW58QqJ{;3Inef@=x4 zI)BgQYXff|j7xg1Qx_M8s)u`0@M0d&aKAfD6qe?B3THxh84PWrQX5xII()>h>b|f$ zpKR+*4#vbnsS3H{v&>IrrO}Xrp{O`p?Q{I%z{XPHRAc7mQ~rVVZ80t_sel;~R{!fE znoWNU9=P1`jx=A?#Ye1fm8**6`|yK3jKQSofyZy4XkM$FK?NExjqO&YVea7N(7$X$ zbR{k3PT@a2CJt_@Dead-55GO?f3gVr{BdM(wXV#1%q{YCJlyB~k-m;m1@SZyhI$5p z9ViBGQ5QzVRGUDbbtaN^E&{f(lI64ub2s){aFm!11riDV*6MFh58H{nU5}0{$^Hi; zJVW(-UYp)>>|Lx|%+y^DwKhz`tPS-85#6Rh0)ckL)U$^na{7 z@VVG(5^ui@Hf1odF537(mlR>ZBhjf%rT+ zPUdZ~CgvIZM_wUkJAw%w}x9jc8!TL)0!EfOi*AMUgP00QdmWDhdxHH4HGc<~J zIVYb|Vj$~E#d*)1>gzKQFOMaAy}BVVo}IK&7ZMB zx!9l*+ek@g>FsKVCTu!A+bt50<5zR%LvhtB47 zphLoLmz-;H4@2#)g8=!k#zLI#UMqFnH)&}~tj#&gW_Q99mQw+L7dU5Tu)W%;@9Qi9 z>QGi--TSZnR2z4)8B5wJy^vu$s+IRc0ll#|LNt!?I`me%fGty24eDN4Xl+O{(+NPj z1ygVh>zf*$Pk&fEX-3AP^1w$s1y_e7lBxzgSu6?iXt=l939t1dNMV&Hw?hI}<+!vx zKuXRw@aAWBEW)iT2xma>qG11B|GnfLf43m`S%SD z3d3^-2o=m;T`_XFO4d`JiOd4T*vl!w_t?SMNPGOr712xew$!m3PP4`3g2iVGiU!9* z&w=GY2O}!evGB%RQa5rA7s5%`YA&A$+(`a%B< z)4%^Wyf-xKA)KjJ=y>(k$Cki3nVk)wxAEYIGA3p>sG^i;f$cIw3$H&^I7dNHU=sw$d)j7 zh|(sSuhT>1EWU{wVQLz{XV1iYPIvxnNv=>Vu3kdkB_SVNJ(KJiSF;#9T-Gc6A9!kU z?a4i1-1H;R$hx=;;1@G7Jsm?|a=U>2b+qZz`aN9sgsIyFSp6r%%!9oq%tbmjY#K7P z-Gux{jUMaKw>DF`W{3tTZ|SIDqX6v)w4@1rITXmow6pv9GTr+NsJ`V>Zv++iD5MFK z@5#Rx6sk|u-Qs__;w5Q)X2-Ad+QXxzHC&)U-n+`G@G_e77|5&TV3EucN^AXqK{AmK pCn+FvZU>f5ukGw-)qi%3dglGbB=rNWkH7i=^YbXv3KMkH{{f&jC-?vW diff --git a/www/js/jqueryui-1.8.5/themes/base/jquery.ui.all.css b/www/js/jqueryui-1.8.5/themes/base/jquery.ui.all.css deleted file mode 100644 index 0302dfb..0000000 --- a/www/js/jqueryui-1.8.5/themes/base/jquery.ui.all.css +++ /dev/null @@ -1,11 +0,0 @@ -/* - * jQuery UI CSS Framework @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Theming - */ -@import "jquery.ui.base.css"; -@import "jquery.ui.theme.css"; diff --git a/www/js/jqueryui-1.8.5/themes/base/jquery.ui.autocomplete.css b/www/js/jqueryui-1.8.5/themes/base/jquery.ui.autocomplete.css deleted file mode 100644 index ea370d6..0000000 --- a/www/js/jqueryui-1.8.5/themes/base/jquery.ui.autocomplete.css +++ /dev/null @@ -1,53 +0,0 @@ -/* - * jQuery UI Autocomplete @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Autocomplete#theming - */ -.ui-autocomplete { position: absolute; cursor: default; } - -/* workarounds */ -* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ - -/* - * jQuery UI Menu @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Menu#theming - */ -.ui-menu { - list-style:none; - padding: 2px; - margin: 0; - display:block; - float: left; -} -.ui-menu .ui-menu { - margin-top: -3px; -} -.ui-menu .ui-menu-item { - margin:0; - padding: 0; - zoom: 1; - float: left; - clear: left; - width: 100%; -} -.ui-menu .ui-menu-item a { - text-decoration:none; - display:block; - padding:.2em .4em; - line-height:1.5; - zoom:1; -} -.ui-menu .ui-menu-item a.ui-state-hover, -.ui-menu .ui-menu-item a.ui-state-active { - font-weight: normal; - margin: -1px; -} diff --git a/www/js/jqueryui-1.8.5/themes/base/jquery.ui.base.css b/www/js/jqueryui-1.8.5/themes/base/jquery.ui.base.css deleted file mode 100644 index 63a08e8..0000000 --- a/www/js/jqueryui-1.8.5/themes/base/jquery.ui.base.css +++ /dev/null @@ -1,2 +0,0 @@ -@import url("jquery.ui.core.css"); -@import url("jquery.ui.autocomplete.css"); \ No newline at end of file diff --git a/www/js/jqueryui-1.8.5/themes/base/jquery.ui.core.css b/www/js/jqueryui-1.8.5/themes/base/jquery.ui.core.css deleted file mode 100644 index a04066d..0000000 --- a/www/js/jqueryui-1.8.5/themes/base/jquery.ui.core.css +++ /dev/null @@ -1,41 +0,0 @@ -/* - * jQuery UI CSS Framework @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Theming/API - */ - -/* Layout helpers -----------------------------------*/ -.ui-helper-hidden { display: none; } -.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } -.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.ui-helper-clearfix { display: inline-block; } -/* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { height:1%; } -.ui-helper-clearfix { display:block; } -/* end clearfix */ -.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } - - -/* Interaction Cues -----------------------------------*/ -.ui-state-disabled { cursor: default !important; } - - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } - - -/* Misc visuals -----------------------------------*/ - -/* Overlays */ -.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } diff --git a/www/js/jqueryui-1.8.5/themes/base/jquery.ui.theme.css b/www/js/jqueryui-1.8.5/themes/base/jquery.ui.theme.css deleted file mode 100644 index 9220543..0000000 --- a/www/js/jqueryui-1.8.5/themes/base/jquery.ui.theme.css +++ /dev/null @@ -1,252 +0,0 @@ -/* - * jQuery UI CSS Framework @VERSION - * - * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Theming/API - * - * To view and modify this theme, visit http://jqueryui.com/themeroller/ - */ - - -/* Component containers -----------------------------------*/ -.ui-widget { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1.1em/*{fsDefault}*/; } -.ui-widget .ui-widget { font-size: 1em; } -.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif/*{ffDefault}*/; font-size: 1em; } -.ui-widget-content { border: 1px solid #aaaaaa/*{borderColorContent}*/; background: #ffffff/*{bgColorContent}*/ url(images/ui-bg_flat_75_ffffff_40x100.png)/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/; color: #222222/*{fcContent}*/; } -.ui-widget-content a { color: #222222/*{fcContent}*/; } -.ui-widget-header { border: 1px solid #aaaaaa/*{borderColorHeader}*/; background: #cccccc/*{bgColorHeader}*/ url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/; color: #222222/*{fcHeader}*/; font-weight: bold; } -.ui-widget-header a { color: #222222/*{fcHeader}*/; } - -/* Interaction states -----------------------------------*/ -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3/*{borderColorDefault}*/; background: #e6e6e6/*{bgColorDefault}*/ url(images/ui-bg_glass_75_e6e6e6_1x400.png)/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #555555/*{fcDefault}*/; } -.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555/*{fcDefault}*/; text-decoration: none; } -.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999/*{borderColorHover}*/; background: #dadada/*{bgColorHover}*/ url(images/ui-bg_glass_75_dadada_1x400.png)/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcHover}*/; } -.ui-state-hover a, .ui-state-hover a:hover { color: #212121/*{fcHover}*/; text-decoration: none; } -.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa/*{borderColorActive}*/; background: #ffffff/*{bgColorActive}*/ url(images/ui-bg_glass_65_ffffff_1x400.png)/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/; font-weight: normal/*{fwDefault}*/; color: #212121/*{fcActive}*/; } -.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121/*{fcActive}*/; text-decoration: none; } -.ui-widget :active { outline: none; } - -/* Interaction Cues -----------------------------------*/ -.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fcefa1/*{borderColorHighlight}*/; background: #fbf9ee/*{bgColorHighlight}*/ url(images/ui-bg_glass_55_fbf9ee_1x400.png)/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/; color: #363636/*{fcHighlight}*/; } -.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636/*{fcHighlight}*/; } -.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a/*{borderColorError}*/; background: #fef1ec/*{bgColorError}*/ url(images/ui-bg_glass_95_fef1ec_1x400.png)/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/; color: #cd0a0a/*{fcError}*/; } -.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a/*{fcError}*/; } -.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a/*{fcError}*/; } -.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } -.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } -.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; } -.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsContent}*/; } -.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png)/*{iconsHeader}*/; } -.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png)/*{iconsDefault}*/; } -.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsHover}*/; } -.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png)/*{iconsActive}*/; } -.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png)/*{iconsHighlight}*/; } -.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png)/*{iconsError}*/; } - -/* positioning */ -.ui-icon-carat-1-n { background-position: 0 0; } -.ui-icon-carat-1-ne { background-position: -16px 0; } -.ui-icon-carat-1-e { background-position: -32px 0; } -.ui-icon-carat-1-se { background-position: -48px 0; } -.ui-icon-carat-1-s { background-position: -64px 0; } -.ui-icon-carat-1-sw { background-position: -80px 0; } -.ui-icon-carat-1-w { background-position: -96px 0; } -.ui-icon-carat-1-nw { background-position: -112px 0; } -.ui-icon-carat-2-n-s { background-position: -128px 0; } -.ui-icon-carat-2-e-w { background-position: -144px 0; } -.ui-icon-triangle-1-n { background-position: 0 -16px; } -.ui-icon-triangle-1-ne { background-position: -16px -16px; } -.ui-icon-triangle-1-e { background-position: -32px -16px; } -.ui-icon-triangle-1-se { background-position: -48px -16px; } -.ui-icon-triangle-1-s { background-position: -64px -16px; } -.ui-icon-triangle-1-sw { background-position: -80px -16px; } -.ui-icon-triangle-1-w { background-position: -96px -16px; } -.ui-icon-triangle-1-nw { background-position: -112px -16px; } -.ui-icon-triangle-2-n-s { background-position: -128px -16px; } -.ui-icon-triangle-2-e-w { background-position: -144px -16px; } -.ui-icon-arrow-1-n { background-position: 0 -32px; } -.ui-icon-arrow-1-ne { background-position: -16px -32px; } -.ui-icon-arrow-1-e { background-position: -32px -32px; } -.ui-icon-arrow-1-se { background-position: -48px -32px; } -.ui-icon-arrow-1-s { background-position: -64px -32px; } -.ui-icon-arrow-1-sw { background-position: -80px -32px; } -.ui-icon-arrow-1-w { background-position: -96px -32px; } -.ui-icon-arrow-1-nw { background-position: -112px -32px; } -.ui-icon-arrow-2-n-s { background-position: -128px -32px; } -.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } -.ui-icon-arrow-2-e-w { background-position: -160px -32px; } -.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } -.ui-icon-arrowstop-1-n { background-position: -192px -32px; } -.ui-icon-arrowstop-1-e { background-position: -208px -32px; } -.ui-icon-arrowstop-1-s { background-position: -224px -32px; } -.ui-icon-arrowstop-1-w { background-position: -240px -32px; } -.ui-icon-arrowthick-1-n { background-position: 0 -48px; } -.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } -.ui-icon-arrowthick-1-e { background-position: -32px -48px; } -.ui-icon-arrowthick-1-se { background-position: -48px -48px; } -.ui-icon-arrowthick-1-s { background-position: -64px -48px; } -.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } -.ui-icon-arrowthick-1-w { background-position: -96px -48px; } -.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } -.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } -.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } -.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } -.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } -.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } -.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } -.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } -.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } -.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } -.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } -.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } -.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } -.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } -.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } -.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } -.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } -.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } -.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } -.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } -.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } -.ui-icon-arrow-4 { background-position: 0 -80px; } -.ui-icon-arrow-4-diag { background-position: -16px -80px; } -.ui-icon-extlink { background-position: -32px -80px; } -.ui-icon-newwin { background-position: -48px -80px; } -.ui-icon-refresh { background-position: -64px -80px; } -.ui-icon-shuffle { background-position: -80px -80px; } -.ui-icon-transfer-e-w { background-position: -96px -80px; } -.ui-icon-transferthick-e-w { background-position: -112px -80px; } -.ui-icon-folder-collapsed { background-position: 0 -96px; } -.ui-icon-folder-open { background-position: -16px -96px; } -.ui-icon-document { background-position: -32px -96px; } -.ui-icon-document-b { background-position: -48px -96px; } -.ui-icon-note { background-position: -64px -96px; } -.ui-icon-mail-closed { background-position: -80px -96px; } -.ui-icon-mail-open { background-position: -96px -96px; } -.ui-icon-suitcase { background-position: -112px -96px; } -.ui-icon-comment { background-position: -128px -96px; } -.ui-icon-person { background-position: -144px -96px; } -.ui-icon-print { background-position: -160px -96px; } -.ui-icon-trash { background-position: -176px -96px; } -.ui-icon-locked { background-position: -192px -96px; } -.ui-icon-unlocked { background-position: -208px -96px; } -.ui-icon-bookmark { background-position: -224px -96px; } -.ui-icon-tag { background-position: -240px -96px; } -.ui-icon-home { background-position: 0 -112px; } -.ui-icon-flag { background-position: -16px -112px; } -.ui-icon-calendar { background-position: -32px -112px; } -.ui-icon-cart { background-position: -48px -112px; } -.ui-icon-pencil { background-position: -64px -112px; } -.ui-icon-clock { background-position: -80px -112px; } -.ui-icon-disk { background-position: -96px -112px; } -.ui-icon-calculator { background-position: -112px -112px; } -.ui-icon-zoomin { background-position: -128px -112px; } -.ui-icon-zoomout { background-position: -144px -112px; } -.ui-icon-search { background-position: -160px -112px; } -.ui-icon-wrench { background-position: -176px -112px; } -.ui-icon-gear { background-position: -192px -112px; } -.ui-icon-heart { background-position: -208px -112px; } -.ui-icon-star { background-position: -224px -112px; } -.ui-icon-link { background-position: -240px -112px; } -.ui-icon-cancel { background-position: 0 -128px; } -.ui-icon-plus { background-position: -16px -128px; } -.ui-icon-plusthick { background-position: -32px -128px; } -.ui-icon-minus { background-position: -48px -128px; } -.ui-icon-minusthick { background-position: -64px -128px; } -.ui-icon-close { background-position: -80px -128px; } -.ui-icon-closethick { background-position: -96px -128px; } -.ui-icon-key { background-position: -112px -128px; } -.ui-icon-lightbulb { background-position: -128px -128px; } -.ui-icon-scissors { background-position: -144px -128px; } -.ui-icon-clipboard { background-position: -160px -128px; } -.ui-icon-copy { background-position: -176px -128px; } -.ui-icon-contact { background-position: -192px -128px; } -.ui-icon-image { background-position: -208px -128px; } -.ui-icon-video { background-position: -224px -128px; } -.ui-icon-script { background-position: -240px -128px; } -.ui-icon-alert { background-position: 0 -144px; } -.ui-icon-info { background-position: -16px -144px; } -.ui-icon-notice { background-position: -32px -144px; } -.ui-icon-help { background-position: -48px -144px; } -.ui-icon-check { background-position: -64px -144px; } -.ui-icon-bullet { background-position: -80px -144px; } -.ui-icon-radio-off { background-position: -96px -144px; } -.ui-icon-radio-on { background-position: -112px -144px; } -.ui-icon-pin-w { background-position: -128px -144px; } -.ui-icon-pin-s { background-position: -144px -144px; } -.ui-icon-play { background-position: 0 -160px; } -.ui-icon-pause { background-position: -16px -160px; } -.ui-icon-seek-next { background-position: -32px -160px; } -.ui-icon-seek-prev { background-position: -48px -160px; } -.ui-icon-seek-end { background-position: -64px -160px; } -.ui-icon-seek-start { background-position: -80px -160px; } -/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ -.ui-icon-seek-first { background-position: -80px -160px; } -.ui-icon-stop { background-position: -96px -160px; } -.ui-icon-eject { background-position: -112px -160px; } -.ui-icon-volume-off { background-position: -128px -160px; } -.ui-icon-volume-on { background-position: -144px -160px; } -.ui-icon-power { background-position: 0 -176px; } -.ui-icon-signal-diag { background-position: -16px -176px; } -.ui-icon-signal { background-position: -32px -176px; } -.ui-icon-battery-0 { background-position: -48px -176px; } -.ui-icon-battery-1 { background-position: -64px -176px; } -.ui-icon-battery-2 { background-position: -80px -176px; } -.ui-icon-battery-3 { background-position: -96px -176px; } -.ui-icon-circle-plus { background-position: 0 -192px; } -.ui-icon-circle-minus { background-position: -16px -192px; } -.ui-icon-circle-close { background-position: -32px -192px; } -.ui-icon-circle-triangle-e { background-position: -48px -192px; } -.ui-icon-circle-triangle-s { background-position: -64px -192px; } -.ui-icon-circle-triangle-w { background-position: -80px -192px; } -.ui-icon-circle-triangle-n { background-position: -96px -192px; } -.ui-icon-circle-arrow-e { background-position: -112px -192px; } -.ui-icon-circle-arrow-s { background-position: -128px -192px; } -.ui-icon-circle-arrow-w { background-position: -144px -192px; } -.ui-icon-circle-arrow-n { background-position: -160px -192px; } -.ui-icon-circle-zoomin { background-position: -176px -192px; } -.ui-icon-circle-zoomout { background-position: -192px -192px; } -.ui-icon-circle-check { background-position: -208px -192px; } -.ui-icon-circlesmall-plus { background-position: 0 -208px; } -.ui-icon-circlesmall-minus { background-position: -16px -208px; } -.ui-icon-circlesmall-close { background-position: -32px -208px; } -.ui-icon-squaresmall-plus { background-position: -48px -208px; } -.ui-icon-squaresmall-minus { background-position: -64px -208px; } -.ui-icon-squaresmall-close { background-position: -80px -208px; } -.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } -.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } -.ui-icon-grip-solid-vertical { background-position: -32px -224px; } -.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } -.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } -.ui-icon-grip-diagonal-se { background-position: -80px -224px; } - - -/* Misc visuals -----------------------------------*/ - -/* Corner radius */ -.ui-corner-tl { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; } -.ui-corner-tr { -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; } -.ui-corner-bl { -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; } -.ui-corner-br { -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; } -.ui-corner-top { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; } -.ui-corner-bottom { -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; } -.ui-corner-right { -moz-border-radius-topright: 4px/*{cornerRadius}*/; -webkit-border-top-right-radius: 4px/*{cornerRadius}*/; border-top-right-radius: 4px/*{cornerRadius}*/; -moz-border-radius-bottomright: 4px/*{cornerRadius}*/; -webkit-border-bottom-right-radius: 4px/*{cornerRadius}*/; border-bottom-right-radius: 4px/*{cornerRadius}*/; } -.ui-corner-left { -moz-border-radius-topleft: 4px/*{cornerRadius}*/; -webkit-border-top-left-radius: 4px/*{cornerRadius}*/; border-top-left-radius: 4px/*{cornerRadius}*/; -moz-border-radius-bottomleft: 4px/*{cornerRadius}*/; -webkit-border-bottom-left-radius: 4px/*{cornerRadius}*/; border-bottom-left-radius: 4px/*{cornerRadius}*/; } -.ui-corner-all { -moz-border-radius: 4px/*{cornerRadius}*/; -webkit-border-radius: 4px/*{cornerRadius}*/; border-radius: 4px/*{cornerRadius}*/; } - -/* Overlays */ -.ui-widget-overlay { background: #aaaaaa/*{bgColorOverlay}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityOverlay}*/; } -.ui-widget-shadow { margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/; padding: 8px/*{thicknessShadow}*/; background: #aaaaaa/*{bgColorShadow}*/ url(images/ui-bg_flat_0_aaaaaa_40x100.png)/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/; opacity: .3;filter:Alpha(Opacity=30)/*{opacityShadow}*/; -moz-border-radius: 8px/*{cornerRadiusShadow}*/; -webkit-border-radius: 8px/*{cornerRadiusShadow}*/; border-radius: 8px/*{cornerRadiusShadow}*/; } \ No newline at end of file From 10ee2e79cc7c9ea968df2c0ace27e72432895712 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 29 Oct 2010 22:35:22 +0200 Subject: [PATCH 105/173] fix bookmark adding in strict mode --- data/templates/top.inc.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php index bdd4b1a..a20348a 100644 --- a/data/templates/top.inc.php +++ b/data/templates/top.inc.php @@ -1,5 +1,12 @@ - + + + +%xhtml-symbol; +]> From a04938f5598b47314bff9f9c49710cd08aa28418 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 2 Nov 2010 19:07:59 +0100 Subject: [PATCH 106/173] get rid of arrow entities --- data/templates/bookmarks.tpl.php | 12 ++++++------ data/templates/editprofile.tpl.php | 2 +- data/templates/sidebar.block.menu.php | 6 +++--- data/templates/sidebar.block.recent.php | 2 +- data/templates/sidebar.block.users.php | 2 +- data/templates/sidebar.block.watchlist.php | 6 +++--- data/templates/tagrename.tpl.php | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php index db560f2..34beb39 100644 --- a/data/templates/bookmarks.tpl.php +++ b/data/templates/bookmarks.tpl.php @@ -121,33 +121,33 @@ $votingSort = 'voting_desc'; switch(getSortOrder()) { case 'date_asc': - $dateArrow = ' ↑'; + $dateArrow = ' ↑'; $dateSort = 'date_desc'; break; case 'title_asc': - $titleArrow = ' ↑'; + $titleArrow = ' ↑'; $titleSort = 'title_desc'; break; case 'title_desc': - $titleArrow = ' ↓'; + $titleArrow = ' ↓'; $titleSort = 'title_asc'; break; case 'voting_asc': - $votingArrow = ' ↑'; + $votingArrow = ' ↑'; $votingSort = 'voting_desc'; break; case 'voting_desc': - $votingArrow = ' ↓'; + $votingArrow = ' ↓'; $votingSort = 'voting_asc'; break; case 'date_desc': default: - $dateArrow = ' ↓'; + $dateArrow = ' ↓'; $dateSort = 'date_asc'; break; } diff --git a/data/templates/editprofile.tpl.php b/data/templates/editprofile.tpl.php index 887dce3..518afbe 100644 --- a/data/templates/editprofile.tpl.php +++ b/data/templates/editprofile.tpl.php @@ -26,7 +26,7 @@ $this->includeTemplate($GLOBALS['top_include']); - ← + ← diff --git a/data/templates/sidebar.block.menu.php b/data/templates/sidebar.block.menu.php index ee82997..94a9fa2 100644 --- a/data/templates/sidebar.block.menu.php +++ b/data/templates/sidebar.block.menu.php @@ -65,13 +65,13 @@ if (sizeof($menuTags) > 0 || ($userid != 0 && $userid === $logged_on_userid)) { getUser($userid); ?> 0): ?> -

                      →

                      +

                      →

                      -

                      →

                      +

                      →

                      -

                      →

                      +

                      →

                      diff --git a/data/templates/sidebar.block.recent.php b/data/templates/sidebar.block.recent.php index e34f820..1ffeb4d 100644 --- a/data/templates/sidebar.block.recent.php +++ b/data/templates/sidebar.block.recent.php @@ -31,7 +31,7 @@ if ($recentTags && count($recentTags) > 0) { } echo $contents ."

                      \n"; ?> -

                      →

                      +

                      →

                  -

                  →

                  +

                  →

                  0):?> -

                  +

                    @@ -27,7 +27,7 @@ foreach($watching as $watchuser) { -

                    +

                      isLoggedOn() && $currentUser->getUsername() == $user): ?> @@ -49,7 +49,7 @@ foreach($watching as $watchuser) {
                    -

                    +

                      diff --git a/data/templates/tagrename.tpl.php b/data/templates/tagrename.tpl.php index ea8b516..894b964 100644 --- a/data/templates/tagrename.tpl.php +++ b/data/templates/tagrename.tpl.php @@ -11,12 +11,12 @@ window.onload = function() { - ← + ← - ← + ← From 9c412f89ff7187bef1b2fbf0bc1dfd6b8f3b6aed Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 2 Nov 2010 19:09:27 +0100 Subject: [PATCH 107/173] we do not need the entities anymore since we will be using the characters themselves now --- data/templates/top.inc.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php index a20348a..bdd4b1a 100644 --- a/data/templates/top.inc.php +++ b/data/templates/top.inc.php @@ -1,12 +1,5 @@ - - - -%xhtml-symbol; -]> + From 77f4b48f9d184661715c32cfffaf2b5b7b441153 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 2 Nov 2010 19:14:31 +0100 Subject: [PATCH 108/173] fix broken XML --- data/locales/de_DE/LC_MESSAGES/messages.mo | Bin 29546 -> 29547 bytes data/locales/de_DE/LC_MESSAGES/messages.po | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/data/locales/de_DE/LC_MESSAGES/messages.mo b/data/locales/de_DE/LC_MESSAGES/messages.mo index 0b18fac7f7693b37ca2823e372b17e3b3aa6cf5c..05778b775811b6f5c3dfdea727cecbd261e27b1f 100644 GIT binary patch delta 793 zcmXZaO-NK>6vpxADyC-5j0t`%N|PBiX++RW3x#wQ%8;N72N}d~C%*+-b)y#1Qo(Q) z(k>JkaVL%7LfnM75Jzw?e(ZE1h(iB^clA5Z%f074_kHjAiF0w{Bvu3Nw4`94lz~f_ zi@z{{32%KH8_2tuk50c7!a^*^X6(TswD)&BQ}}~?hJKtGkQ(tDKE|y9xyq*a$3hz( zVilGRN@0xP8~luKaTA~6HCls$A*l|7=))*>;3(E&67Bs<{D9$MsSCeg3{%6d^p&E1 zMB?MLiMG+xQK=K7_#W3Wg17hy+u~9d?qCM);ZHokR*Zj?9$^CCVG?a{jolAkg7w6( zOJNfZ;%oekK|Drl;EdlNu@7y-SNH^*F%vuR0d{-27t6^b=)-w@h|6eKvx3E##8PyR zDAFiya2D_IB~DLB)wqmy68mTah9;#NjG;A}$1+^SCfvt%^iN5Z*n@Tz-_f4`ivdjG z3-;G3MF9(W{E222=3t9w1k=e;FUK%Mj-w5}fQ7h-6}X1Em_qA!hIT^Ej8ueKX#JjJ Tt5uE{fvD7r4h~{6>M#vO zDxtEWUX!W#BHR;cxtchuDU(4^lR+V=E@m2LF#XcQc3=bMV-VA^8y{kyn}@K997PWXMLXML-Datei lokal auf Ihrem Computer" #: data/templates/importDelicious.tpl.php:35 msgid "" From 29e7cf1aa5ca0e387fdb61372c7a590def694a2a Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 19 Nov 2010 06:51:01 +0100 Subject: [PATCH 109/173] Fix bug #3111254: Search in my_watchlist results in error --- doc/ChangeLog | 1 + src/SemanticScuttle/Service/User.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 0a60bff..60401d4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -6,6 +6,7 @@ ChangeLog for SemantiScuttle - Fix bug in getTagsForBookmarks() that fetched all tags - Fix bug #3073215: Updating bookmark time does not work - Fix bug #3074816: French translation breaks edit javascript +- Fix bug #3111254: Search in my_watchlist results in error - Show error message on mysqli connection errors - Implement patch #3059829: update FR_CA translation - Update php-gettext library to 1.0.10 diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php index fd9d84f..9ef8430 100644 --- a/src/SemanticScuttle/Service/User.php +++ b/src/SemanticScuttle/Service/User.php @@ -364,7 +364,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService public function getCurrentUserId() { if (isset($_SESSION[$this->getSessionKey()])) { - return $_SESSION[$this->getSessionKey()]; + return (int)$_SESSION[$this->getSessionKey()]; } else if (isset($_COOKIE[$this->getCookieKey()])) { $cook = explode(':', $_COOKIE[$this->getCookieKey()]); @@ -385,10 +385,10 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService if ($row = $this->db->sql_fetchrow($dbresult)) { $this->setCurrentUserId( - $row[$this->getFieldName('primary')] + (int)$row[$this->getFieldName('primary')] ); $this->db->sql_freeresult($dbresult); - return $_SESSION[$this->getSessionKey()]; + return (int)$_SESSION[$this->getSessionKey()]; } } return false; From 5a8327be1dc3cba69296dbf82c6b2320cc3a0e2f Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 19 Nov 2010 06:51:01 +0100 Subject: [PATCH 110/173] Fix bug #3111254: Search in my_watchlist results in error --- doc/ChangeLog | 1 + src/SemanticScuttle/Service/User.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 0a60bff..60401d4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -6,6 +6,7 @@ ChangeLog for SemantiScuttle - Fix bug in getTagsForBookmarks() that fetched all tags - Fix bug #3073215: Updating bookmark time does not work - Fix bug #3074816: French translation breaks edit javascript +- Fix bug #3111254: Search in my_watchlist results in error - Show error message on mysqli connection errors - Implement patch #3059829: update FR_CA translation - Update php-gettext library to 1.0.10 diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php index 6fc3bb7..091ea4d 100644 --- a/src/SemanticScuttle/Service/User.php +++ b/src/SemanticScuttle/Service/User.php @@ -356,7 +356,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService public function getCurrentUserId() { if (isset($_SESSION[$this->getSessionKey()])) { - return $_SESSION[$this->getSessionKey()]; + return (int)$_SESSION[$this->getSessionKey()]; } else if (isset($_COOKIE[$this->getCookieKey()])) { $cook = split(':', $_COOKIE[$this->getCookieKey()]); @@ -377,10 +377,10 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService if ($row = $this->db->sql_fetchrow($dbresult)) { $this->setCurrentUserId( - $row[$this->getFieldName('primary')] + (int)$row[$this->getFieldName('primary')] ); $this->db->sql_freeresult($dbresult); - return $_SESSION[$this->getSessionKey()]; + return (int)$_SESSION[$this->getSessionKey()]; } } return false; From 2c4bf8dacff87a1918c4f34d97bbdaff0a6b3f07 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 2 Feb 2011 23:08:43 +0100 Subject: [PATCH 111/173] make unittests run with phpunit 3.5.x --- tests/AllTests.php | 3 --- tests/TestBase.php | 4 ---- tests/TestBaseApi.php | 4 ---- 3 files changed, 11 deletions(-) diff --git a/tests/AllTests.php b/tests/AllTests.php index ded6824..4afcc6b 100644 --- a/tests/AllTests.php +++ b/tests/AllTests.php @@ -17,9 +17,6 @@ if (!defined('PHPUnit_MAIN_METHOD')) { } require_once 'prepare.php'; -require_once 'PHPUnit/Framework/TestSuite.php'; - -PHPUnit_Util_Filter::addFileToFilter(__FILE__); /** * SemanticScuttle unit tests. diff --git a/tests/TestBase.php b/tests/TestBase.php index 402330b..8c1a934 100644 --- a/tests/TestBase.php +++ b/tests/TestBase.php @@ -11,10 +11,6 @@ * @link http://sourceforge.net/projects/semanticscuttle */ -require_once 'PHPUnit/Framework.php'; - -PHPUnit_Util_Filter::addFileToFilter(__FILE__); - /** * Base unittest class that provides several helper methods. * diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php index eb1457f..dacdecd 100644 --- a/tests/TestBaseApi.php +++ b/tests/TestBaseApi.php @@ -11,10 +11,6 @@ * @link http://sourceforge.net/projects/semanticscuttle */ -require_once 'PHPUnit/Framework.php'; - -PHPUnit_Util_Filter::addFileToFilter(__FILE__); - /** * Base unittest class for web API tests. * From 966fdf808ce9050fdbe28c86348b88117031675b Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 9 Feb 2011 07:15:56 +0100 Subject: [PATCH 112/173] rename $range to $status as it is used in all other methods; add privacy to the parameter description so we find it again next time --- src/SemanticScuttle/Service/Bookmark.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php index 4e18d3f..6f8a172 100644 --- a/src/SemanticScuttle/Service/Bookmark.php +++ b/src/SemanticScuttle/Service/Bookmark.php @@ -253,18 +253,18 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService /** * Counts bookmarks for a user. * - * @param integer $uId User ID - * @param string $range Range of bookmarks: - * 'public', 'shared', 'private' - * or 'all' + * @param integer $uId User ID + * @param string $status Bookmark visibility/privacy settings: + * 'public', 'shared', 'private' + * or 'all' * * @return integer Number of bookmarks */ - public function countBookmarks($uId, $range = 'public') + public function countBookmarks($uId, $status = 'public') { $sql = 'SELECT COUNT(*) as "0" FROM '. $this->getTableName(); $sql.= ' WHERE uId = ' . intval($uId); - switch ($range) { + switch ($status) { case 'all': //no constraints break; @@ -439,7 +439,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService * @param string $title Bookmark title * @param string $description Long bookmark description * @param string $privateNote Private note for the user. - * @param string $status Bookmark visibility: + * @param string $status Bookmark visibility / privacy settings: * 0 - public * 1 - shared * 2 - private @@ -554,7 +554,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService * @param string $title Bookmark title * @param string $description Long bookmark description * @param string $privateNote Private note for the user. - * @param string $status Bookmark visibility: + * @param string $status Bookmark visibility / privacy setting: * 0 - public * 1 - shared * 2 - private From 6d752be4de3f08840d4453dfcfefd469fb79d45a Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 14 Feb 2011 17:53:31 +0100 Subject: [PATCH 113/173] documentation todo --- doc/developers/doc-TODO | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/developers/doc-TODO diff --git a/doc/developers/doc-TODO b/doc/developers/doc-TODO new file mode 100644 index 0000000..69f6907 --- /dev/null +++ b/doc/developers/doc-TODO @@ -0,0 +1,4 @@ +- Which fields are searched? + title, description, private note, username, tags + +- What are [isbn] and so for? From 6e46a9329e9d6f7d86ca66725efd79c0f21dbe83 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 14 Feb 2011 17:55:48 +0100 Subject: [PATCH 114/173] fcbkcomplete files --- www/js/FCBKcomplete-2.7.5 | 1 + www/js/FCBKcomplete-scuttle.css | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 120000 www/js/FCBKcomplete-2.7.5 create mode 100644 www/js/FCBKcomplete-scuttle.css diff --git a/www/js/FCBKcomplete-2.7.5 b/www/js/FCBKcomplete-2.7.5 new file mode 120000 index 0000000..bae7bc9 --- /dev/null +++ b/www/js/FCBKcomplete-2.7.5 @@ -0,0 +1 @@ +../../../FCBKcomplete/ \ No newline at end of file diff --git a/www/js/FCBKcomplete-scuttle.css b/www/js/FCBKcomplete-scuttle.css new file mode 100644 index 0000000..10a4837 --- /dev/null +++ b/www/js/FCBKcomplete-scuttle.css @@ -0,0 +1,33 @@ +/* Copyright: Guillermo Rauch - Distributed under MIT - Keep this message! */ + +/* TextboxList sample CSS */ +ul.holder { margin: 0; border: 1px solid #999; overflow: hidden; height: auto !important; height: 1%; padding: 4px 5px 0; } +*:first-child+html ul.holder { padding-bottom: 2px; } * html ul.holder { padding-bottom: 2px; } /* ie7 and below */ +ul.holder li { float: left; list-style-type: none; margin: 0 5px 4px 0; white-space:nowrap;} +ul.holder li.bit-box, ul.holder li.bit-input input { font: 11px "Lucida Grande", "Verdana"; } +ul.holder li.bit-box { -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; border: 1px solid #CAD8F3; background: #DEE7F8; padding: 1px 5px 2px; } +ul.holder li.bit-box-focus { border-color: #598BEC; background: #598BEC; color: #fff; } +ul.holder li.bit-input input { width: auto; overflow:visible; margin: 0; border: 0px; outline: 0; padding: 3px 0px 2px; } /* no left/right padding here please */ +ul.holder li.bit-input input.smallinput { width: 20px; } + +/* part of Facebook demo CSS */ +ul.holder li.bit-box, #apple-list ul.holder li.bit-box { padding-right: 15px; position: relative; z-index:1000;} +#apple-list ul.holder li.bit-input { margin: 0; } +#apple-list ul.holder li.bit-input input.smallinput { width: 5px; } +ul.holder li.bit-hover { background: #BBCEF1; border: 1px solid #6D95E0; } +ul.holder li.bit-box-focus { border-color: #598BEC; background: #598BEC; color: #fff; } +ul.holder li.bit-box a.closebutton { position: absolute; right: 4px; top: 5px; display: block; width: 7px; height: 7px; font-size: 1px; background: url('FCBKcomplete-2.7.5/close.gif'); } +ul.holder li.bit-box a.closebutton:hover { background-position: 7px; } +ul.holder li.bit-box-focus a.closebutton, ul.holder li.bit-box-focus a.closebutton:hover { background-position: bottom; } + +/* Autocompleter */ + +.facebook-auto { display: none; position: absolute; width: 512px; background: #eee; } +.facebook-auto .default { padding: 5px 7px; border: 1px solid #ccc; border-width: 0 1px 1px;font-family:"Lucida Grande","Verdana"; font-size:11px; } +.facebook-auto ul { display: none; margin: 0; padding: 0; overflow: auto; position:absolute; z-index:9999} +.facebook-auto ul li { padding: 5px 12px; z-index: 1000; cursor: pointer; margin: 0; list-style-type: none; border: 1px solid #ccc; border-width: 0 1px 1px; font: 11px "Lucida Grande", "Verdana"; background-color: #eee } +.facebook-auto ul li em { font-weight: bold; font-style: normal; background: #ccc; } +.facebook-auto ul li.auto-focus { background: #4173CC; color: #fff; } +.facebook-auto ul li.auto-focus em { background: none; } +.deleted { background-color:#4173CC !important; color:#ffffff !important;} +.hidden { display:none;} From a46146d01605624e8d8f040699f7c70f92c04773 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 14 Feb 2011 18:13:59 +0100 Subject: [PATCH 115/173] Fix bug #3178597: Broken link to context in gsearch admin index page --- doc/ChangeLog | 5 +++++ www/gsearch/index.php | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 60401d4..ee74bc9 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -13,6 +13,11 @@ ChangeLog for SemantiScuttle - api/posts/add respects the "replace" parameter now +0.97.2 - 2011-02-XX +------------------- +- Fix bug #3178597: Broken link to context in gsearch admin index page + + 0.97.1 - 2010-09-30 ------------------- This is a security release! We do highly recommend to update diff --git a/www/gsearch/index.php b/www/gsearch/index.php index 585536a..70be05e 100644 --- a/www/gsearch/index.php +++ b/www/gsearch/index.php @@ -31,7 +31,9 @@ if($GLOBALS['enableGoogleCustomSearch']==false) { echo '

                      '; echo T_('Admin tips: '); echo T_('To refresh manually Google Custom Search Engine, goes to: '); - echo 'http://www.google.com/coop/cse/cref
                      '; + echo 'http://www.google.com/coop/cse/cref' + . '
                      '; echo T_('If no result appears, check that all the urls are valid in the admin section.'); echo '

                      '; From 96f7172de0123a92cd635f6d8c38d267b73749c7 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 15 Feb 2011 07:56:20 +0100 Subject: [PATCH 116/173] move changes into 0.97.2 where I merged them --- doc/ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index ee74bc9..2fa0f20 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -5,8 +5,6 @@ ChangeLog for SemantiScuttle ------------------- - Fix bug in getTagsForBookmarks() that fetched all tags - Fix bug #3073215: Updating bookmark time does not work -- Fix bug #3074816: French translation breaks edit javascript -- Fix bug #3111254: Search in my_watchlist results in error - Show error message on mysqli connection errors - Implement patch #3059829: update FR_CA translation - Update php-gettext library to 1.0.10 @@ -16,6 +14,8 @@ ChangeLog for SemantiScuttle 0.97.2 - 2011-02-XX ------------------- - Fix bug #3178597: Broken link to context in gsearch admin index page +- Fix bug #3074816: French translation breaks edit javascript +- Fix bug #3111254: Search in my_watchlist results in error 0.97.1 - 2010-09-30 From 4b6e2ea2bcddea9bfc28a7a2951002dbd70dfed1 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 15 Feb 2011 08:00:00 +0100 Subject: [PATCH 117/173] another merged bugfix --- doc/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 2fa0f20..b205f2f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -4,7 +4,6 @@ ChangeLog for SemantiScuttle 0.9X.X - 2010-XX-XX ------------------- - Fix bug in getTagsForBookmarks() that fetched all tags -- Fix bug #3073215: Updating bookmark time does not work - Show error message on mysqli connection errors - Implement patch #3059829: update FR_CA translation - Update php-gettext library to 1.0.10 @@ -16,6 +15,7 @@ ChangeLog for SemantiScuttle - Fix bug #3178597: Broken link to context in gsearch admin index page - Fix bug #3074816: French translation breaks edit javascript - Fix bug #3111254: Search in my_watchlist results in error +- Fix bug #3073215: Updating bookmark time does not work 0.97.1 - 2010-09-30 From 525b509bd29090634ba45f8272e88ff0eadedc25 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 16 Feb 2011 00:42:45 +0100 Subject: [PATCH 118/173] remove svntag task from build file; we do not have svn anymore --- build.xml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/build.xml b/build.xml index 83341e0..9773a63 100644 --- a/build.xml +++ b/build.xml @@ -208,7 +208,7 @@ - @@ -307,17 +307,6 @@ - - - - - - @@ -327,4 +316,4 @@ - \ No newline at end of file + From 66ee4cbe40a56aa3c9b71427ee51c6b371eb3053 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 16 Feb 2011 00:45:06 +0100 Subject: [PATCH 119/173] set release date of 0.97.2 --- doc/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index b205f2f..212b4e3 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -10,7 +10,7 @@ ChangeLog for SemantiScuttle - api/posts/add respects the "replace" parameter now -0.97.2 - 2011-02-XX +0.97.2 - 2011-02-17 ------------------- - Fix bug #3178597: Broken link to context in gsearch admin index page - Fix bug #3074816: French translation breaks edit javascript From 0dd5540bfbad7cd75a1eecd96a245aa512356338 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 16 Feb 2011 08:49:01 +0100 Subject: [PATCH 120/173] Fix bug #3065284: AjaxVote problem with Webkit browsers --- doc/ChangeLog | 1 + www/jsScuttle.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 212b4e3..acfce25 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -16,6 +16,7 @@ ChangeLog for SemantiScuttle - Fix bug #3074816: French translation breaks edit javascript - Fix bug #3111254: Search in my_watchlist results in error - Fix bug #3073215: Updating bookmark time does not work +- Fix bug #3065284: AjaxVote problem with Webkit browsers 0.97.1 - 2010-09-30 diff --git a/www/jsScuttle.php b/www/jsScuttle.php index f37da78..c166755 100644 --- a/www/jsScuttle.php +++ b/www/jsScuttle.php @@ -155,7 +155,10 @@ function processVotingResult() { var bmnode = document.getElementById('bmv-'+bookmark); bmnode.parentNode.replaceChild( - response.getElementsByTagName('html')[0].firstChild, + xmlhttp.responseXML.importNode( + response.getElementsByTagName('html')[0].firstChild, + true + ), bmnode ); } From 4cc46f268676d8df88ce6003df2a7bc9249fe7fb Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 18 Feb 2011 08:01:18 +0100 Subject: [PATCH 121/173] get rid of phpunits warnings about deprecated assertType usages --- tests/Bookmark2TagTest.php | 12 ++++++------ tests/BookmarkTest.php | 20 ++++++++++---------- tests/UserTest.php | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index e6aaf1d..1823c60 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -120,7 +120,7 @@ class Bookmark2TagTest extends TestBase $this->b2ts->attachTags($bid, array('foo', 'bar', 'fuu')); $tags = $this->b2ts->getTagsForBookmark($bid); - $this->assertType('array', $tags); + $this->assertInternalType('array', $tags); $this->assertContains('foo', $tags); $this->assertContains('bar', $tags); $this->assertContains('fuu', $tags); @@ -141,10 +141,10 @@ class Bookmark2TagTest extends TestBase $alltags = $this->b2ts->getTagsForBookmarks( array($bid1, $bid2) ); - $this->assertType('array', $alltags); + $this->assertInternalType('array', $alltags); $this->assertEquals(2, count($alltags)); - $this->assertType('array', $alltags[$bid1]); - $this->assertType('array', $alltags[$bid2]); + $this->assertInternalType('array', $alltags[$bid1]); + $this->assertInternalType('array', $alltags[$bid2]); $this->assertEquals(0, count($alltags[$bid1])); $this->assertEquals(0, count($alltags[$bid2])); } @@ -179,9 +179,9 @@ class Bookmark2TagTest extends TestBase $alltags = $this->b2ts->getTagsForBookmarks( array($bid1, $bid2, $bid3, $bid4) ); - $this->assertType('array', $alltags); + $this->assertInternalType('array', $alltags); foreach ($alltags as $bid => $btags) { - $this->assertType('array', $btags); + $this->assertInternalType('array', $btags); if ($bid == $bid1) { $this->assertEquals(3, count($btags)); $this->assertContains('foo', $btags); diff --git a/tests/BookmarkTest.php b/tests/BookmarkTest.php index 2a7c318..f54fe9a 100644 --- a/tests/BookmarkTest.php +++ b/tests/BookmarkTest.php @@ -263,7 +263,7 @@ class BookmarkTest extends TestBase $bookmark = $this->bs->getBookmark($bid); $ret = $this->bs->bookmarksExist(array($bookmark['bAddress'])); - $this->assertType('array', $ret); + $this->assertInternalType('array', $ret); $this->assertEquals(1, count($ret)); $this->assertTrue($ret[$bookmark['bAddress']]); } @@ -291,7 +291,7 @@ class BookmarkTest extends TestBase $bookmark2['bAddress'] ) ); - $this->assertType('array', $ret); + $this->assertInternalType('array', $ret); $this->assertEquals(2, count($ret)); $this->assertTrue($ret[$bookmark['bAddress']]); $this->assertTrue($ret[$bookmark2['bAddress']]); @@ -308,7 +308,7 @@ class BookmarkTest extends TestBase public function testBookmarksExistFalseSingle() { $ret = $this->bs->bookmarksExist(array('does-not-exist')); - $this->assertType('array', $ret); + $this->assertInternalType('array', $ret); $this->assertEquals(1, count($ret)); $this->assertFalse($ret['does-not-exist']); } @@ -329,7 +329,7 @@ class BookmarkTest extends TestBase 'does-not-exist-3', ); $ret = $this->bs->bookmarksExist($bms); - $this->assertType('array', $ret); + $this->assertInternalType('array', $ret); $this->assertEquals(3, count($ret)); $this->assertFalse($ret['does-not-exist']); $this->assertFalse($ret['does-not-exist-2']); @@ -366,7 +366,7 @@ class BookmarkTest extends TestBase 'does-not-exist-3' ) ); - $this->assertType('array', $ret); + $this->assertInternalType('array', $ret); $this->assertEquals(5, count($ret)); $this->assertTrue($ret[$bookmark['bAddress']]); $this->assertTrue($ret[$bookmark2['bAddress']]); @@ -475,7 +475,7 @@ class BookmarkTest extends TestBase foreach ($bms['bookmarks'] as $bm) { $this->assertArrayHasKey('tags', $bm); - $this->assertType('array', $bm['tags']); + $this->assertInternalType('array', $bm['tags']); if ($bm['bId'] == $bid) { $this->assertContains('foo', $bm['tags']); $this->assertContains('bar', $bm['tags']); @@ -756,7 +756,7 @@ class BookmarkTest extends TestBase $bm = $this->bs->getBookmark($bid, true); $this->assertArrayHasKey('tags', $bm); - $this->assertType('array', $bm['tags']); + $this->assertInternalType('array', $bm['tags']); $this->assertContains('foo', $bm['tags']); $this->assertContains('bar', $bm['tags']); } @@ -874,7 +874,7 @@ class BookmarkTest extends TestBase $bid = $this->addBookmark($uid, $url); $bm = $this->bs->getBookmarkByAddress($url); - $this->assertType('array', $bm); + $this->assertInternalType('array', $bm); $this->assertEquals($url, $bm['bAddress']); } @@ -900,7 +900,7 @@ class BookmarkTest extends TestBase $bid = $this->addBookmark($uid, $url); $bm = $this->bs->getBookmarkByAddress($incomplete); - $this->assertType('array', $bm); + $this->assertInternalType('array', $bm); $this->assertEquals($url, $bm['bAddress']); } @@ -951,7 +951,7 @@ class BookmarkTest extends TestBase $this->assertEquals('new description', $bm['bDescription']); $this->assertEquals('new private note', $bm['bPrivateNote']); $this->assertEquals(1, $bm['bStatus']); - $this->assertType('array', $bm['tags']); + $this->assertInternalType('array', $bm['tags']); $this->assertEquals(1, count($bm['tags'])); $this->assertContains('new', $bm['tags']); } diff --git a/tests/UserTest.php b/tests/UserTest.php index 6da7776..49f3730 100644 --- a/tests/UserTest.php +++ b/tests/UserTest.php @@ -143,7 +143,7 @@ class UserTest extends TestBase $uid = $this->addUser(); $users = $this->us->getObjectUsers(); $this->assertEquals(1, count($users)); - $this->assertType('SemanticScuttle_Model_User', reset($users)); + $this->assertInstanceOf('SemanticScuttle_Model_User', reset($users)); } @@ -160,7 +160,7 @@ class UserTest extends TestBase $uid3 = $this->addUser(); $users = $this->us->getObjectUsers(); $this->assertEquals(3, count($users)); - $this->assertType('SemanticScuttle_Model_User', reset($users)); + $this->assertInstanceOf('SemanticScuttle_Model_User', reset($users)); } From 3e9e2154a6ec7e4a1ab34b16f9e7ab9ea5c7f109 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 15 Mar 2011 07:59:03 +0100 Subject: [PATCH 122/173] Fix bug #3187177: Wrong URL / Export XML Bookmarks --- data/templates/editprofile.tpl.php | 2 +- doc/ChangeLog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/templates/editprofile.tpl.php b/data/templates/editprofile.tpl.php index b55d250..232b1d3 100644 --- a/data/templates/editprofile.tpl.php +++ b/data/templates/editprofile.tpl.php @@ -58,7 +58,7 @@ $this->includeTemplate($GLOBALS['top_include']); / - / + / diff --git a/doc/ChangeLog b/doc/ChangeLog index acfce25..6144a81 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -8,6 +8,7 @@ ChangeLog for SemantiScuttle - Implement patch #3059829: update FR_CA translation - Update php-gettext library to 1.0.10 - api/posts/add respects the "replace" parameter now +- Fix bug #3187177: Wrong URL / Export XML Bookmarks 0.97.2 - 2011-02-17 From 82ada0d75f249733936a0826b115b20cba0657ab Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 15 Mar 2011 19:13:14 +0100 Subject: [PATCH 123/173] Implement request #3054906: Show user's full name instead of nickname --- .../bookmarkcommondescriptionedit.tpl.php | 3 +- data/templates/bookmarks.tpl.php | 3 +- data/templates/sidebar.block.users.php | 2 +- .../tagcommondescriptionedit.tpl.php | 3 +- data/templates/users.tpl.php | 9 +++- doc/ChangeLog | 5 ++- src/SemanticScuttle/Model/UserArray.php | 41 +++++++++++++++++++ src/SemanticScuttle/Service/Bookmark.php | 3 +- src/SemanticScuttle/header.php | 1 + www/rss.php | 2 +- 10 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 src/SemanticScuttle/Model/UserArray.php diff --git a/data/templates/bookmarkcommondescriptionedit.tpl.php b/data/templates/bookmarkcommondescriptionedit.tpl.php index af5909a..807c58b 100644 --- a/data/templates/bookmarkcommondescriptionedit.tpl.php +++ b/data/templates/bookmarkcommondescriptionedit.tpl.php @@ -30,7 +30,8 @@ window.onload = function() { if(strlen($description['cdDatetime'])>0) { echo T_('Last modification:').' '.$description['cdDatetime'].', '; $lastUser = $userservice->getUser($description['uId']); - echo ''.$lastUser['username'].''; + echo '' + . SemanticScuttle_Model_UserArray::getName($lastUser) . ''; } ?> diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php index e32d3c9..c404358 100644 --- a/data/templates/bookmarks.tpl.php +++ b/data/templates/bookmarks.tpl.php @@ -309,7 +309,8 @@ if ($currenttag!= '') { $copy .= T_('you'); } else { $copy .= '' - . $row['username'] . ''; + . SemanticScuttle_Model_UserArray::getName($row) + . ''; } // Udders! diff --git a/data/templates/sidebar.block.users.php b/data/templates/sidebar.block.users.php index 3ad18bc..826871e 100644 --- a/data/templates/sidebar.block.users.php +++ b/data/templates/sidebar.block.users.php @@ -18,7 +18,7 @@ if ($lastUsers && count($lastUsers) > 0) { foreach ($lastUsers as $row) { echo ''; echo ''; - echo $row['username']; + echo SemanticScuttle_Model_UserArray::getName($row); echo ''; echo ' ('.T_('bookmarks').')'; echo ''; diff --git a/data/templates/tagcommondescriptionedit.tpl.php b/data/templates/tagcommondescriptionedit.tpl.php index d3a006a..f938f93 100644 --- a/data/templates/tagcommondescriptionedit.tpl.php +++ b/data/templates/tagcommondescriptionedit.tpl.php @@ -20,7 +20,8 @@ window.onload = function() { if(strlen($description['cdDatetime'])>0) { echo T_('Last modification:').' '.$description['cdDatetime'].', '; $lastUser = $userservice->getUser($description['uId']); - echo ''.$lastUser['username'].''; + echo '' + . SemanticScuttle_Model_UserArray::getName($lastUser) . ''; } ?> diff --git a/data/templates/users.tpl.php b/data/templates/users.tpl.php index c209f94..fa92bef 100644 --- a/data/templates/users.tpl.php +++ b/data/templates/users.tpl.php @@ -14,7 +14,14 @@ if ($users && count($users) > 0) { '.$row['username'].' ('.T_('profile').' '.T_('created in').' '.date('M Y',strtotime($row['uDatetime'])).') : '.T_('bookmarks').''; + echo '
                    • ' + . SemanticScuttle_Model_UserArray::getName($row) . '' + . ' (' + . T_('profile') . ' ' + . T_('created in') . ' ' + . date('M Y', strtotime($row['uDatetime'])) . ')' + . ' : ' + . T_('bookmarks') . '
                      • '; } ?>
                    diff --git a/doc/ChangeLog b/doc/ChangeLog index 6144a81..4c93a9a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -3,12 +3,13 @@ ChangeLog for SemantiScuttle 0.9X.X - 2010-XX-XX ------------------- +- Fix bug #3187177: Wrong URL / Export XML Bookmarks - Fix bug in getTagsForBookmarks() that fetched all tags -- Show error message on mysqli connection errors +- Implement request #3054906: Show user's full name instead of nickname - Implement patch #3059829: update FR_CA translation +- Show error message on mysqli connection errors - Update php-gettext library to 1.0.10 - api/posts/add respects the "replace" parameter now -- Fix bug #3187177: Wrong URL / Export XML Bookmarks 0.97.2 - 2011-02-17 diff --git a/src/SemanticScuttle/Model/UserArray.php b/src/SemanticScuttle/Model/UserArray.php new file mode 100644 index 0000000..a0d9c9b --- /dev/null +++ b/src/SemanticScuttle/Model/UserArray.php @@ -0,0 +1,41 @@ + + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +/** + * Mostly static methods that help working with a user row array from database. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Christian Weiske + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class SemanticScuttle_Model_UserArray +{ + /** + * Returns full user name as specified in the profile if it is set, + * otherwise the nickname/loginname is returned. + * + * @param array $row User row array from database + * + * @return string Full name or username + */ + public static function getName($row) + { + if (isset($row['name']) && $row['name']) { + return $row['name']; + } + return $row['username']; + } +} +?> \ No newline at end of file diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php index 6f8a172..a30ad5f 100644 --- a/src/SemanticScuttle/Service/Bookmark.php +++ b/src/SemanticScuttle/Service/Bookmark.php @@ -734,7 +734,8 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService if (SQL_LAYER == 'mysql4') { $query_1 .= 'SQL_CALC_FOUND_ROWS '; } - $query_1 .= 'B.*, U.'. $userservice->getFieldName('username'); + $query_1 .= 'B.*, U.'. $userservice->getFieldName('username') + . ', U.name'; $query_2 = ' FROM '. $userservice->getTableName() .' AS U' . ', '. $this->getTableName() .' AS B'; diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index d1a5c29..4fecb8f 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -68,6 +68,7 @@ require_once 'SemanticScuttle/Service.php'; require_once 'SemanticScuttle/DbService.php'; require_once 'SemanticScuttle/Service/Factory.php'; require_once 'SemanticScuttle/functions.php'; +require_once 'SemanticScuttle/Model/UserArray.php'; if (count($GLOBALS['serviceoverrides']) > 0 && !defined('UNIT_TEST_MODE') diff --git a/www/rss.php b/www/rss.php index 6dcfb4c..298d9ba 100644 --- a/www/rss.php +++ b/www/rss.php @@ -116,7 +116,7 @@ foreach ($bookmarks_tmp as $key => $row) { 'title' => $row['bTitle'], 'link' => $_link, 'description' => $row['bDescription'], - 'creator' => $row['username'], + 'creator' => SemanticScuttle_Model_UserArray::getName($row), 'pubdate' => $_pubdate, 'tags' => $row['tags'] ); From 975809a8347929c9eae9c6a8bf3beb8d92af63ef Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 15 Mar 2011 19:18:57 +0100 Subject: [PATCH 124/173] unit test for the new SemanticScuttle_Model_UserArray class --- tests/UserArrayTest.php | 68 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 tests/UserArrayTest.php diff --git a/tests/UserArrayTest.php b/tests/UserArrayTest.php new file mode 100644 index 0000000..cb53f15 --- /dev/null +++ b/tests/UserArrayTest.php @@ -0,0 +1,68 @@ + + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +require_once 'prepare.php'; + +/** + * Unit tests for the SemanticScuttle user array model. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Christian Weiske + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class UserArrayTest extends PHPUnit_Framework_TestCase +{ + + public function testGetNameLongName() + { + $this->assertEquals( + 'John Doe', + SemanticScuttle_Model_UserArray::getName( + array( + 'name' => 'John Doe', + 'username' => 'jdoe' + ) + ) + ); + } + + public function testGetNameUsernameIfNameIsEmpty() + { + $this->assertEquals( + 'jdoe', + SemanticScuttle_Model_UserArray::getName( + array( + 'name' => '', + 'username' => 'jdoe' + ) + ) + ); + } + + public function testGetNameUsernameIfNameIsNotSet() + { + $this->assertEquals( + 'jdoe', + SemanticScuttle_Model_UserArray::getName( + array( + 'username' => 'jdoe' + ) + ) + ); + } + +} + +?> \ No newline at end of file From 8146646a0e1c7535e62aeebab049f7b1740c86ae Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 17 Mar 2011 08:46:15 +0100 Subject: [PATCH 125/173] prepare jquery autocomplete (does not work yet) --- data/templates/editbookmark.tpl.php | 19 +++++++------------ www/ajax/getcontacttags.php | 22 ++++++++++++---------- www/bookmarks.php | 11 +++++++---- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 44e3ac3..504249b 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -26,12 +26,12 @@ function jsEscTitle($title) - ← + ← - ← + ← @@ -39,7 +39,7 @@ function jsEscTitle($title) - ← + ← 0): ?>

                    @@ -56,19 +56,15 @@ function jsEscTitle($title) style="display:none"> - ← + ← - - ← + ← @@ -104,7 +100,7 @@ function jsEscTitle($title) echo ' ('; echo T_('edit common description').')'; } - + if ($popup) { ?> @@ -135,7 +131,6 @@ jQuery(document).ready(function() { }); - includeTemplate('dynamictags.inc'); @@ -204,5 +199,5 @@ else if (false) includeTemplate($GLOBALS['bottom_include']); +$this->includeTemplate($GLOBALS['bottom_include']); ?> diff --git a/www/ajax/getcontacttags.php b/www/ajax/getcontacttags.php index 89d6a3a..5f1edb3 100644 --- a/www/ajax/getcontacttags.php +++ b/www/ajax/getcontacttags.php @@ -27,18 +27,20 @@ require_once '../www-header.php'; $b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); $bookmarkservice =SemanticScuttle_Service_Factory::get('Tag'); +$listTags = $b2tservice->getContactTags( + $userservice->getCurrentUserId(), 1000, $userservice->getCurrentUserId() +); +$tags = array(); +foreach($listTags as $t) { + $tags[] = array( + 'caption' => $t['tag'], + 'value' => $t['tag'], + ); +} + +echo json_encode($tags); ?> -{identifier:"tag", -items: [ -getContactTags($userservice->getCurrentUserId(), 1000, $userservice->getCurrentUserId()); - foreach($listTags as $t) { - echo "{tag: \"".$t['tag']."\"},"; - } -?> -]} - diff --git a/www/bookmarks.php b/www/bookmarks.php index 5241481..0753c16 100644 --- a/www/bookmarks.php +++ b/www/bookmarks.php @@ -41,7 +41,6 @@ isset($_POST['address']) ? define('POST_ADDRESS', $_POST['address']): define('PO isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']): define('POST_DESCRIPTION', ''); isset($_POST['privateNote']) ? define('POST_PRIVATENOTE', $_POST['privateNote']): define('POST_PRIVATENOTE', ''); isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', ''); -isset($_POST['tags']) ? define('POST_TAGS', $_POST['tags']): define('POST_TAGS', ''); isset($_POST['referrer']) ? define('POST_REFERRER', $_POST['referrer']): define('POST_REFERRER', ''); isset($_GET['popup']) ? define('GET_POPUP', $_GET['popup']): define('GET_POPUP', ''); @@ -50,6 +49,10 @@ isset($_POST['popup']) ? define('POST_POPUP', $_POST['popup']): define('POST_POP isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0); isset($_GET['sort']) ? define('GET_SORT', $_GET['sort']): define('GET_SORT', ''); +if (!isset($_POST['tags'])) { + $_POST['tags'] = array(); +} +//echo '

                    ' . var_export($_POST, true) . '

                    ';die(); if ((GET_ACTION == "add") && !$userservice->isLoggedOn()) { @@ -143,7 +146,7 @@ if ($userservice->isLoggedOn() && POST_SUBMITTED != '') { $description = trim(POST_DESCRIPTION); $privateNote = trim(POST_PRIVATENOTE); $status = intval(POST_STATUS); - $categories = trim(POST_TAGS); + $categories = trim(implode(',', $_POST['tags'])); $saved = true; if ($bookmarkservice->addBookmark($address, $title, $description, $privateNote, $status, $categories)) { if (POST_POPUP != '') { @@ -184,10 +187,10 @@ if ($templatename == 'editbookmark.tpl') { 'bAddress' => stripslashes(POST_ADDRESS), 'bDescription' => stripslashes(POST_DESCRIPTION), 'bPrivateNote' => stripslashes(POST_PRIVATENOTE), - 'tags' => (POST_TAGS ? explode(',', stripslashes(POST_TAGS)) : array()), + 'tags' => ($_POST['tags'] ? $_POST['tags'] : array()), 'bStatus' => 0, ); - $tplVars['tags'] = POST_TAGS; + $tplVars['tags'] = $_POST['tags']; } else { if(GET_COPYOF != '') { //copy from bookmarks page $tplVars['row'] = $bookmarkservice->getBookmark(intval(GET_COPYOF), true); From 0717da92aee39b7e363a950cfb65f7ed1e8b2bf7 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 22 Mar 2011 17:57:29 +0100 Subject: [PATCH 126/173] remove fcbkcomplete javascript and css; we will be using jquery autocomplete --- www/js/FCBKcomplete-2.7.5 | 1 - www/js/FCBKcomplete-scuttle.css | 33 --------------------------------- 2 files changed, 34 deletions(-) delete mode 120000 www/js/FCBKcomplete-2.7.5 delete mode 100644 www/js/FCBKcomplete-scuttle.css diff --git a/www/js/FCBKcomplete-2.7.5 b/www/js/FCBKcomplete-2.7.5 deleted file mode 120000 index bae7bc9..0000000 --- a/www/js/FCBKcomplete-2.7.5 +++ /dev/null @@ -1 +0,0 @@ -../../../FCBKcomplete/ \ No newline at end of file diff --git a/www/js/FCBKcomplete-scuttle.css b/www/js/FCBKcomplete-scuttle.css deleted file mode 100644 index 10a4837..0000000 --- a/www/js/FCBKcomplete-scuttle.css +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright: Guillermo Rauch - Distributed under MIT - Keep this message! */ - -/* TextboxList sample CSS */ -ul.holder { margin: 0; border: 1px solid #999; overflow: hidden; height: auto !important; height: 1%; padding: 4px 5px 0; } -*:first-child+html ul.holder { padding-bottom: 2px; } * html ul.holder { padding-bottom: 2px; } /* ie7 and below */ -ul.holder li { float: left; list-style-type: none; margin: 0 5px 4px 0; white-space:nowrap;} -ul.holder li.bit-box, ul.holder li.bit-input input { font: 11px "Lucida Grande", "Verdana"; } -ul.holder li.bit-box { -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; border: 1px solid #CAD8F3; background: #DEE7F8; padding: 1px 5px 2px; } -ul.holder li.bit-box-focus { border-color: #598BEC; background: #598BEC; color: #fff; } -ul.holder li.bit-input input { width: auto; overflow:visible; margin: 0; border: 0px; outline: 0; padding: 3px 0px 2px; } /* no left/right padding here please */ -ul.holder li.bit-input input.smallinput { width: 20px; } - -/* part of Facebook demo CSS */ -ul.holder li.bit-box, #apple-list ul.holder li.bit-box { padding-right: 15px; position: relative; z-index:1000;} -#apple-list ul.holder li.bit-input { margin: 0; } -#apple-list ul.holder li.bit-input input.smallinput { width: 5px; } -ul.holder li.bit-hover { background: #BBCEF1; border: 1px solid #6D95E0; } -ul.holder li.bit-box-focus { border-color: #598BEC; background: #598BEC; color: #fff; } -ul.holder li.bit-box a.closebutton { position: absolute; right: 4px; top: 5px; display: block; width: 7px; height: 7px; font-size: 1px; background: url('FCBKcomplete-2.7.5/close.gif'); } -ul.holder li.bit-box a.closebutton:hover { background-position: 7px; } -ul.holder li.bit-box-focus a.closebutton, ul.holder li.bit-box-focus a.closebutton:hover { background-position: bottom; } - -/* Autocompleter */ - -.facebook-auto { display: none; position: absolute; width: 512px; background: #eee; } -.facebook-auto .default { padding: 5px 7px; border: 1px solid #ccc; border-width: 0 1px 1px;font-family:"Lucida Grande","Verdana"; font-size:11px; } -.facebook-auto ul { display: none; margin: 0; padding: 0; overflow: auto; position:absolute; z-index:9999} -.facebook-auto ul li { padding: 5px 12px; z-index: 1000; cursor: pointer; margin: 0; list-style-type: none; border: 1px solid #ccc; border-width: 0 1px 1px; font: 11px "Lucida Grande", "Verdana"; background-color: #eee } -.facebook-auto ul li em { font-weight: bold; font-style: normal; background: #ccc; } -.facebook-auto ul li.auto-focus { background: #4173CC; color: #fff; } -.facebook-auto ul li.auto-focus em { background: none; } -.deleted { background-color:#4173CC !important; color:#ffffff !important;} -.hidden { display:none;} From abc2ca6f79d14ed92fdd251284708212eba425dd Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 22 Mar 2011 18:06:43 +0100 Subject: [PATCH 127/173] add jquery-ui with autocomplete --- data/templates/editbookmark.tpl.php | 10 +- .../jquery-ui-1.8.5/jquery-ui-1.8.5.custom.js | 1362 +++++++++++++++++ .../jquery-ui-1.8.5/jquery.ui.autocomplete.js | 555 +++++++ .../jquery.ui.autocomplete.min.js | 31 + www/js/jquery-ui-1.8.5/jquery.ui.core.js | 307 ++++ www/js/jquery-ui-1.8.5/jquery.ui.core.min.js | 17 + www/js/jquery-ui-1.8.5/jquery.ui.position.js | 251 +++ .../jquery-ui-1.8.5/jquery.ui.position.min.js | 16 + www/js/jquery-ui-1.8.5/jquery.ui.widget.js | 249 +++ .../jquery-ui-1.8.5/jquery.ui.widget.min.js | 15 + .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 180 bytes .../images/ui-bg_flat_75_ffffff_40x100.png | Bin 0 -> 178 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 120 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 105 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 111 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 110 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 119 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 101 bytes .../base/images/ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes .../base/images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4369 bytes .../base/images/ui-icons_454545_256x240.png | Bin 0 -> 4369 bytes .../base/images/ui-icons_888888_256x240.png | Bin 0 -> 4369 bytes .../base/images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4369 bytes .../themes/base/jquery.ui.all.css | 11 + .../themes/base/jquery.ui.autocomplete.css | 53 + .../themes/base/jquery.ui.base.css | 2 + .../themes/base/jquery.ui.core.css | 41 + .../themes/base/jquery.ui.theme.css | 252 +++ 28 files changed, 3167 insertions(+), 5 deletions(-) create mode 100644 www/js/jquery-ui-1.8.5/jquery-ui-1.8.5.custom.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.autocomplete.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.autocomplete.min.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.core.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.core.min.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.position.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.position.min.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.widget.js create mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.widget.min.js create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_flat_75_ffffff_40x100.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_glass_65_ffffff_1x400.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_glass_75_dadada_1x400.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-icons_222222_256x240.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-icons_2e83ff_256x240.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-icons_454545_256x240.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-icons_888888_256x240.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/images/ui-icons_cd0a0a_256x240.png create mode 100644 www/js/jquery-ui-1.8.5/themes/base/jquery.ui.all.css create mode 100644 www/js/jquery-ui-1.8.5/themes/base/jquery.ui.autocomplete.css create mode 100644 www/js/jquery-ui-1.8.5/themes/base/jquery.ui.base.css create mode 100644 www/js/jquery-ui-1.8.5/themes/base/jquery.ui.core.css create mode 100644 www/js/jquery-ui-1.8.5/themes/base/jquery.ui.theme.css diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 504249b..bbdd544 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -117,12 +117,12 @@ function jsEscTitle($title) - + - - - - + + + + diff --git a/www/bookmarks.php b/www/bookmarks.php index 0753c16..3b1d50a 100644 --- a/www/bookmarks.php +++ b/www/bookmarks.php @@ -146,7 +146,7 @@ if ($userservice->isLoggedOn() && POST_SUBMITTED != '') { $description = trim(POST_DESCRIPTION); $privateNote = trim(POST_PRIVATENOTE); $status = intval(POST_STATUS); - $categories = trim(implode(',', $_POST['tags'])); + $categories = explode(',', $_POST['tags']); $saved = true; if ($bookmarkservice->addBookmark($address, $title, $description, $privateNote, $status, $categories)) { if (POST_POPUP != '') { From f67250a720c96031309f7c9ed129bb30e4972242 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 22 Mar 2011 21:08:17 +0100 Subject: [PATCH 129/173] do not error out when the bookmark cannot be saved --- data/templates/editbookmark.tpl.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 0bfdb29..727ee1a 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -20,6 +20,10 @@ function jsEscTitle($title) { return addcslashes($title, "'"); } + +if (is_array($row['tags'])) { + $row['tags'] = implode(', ', $row['tags']); +} ?>
                    @@ -62,7 +66,7 @@ function jsEscTitle($title) From d4ccb1d3d3abf433200b39e8a5566a71bb1e6c2b Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 23 Mar 2011 08:23:36 +0100 Subject: [PATCH 130/173] first unit tests for Bookmark2Tag::getPopularTags --- tests/Bookmark2TagTest.php | 82 ++++++++++++++++++++++++++++++++++++++ tests/TestBase.php | 5 ++- 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index 1823c60..6932a10 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -204,6 +204,88 @@ class Bookmark2TagTest extends TestBase } } } + + + /** + * Create a bookmark + * + * @param integer $user User ID the bookmark shall belong + * @param array $tags Array of tags to attach. If "null" is given, + * it will automatically be "unittest" + * @param string $date strtotime-compatible string + * @param string $title Bookmark title + * + * @return integer ID of bookmark + */ + protected function addTagBookmark($user, $tags, $date = null, $title = null) + { + return $this->addBookmark( + $user, null, 0, $tags, $title, $date + ); + } + + + + /** + * Fetch the most popular tags in descending order + */ + public function testGetPopularTagsOrder() + { + $user = $this->addUser(); + $this->addTagBookmark($user, array('one', 'two')); + $this->addTagBookmark($user, array('one', 'three')); + $this->addTagBookmark($user, array('one', 'two')); + + $arTags = $this->b2ts->getPopularTags(); + $this->assertInternalType('array', $arTags); + $this->assertEquals(3, count($arTags)); + + $this->assertInternalType('array', $arTags[0]); + + $this->assertEquals( + array( + array('tag' => 'one', 'bCount' => '3'), + array('tag' => 'two', 'bCount' => '2'), + array('tag' => 'three', 'bCount' => '1') + ), + $arTags + ); + } + + + + public function testGetPopularTagsLimit() + { + $user = $this->addUser(); + $this->addTagBookmark($user, array('one', 'two')); + $this->addTagBookmark($user, array('one', 'three')); + $this->addTagBookmark($user, array('one', 'two')); + + $arTags = $this->b2ts->getPopularTags(); + $this->assertInternalType('array', $arTags); + $this->assertEquals(3, count($arTags)); + + $arTags = $this->b2ts->getPopularTags(null, 2); + $this->assertInternalType('array', $arTags); + $this->assertEquals(2, count($arTags)); + $this->assertEquals( + array( + array('tag' => 'one', 'bCount' => '3'), + array('tag' => 'two', 'bCount' => '2'), + ), + $arTags + ); + + $arTags = $this->b2ts->getPopularTags(null, 1); + $this->assertInternalType('array', $arTags); + $this->assertEquals(1, count($arTags)); + $this->assertEquals( + array( + array('tag' => 'one', 'bCount' => '3'), + ), + $arTags + ); + } } if (PHPUnit_MAIN_METHOD == 'Bookmark2TagTest::main') { diff --git a/tests/TestBase.php b/tests/TestBase.php index 6006f4e..3e2e213 100644 --- a/tests/TestBase.php +++ b/tests/TestBase.php @@ -31,6 +31,7 @@ class TestBase extends PHPUnit_Framework_TestCase * @param array $tags Array of tags to attach. If "null" is given, * it will automatically be "unittest" * @param string $title Bookmark title + * @param string $date strtotime-compatible string * * @return integer ID of bookmark * @@ -38,7 +39,7 @@ class TestBase extends PHPUnit_Framework_TestCase */ protected function addBookmark( $user = null, $address = null, $status = 0, - $tags = null, $title = null + $tags = null, $title = null, $date = null ) { if ($user === null) { $user = $this->addUser(); @@ -64,7 +65,7 @@ class TestBase extends PHPUnit_Framework_TestCase null, $status, $tags, - null, null, false, false, + null, $date, false, false, $user ); return $bid; From 7d31d9d1654bf5bdb1765397bb7bfd1a85c770a7 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 23 Mar 2011 08:33:49 +0100 Subject: [PATCH 131/173] test for the days parameter --- tests/Bookmark2TagTest.php | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index 6932a10..0fae2ea 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -286,6 +286,43 @@ class Bookmark2TagTest extends TestBase $arTags ); } + + + + public function testGetPopularTagsDays() + { + $user = $this->addUser(); + $this->addTagBookmark($user, array('one', 'two'), 'today'); + $this->addTagBookmark($user, array('one', 'three'), 'today'); + $this->addTagBookmark($user, array('one', 'two'), '-1 day 1 hour'); + $this->addTagBookmark($user, array('one', 'three'), '-3 days 1 hour'); + + $arTags = $this->b2ts->getPopularTags(null, 10, null, 1); + $this->assertInternalType('array', $arTags); + $this->assertEquals(3, count($arTags)); + $this->assertContains(array('tag' => 'one', 'bCount' => '2'), $arTags); + $this->assertContains(array('tag' => 'two', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'three', 'bCount' => '1'), $arTags); + + $arTags = $this->b2ts->getPopularTags(null, 10, null, 2); + $this->assertInternalType('array', $arTags); + $this->assertEquals(3, count($arTags)); + $this->assertEquals( + array( + array('tag' => 'one', 'bCount' => '3'), + array('tag' => 'two', 'bCount' => '2'), + array('tag' => 'three', 'bCount' => '1'), + ), + $arTags + ); + + $arTags = $this->b2ts->getPopularTags(null, 10, null, 5); + $this->assertInternalType('array', $arTags); + $this->assertEquals(3, count($arTags)); + $this->assertContains(array('tag' => 'one', 'bCount' => '4'), $arTags); + $this->assertContains(array('tag' => 'two', 'bCount' => '2'), $arTags); + $this->assertContains(array('tag' => 'three', 'bCount' => '2'), $arTags); + } } if (PHPUnit_MAIN_METHOD == 'Bookmark2TagTest::main') { From 821c17d9e378ecd702a219dfa8392d4d48df3cd0 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 23 Mar 2011 08:54:40 +0100 Subject: [PATCH 132/173] exclude tests directory from coverage --- tests/phpunit.xml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tests/phpunit.xml diff --git a/tests/phpunit.xml b/tests/phpunit.xml new file mode 100644 index 0000000..734fa95 --- /dev/null +++ b/tests/phpunit.xml @@ -0,0 +1,8 @@ + + + + + . + + + \ No newline at end of file From 9f46e9f3ff2454318f50ead7790e3bf46bb868f2 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 23 Mar 2011 08:58:20 +0100 Subject: [PATCH 133/173] getPopularTags is fully covered now --- tests/Bookmark2TagTest.php | 124 +++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index 0fae2ea..8ee3fc1 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -228,6 +228,8 @@ class Bookmark2TagTest extends TestBase /** * Fetch the most popular tags in descending order + * + * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags */ public function testGetPopularTagsOrder() { @@ -254,6 +256,9 @@ class Bookmark2TagTest extends TestBase + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags + */ public function testGetPopularTagsLimit() { $user = $this->addUser(); @@ -289,6 +294,9 @@ class Bookmark2TagTest extends TestBase + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags + */ public function testGetPopularTagsDays() { $user = $this->addUser(); @@ -323,6 +331,122 @@ class Bookmark2TagTest extends TestBase $this->assertContains(array('tag' => 'two', 'bCount' => '2'), $arTags); $this->assertContains(array('tag' => 'three', 'bCount' => '2'), $arTags); } + + + + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags + */ + public function testGetPopularTagsExcludesSystemTags() + { + $user = $this->addUser(); + $this->addTagBookmark($user, array('one', 'system:test')); + $this->addTagBookmark($user, array('one', 'system:unittest')); + $this->addTagBookmark($user, array('one', 'sys:unittest')); + + $arTags = $this->b2ts->getPopularTags(); + $this->assertInternalType('array', $arTags); + $this->assertEquals(2, count($arTags)); + $this->assertEquals( + array( + array('tag' => 'one', 'bCount' => '3'), + array('tag' => 'sys:unittest', 'bCount' => '1'), + ), + $arTags + ); + } + + + + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags + */ + public function testGetPopularTagsUserTags() + { + $user1 = $this->addUser(); + $user2 = $this->addUser(); + $user3 = $this->addUser(); + $this->addTagBookmark($user1, array('one')); + $this->addTagBookmark($user2, array('one', 'two')); + $this->addTagBookmark($user2, array('two')); + $this->addTagBookmark($user3, array('one', 'three')); + + $arTags = $this->b2ts->getPopularTags($user1); + $this->assertEquals(1, count($arTags)); + $this->assertEquals( + array( + array('tag' => 'one', 'bCount' => '1'), + ), + $arTags + ); + + $arTags = $this->b2ts->getPopularTags($user2); + $this->assertEquals(2, count($arTags)); + $this->assertEquals( + array( + array('tag' => 'two', 'bCount' => '2'), + array('tag' => 'one', 'bCount' => '1'), + ), + $arTags + ); + + $arTags = $this->b2ts->getPopularTags(array($user2, $user3)); + $this->assertEquals(3, count($arTags)); + $this->assertContains(array('tag' => 'one', 'bCount' => '2'), $arTags); + $this->assertContains(array('tag' => 'two', 'bCount' => '2'), $arTags); + $this->assertContains(array('tag' => 'three', 'bCount' => '1'), $arTags); + } + + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags + */ + public function testGetPopularTagsPublicOnly() + { + $user1 = $this->addUser(); + $this->addBookmark($user1, null, 0, array('one')); + $this->addBookmark($user1, null, 1, array('one', 'two')); + $this->addBookmark($user1, null, 2, array('three')); + + $arTags = $this->b2ts->getPopularTags(); + $this->assertEquals(1, count($arTags)); + $this->assertEquals( + array( + array('tag' => 'one', 'bCount' => '1'), + ), + $arTags + ); + + $user1 = $this->addUser(); + $this->addBookmark($user1, null, 0, array('one')); + $this->addBookmark($user1, null, 1, array('one', 'two')); + $this->addBookmark($user1, null, 2, array('three')); + + $arTags = $this->b2ts->getPopularTags($user1); + $this->assertEquals(1, count($arTags)); + $this->assertEquals( + array( + array('tag' => 'one', 'bCount' => '1'), + ), + $arTags + ); + } + + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags + */ + public function testGetPopularTagsUserPrivatesWhenLoggedIn() + { + $user1 = $this->addUser(); + $this->addBookmark($user1, null, 0, array('one')); + $this->addBookmark($user1, null, 1, array('one', 'two')); + $this->addBookmark($user1, null, 2, array('three')); + + $arTags = $this->b2ts->getPopularTags($user1, 10, $user1); + $this->assertEquals(3, count($arTags)); + $this->assertContains(array('tag' => 'one', 'bCount' => '2'), $arTags); + $this->assertContains(array('tag' => 'two', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'three', 'bCount' => '1'), $arTags); + } } if (PHPUnit_MAIN_METHOD == 'Bookmark2TagTest::main') { From 5c480c9babcd20c8701fc5e3f651a1e9082d4e8f Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 23 Mar 2011 18:52:01 +0100 Subject: [PATCH 134/173] format getPopularTags and add docblock --- src/SemanticScuttle/Service/Bookmark2Tag.php | 75 +++++++++++++++----- 1 file changed, 56 insertions(+), 19 deletions(-) diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index 4d2c969..e3997dd 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -477,35 +477,70 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService return $this->getPopularTags($contacts, $limit, $logged_on_user, $days); } - // $users can be {NULL, an id, an array of id} - function &getPopularTags($user = NULL, $limit = 30, $logged_on_user = NULL, $days = NULL) { + /** + * The the most popular tags and their usage count + * + * @param mixed $user Integer user ID or array of user IDs to limit tag + * finding to + * @param integer $limit Number of tags to return + * @param integer $logged_on_user ID of the user that's currently logged in. + * If the logged in user equals the $user to find + * tags for, tags of private bookmarks are + * returned. + * @param integer $days Bookmarks have to be changed in the last X days + * if their tags shall count* + * + * @return array Array of found tags. Each tag entry is an array with two keys, + * 'tag' (tag name) and 'bCount'. + */ + public function getPopularTags( + $user = null, $limit = 30, $logged_on_user = null, $days = 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 = ''; + if (($user != $logged_on_user) || is_null($user) || ($user === false)) { + $privacy = ' AND B.bStatus = 0'; + } else { + $privacy = ''; + } - if (is_null($days) || !is_int($days)) - $span = ''; - else - $span = ' AND B.bDatetime > "'. date('Y-m-d H:i:s', time() - (86400 * $days)) .'"'; + if (is_null($days) || !is_int($days)) { + $span = ''; + } else { + $span = ' AND B.bDatetime > "' + . date('Y-m-d H:i:s', time() - (86400 * $days)) + . '"'; + } + + $query = 'SELECT' + . ' T.tag, COUNT(T.bId) AS bCount' + . ' FROM ' + . $this->getTableName() . ' AS T' + . ', ' . $GLOBALS['tableprefix'] . 'bookmarks AS B' + . ' WHERE'; - $query = 'SELECT T.tag, COUNT(T.bId) AS bCount FROM '. $this->getTableName() .' AS T, '. $GLOBALS['tableprefix'] .'bookmarks AS B WHERE '; if (is_null($user) || ($user === false)) { - $query .= 'B.bId = T.bId AND B.bStatus = 0'; - } elseif(is_array($user)) { + $query .= ' B.bId = T.bId AND B.bStatus = 0'; + } else if (is_array($user)) { $query .= ' (1 = 0'; //tricks - foreach($user as $u) { - $query .= ' OR B.uId = '. $this->db->sql_escape($u) .' AND B.bId = T.bId'; + foreach ($user as $u) { + $query .= ' OR B.uId = ' . $this->db->sql_escape($u) + . ' AND B.bId = T.bId'; } $query .= ' )'; } else { - $query .= 'B.uId = '. $this->db->sql_escape($user) .' AND B.bId = T.bId'. $privacy; + $query .= ' B.uId = ' . $this->db->sql_escape($user) + . ' AND B.bId = T.bId' . $privacy; } - $query .= $span .' AND LEFT(T.tag, 7) <> "system:" GROUP BY T.tag ORDER BY bCount DESC, tag'; - if (!($dbresult =& $this->db->sql_query_limit($query, $limit))) { - message_die(GENERAL_ERROR, 'Could not get popular tags', '', __LINE__, __FILE__, $query, $this->db); + $query .= $span . ' AND LEFT(T.tag, 7) <> "system:"' + . ' GROUP BY T.tag' + . ' ORDER BY bCount DESC, tag'; + + if (!($dbresult = $this->db->sql_query_limit($query, $limit))) { + message_die( + GENERAL_ERROR, 'Could not get popular tags', + '', __LINE__, __FILE__, $query, $this->db + ); return false; } @@ -514,6 +549,8 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService return $output; } + + function hasTag($bookmarkid, $tag) { $query = 'SELECT COUNT(*) AS tCount FROM '. $this->getTableName() .' WHERE bId = '. intval($bookmarkid) .' AND tag ="'. $this->db->sql_escape($tag) .'"'; From 66c60880d26df7161e8bbe46d52b058e04f7ea05 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 23 Mar 2011 19:00:25 +0100 Subject: [PATCH 135/173] rename three to thr to make the code look nicer --- tests/Bookmark2TagTest.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index 8ee3fc1..a83a826 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -108,11 +108,11 @@ class Bookmark2TagTest extends TestBase /** - * Test getTagsForBookmark() when the bookmark has three tags + * Test getTagsForBookmark() when the bookmark has thr tags * * @return void */ - public function testGetTagsForBookmarkThree() + public function testGetTagsForBookmarkThr() { $this->addBookmark(null, null, 0, array('forz', 'barz')); @@ -235,7 +235,7 @@ class Bookmark2TagTest extends TestBase { $user = $this->addUser(); $this->addTagBookmark($user, array('one', 'two')); - $this->addTagBookmark($user, array('one', 'three')); + $this->addTagBookmark($user, array('one', 'thr')); $this->addTagBookmark($user, array('one', 'two')); $arTags = $this->b2ts->getPopularTags(); @@ -248,7 +248,7 @@ class Bookmark2TagTest extends TestBase array( array('tag' => 'one', 'bCount' => '3'), array('tag' => 'two', 'bCount' => '2'), - array('tag' => 'three', 'bCount' => '1') + array('tag' => 'thr', 'bCount' => '1') ), $arTags ); @@ -263,7 +263,7 @@ class Bookmark2TagTest extends TestBase { $user = $this->addUser(); $this->addTagBookmark($user, array('one', 'two')); - $this->addTagBookmark($user, array('one', 'three')); + $this->addTagBookmark($user, array('one', 'thr')); $this->addTagBookmark($user, array('one', 'two')); $arTags = $this->b2ts->getPopularTags(); @@ -301,16 +301,16 @@ class Bookmark2TagTest extends TestBase { $user = $this->addUser(); $this->addTagBookmark($user, array('one', 'two'), 'today'); - $this->addTagBookmark($user, array('one', 'three'), 'today'); + $this->addTagBookmark($user, array('one', 'thr'), 'today'); $this->addTagBookmark($user, array('one', 'two'), '-1 day 1 hour'); - $this->addTagBookmark($user, array('one', 'three'), '-3 days 1 hour'); + $this->addTagBookmark($user, array('one', 'thr'), '-3 days 1 hour'); $arTags = $this->b2ts->getPopularTags(null, 10, null, 1); $this->assertInternalType('array', $arTags); $this->assertEquals(3, count($arTags)); $this->assertContains(array('tag' => 'one', 'bCount' => '2'), $arTags); $this->assertContains(array('tag' => 'two', 'bCount' => '1'), $arTags); - $this->assertContains(array('tag' => 'three', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags); $arTags = $this->b2ts->getPopularTags(null, 10, null, 2); $this->assertInternalType('array', $arTags); @@ -319,7 +319,7 @@ class Bookmark2TagTest extends TestBase array( array('tag' => 'one', 'bCount' => '3'), array('tag' => 'two', 'bCount' => '2'), - array('tag' => 'three', 'bCount' => '1'), + array('tag' => 'thr', 'bCount' => '1'), ), $arTags ); @@ -329,7 +329,7 @@ class Bookmark2TagTest extends TestBase $this->assertEquals(3, count($arTags)); $this->assertContains(array('tag' => 'one', 'bCount' => '4'), $arTags); $this->assertContains(array('tag' => 'two', 'bCount' => '2'), $arTags); - $this->assertContains(array('tag' => 'three', 'bCount' => '2'), $arTags); + $this->assertContains(array('tag' => 'thr', 'bCount' => '2'), $arTags); } @@ -369,7 +369,7 @@ class Bookmark2TagTest extends TestBase $this->addTagBookmark($user1, array('one')); $this->addTagBookmark($user2, array('one', 'two')); $this->addTagBookmark($user2, array('two')); - $this->addTagBookmark($user3, array('one', 'three')); + $this->addTagBookmark($user3, array('one', 'thr')); $arTags = $this->b2ts->getPopularTags($user1); $this->assertEquals(1, count($arTags)); @@ -394,7 +394,7 @@ class Bookmark2TagTest extends TestBase $this->assertEquals(3, count($arTags)); $this->assertContains(array('tag' => 'one', 'bCount' => '2'), $arTags); $this->assertContains(array('tag' => 'two', 'bCount' => '2'), $arTags); - $this->assertContains(array('tag' => 'three', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags); } /** @@ -405,7 +405,7 @@ class Bookmark2TagTest extends TestBase $user1 = $this->addUser(); $this->addBookmark($user1, null, 0, array('one')); $this->addBookmark($user1, null, 1, array('one', 'two')); - $this->addBookmark($user1, null, 2, array('three')); + $this->addBookmark($user1, null, 2, array('thr')); $arTags = $this->b2ts->getPopularTags(); $this->assertEquals(1, count($arTags)); @@ -419,7 +419,7 @@ class Bookmark2TagTest extends TestBase $user1 = $this->addUser(); $this->addBookmark($user1, null, 0, array('one')); $this->addBookmark($user1, null, 1, array('one', 'two')); - $this->addBookmark($user1, null, 2, array('three')); + $this->addBookmark($user1, null, 2, array('thr')); $arTags = $this->b2ts->getPopularTags($user1); $this->assertEquals(1, count($arTags)); @@ -439,13 +439,13 @@ class Bookmark2TagTest extends TestBase $user1 = $this->addUser(); $this->addBookmark($user1, null, 0, array('one')); $this->addBookmark($user1, null, 1, array('one', 'two')); - $this->addBookmark($user1, null, 2, array('three')); + $this->addBookmark($user1, null, 2, array('thr')); $arTags = $this->b2ts->getPopularTags($user1, 10, $user1); $this->assertEquals(3, count($arTags)); $this->assertContains(array('tag' => 'one', 'bCount' => '2'), $arTags); $this->assertContains(array('tag' => 'two', 'bCount' => '1'), $arTags); - $this->assertContains(array('tag' => 'three', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags); } } From cb28cd3371e215646765f6d1d06263a54a5526f1 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 23 Mar 2011 19:11:38 +0100 Subject: [PATCH 136/173] unittest for getAdminTags as well as CS and docblock fixes on it --- src/SemanticScuttle/Service/Bookmark2Tag.php | 30 ++++++++++++++++++-- tests/Bookmark2TagTest.php | 20 +++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index e3997dd..d367b62 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -454,15 +454,37 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService return $output; } - function &getAdminTags($limit = 30, $logged_on_user = NULL, $days = NULL) { + + + /** + * Returns the tags used by admin users + * + * @param integer $limit Number of tags to return + * @param integer $logged_on_user ID of the user that's currently logged in. + * If the logged in user equals the $user to find + * tags for, tags of private bookmarks are + * returned. + * @param integer $days Bookmarks have to be changed in the last X days + * if their tags shall count* + * + * @return array Array of found tags. Each tag entry is an array with two keys, + * 'tag' (tag name) and 'bCount'. + * + * @see getPopularTags() + */ + public function getAdminTags( + $limit = 30, $logged_on_user = null, $days = null + ) { // look for admin ids - $userservice = SemanticScuttle_Service_Factory :: get('User'); - $adminIds = $userservice->getAdminIds(); + $userservice = SemanticScuttle_Service_Factory::get('User'); + $adminIds = $userservice->getAdminIds(); // ask for their tags return $this->getPopularTags($adminIds, $limit, $logged_on_user, $days); } + + function &getContactTags($user, $limit = 30, $logged_on_user = NULL, $days = NULL) { // look for contact ids $userservice = SemanticScuttle_Service_Factory :: get('User'); @@ -477,6 +499,8 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService return $this->getPopularTags($contacts, $limit, $logged_on_user, $days); } + + /** * The the most popular tags and their usage count * diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index a83a826..d85cf73 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -56,6 +56,7 @@ class Bookmark2TagTest extends TestBase protected function setUp() { $this->us = SemanticScuttle_Service_Factory::get('User'); + $this->us->deleteAll(); $this->bs = SemanticScuttle_Service_Factory::get('Bookmark'); $this->bs->deleteAll(); $this->b2ts= SemanticScuttle_Service_Factory::get('Bookmark2Tag'); @@ -447,6 +448,25 @@ class Bookmark2TagTest extends TestBase $this->assertContains(array('tag' => 'two', 'bCount' => '1'), $arTags); $this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags); } + + + public function testGetAdminTags() + { + $admin1 = $this->addUser('admin1'); + $admin2 = $this->addUser('admin2'); + $user1 = $this->addUser(); + $this->addBookmark($admin1, null, 0, array('admintag', 'admintag1')); + $this->addBookmark($admin2, null, 0, array('admintag', 'admintag2')); + $this->addBookmark($user1, null, 0, array('usertag')); + + $GLOBALS['admin_users'] = array('admin1', 'admin2'); + + $arTags = $this->b2ts->getAdminTags(4); + $this->assertEquals(3, count($arTags)); + $this->assertContains(array('tag' => 'admintag', 'bCount' => '2'), $arTags); + $this->assertContains(array('tag' => 'admintag1', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'admintag2', 'bCount' => '1'), $arTags); + } } if (PHPUnit_MAIN_METHOD == 'Bookmark2TagTest::main') { From 637e276ac7dc0e9acdbb79ed68415c1770ce7a3f Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 24 Mar 2011 08:36:54 +0100 Subject: [PATCH 137/173] unittest for Bookmark2Tag::getContactTags, CS and docblock --- src/SemanticScuttle/Service/Bookmark2Tag.php | 31 ++++++++-- tests/Bookmark2TagTest.php | 62 ++++++++++++++++++-- 2 files changed, 83 insertions(+), 10 deletions(-) diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index d367b62..478b47e 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -485,13 +485,33 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService - function &getContactTags($user, $limit = 30, $logged_on_user = NULL, $days = NULL) { + + /** + * Returns the tags used by users that are part of the user's watchlist, + * and the current user's own tags. + * + * @param integer $user ID of the user to get the watchlist from + * @param integer $limit Number of tags to return + * @param integer $logged_on_user ID of the user that's currently logged in. + * If set, that user is added to the list of + * people to get the tags from + * @param integer $days Bookmarks have to be changed in the last X days + * if their tags shall count* + * + * @return array Array of found tags. Each tag entry is an array with two keys, + * 'tag' (tag name) and 'bCount'. + * + * @see getPopularTags() + */ + public function getContactTags( + $user, $limit = 30, $logged_on_user = null, $days = null + ) { // look for contact ids - $userservice = SemanticScuttle_Service_Factory :: get('User'); + $userservice = SemanticScuttle_Service_Factory::get('User'); $contacts = $userservice->getWatchlist($user); - // add the user (to show him/her also his/her tags) - if(!is_null($logged_on_user)) { + // add the user (to show him also his own tags) + if (!is_null($logged_on_user)) { $contacts[] = $logged_on_user; } @@ -516,6 +536,9 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService * * @return array Array of found tags. Each tag entry is an array with two keys, * 'tag' (tag name) and 'bCount'. + * + * @see getAdminTags() + * @see getContactTags() */ public function getPopularTags( $user = null, $limit = 30, $logged_on_user = null, $days = null diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index d85cf73..ad64bf6 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -74,7 +74,7 @@ class Bookmark2TagTest extends TestBase /** * Test getTagsForBookmark() when the bookmark has no tags * - * @return void + * @covers SemanticScuttle_Service_Bookmark2Tag::getTagsForBookmark */ public function testGetTagsForBookmarkNone() { @@ -92,7 +92,7 @@ class Bookmark2TagTest extends TestBase /** * Test getTagsForBookmark() when the bookmark has one tag * - * @return void + * @covers SemanticScuttle_Service_Bookmark2Tag::getTagsForBookmark */ public function testGetTagsForBookmarkOne() { @@ -109,9 +109,9 @@ class Bookmark2TagTest extends TestBase /** - * Test getTagsForBookmark() when the bookmark has thr tags + * Test getTagsForBookmark() when the bookmark has three tags * - * @return void + * @covers SemanticScuttle_Service_Bookmark2Tag::getTagsForBookmark */ public function testGetTagsForBookmarkThr() { @@ -132,7 +132,7 @@ class Bookmark2TagTest extends TestBase /** * Test getTagsForBookmarks() when no bookmarks have tags. * - * @return void + * @covers SemanticScuttle_Service_Bookmark2Tag::getTagsForBookmarks */ public function testGetTagsForBookmarksNone() { @@ -155,7 +155,7 @@ class Bookmark2TagTest extends TestBase /** * Test getTagsForBookmarks() when most bookmarks have tags. * - * @return void + * @covers SemanticScuttle_Service_Bookmark2Tag::getTagsForBookmarks */ public function testGetTagsForBookmarksMost() { @@ -450,6 +450,9 @@ class Bookmark2TagTest extends TestBase } + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getAdminTags + */ public function testGetAdminTags() { $admin1 = $this->addUser('admin1'); @@ -467,6 +470,53 @@ class Bookmark2TagTest extends TestBase $this->assertContains(array('tag' => 'admintag1', 'bCount' => '1'), $arTags); $this->assertContains(array('tag' => 'admintag2', 'bCount' => '1'), $arTags); } + + + + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getContactTags + */ + public function testGetContactTagsWatchlistOnly() + { + $user1 = $this->addUser(); + $user2 = $this->addUser(); + $user3 = $this->addUser(); + $this->us->setCurrentUserId($user1); + $this->us->setWatchStatus($user2); + //user1 watches user2 now + + $this->addBookmark($user1, null, 0, array('usertag', 'usertag1')); + $this->addBookmark($user2, null, 0, array('usertag', 'usertag2')); + $this->addBookmark($user3, null, 0, array('usertag', 'usertag3')); + + $arTags = $this->b2ts->getContactTags($user1, 10); + $this->assertEquals(2, count($arTags)); + $this->assertContains(array('tag' => 'usertag', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'usertag2', 'bCount' => '1'), $arTags); + } + + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getContactTags + */ + public function testGetContactTagsIncludingUser() + { + $user1 = $this->addUser(); + $user2 = $this->addUser(); + $user3 = $this->addUser(); + $this->us->setCurrentUserId($user1); + $this->us->setWatchStatus($user2); + //user1 watches user2 now + + $this->addBookmark($user1, null, 0, array('usertag', 'usertag1')); + $this->addBookmark($user2, null, 0, array('usertag', 'usertag2')); + $this->addBookmark($user3, null, 0, array('usertag', 'usertag3')); + + $arTags = $this->b2ts->getContactTags($user1, 10, $user1); + $this->assertEquals(3, count($arTags)); + $this->assertContains(array('tag' => 'usertag', 'bCount' => '2'), $arTags); + $this->assertContains(array('tag' => 'usertag1', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'usertag2', 'bCount' => '1'), $arTags); + } } if (PHPUnit_MAIN_METHOD == 'Bookmark2TagTest::main') { From 3828cfe6d6bb64df763276fa2bc2c4da6ccb06dd Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 24 Mar 2011 08:41:02 +0100 Subject: [PATCH 138/173] replace assertType with assertInternalType to please phpunit --- tests/ajax/GetAdminLinkedTagsTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/ajax/GetAdminLinkedTagsTest.php b/tests/ajax/GetAdminLinkedTagsTest.php index d8ec447..2552ea0 100644 --- a/tests/ajax/GetAdminLinkedTagsTest.php +++ b/tests/ajax/GetAdminLinkedTagsTest.php @@ -66,7 +66,7 @@ class ajax_GetAdminLinkedTagsTest extends TestBaseApi ); $data = json_decode($res->getBody()); - $this->assertType('array', $data); + $this->assertInternalType('array', $data); //same number of elements as the menu2Tags array $this->assertEquals( @@ -106,7 +106,7 @@ class ajax_GetAdminLinkedTagsTest extends TestBaseApi ); $data = json_decode($res->getBody()); - $this->assertType('array', $data); + $this->assertInternalType('array', $data); //only one subtag $this->assertEquals(1, count($data)); @@ -146,7 +146,7 @@ class ajax_GetAdminLinkedTagsTest extends TestBaseApi ); $data = json_decode($res->getBody()); - $this->assertType('array', $data); + $this->assertInternalType('array', $data); //we should have only one subtag now, the admin one $this->assertEquals(1, count($data)); From 0f481a99ea1dea8ec993c37f0613a48f97463e6b Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 24 Mar 2011 08:45:03 +0100 Subject: [PATCH 139/173] fix docblock --- src/SemanticScuttle/Service/Bookmark2Tag.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index 478b47e..83a8aed 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -465,7 +465,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService * tags for, tags of private bookmarks are * returned. * @param integer $days Bookmarks have to be changed in the last X days - * if their tags shall count* + * if their tags shall count * * @return array Array of found tags. Each tag entry is an array with two keys, * 'tag' (tag name) and 'bCount'. @@ -496,7 +496,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService * If set, that user is added to the list of * people to get the tags from * @param integer $days Bookmarks have to be changed in the last X days - * if their tags shall count* + * if their tags shall count * * @return array Array of found tags. Each tag entry is an array with two keys, * 'tag' (tag name) and 'bCount'. @@ -532,7 +532,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService * tags for, tags of private bookmarks are * returned. * @param integer $days Bookmarks have to be changed in the last X days - * if their tags shall count* + * if their tags shall count * * @return array Array of found tags. Each tag entry is an array with two keys, * 'tag' (tag name) and 'bCount'. From 3f57237b88688f956add02bc18cd4642082fb526 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 24 Mar 2011 08:50:18 +0100 Subject: [PATCH 140/173] make getPopularTags a tiny bit easier --- src/SemanticScuttle/Service/Bookmark2Tag.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index 83a8aed..b69cfd4 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -550,14 +550,6 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService $privacy = ''; } - if (is_null($days) || !is_int($days)) { - $span = ''; - } else { - $span = ' AND B.bDatetime > "' - . date('Y-m-d H:i:s', time() - (86400 * $days)) - . '"'; - } - $query = 'SELECT' . ' T.tag, COUNT(T.bId) AS bCount' . ' FROM ' @@ -579,7 +571,13 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService . ' AND B.bId = T.bId' . $privacy; } - $query .= $span . ' AND LEFT(T.tag, 7) <> "system:"' + if (is_int($days)) { + $query .= ' AND B.bDatetime > "' + . date('Y-m-d H:i:s', time() - (86400 * $days)) + . '"'; + } + + $query .= ' AND LEFT(T.tag, 7) <> "system:"' . ' GROUP BY T.tag' . ' ORDER BY bCount DESC, tag'; From 30f84b3ca3242f00926f30c08ece4405be8b61fc Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 24 Mar 2011 19:07:50 +0100 Subject: [PATCH 141/173] fix privacy protection issue when fetching tags of several users --- src/SemanticScuttle/Service/Bookmark2Tag.php | 2 +- tests/Bookmark2TagTest.php | 69 ++++++++++++++------ 2 files changed, 50 insertions(+), 21 deletions(-) diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index b69cfd4..21ea0d5 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -565,7 +565,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService $query .= ' OR B.uId = ' . $this->db->sql_escape($u) . ' AND B.bId = T.bId'; } - $query .= ' )'; + $query .= ' )' . $privacy; } else { $query .= ' B.uId = ' . $this->db->sql_escape($user) . ' AND B.bId = T.bId' . $privacy; diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index ad64bf6..e2020dc 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -37,6 +37,26 @@ class Bookmark2TagTest extends TestBase protected $tts; + /** + * Create a bookmark. Like addBookmark(), just with other paramter order + * to make some tests in that class easier to write. + * + * @param integer $user User ID the bookmark shall belong + * @param array $tags Array of tags to attach. If "null" is given, + * it will automatically be "unittest" + * @param string $date strtotime-compatible string + * @param string $title Bookmark title + * + * @return integer ID of bookmark + */ + protected function addTagBookmark($user, $tags, $date = null, $title = null) + { + return $this->addBookmark( + $user, null, 0, $tags, $title, $date + ); + } + + /** * Used to run this test class standalone @@ -207,25 +227,6 @@ class Bookmark2TagTest extends TestBase } - /** - * Create a bookmark - * - * @param integer $user User ID the bookmark shall belong - * @param array $tags Array of tags to attach. If "null" is given, - * it will automatically be "unittest" - * @param string $date strtotime-compatible string - * @param string $title Bookmark title - * - * @return integer ID of bookmark - */ - protected function addTagBookmark($user, $tags, $date = null, $title = null) - { - return $this->addBookmark( - $user, null, 0, $tags, $title, $date - ); - } - - /** * Fetch the most popular tags in descending order @@ -398,10 +399,12 @@ class Bookmark2TagTest extends TestBase $this->assertContains(array('tag' => 'thr', 'bCount' => '1'), $arTags); } + + /** * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags */ - public function testGetPopularTagsPublicOnly() + public function testGetPopularTagsPublicOnlyNoUser() { $user1 = $this->addUser(); $this->addBookmark($user1, null, 0, array('one')); @@ -416,7 +419,13 @@ class Bookmark2TagTest extends TestBase ), $arTags ); + } + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags + */ + public function testGetPopularTagsPublicOnlySingleUser() + { $user1 = $this->addUser(); $this->addBookmark($user1, null, 0, array('one')); $this->addBookmark($user1, null, 1, array('one', 'two')); @@ -432,6 +441,26 @@ class Bookmark2TagTest extends TestBase ); } + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags + */ + public function testGetPopularTagsPublicOnlySeveralUsers() + { + $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($user1, $user2)); + $this->assertEquals(2, count($arTags)); + $this->assertContains(array('tag' => 'one', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'fou', 'bCount' => '1'), $arTags); + } + /** * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags */ From e1370d949c48b98261f63bc2048b09c1c8648244 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 24 Mar 2011 19:09:19 +0100 Subject: [PATCH 142/173] update changelog --- doc/ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 4c93a9a..aff6dc3 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -10,6 +10,7 @@ ChangeLog for SemantiScuttle - Show error message on mysqli connection errors - Update php-gettext library to 1.0.10 - api/posts/add respects the "replace" parameter now +- Fix privacy issue when fetching tags of several users 0.97.2 - 2011-02-17 From d761abb05e28ef4f345acef739e3b371b462f9fe Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 24 Mar 2011 19:11:06 +0100 Subject: [PATCH 143/173] docblock for deleteAll --- src/SemanticScuttle/Service/Bookmark2Tag.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index 21ea0d5..beb4185 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -674,7 +674,15 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService return $output; } - function deleteAll() { + + + /** + * Deletes all tags in bookmarks2tags + * + * @return void + */ + public function deleteAll() + { $query = 'TRUNCATE TABLE `'. $this->getTableName() .'`'; $this->db->sql_query($query); } From e667feb0ca9ff30a063149a2ce20b3398585dd4f Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 25 Mar 2011 07:44:07 +0100 Subject: [PATCH 144/173] beginsWith-parameter for getPopulartags, getContactTags and getAdminTags --- src/SemanticScuttle/Service/Bookmark2Tag.php | 25 ++++++-- tests/Bookmark2TagTest.php | 64 ++++++++++++++++++++ 2 files changed, 84 insertions(+), 5 deletions(-) diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index beb4185..1dc0ffe 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -466,6 +466,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService * returned. * @param integer $days Bookmarks have to be changed in the last X days * if their tags shall count + * @param string $beginsWith The tag name shall begin with that string * * @return array Array of found tags. Each tag entry is an array with two keys, * 'tag' (tag name) and 'bCount'. @@ -473,14 +474,16 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService * @see getPopularTags() */ public function getAdminTags( - $limit = 30, $logged_on_user = null, $days = null + $limit = 30, $logged_on_user = null, $days = null, $beginsWith = null ) { // look for admin ids $userservice = SemanticScuttle_Service_Factory::get('User'); $adminIds = $userservice->getAdminIds(); // ask for their tags - return $this->getPopularTags($adminIds, $limit, $logged_on_user, $days); + return $this->getPopularTags( + $adminIds, $limit, $logged_on_user, $days, $beginsWith + ); } @@ -497,6 +500,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService * people to get the tags from * @param integer $days Bookmarks have to be changed in the last X days * if their tags shall count + * @param string $beginsWith The tag name shall begin with that string * * @return array Array of found tags. Each tag entry is an array with two keys, * 'tag' (tag name) and 'bCount'. @@ -504,7 +508,8 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService * @see getPopularTags() */ public function getContactTags( - $user, $limit = 30, $logged_on_user = null, $days = null + $user, $limit = 30, $logged_on_user = null, $days = null, + $beginsWith = null ) { // look for contact ids $userservice = SemanticScuttle_Service_Factory::get('User'); @@ -516,7 +521,9 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService } // ask for their tags - return $this->getPopularTags($contacts, $limit, $logged_on_user, $days); + return $this->getPopularTags( + $contacts, $limit, $logged_on_user, $days, $beginsWith + ); } @@ -533,6 +540,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService * returned. * @param integer $days Bookmarks have to be changed in the last X days * if their tags shall count + * @param string $beginsWith The tag name shall begin with that string * * @return array Array of found tags. Each tag entry is an array with two keys, * 'tag' (tag name) and 'bCount'. @@ -541,7 +549,8 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService * @see getContactTags() */ public function getPopularTags( - $user = null, $limit = 30, $logged_on_user = null, $days = null + $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)) { @@ -577,6 +586,12 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService . '"'; } + if (!is_null($beginsWith)) { + $query .= ' AND T.tag LIKE \'' + . $this->db->sql_escape($beginsWith) + . '%\''; + } + $query .= ' AND LEFT(T.tag, 7) <> "system:"' . ' GROUP BY T.tag' . ' ORDER BY bCount DESC, tag'; diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index e2020dc..ffd83c3 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -334,6 +334,31 @@ class Bookmark2TagTest extends TestBase $this->assertContains(array('tag' => 'thr', 'bCount' => '2'), $arTags); } + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags + */ + public function testGetPopularTagsBeginsWith() + { + $user = $this->addUser(); + $this->addTagBookmark($user, array('one', 'two')); + $this->addTagBookmark($user, array('one', 'thr')); + $this->addTagBookmark($user, array('one', 'two')); + $this->addTagBookmark($user, array('one', 'thr')); + + $arTags = $this->b2ts->getPopularTags(null, 10, null, null, 'o'); + $this->assertEquals(1, count($arTags)); + $this->assertContains(array('tag' => 'one', 'bCount' => '4'), $arTags); + + $arTags = $this->b2ts->getPopularTags(null, 10, null, null, 'tw'); + $this->assertEquals(1, count($arTags)); + $this->assertContains(array('tag' => 'two', 'bCount' => '2'), $arTags); + + $arTags = $this->b2ts->getPopularTags(null, 10, null, null, 't'); + $this->assertEquals(2, count($arTags)); + $this->assertContains(array('tag' => 'two', 'bCount' => '2'), $arTags); + $this->assertContains(array('tag' => 'thr', 'bCount' => '2'), $arTags); + } + /** @@ -500,6 +525,23 @@ class Bookmark2TagTest extends TestBase $this->assertContains(array('tag' => 'admintag2', 'bCount' => '1'), $arTags); } + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getAdminTags + */ + public function testGetAdminTagsBeginsWith() + { + $admin1 = $this->addUser('admin1'); + $this->addBookmark($admin1, null, 0, array('admintag', 'admintag1')); + $this->addBookmark($admin1, null, 0, array('tester', 'testos')); + + $GLOBALS['admin_users'] = array('admin1'); + + $arTags = $this->b2ts->getAdminTags(4, null, null, 'test'); + $this->assertEquals(2, count($arTags)); + $this->assertContains(array('tag' => 'tester', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'testos', 'bCount' => '1'), $arTags); + } + /** @@ -546,6 +588,28 @@ class Bookmark2TagTest extends TestBase $this->assertContains(array('tag' => 'usertag1', 'bCount' => '1'), $arTags); $this->assertContains(array('tag' => 'usertag2', 'bCount' => '1'), $arTags); } + + /** + * @covers SemanticScuttle_Service_Bookmark2Tag::getContactTags + */ + public function testGetContactTagsBeginsWith() + { + $user1 = $this->addUser(); + $this->addBookmark($user1, null, 0, array('usertag', 'usertag1')); + $this->addBookmark($user1, null, 0, array('usable', 'undefined')); + $this->addBookmark($user1, null, 0, array('fußbad', 'usable')); + + $arTags = $this->b2ts->getContactTags($user1, 10, $user1, null, 'user'); + $this->assertEquals(2, count($arTags)); + $this->assertContains(array('tag' => 'usertag', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'usertag1', 'bCount' => '1'), $arTags); + + $arTags = $this->b2ts->getContactTags($user1, 10, $user1, null, 'us'); + $this->assertEquals(3, count($arTags)); + $this->assertContains(array('tag' => 'usertag', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'usertag1', 'bCount' => '1'), $arTags); + $this->assertContains(array('tag' => 'usable', 'bCount' => '2'), $arTags); + } } if (PHPUnit_MAIN_METHOD == 'Bookmark2TagTest::main') { From d6e99db40dc88de1782099b30941075ebc8dfa97 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 25 Mar 2011 08:00:32 +0100 Subject: [PATCH 145/173] do not generate invalid SQL when called with a not-so valid array --- src/SemanticScuttle/Service/Bookmark2Tag.php | 6 ++++-- tests/Bookmark2TagTest.php | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php index 1dc0ffe..a10cb61 100644 --- a/src/SemanticScuttle/Service/Bookmark2Tag.php +++ b/src/SemanticScuttle/Service/Bookmark2Tag.php @@ -571,8 +571,10 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService } else if (is_array($user)) { $query .= ' (1 = 0'; //tricks foreach ($user as $u) { - $query .= ' OR B.uId = ' . $this->db->sql_escape($u) - . ' AND B.bId = T.bId'; + if (is_numeric($u)) { + $query .= ' OR B.uId = ' . $this->db->sql_escape($u) + . ' AND B.bId = T.bId'; + } } $query .= ' )' . $privacy; } else { diff --git a/tests/Bookmark2TagTest.php b/tests/Bookmark2TagTest.php index ffd83c3..fff4222 100644 --- a/tests/Bookmark2TagTest.php +++ b/tests/Bookmark2TagTest.php @@ -426,6 +426,23 @@ class Bookmark2TagTest extends TestBase + /** + * This may happen when the method is called with a problematic user array. + * In that case we may not generate invalid SQL or so. + * + * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags + */ + public function testGetPopularTagsUserArrayWithNull() + { + $user1 = $this->addUser(); + $this->addTagBookmark($user1, array('one')); + + $arTags = $this->b2ts->getPopularTags(array(null)); + $this->assertEquals(0, count($arTags)); + } + + + /** * @covers SemanticScuttle_Service_Bookmark2Tag::getPopularTags */ From db71e63467a26afb8265979f8c8071935ec349b4 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 25 Mar 2011 19:26:21 +0100 Subject: [PATCH 146/173] begin with ajax unittests - but they do not work yet --- tests/TestBaseApi.php | 36 +++++++++++++++ tests/ajax/GetContactTagsTest.php | 73 +++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 tests/ajax/GetContactTagsTest.php diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php index dacdecd..b7c1921 100644 --- a/tests/TestBaseApi.php +++ b/tests/TestBaseApi.php @@ -84,6 +84,9 @@ class TestBaseApi extends TestBase * the request object with authentication details, so that * the user is logged in. * + * Useful for HTTP API methods only, cannot be used with + * "normal" HTML pages since they do not support HTTP auth. + * * @param string $urlSuffix Suffix for the URL * @param mixed $auth If user authentication is needed (true/false) * or array with username and password @@ -109,5 +112,38 @@ class TestBaseApi extends TestBase return array($req, $uid); } + + + /** + * Creates a user and a HTTP_Request2 object, does a normal login + * and prepares the cookies for the HTTP request object so that + * the user is seen as logged in when requesting any HTML page. + * + * Useful for testing HTML pages or ajax URLs. + * + * @param string $urlSuffix Suffix for the URL + * @param mixed $auth If user authentication is needed (true/false) + * or array with username and password + * + * @return array(HTTP_Request2, integer) HTTP request object and user id + * + * @uses getRequest() + */ + protected function getLoggedInRequest($urlSuffix = null, $auth = true) + { + $req = $this->getRequest($urlSuffix); + if (is_array($auth)) { + list($username, $password) = $auth; + } else { + $username = 'testuser'; + $password = 'testpassword'; + } + $uid = $this->addUser($username, $password); + + //FIXME: login via the login form, check if it worked + //FIXME: prepare new request with cookie + return array($req, $uid); + } + } ?> \ No newline at end of file diff --git a/tests/ajax/GetContactTagsTest.php b/tests/ajax/GetContactTagsTest.php new file mode 100644 index 0000000..7f46888 --- /dev/null +++ b/tests/ajax/GetContactTagsTest.php @@ -0,0 +1,73 @@ + + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +require_once dirname(__FILE__) . '/../prepare.php'; +require_once 'HTTP/Request2.php'; + +/** + * Unit tests for the ajax getcontacttags.php script + * + * @category Bookmarking + * @package SemanticScuttle + * @author Christian Weiske + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class ajax_GetContactTagsTest extends TestBaseApi +{ + protected $urlPart = 'ajax/getcontacttags.php'; + + + /** + * If no user is logged in, no data are returned + */ + public function testNoUserLoggedIn() + { + $res = $this->getRequest()->send(); + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + $data = json_decode($res->getBody()); + $this->assertInternalType('array', $data); + $this->assertEquals(0, count($data)); + } + + + public function testUserLoggedIn() + { + list($req, $uId) = $this->getAuthRequest(); + $this->addBookmark($uId, null, 0, array('public')); + $this->addBookmark($uId, null, 1, array('shared')); + $this->addBookmark($uId, null, 2, array('private')); + + $res = $req->send(); + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + $data = json_decode($res->getBody()); + $this->assertInternalType('array', $data); + $this->assertEquals(3, count($data)); + $this->assertContains('public', $data); + $this->assertContains('shared', $data); + $this->assertContains('private', $data); + } +} + + +?> \ No newline at end of file From 6d49b0622df0ea44975e99b585781f55fe9ac671 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 25 Mar 2011 19:26:42 +0100 Subject: [PATCH 147/173] begin modifying ajax/getcontacttags --- data/templates/editbookmark.tpl.php | 5 +++ www/ajax/getcontacttags.php | 69 +++++++++++++++-------------- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 727ee1a..6ce10b3 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -150,6 +150,11 @@ jQuery(document).ready(function() { $.ui.autocomplete.filter( availableTags, extractLast(request.term) ) + /* + $.getJSON( "search.php", { + term: extractLast( request.term ) + }, response ); + */ ); }, diff --git a/www/ajax/getcontacttags.php b/www/ajax/getcontacttags.php index 5f1edb3..1377fea 100644 --- a/www/ajax/getcontacttags.php +++ b/www/ajax/getcontacttags.php @@ -1,46 +1,47 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -***************************************************************************/ - -/* Return a json file with list of tags according to current user and sort by popularity*/ $httpContentType = 'application/json'; require_once '../www-header.php'; -/* Service creation: only useful services are created */ -$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); -$bookmarkservice =SemanticScuttle_Service_Factory::get('Tag'); +$limit = 30; +$beginsWith = null; +$currentUserId = $userservice->getCurrentUserId(); -$listTags = $b2tservice->getContactTags( - $userservice->getCurrentUserId(), 1000, $userservice->getCurrentUserId() +if (isset($_GET['limit']) && is_numeric($_GET['limit'])) { + $limit = (int)$_GET['limit']; +} +if (isset($_GET['beginsWith']) && strlen(trim($_GET['beginsWith']))) { + $beginsWith = trim($_GET['beginsWith']); +} + +$listTags = SemanticScuttle_Service_Factory::get('Bookmark2Tag')->getContactTags( + $currentUserId, $limit, $currentUserId, $beginsWith ); $tags = array(); -foreach($listTags as $t) { - $tags[] = array( - 'caption' => $t['tag'], - 'value' => $t['tag'], - ); +foreach ($listTags as $t) { + $tags[] = $t['tag']; } echo json_encode($tags); ?> - - - - From 0f9d06c6644f634b436549f0d5e56fc96ebd361c Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 26 Mar 2011 10:00:18 +0100 Subject: [PATCH 148/173] first working unittest for ajax/getcontacttags with login! --- tests/TestBaseApi.php | 19 ++++++++++++++++--- tests/ajax/GetContactTagsTest.php | 20 ++++++++++++-------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php index b7c1921..2af228a 100644 --- a/tests/TestBaseApi.php +++ b/tests/TestBaseApi.php @@ -131,7 +131,6 @@ class TestBaseApi extends TestBase */ protected function getLoggedInRequest($urlSuffix = null, $auth = true) { - $req = $this->getRequest($urlSuffix); if (is_array($auth)) { list($username, $password) = $auth; } else { @@ -140,8 +139,22 @@ class TestBaseApi extends TestBase } $uid = $this->addUser($username, $password); - //FIXME: login via the login form, check if it worked - //FIXME: prepare new request with cookie + $req = new HTTP_Request2( + $GLOBALS['unittestUrl'] . '/login.php', + HTTP_Request2::METHOD_POST + ); + $cookies = $req->setCookieJar()->getCookieJar(); + $req->addPostParameter('username', $username); + $req->addPostParameter('password', $password); + $req->addPostParameter('submitted', 'Log In'); + $res = $req->send(); + + //after login, we normally get redirected + $this->assertEquals(302, $res->getStatus(), 'Login failure'); + + $req = $this->getRequest($urlSuffix); + $req->setCookieJar($cookies); + return array($req, $uid); } diff --git a/tests/ajax/GetContactTagsTest.php b/tests/ajax/GetContactTagsTest.php index 7f46888..757dce9 100644 --- a/tests/ajax/GetContactTagsTest.php +++ b/tests/ajax/GetContactTagsTest.php @@ -47,13 +47,17 @@ class ajax_GetContactTagsTest extends TestBaseApi } - public function testUserLoggedIn() + public function testUserLoggedInWatchlist() { - list($req, $uId) = $this->getAuthRequest(); - $this->addBookmark($uId, null, 0, array('public')); - $this->addBookmark($uId, null, 1, array('shared')); - $this->addBookmark($uId, null, 2, array('private')); - + list($req, $uId) = $this->getLoggedInRequest(); + $this->addBookmark($uId, null, 0, array('public', 'public2')); + + $user2 = $this->addUser(); + $this->us->setCurrentUserId($uId); + $this->us->setWatchStatus($user2); + //uId watches user2 now + $this->addBookmark($user2, null, 0, array('user2tag')); + $res = $req->send(); $this->assertEquals(200, $res->getStatus()); $this->assertEquals( @@ -64,8 +68,8 @@ class ajax_GetContactTagsTest extends TestBaseApi $this->assertInternalType('array', $data); $this->assertEquals(3, count($data)); $this->assertContains('public', $data); - $this->assertContains('shared', $data); - $this->assertContains('private', $data); + $this->assertContains('public2', $data); + $this->assertContains('user2tag', $data); } } From 78654369e918126c137b5aa4ba709a7bc0a27b43 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 26 Mar 2011 11:54:47 +0100 Subject: [PATCH 149/173] test for beginsWith parameter and a bugfix :) --- tests/ajax/GetContactTagsTest.php | 17 +++++++++++++++++ www/ajax/getcontacttags.php | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/tests/ajax/GetContactTagsTest.php b/tests/ajax/GetContactTagsTest.php index 757dce9..6e40444 100644 --- a/tests/ajax/GetContactTagsTest.php +++ b/tests/ajax/GetContactTagsTest.php @@ -71,6 +71,23 @@ class ajax_GetContactTagsTest extends TestBaseApi $this->assertContains('public2', $data); $this->assertContains('user2tag', $data); } + + public function testParameterBeginsWith() + { + list($req, $uId) = $this->getLoggedInRequest('?beginsWith=bar'); + $this->addBookmark($uId, null, 0, array('foobar', 'barmann')); + + $res = $req->send(); + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + $data = json_decode($res->getBody()); + $this->assertInternalType('array', $data); + $this->assertEquals(1, count($data)); + $this->assertContains('barmann', $data); + } } diff --git a/www/ajax/getcontacttags.php b/www/ajax/getcontacttags.php index 1377fea..d353226 100644 --- a/www/ajax/getcontacttags.php +++ b/www/ajax/getcontacttags.php @@ -36,7 +36,7 @@ if (isset($_GET['beginsWith']) && strlen(trim($_GET['beginsWith']))) { } $listTags = SemanticScuttle_Service_Factory::get('Bookmark2Tag')->getContactTags( - $currentUserId, $limit, $currentUserId, $beginsWith + $currentUserId, $limit, $currentUserId, null, $beginsWith ); $tags = array(); foreach ($listTags as $t) { From 0935c984991defbc3b7d8549ffa020371d5688f3 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 26 Mar 2011 13:55:46 +0100 Subject: [PATCH 150/173] test the limit parameter --- tests/ajax/GetContactTagsTest.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/ajax/GetContactTagsTest.php b/tests/ajax/GetContactTagsTest.php index 6e40444..682173b 100644 --- a/tests/ajax/GetContactTagsTest.php +++ b/tests/ajax/GetContactTagsTest.php @@ -88,6 +88,30 @@ class ajax_GetContactTagsTest extends TestBaseApi $this->assertEquals(1, count($data)); $this->assertContains('barmann', $data); } + + public function testParameterLimit() + { + list($req, $uId) = $this->getLoggedInRequest('?limit=2'); + $this->addBookmark($uId, null, 0, array('foo', 'bar', 'baz', 'omg')); + + $res = $req->send(); + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + $data = json_decode($res->getBody()); + $this->assertInternalType('array', $data); + $this->assertEquals(2, count($data)); + + $req2 = $this->getRequest('?limit=3'); + $req2->setCookieJar($req->getCookieJar()); + $res = $req2->send(); + $this->assertEquals(200, $res->getStatus()); + $data = json_decode($res->getBody()); + $this->assertInternalType('array', $data); + $this->assertEquals(3, count($data)); + } } From 361c18469af5f6782e622420797c4acd5fa70b97 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 26 Mar 2011 15:09:22 +0100 Subject: [PATCH 151/173] add new feature: allow unit test mode enabling via HTTP GET parameter --- data/config.default.php | 8 +++++ src/SemanticScuttle/header.php | 16 ++++++++- tests/TestBase.php | 63 +++++++++++++++++++++++++++++++++- 3 files changed, 85 insertions(+), 2 deletions(-) diff --git a/data/config.default.php b/data/config.default.php index 3d60b91..af79891 100644 --- a/data/config.default.php +++ b/data/config.default.php @@ -735,4 +735,12 @@ $authEmailSuffix = null; */ $unittestUrl = null; +/** + * Allow "unittestMode=1" in URLs. + * Should only be enabled on development systems + * + * @var boolean + */ +$allowUnittestMode = false; + ?> diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index 9c5f7da..75e5204 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -39,6 +39,20 @@ set_include_path( require_once $datadir . '/config.default.php'; require_once $datadir . '/config.php'; +if (isset($_GET['unittestMode']) && $_GET['unittestMode'] == 1 +) { + if ($allowUnittestMode !== true) { + header('HTTP/1.0 400 Bad Request'); + die("Unittestmode is not allowed\n"); + } + + $unittestConfigFile = $datadir . '/config.unittest.php'; + if (file_exists($unittestConfigFile)) { + require_once $unittestConfigFile; + } + define('HTTP_UNIT_TEST_MODE', true); + define('UNIT_TEST_MODE', true); +} if (defined('UNIT_TEST_MODE')) { //make local config vars global - needed for unit tests //run with phpunit @@ -118,7 +132,7 @@ $tplVars['currentUser'] = $currentUser; $tplVars['userservice'] = $userservice; // 6 // Force UTF-8 behaviour for server (cannot be moved into top.inc.php which is not included into every file) -if (!defined('UNIT_TEST_MODE')) { +if (!defined('UNIT_TEST_MODE') || defined('HTTP_UNIT_TEST_MODE')) { //API files define that, so we need a way to support both of them if (!isset($httpContentType)) { if (DEBUG_MODE) { diff --git a/tests/TestBase.php b/tests/TestBase.php index 3e2e213..b85c189 100644 --- a/tests/TestBase.php +++ b/tests/TestBase.php @@ -22,6 +22,18 @@ */ class TestBase extends PHPUnit_Framework_TestCase { + /** + * Clean up after test + */ + public function tearDown() + { + if (file_exists($GLOBALS['datadir'] . '/config.unittest.php')) { + unlink($GLOBALS['datadir'] . '/config.unittest.php'); + } + } + + + /** * Create a new bookmark. * @@ -80,8 +92,25 @@ class TestBase extends PHPUnit_Framework_TestCase * @param string $password Password * * @return integer ID of user + * + * @uses addUserData() */ protected function addUser($username = null, $password = null) + { + return reset($this->addUserData($username, $password)); + } + + + + /** + * Creates a new user in the database and returns id, username and password. + * + * @param string $username Username + * @param string $password Password + * + * @return array ID of user, Name of user, password of user + */ + protected function addUserData($username = null, $password = null) { $us = SemanticScuttle_Service_Factory::get('User'); $rand = rand(); @@ -98,7 +127,7 @@ class TestBase extends PHPUnit_Framework_TestCase $password, 'unittest-' . $rand . '@example.org' ); - return $uid; + return array($uid, $username, $password); } @@ -129,6 +158,38 @@ class TestBase extends PHPUnit_Framework_TestCase return $uid; } + + + /** + * Writes a special unittest configuration file. + * The unittest config file is read when a GET request with unittestMode=1 + * is sent, and the user allowed unittestmode in config.php. + * + * @param array $arConfig Array with config names as key and their value as + * value + * + * @return void + */ + protected function setUnittestConfig($arConfig) + { + $str = '<' . "?php\r\n"; + foreach ($arConfig as $name => $value) { + $str .= '$' . $name . ' = ' + . var_export($value, true) . ";\n"; + } + + if (!is_dir($GLOBALS['datadir'])) { + $this->fail( + 'datadir not set or not a directory: ' . $GLOBALS['datadir'] + ); + } + + $this->assertInternalType( + 'integer', + file_put_contents($GLOBALS['datadir'] . '/config.unittest.php', $str), + 'Writing config.unittest.php failed' + ); + } } ?> \ No newline at end of file From a756799ef4df0449244d41c2ecc7133c3fb8ce70 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 26 Mar 2011 17:04:00 +0100 Subject: [PATCH 152/173] move setUnittestConfig to TestBaseApi since it makes only sense to use it there --- tests/TestBase.php | 44 ----------------------- tests/TestBaseApi.php | 44 +++++++++++++++++++++++ tests/ajax/GetAdminTagsTest.php | 63 +++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 44 deletions(-) create mode 100644 tests/ajax/GetAdminTagsTest.php diff --git a/tests/TestBase.php b/tests/TestBase.php index b85c189..095f32d 100644 --- a/tests/TestBase.php +++ b/tests/TestBase.php @@ -22,18 +22,6 @@ */ class TestBase extends PHPUnit_Framework_TestCase { - /** - * Clean up after test - */ - public function tearDown() - { - if (file_exists($GLOBALS['datadir'] . '/config.unittest.php')) { - unlink($GLOBALS['datadir'] . '/config.unittest.php'); - } - } - - - /** * Create a new bookmark. * @@ -158,38 +146,6 @@ class TestBase extends PHPUnit_Framework_TestCase return $uid; } - - - /** - * Writes a special unittest configuration file. - * The unittest config file is read when a GET request with unittestMode=1 - * is sent, and the user allowed unittestmode in config.php. - * - * @param array $arConfig Array with config names as key and their value as - * value - * - * @return void - */ - protected function setUnittestConfig($arConfig) - { - $str = '<' . "?php\r\n"; - foreach ($arConfig as $name => $value) { - $str .= '$' . $name . ' = ' - . var_export($value, true) . ";\n"; - } - - if (!is_dir($GLOBALS['datadir'])) { - $this->fail( - 'datadir not set or not a directory: ' . $GLOBALS['datadir'] - ); - } - - $this->assertInternalType( - 'integer', - file_put_contents($GLOBALS['datadir'] . '/config.unittest.php', $str), - 'Writing config.unittest.php failed' - ); - } } ?> \ No newline at end of file diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php index 2af228a..2341ea1 100644 --- a/tests/TestBaseApi.php +++ b/tests/TestBaseApi.php @@ -57,6 +57,18 @@ class TestBaseApi extends TestBase + /** + * Clean up after test + */ + public function tearDown() + { + if (file_exists($GLOBALS['datadir'] . '/config.unittest.php')) { + unlink($GLOBALS['datadir'] . '/config.unittest.php'); + } + } + + + /** * Gets a HTTP request object. * Uses $this->url plus $urlSuffix as request URL. @@ -158,5 +170,37 @@ class TestBaseApi extends TestBase return array($req, $uid); } + + + /** + * Writes a special unittest configuration file. + * The unittest config file is read when a GET request with unittestMode=1 + * is sent, and the user allowed unittestmode in config.php. + * + * @param array $arConfig Array with config names as key and their value as + * value + * + * @return void + */ + protected function setUnittestConfig($arConfig) + { + $str = '<' . "?php\r\n"; + foreach ($arConfig as $name => $value) { + $str .= '$' . $name . ' = ' + . var_export($value, true) . ";\n"; + } + + if (!is_dir($GLOBALS['datadir'])) { + $this->fail( + 'datadir not set or not a directory: ' . $GLOBALS['datadir'] + ); + } + + $this->assertInternalType( + 'integer', + file_put_contents($GLOBALS['datadir'] . '/config.unittest.php', $str), + 'Writing config.unittest.php failed' + ); + } } ?> \ No newline at end of file diff --git a/tests/ajax/GetAdminTagsTest.php b/tests/ajax/GetAdminTagsTest.php new file mode 100644 index 0000000..5c941e8 --- /dev/null +++ b/tests/ajax/GetAdminTagsTest.php @@ -0,0 +1,63 @@ + + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +require_once dirname(__FILE__) . '/../prepare.php'; +require_once 'HTTP/Request2.php'; + +/** + * Unit tests for the ajax getadmintags.php script + * + * @category Bookmarking + * @package SemanticScuttle + * @author Christian Weiske + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class ajax_GetAdminTagsTest extends TestBaseApi +{ + protected $urlPart = 'ajax/getadmintags.php'; + + + public function testTags() + { + list($user1, $uname1) = $this->addUserData(); + $user2 = $this->addUser(); + $this->addBookmark($user1, null, 0, array('admintag', 'admintag2')); + $this->addBookmark($user2, null, 0, array('lusertag', 'lusertag2')); + + $this->setUnittestConfig( + array( + 'admin_users' => array($uname1) + ) + ); + + $req = $this->getRequest('?unittestMode=1'); + $res = $req->send(); + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + $data = json_decode($res->getBody()); + $this->assertInternalType('array', $data); + $this->assertEquals(2, count($data)); + $this->assertContains('admintag', $data); + $this->assertContains('admintag2', $data); + } + +} + + +?> \ No newline at end of file From a1545004f2a96597165e4d9b970229137dd156e3 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sat, 26 Mar 2011 17:04:21 +0100 Subject: [PATCH 153/173] rewrite ajax/getadmintags.php --- www/ajax/getadmintags.php | 75 ++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/www/ajax/getadmintags.php b/www/ajax/getadmintags.php index ffd20bb..2f13060 100644 --- a/www/ajax/getadmintags.php +++ b/www/ajax/getadmintags.php @@ -1,44 +1,47 @@ + * @author Christian Weiske + * @author Eric Dane + * @license GPL http://www.gnu.org/licenses/gpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -***************************************************************************/ - -/* Return a json file with list of tags according to current user and sort by popularity*/ $httpContentType = 'application/json'; require_once '../www-header.php'; -/* Service creation: only useful services are created */ -$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); -$bookmarkservice =SemanticScuttle_Service_Factory::get('Tag'); - -?> - -{identifier:"tag", -items: [ -getAdminTags(1000, $userservice->getCurrentUserId()); - foreach($listTags as $t) { - echo "{tag: \"".$t['tag']."\"},"; - } -?> -]} - +$limit = 30; +$beginsWith = null; +$currentUserId = $userservice->getCurrentUserId(); +if (isset($_GET['limit']) && is_numeric($_GET['limit'])) { + $limit = (int)$_GET['limit']; +} +if (isset($_GET['beginsWith']) && strlen(trim($_GET['beginsWith']))) { + $beginsWith = trim($_GET['beginsWith']); +} +$listTags = SemanticScuttle_Service_Factory::get('Bookmark2Tag')->getAdminTags( + $limit, $currentUserId, null, $beginsWith +); +$tags = array(); +foreach ($listTags as $t) { + $tags[] = $t['tag']; +} +echo json_encode($tags); +?> \ No newline at end of file From 1dfff5d3d81fdb67e4c78136168801a488fcf139 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 28 Mar 2011 08:01:02 +0200 Subject: [PATCH 154/173] add tests for getadmintags beginsWith and limit parameters --- tests/ajax/GetAdminTagsTest.php | 79 +++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/tests/ajax/GetAdminTagsTest.php b/tests/ajax/GetAdminTagsTest.php index 5c941e8..6afe45c 100644 --- a/tests/ajax/GetAdminTagsTest.php +++ b/tests/ajax/GetAdminTagsTest.php @@ -57,6 +57,85 @@ class ajax_GetAdminTagsTest extends TestBaseApi $this->assertContains('admintag2', $data); } + public function testParameterBeginsWith() + { + list($user1, $uname1) = $this->addUserData(); + $this->addBookmark($user1, null, 0, array('foo', 'foobar', 'bar')); + + $this->setUnittestConfig( + array( + 'admin_users' => array($uname1) + ) + ); + + $req = $this->getRequest('?unittestMode=1&beginsWith=foo'); + $res = $req->send(); + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + $data = json_decode($res->getBody()); + $this->assertInternalType('array', $data); + $this->assertEquals(2, count($data)); + $this->assertContains('foo', $data); + $this->assertContains('foobar', $data); + } + + + + public function testParameterLimit() + { + list($user1, $uname1) = $this->addUserData(); + list($user2, $uname2) = $this->addUserData(); + $this->addBookmark($user1, null, 0, array('foo', 'foobar')); + $this->addBookmark($user2, null, 0, array('foo', 'bar')); + + $this->setUnittestConfig( + array( + 'admin_users' => array($uname1, $uname2) + ) + ); + + $req = $this->getRequest('?unittestMode=1&limit=1'); + $res = $req->send(); + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + $data = json_decode($res->getBody()); + $this->assertInternalType('array', $data); + $this->assertEquals(1, count($data)); + $this->assertContains('foo', $data); + + $req = $this->getRequest('?unittestMode=1&limit=2'); + $res = $req->send(); + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + $data = json_decode($res->getBody()); + $this->assertInternalType('array', $data); + $this->assertEquals(2, count($data)); + $this->assertContains('foo', $data); + + $req = $this->getRequest('?unittestMode=1&limit=3'); + $res = $req->send(); + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + $data = json_decode($res->getBody()); + $this->assertInternalType('array', $data); + $this->assertEquals(3, count($data)); + $this->assertContains('foo', $data); + $this->assertContains('foobar', $data); + $this->assertContains('bar', $data); + } + } From a5bd7789297378be3fb8dc3814c6649ea82a88d8 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 28 Mar 2011 08:34:12 +0200 Subject: [PATCH 155/173] introduce assertResponseJson200 for API/ajax tests and use it --- tests/TestBaseApi.php | 19 +++++++++++++++++ tests/ajax/GetAdminLinkedTagsTest.php | 20 +++--------------- tests/ajax/GetAdminTagsTest.php | 30 +++++---------------------- tests/ajax/GetContactTagsTest.php | 26 +++++------------------ 4 files changed, 32 insertions(+), 63 deletions(-) diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php index 2341ea1..f054973 100644 --- a/tests/TestBaseApi.php +++ b/tests/TestBaseApi.php @@ -172,6 +172,25 @@ class TestBaseApi extends TestBase + /** + * Verifies that the HTTP response has status code 200 and + * content-type application/json; charset=utf-8 + * + * @param HTTP_Request2_Response $res HTTP Response object + * + * @return void + */ + protected function assertResponseJson200(HTTP_Request2_Response $res) + { + $this->assertEquals(200, $res->getStatus()); + $this->assertEquals( + 'application/json; charset=utf-8', + $res->getHeader('content-type') + ); + } + + + /** * Writes a special unittest configuration file. * The unittest config file is read when a GET request with unittestMode=1 diff --git a/tests/ajax/GetAdminLinkedTagsTest.php b/tests/ajax/GetAdminLinkedTagsTest.php index 2552ea0..aded834 100644 --- a/tests/ajax/GetAdminLinkedTagsTest.php +++ b/tests/ajax/GetAdminLinkedTagsTest.php @@ -58,13 +58,7 @@ class ajax_GetAdminLinkedTagsTest extends TestBaseApi { $req = $this->getRequest(); $res = $req->send(); - - $this->assertEquals(200, $res->getStatus()); - $this->assertEquals( - 'application/json; charset=utf-8', - $res->getHeader('content-type') - ); - + $this->assertResponseJson200($res); $data = json_decode($res->getBody()); $this->assertInternalType('array', $data); @@ -99,11 +93,7 @@ class ajax_GetAdminLinkedTagsTest extends TestBaseApi ); $res = $this->getRequest('?tag=' . $menu2Tag)->send(); - $this->assertEquals(200, $res->getStatus()); - $this->assertEquals( - 'application/json; charset=utf-8', - $res->getHeader('content-type') - ); + $this->assertResponseJson200($res); $data = json_decode($res->getBody()); $this->assertInternalType('array', $data); @@ -139,11 +129,7 @@ class ajax_GetAdminLinkedTagsTest extends TestBaseApi ); $res = $this->getRequest('?tag=' . $menu2Tag)->send(); - $this->assertEquals(200, $res->getStatus()); - $this->assertEquals( - 'application/json; charset=utf-8', - $res->getHeader('content-type') - ); + $this->assertResponseJson200($res); $data = json_decode($res->getBody()); $this->assertInternalType('array', $data); diff --git a/tests/ajax/GetAdminTagsTest.php b/tests/ajax/GetAdminTagsTest.php index 6afe45c..80d702f 100644 --- a/tests/ajax/GetAdminTagsTest.php +++ b/tests/ajax/GetAdminTagsTest.php @@ -45,11 +45,7 @@ class ajax_GetAdminTagsTest extends TestBaseApi $req = $this->getRequest('?unittestMode=1'); $res = $req->send(); - $this->assertEquals(200, $res->getStatus()); - $this->assertEquals( - 'application/json; charset=utf-8', - $res->getHeader('content-type') - ); + $this->assertResponseJson200($res); $data = json_decode($res->getBody()); $this->assertInternalType('array', $data); $this->assertEquals(2, count($data)); @@ -70,12 +66,8 @@ class ajax_GetAdminTagsTest extends TestBaseApi $req = $this->getRequest('?unittestMode=1&beginsWith=foo'); $res = $req->send(); - $this->assertEquals(200, $res->getStatus()); - $this->assertEquals( - 'application/json; charset=utf-8', - $res->getHeader('content-type') - ); $data = json_decode($res->getBody()); + $this->assertResponseJson200($res); $this->assertInternalType('array', $data); $this->assertEquals(2, count($data)); $this->assertContains('foo', $data); @@ -99,11 +91,7 @@ class ajax_GetAdminTagsTest extends TestBaseApi $req = $this->getRequest('?unittestMode=1&limit=1'); $res = $req->send(); - $this->assertEquals(200, $res->getStatus()); - $this->assertEquals( - 'application/json; charset=utf-8', - $res->getHeader('content-type') - ); + $this->assertResponseJson200($res); $data = json_decode($res->getBody()); $this->assertInternalType('array', $data); $this->assertEquals(1, count($data)); @@ -111,11 +99,7 @@ class ajax_GetAdminTagsTest extends TestBaseApi $req = $this->getRequest('?unittestMode=1&limit=2'); $res = $req->send(); - $this->assertEquals(200, $res->getStatus()); - $this->assertEquals( - 'application/json; charset=utf-8', - $res->getHeader('content-type') - ); + $this->assertResponseJson200($res); $data = json_decode($res->getBody()); $this->assertInternalType('array', $data); $this->assertEquals(2, count($data)); @@ -123,11 +107,7 @@ class ajax_GetAdminTagsTest extends TestBaseApi $req = $this->getRequest('?unittestMode=1&limit=3'); $res = $req->send(); - $this->assertEquals(200, $res->getStatus()); - $this->assertEquals( - 'application/json; charset=utf-8', - $res->getHeader('content-type') - ); + $this->assertResponseJson200($res); $data = json_decode($res->getBody()); $this->assertInternalType('array', $data); $this->assertEquals(3, count($data)); diff --git a/tests/ajax/GetContactTagsTest.php b/tests/ajax/GetContactTagsTest.php index 682173b..559040f 100644 --- a/tests/ajax/GetContactTagsTest.php +++ b/tests/ajax/GetContactTagsTest.php @@ -36,11 +36,7 @@ class ajax_GetContactTagsTest extends TestBaseApi public function testNoUserLoggedIn() { $res = $this->getRequest()->send(); - $this->assertEquals(200, $res->getStatus()); - $this->assertEquals( - 'application/json; charset=utf-8', - $res->getHeader('content-type') - ); + $this->assertResponseJson200($res); $data = json_decode($res->getBody()); $this->assertInternalType('array', $data); $this->assertEquals(0, count($data)); @@ -59,11 +55,7 @@ class ajax_GetContactTagsTest extends TestBaseApi $this->addBookmark($user2, null, 0, array('user2tag')); $res = $req->send(); - $this->assertEquals(200, $res->getStatus()); - $this->assertEquals( - 'application/json; charset=utf-8', - $res->getHeader('content-type') - ); + $this->assertResponseJson200($res); $data = json_decode($res->getBody()); $this->assertInternalType('array', $data); $this->assertEquals(3, count($data)); @@ -78,11 +70,7 @@ class ajax_GetContactTagsTest extends TestBaseApi $this->addBookmark($uId, null, 0, array('foobar', 'barmann')); $res = $req->send(); - $this->assertEquals(200, $res->getStatus()); - $this->assertEquals( - 'application/json; charset=utf-8', - $res->getHeader('content-type') - ); + $this->assertResponseJson200($res); $data = json_decode($res->getBody()); $this->assertInternalType('array', $data); $this->assertEquals(1, count($data)); @@ -95,11 +83,7 @@ class ajax_GetContactTagsTest extends TestBaseApi $this->addBookmark($uId, null, 0, array('foo', 'bar', 'baz', 'omg')); $res = $req->send(); - $this->assertEquals(200, $res->getStatus()); - $this->assertEquals( - 'application/json; charset=utf-8', - $res->getHeader('content-type') - ); + $this->assertResponseJson200($res); $data = json_decode($res->getBody()); $this->assertInternalType('array', $data); $this->assertEquals(2, count($data)); @@ -107,7 +91,7 @@ class ajax_GetContactTagsTest extends TestBaseApi $req2 = $this->getRequest('?limit=3'); $req2->setCookieJar($req->getCookieJar()); $res = $req2->send(); - $this->assertEquals(200, $res->getStatus()); + $this->assertResponseJson200($res); $data = json_decode($res->getBody()); $this->assertInternalType('array', $data); $this->assertEquals(3, count($data)); From 833dde3f53fe4f5101c299245d9fa02e0ae51c80 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 28 Mar 2011 19:17:51 +0200 Subject: [PATCH 156/173] jquey-autocomplete works! --- data/templates/editbookmark.tpl.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 6ce10b3..f440740 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -142,19 +142,21 @@ jQuery(document).ready(function() { jQuery("input#tags").autocomplete({ - minLength: 0, + minLength: 1, source: function(request, response) { // delegate back to autocomplete, but extract the last term response( + /* $.ui.autocomplete.filter( availableTags, extractLast(request.term) ) - /* - $.getJSON( "search.php", { - term: extractLast( request.term ) - }, response ); */ + $.getJSON( + "ajax/getcontacttags.php", + { beginsWith: extractLast(request.term) }, + response + ) ); }, From 5c1d75ae653275d329ca5c7fd5df4bd918937dba Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 28 Mar 2011 19:24:44 +0200 Subject: [PATCH 157/173] use getadmintags.php if configured so --- data/templates/editbookmark.tpl.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index f440740..4ce3239 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -24,6 +24,13 @@ function jsEscTitle($title) if (is_array($row['tags'])) { $row['tags'] = implode(', ', $row['tags']); } + +$ajaxUrl = ROOT . 'ajax/' + . ( + ($GLOBALS['adminsAreAdvisedTagsFromOtherAdmins'] && $currentUser->isAdmin()) + ? 'getadmintags' + : 'getcontacttags' + ) . '.php'; ?>
                    - + ←
                    @@ -138,7 +145,7 @@ jQuery(document).ready(function() { { return split(term).pop(); } - var availableTags = ["c++", "java", "php", "coldfusion", "javascript", "asp", "ruby"]; + //var availableTags = ["c++", "java", "php", "coldfusion", "javascript", "asp", "ruby"]; jQuery("input#tags").autocomplete({ @@ -153,7 +160,7 @@ jQuery(document).ready(function() { ) */ $.getJSON( - "ajax/getcontacttags.php", + "", { beginsWith: extractLast(request.term) }, response ) From 3f6bf4a5eb6705d3d8b83f0e6a488c1fca2c1565 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 29 Mar 2011 07:54:47 +0200 Subject: [PATCH 158/173] update from 1.8.5 to jquery-ui 1.8.11 --- data/templates/editbookmark.tpl.php | 12 +- .../jquery.ui.autocomplete.js | 125 +- .../jquery.ui.autocomplete.min.js | 32 + .../jquery.ui.core.js | 29 +- www/js/jquery-ui-1.8.11/jquery.ui.core.min.js | 17 + .../jquery.ui.position.js | 17 +- .../jquery.ui.position.min.js | 16 + .../jquery.ui.widget.js | 47 +- .../jquery-ui-1.8.11/jquery.ui.widget.min.js | 15 + .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_flat_75_ffffff_40x100.png | Bin .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../images/ui-bg_glass_65_ffffff_1x400.png | Bin .../images/ui-bg_glass_75_dadada_1x400.png | Bin .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../base/images/ui-icons_222222_256x240.png | Bin .../base/images/ui-icons_2e83ff_256x240.png | Bin .../base/images/ui-icons_454545_256x240.png | Bin .../base/images/ui-icons_888888_256x240.png | Bin .../base/images/ui-icons_cd0a0a_256x240.png | Bin .../themes/base/jquery.ui.all.css | 0 .../themes/base/jquery.ui.autocomplete.css | 6 +- .../themes/base/jquery.ui.base.css | 11 + .../themes/base/jquery.ui.core.css | 6 +- .../themes/base/jquery.ui.theme.css | 4 +- .../jquery-ui-1.8.5/jquery-ui-1.8.5.custom.js | 1362 ----------------- .../jquery.ui.autocomplete.min.js | 31 - www/js/jquery-ui-1.8.5/jquery.ui.core.min.js | 17 - .../jquery-ui-1.8.5/jquery.ui.position.min.js | 16 - .../jquery-ui-1.8.5/jquery.ui.widget.min.js | 15 - .../themes/base/jquery.ui.base.css | 2 - 33 files changed, 250 insertions(+), 1530 deletions(-) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/jquery.ui.autocomplete.js (81%) create mode 100644 www/js/jquery-ui-1.8.11/jquery.ui.autocomplete.min.js rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/jquery.ui.core.js (92%) create mode 100644 www/js/jquery-ui-1.8.11/jquery.ui.core.min.js rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/jquery.ui.position.js (94%) create mode 100644 www/js/jquery-ui-1.8.11/jquery.ui.position.min.js rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/jquery.ui.widget.js (83%) create mode 100644 www/js/jquery-ui-1.8.11/jquery.ui.widget.min.js rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-bg_flat_75_ffffff_40x100.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-bg_glass_65_ffffff_1x400.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-bg_glass_75_dadada_1x400.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-icons_222222_256x240.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-icons_2e83ff_256x240.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-icons_454545_256x240.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-icons_888888_256x240.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/images/ui-icons_cd0a0a_256x240.png (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/jquery.ui.all.css (100%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/jquery.ui.autocomplete.css (89%) create mode 100644 www/js/jquery-ui-1.8.11/themes/base/jquery.ui.base.css rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/jquery.ui.core.css (85%) rename www/js/{jquery-ui-1.8.5 => jquery-ui-1.8.11}/themes/base/jquery.ui.theme.css (99%) delete mode 100644 www/js/jquery-ui-1.8.5/jquery-ui-1.8.5.custom.js delete mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.autocomplete.min.js delete mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.core.min.js delete mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.position.min.js delete mode 100644 www/js/jquery-ui-1.8.5/jquery.ui.widget.min.js delete mode 100644 www/js/jquery-ui-1.8.5/themes/base/jquery.ui.base.css diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 4ce3239..8083a79 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -128,12 +128,12 @@ $ajaxUrl = ROOT . 'ajax/'
                    - + - - - - + + + + Date: Tue, 29 Mar 2011 08:02:37 +0200 Subject: [PATCH 160/173] do not load all css files --- www/js/jquery-ui-1.8.11/themes/base/jquery.ui.base.css | 9 --------- 1 file changed, 9 deletions(-) diff --git a/www/js/jquery-ui-1.8.11/themes/base/jquery.ui.base.css b/www/js/jquery-ui-1.8.11/themes/base/jquery.ui.base.css index f52ee39..98267a4 100644 --- a/www/js/jquery-ui-1.8.11/themes/base/jquery.ui.base.css +++ b/www/js/jquery-ui-1.8.11/themes/base/jquery.ui.base.css @@ -1,11 +1,2 @@ @import url("jquery.ui.core.css"); -@import url("jquery.ui.resizable.css"); -@import url("jquery.ui.selectable.css"); -@import url("jquery.ui.accordion.css"); @import url("jquery.ui.autocomplete.css"); -@import url("jquery.ui.button.css"); -@import url("jquery.ui.dialog.css"); -@import url("jquery.ui.slider.css"); -@import url("jquery.ui.tabs.css"); -@import url("jquery.ui.datepicker.css"); -@import url("jquery.ui.progressbar.css"); \ No newline at end of file From 407daf0bfa9cbb86078d8f5497a10c80e53963ce Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 29 Mar 2011 08:05:15 +0200 Subject: [PATCH 161/173] work around minLength problem in jquery-ui-autocomplete --- data/templates/editbookmark.tpl.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 69d3897..1783692 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -154,6 +154,10 @@ jQuery(document).ready(function() { source: function(request, response) { // delegate back to autocomplete, but extract the last term + var term = extractLast(request.term); + if (term.length < this.options.minLength) { + return; + } response( /* $.ui.autocomplete.filter( @@ -162,7 +166,7 @@ jQuery(document).ready(function() { */ $.getJSON( "", - { beginsWith: extractLast(request.term) }, + { beginsWith: term }, response ) ); From c7c702f54428a1c3569e90a6a58f879d575571cb Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 29 Mar 2011 18:04:26 +0200 Subject: [PATCH 162/173] begin to fix dynamictags for xhtml compatibility --- data/templates/dynamictags.inc.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/data/templates/dynamictags.inc.php b/data/templates/dynamictags.inc.php index b18565b..62f5071 100644 --- a/data/templates/dynamictags.inc.php +++ b/data/templates/dynamictags.inc.php @@ -56,8 +56,8 @@ function writeTagsProposition($tagsCloud, $title) { if ($allPopularTagsCount > 0 || $userPopularTagsCount > 0 ) { ?> - Date: Wed, 30 Mar 2011 19:20:26 +0200 Subject: [PATCH 163/173] make dynamictags (tagcloud) work again --- data/templates/dynamictags.inc.php | 63 ++++++++++++++++------------- data/templates/editbookmark.tpl.php | 2 +- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/data/templates/dynamictags.inc.php b/data/templates/dynamictags.inc.php index 62f5071..8cf07c1 100644 --- a/data/templates/dynamictags.inc.php +++ b/data/templates/dynamictags.inc.php @@ -36,22 +36,34 @@ $allPopularTagsCount = count($allPopularTags); // function printing the cloud -function writeTagsProposition($tagsCloud, $title) { - echo 'document.write(\'
                    \');'; - echo 'document.write(\'

                    '. $title .'<\/h3>\');'; - echo 'document.write(\'

                    \');'; +function writeTagsProposition($tagsCloud, $title) +{ + static $id = 0; + ++$id; + + echo <<' ++ '

                    $title

                    ' ++ '

                    ' ++ '
                    '); +JS; $taglist = ''; - foreach(array_keys($tagsCloud) as $key) { - $row =& $tagsCloud[$key]; + foreach (array_keys($tagsCloud) as $key) { + $row = $tagsCloud[$key]; $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']); - $taglist .= ''. filter($row['tag']) .'<\/span> '; + $taglist .= '' + . filter($row['tag']) + . ' '; } - - echo 'document.write(\''. $taglist .'\');'; - echo 'document.write(\'<\/p>\');'; - echo 'document.write(\'<\/div>\');'; - + echo '$(\'#edit-tagcloud-' . $id . ' p\').append(' + . json_encode($taglist) + . ");\n"; } @@ -88,10 +100,18 @@ function addonload(addition) { } jQuery(function($) { - var taglist = document.getElementById('tags'); - var tags = taglist.value.split(', '); + 0) { + writeTagsProposition($userPopularTagsCloud, T_('Popular Tags')); +} +if ($allPopularTagsCount > 0) { + writeTagsProposition($allPopularTagsCloud, T_('Popular Tags From All Users')); +} +?> + var taglist = $('#tags'); + var tags = taglist.val().split(', '); - var populartags = document.getElementById('popularTags').getElementsByTagName('span'); + var populartags = $('.edit-tagclouds span'); for (var i = 0; i < populartags.length; i++) { if (tags.contains(populartags[i].innerHTML)) { @@ -120,20 +140,9 @@ function addTag(ele) { document.getElementById('tags').focus(); } - - 0) { - writeTagsProposition($userPopularTagsCloud, T_('Popular Tags')); -} -if( $allPopularTagsCount > 0) { - writeTagsProposition($allPopularTagsCloud, T_('Popular Tags From All Users')); -} - - -?> //]]> - +
                    diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 1783692..25938e8 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -194,7 +194,7 @@ jQuery(document).ready(function() { includeTemplate('dynamictags.inc'); +$this->includeTemplate('dynamictags.inc'); // Bookmarklets and import links if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) { From 7a45f330a7a6011a1816ffb77011518c29f332c2 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Thu, 31 Mar 2011 19:13:07 +0200 Subject: [PATCH 164/173] re-enable browser bookmarklets after fixing some naaaaaaaaaaaaaasty bugs with site titles that have special chars in them --- data/templates/editbookmark.tpl.php | 60 +++++++++++++++++++---------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 25938e8..8b98987 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -201,33 +201,34 @@ if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) { ?>

                    -

                    +

                    -:

                    From 43974a15f24859fd817adccb6c906522748ce42d Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 1 Apr 2011 08:17:01 +0200 Subject: [PATCH 165/173] make popup bookmarklet work in firefox when the title contains double and single quotes. opera still broken, though --- data/templates/editbookmark.tpl.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 8b98987..1a74290 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -20,6 +20,10 @@ function jsEscTitle($title) { return addcslashes($title, "'"); } +function jsEscTitleDouble($title) +{ + return addcslashes(addcslashes($title, "'"), "'\\"); +} if (is_array($row['tags'])) { $row['tags'] = implode(', ', $row['tags']); @@ -261,7 +265,7 @@ if (browser == "Opera") { + 't=encodeURIComponent(x.title);' + 'd=encodeURIComponent('+selection+');' + 'open(' - + '\'?action=add&popup=1&address=\'+a+\'&title=\'+t+\'&description=\'+d,\'\',\'modal=1,status=0,scrollbars=1,toolbar=0,resizable=1,width=790,height=465,left=\'+(screen.width-790)/2+\',top=\'+(screen.height-425)/2' + + '\'?action=add&popup=1&address=\'+a+\'&title=\'+t+\'&description=\'+d,\'\',\'modal=1,status=0,scrollbars=1,toolbar=0,resizable=1,width=790,height=465,left=\'+(screen.width-790)/2+\',top=\'+(screen.height-425)/2' + ');void 0;">' + '' + '' From 51763183e0ccf15de791a2d8206d84a4116e8b20 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Mon, 4 Apr 2011 22:07:39 +0200 Subject: [PATCH 166/173] FINALLY get the first opera bookmarklet working, with cleaner code now --- data/templates/editbookmark.tpl.php | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index 1a74290..fc03a59 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -247,7 +247,27 @@ if (browser == "Opera") { $('#bookmarklet').append( '' ); From 705d016301194b39b87ec4f1223633bf1ac4489e Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 5 Apr 2011 18:56:51 +0200 Subject: [PATCH 170/173] move bookmarklet code to own template file --- data/templates/bookmarklet.inc.php | 117 +++++++++++++++++++++++++++ data/templates/editbookmark.tpl.php | 121 +--------------------------- 2 files changed, 119 insertions(+), 119 deletions(-) create mode 100644 data/templates/bookmarklet.inc.php diff --git a/data/templates/bookmarklet.inc.php b/data/templates/bookmarklet.inc.php new file mode 100644 index 0000000..9867745 --- /dev/null +++ b/data/templates/bookmarklet.inc.php @@ -0,0 +1,117 @@ +

                    +

                    + + diff --git a/data/templates/editbookmark.tpl.php b/data/templates/editbookmark.tpl.php index b7fb227..8b71230 100644 --- a/data/templates/editbookmark.tpl.php +++ b/data/templates/editbookmark.tpl.php @@ -206,126 +206,9 @@ $this->includeTemplate('dynamictags.inc'); // Bookmarklets and import links if (empty($_REQUEST['popup']) && (!isset($showdelete) || !$showdelete)) { + +$this->includeTemplate('bookmarklet.inc.php'); ?> - -

                    -

                    - - -

                    • ()
                      • From cbf36891ae8f1fc568594983387e79c0c6e786a4 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 5 Apr 2011 19:02:52 +0200 Subject: [PATCH 171/173] set width of autocomplete dropdown --- www/scuttle.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/www/scuttle.css b/www/scuttle.css index e5aaf0b..78f24e9 100644 --- a/www/scuttle.css +++ b/www/scuttle.css @@ -644,4 +644,10 @@ a.bookmarklet { /* tree styles */ #related-content.jstree-default.jstree-focused { background: none !important; -} \ No newline at end of file +} + + +/* add/edit bookmark */ +.ui-autocomplete { + width: 458px; +} From 599ac400f2e54c4a7041059eef545bf5f2efb3d7 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Tue, 5 Apr 2011 19:05:31 +0200 Subject: [PATCH 172/173] update changelog with jquery merge --- doc/ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index aff6dc3..273e84b 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,8 +1,9 @@ ChangeLog for SemantiScuttle ============================ -0.9X.X - 2010-XX-XX +0.98.0 - 2011-XX-XX ------------------- +- Switch to jQuery and drop dojo - Fix bug #3187177: Wrong URL / Export XML Bookmarks - Fix bug in getTagsForBookmarks() that fetched all tags - Implement request #3054906: Show user's full name instead of nickname From 12c77161aca2c7d76fa5154fa1f4e214106d834b Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Wed, 6 Apr 2011 19:03:52 +0200 Subject: [PATCH 173/173] move doc-todo to doc-todo file --- doc/README.txt | 10 ---------- doc/developers/doc-TODO | 5 +++++ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/doc/README.txt b/doc/README.txt index a7f9b66..97387d2 100644 --- a/doc/README.txt +++ b/doc/README.txt @@ -89,13 +89,3 @@ Number of bookmarks always 0: "0 bookmark(s)" This issue occurs when debug mode is enabled. Technically, this is because the database layers DEBUG_EXTRA gets enabled through debug mode. - - - -End user docs -------------- -Unfortunately, there are no real end user docs yet. -Here is a list of interesting things: -- Bookmarklets: Text selection is used as description -- Tag nesting: Paris > France > World -- Tag alias: Deutschland = Germany diff --git a/doc/developers/doc-TODO b/doc/developers/doc-TODO index 69f6907..4fac4ab 100644 --- a/doc/developers/doc-TODO +++ b/doc/developers/doc-TODO @@ -1,3 +1,8 @@ +- Bookmarklets: Text selection is used as description +- Tag nesting: Paris > France > World +- Tag alias: Deutschland = Germany + + - Which fields are searched? title, description, private note, username, tags