+ * @see utf8_stripspecials()
+ */
+$UTF8_SPECIAL_CHARS = array(
+ 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 0x0020, 0x0021, 0x0022, 0x0023,
+ 0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029, 0x002a, 0x002b, 0x002c, 0x002d,
+ 0x002e, 0x002f, 0x003a, 0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040, 0x005b,
+ 0x005c, 0x005d, 0x005e, 0x005f, 0x0060, 0x0142, 0x007b, 0x007c, 0x007d, 0x007e,
+ 0x007f, 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088,
+ 0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 0x0090, 0x0091, 0x0092,
+ 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c,
+ 0x009d, 0x009e, 0x009f, 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6,
+ 0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 0x00b0,
+ 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba,
+ 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 0x00d7, 0x00f7, 0x02c7, 0x02d8, 0x02d9,
+ 0x02da, 0x02db, 0x02dc, 0x02dd, 0x0300, 0x0301, 0x0303, 0x0309, 0x0323, 0x0384,
+ 0x0385, 0x0387, 0x03b2, 0x03c6, 0x03d1, 0x03d2, 0x03d5, 0x03d6, 0x05b0, 0x05b1,
+ 0x05b2, 0x05b3, 0x05b4, 0x05b5, 0x05b6, 0x05b7, 0x05b8, 0x05b9, 0x05bb, 0x05bc,
+ 0x05bd, 0x05be, 0x05bf, 0x05c0, 0x05c1, 0x05c2, 0x05c3, 0x05f3, 0x05f4, 0x060c,
+ 0x061b, 0x061f, 0x0640, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, 0x0650, 0x0651,
+ 0x0652, 0x066a, 0x0e3f, 0x200c, 0x200d, 0x200e, 0x200f, 0x2013, 0x2014, 0x2015,
+ 0x2017, 0x2018, 0x2019, 0x201a, 0x201c, 0x201d, 0x201e, 0x2020, 0x2021, 0x2022,
+ 0x2026, 0x2030, 0x2032, 0x2033, 0x2039, 0x203a, 0x2044, 0x20a7, 0x20aa, 0x20ab,
+ 0x20ac, 0x2116, 0x2118, 0x2122, 0x2126, 0x2135, 0x2190, 0x2191, 0x2192, 0x2193,
+ 0x2194, 0x2195, 0x21b5, 0x21d0, 0x21d1, 0x21d2, 0x21d3, 0x21d4, 0x2200, 0x2202,
+ 0x2203, 0x2205, 0x2206, 0x2207, 0x2208, 0x2209, 0x220b, 0x220f, 0x2211, 0x2212,
+ 0x2215, 0x2217, 0x2219, 0x221a, 0x221d, 0x221e, 0x2220, 0x2227, 0x2228, 0x2229,
+ 0x222a, 0x222b, 0x2234, 0x223c, 0x2245, 0x2248, 0x2260, 0x2261, 0x2264, 0x2265,
+ 0x2282, 0x2283, 0x2284, 0x2286, 0x2287, 0x2295, 0x2297, 0x22a5, 0x22c5, 0x2310,
+ 0x2320, 0x2321, 0x2329, 0x232a, 0x2469, 0x2500, 0x2502, 0x250c, 0x2510, 0x2514,
+ 0x2518, 0x251c, 0x2524, 0x252c, 0x2534, 0x253c, 0x2550, 0x2551, 0x2552, 0x2553,
+ 0x2554, 0x2555, 0x2556, 0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x255c, 0x255d,
+ 0x255e, 0x255f, 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567,
+ 0x2568, 0x2569, 0x256a, 0x256b, 0x256c, 0x2580, 0x2584, 0x2588, 0x258c, 0x2590,
+ 0x2591, 0x2592, 0x2593, 0x25a0, 0x25b2, 0x25bc, 0x25c6, 0x25ca, 0x25cf, 0x25d7,
+ 0x2605, 0x260e, 0x261b, 0x261e, 0x2660, 0x2663, 0x2665, 0x2666, 0x2701, 0x2702,
+ 0x2703, 0x2704, 0x2706, 0x2707, 0x2708, 0x2709, 0x270c, 0x270d, 0x270e, 0x270f,
+ 0x2710, 0x2711, 0x2712, 0x2713, 0x2714, 0x2715, 0x2716, 0x2717, 0x2718, 0x2719,
+ 0x271a, 0x271b, 0x271c, 0x271d, 0x271e, 0x271f, 0x2720, 0x2721, 0x2722, 0x2723,
+ 0x2724, 0x2725, 0x2726, 0x2727, 0x2729, 0x272a, 0x272b, 0x272c, 0x272d, 0x272e,
+ 0x272f, 0x2730, 0x2731, 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, 0x2738,
+ 0x2739, 0x273a, 0x273b, 0x273c, 0x273d, 0x273e, 0x273f, 0x2740, 0x2741, 0x2742,
+ 0x2743, 0x2744, 0x2745, 0x2746, 0x2747, 0x2748, 0x2749, 0x274a, 0x274b, 0x274d,
+ 0x274f, 0x2750, 0x2751, 0x2752, 0x2756, 0x2758, 0x2759, 0x275a, 0x275b, 0x275c,
+ 0x275d, 0x275e, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x277f,
+ 0x2789, 0x2793, 0x2794, 0x2798, 0x2799, 0x279a, 0x279b, 0x279c, 0x279d, 0x279e,
+ 0x279f, 0x27a0, 0x27a1, 0x27a2, 0x27a3, 0x27a4, 0x27a5, 0x27a6, 0x27a7, 0x27a8,
+ 0x27a9, 0x27aa, 0x27ab, 0x27ac, 0x27ad, 0x27ae, 0x27af, 0x27b1, 0x27b2, 0x27b3,
+ 0x27b4, 0x27b5, 0x27b6, 0x27b7, 0x27b8, 0x27b9, 0x27ba, 0x27bb, 0x27bc, 0x27bd,
+ 0x27be, 0xf6d9, 0xf6da, 0xf6db, 0xf8d7, 0xf8d8, 0xf8d9, 0xf8da, 0xf8db, 0xf8dc,
+ 0xf8dd, 0xf8de, 0xf8df, 0xf8e0, 0xf8e1, 0xf8e2, 0xf8e3, 0xf8e4, 0xf8e5, 0xf8e6,
+ 0xf8e7, 0xf8e8, 0xf8e9, 0xf8ea, 0xf8eb, 0xf8ec, 0xf8ed, 0xf8ee, 0xf8ef, 0xf8f0,
+ 0xf8f1, 0xf8f2, 0xf8f3, 0xf8f4, 0xf8f5, 0xf8f6, 0xf8f7, 0xf8f8, 0xf8f9, 0xf8fa,
+ 0xf8fb, 0xf8fc, 0xf8fd, 0xf8fe, 0xfe7c, 0xfe7d,
+);
+?>
diff --git a/tests/bookmarksTest.php b/tests/bookmarksTest.php
index e229d5e..3bff35d 100644
--- a/tests/bookmarksTest.php
+++ b/tests/bookmarksTest.php
@@ -19,14 +19,14 @@ class BookmarksTest extends PHPUnit_Framework_TestCase
global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix, $TEMPLATES_DIR, $filetypes, $debugMode;
require_once('./header.inc.php');
- $this->us =& ServiceFactory::getServiceInstance('UserService');
- $this->bs =& ServiceFactory::getServiceInstance('BookmarkService');
+ $this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
+ $this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
$this->bs->deleteAll();
- $this->b2ts=& ServiceFactory::getServiceInstance('Bookmark2TagService');
+ $this->b2ts=SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
$this->b2ts->deleteAll();
- $this->tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+ $this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
$this->tts->deleteAll();
- $this->tsts =& ServiceFactory::getServiceInstance('TagStatService');
+ $this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
$this->tsts->deleteAll();
}
diff --git a/tests/commonDescriptionTest.php b/tests/commonDescriptionTest.php
index c8666c2..f73b646 100644
--- a/tests/commonDescriptionTest.php
+++ b/tests/commonDescriptionTest.php
@@ -21,16 +21,16 @@ class CommonDescriptionTest extends PHPUnit_Framework_TestCase
global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix;
require_once('./header.inc.php');
- $this->us =& ServiceFactory::getServiceInstance('UserService');
- $this->bs =& ServiceFactory::getServiceInstance('BookmarkService');
+ $this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
+ $this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
$this->bs->deleteAll();
- $this->b2ts =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+ $this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
$this->b2ts->deleteAll();
- $this->tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+ $this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
$this->tts->deleteAll();
- $this->tsts =& ServiceFactory::getServiceInstance('TagStatService');
+ $this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
$this->tsts->deleteAll();
- $this->cds =& ServiceFactory::getServiceInstance('CommonDescriptionService');
+ $this->cds =SemanticScuttle_Service_Factory::getServiceInstance('CommonDescription');
$this->cds->deleteAll();
}
diff --git a/tests/searchTest.php b/tests/searchTest.php
index 2e51717..1dce7dc 100644
--- a/tests/searchTest.php
+++ b/tests/searchTest.php
@@ -20,16 +20,16 @@ class SearchTest extends PHPUnit_Framework_TestCase
global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix;
require_once('./header.inc.php');
- $this->us =& ServiceFactory::getServiceInstance('UserService');
- $this->bs =& ServiceFactory::getServiceInstance('BookmarkService');
+ $this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
+ $this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
$this->bs->deleteAll();
- $this->b2ts =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+ $this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
$this->b2ts->deleteAll();
- $this->tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+ $this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
$this->tts->deleteAll();
- $this->tsts =& ServiceFactory::getServiceInstance('TagStatService');
+ $this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
$this->tsts->deleteAll();
- $this->shs =& ServiceFactory::getServiceInstance('SearchHistoryService');
+ $this->shs =SemanticScuttle_Service_Factory::getServiceInstance('SearchHistory');
$this->shs->deleteAll();
}
diff --git a/tests/tag2TagTest.php b/tests/tag2TagTest.php
index 8bb9ef3..ab3114c 100644
--- a/tests/tag2TagTest.php
+++ b/tests/tag2TagTest.php
@@ -19,14 +19,14 @@ class Tag2TagTest extends PHPUnit_Framework_TestCase
global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix;
require_once('./header.inc.php');
- $this->us =& ServiceFactory::getServiceInstance('UserService');
- $this->bs =& ServiceFactory::getServiceInstance('BookmarkService');
+ $this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
+ $this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
$this->bs->deleteAll();
- $this->b2ts =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+ $this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
$this->b2ts->deleteAll();
- $this->tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+ $this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
$this->tts->deleteAll();
- $this->tsts =& ServiceFactory::getServiceInstance('TagStatService');
+ $this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
$this->tsts->deleteAll();
}
diff --git a/tests/tagsCacheTest.php b/tests/tagsCacheTest.php
index 595afb9..7673565 100644
--- a/tests/tagsCacheTest.php
+++ b/tests/tagsCacheTest.php
@@ -19,16 +19,16 @@ class TagsCacheTest extends PHPUnit_Framework_TestCase
global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix, $TEMPLATES_DIR, $debugMode;
require_once('./header.inc.php');
- $this->us =& ServiceFactory::getServiceInstance('UserService');
- $this->bs =& ServiceFactory::getServiceInstance('BookmarkService');
+ $this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
+ $this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
$this->bs->deleteAll();
- $this->b2ts =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+ $this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
$this->b2ts->deleteAll();
- $this->tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+ $this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
$this->tts->deleteAll();
- $this->tsts =& ServiceFactory::getServiceInstance('TagStatService');
+ $this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
$this->tsts->deleteAll();
- $this->tcs =& ServiceFactory::getServiceInstance('TagCacheService');
+ $this->tcs =SemanticScuttle_Service_Factory::getServiceInstance('TagCache');
$this->tcs->deleteAll();
}
diff --git a/tests/tagsTest.php b/tests/tagsTest.php
index 49fec6f..d4957c9 100644
--- a/tests/tagsTest.php
+++ b/tests/tagsTest.php
@@ -16,16 +16,16 @@ class TagsTest extends PHPUnit_Framework_TestCase
global $dbhost, $dbuser, $dbpass, $dbname, $dbport, $dbpersist, $dbtype, $tableprefix;
require_once('./header.inc.php');
- $this->ts =& ServiceFactory::getServiceInstance('TagService');
+ $this->ts =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
$this->ts->deleteAll();
- $this->us =& ServiceFactory::getServiceInstance('UserService');
- $this->bs =& ServiceFactory::getServiceInstance('BookmarkService');
+ $this->us =SemanticScuttle_Service_Factory::getServiceInstance('User');
+ $this->bs =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
$this->bs->deleteAll();
- $this->b2ts =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+ $this->b2ts =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
$this->b2ts->deleteAll();
- $this->tts =& ServiceFactory::getServiceInstance('Tag2TagService');
+ $this->tts =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
$this->tts->deleteAll();
- $this->tsts =& ServiceFactory::getServiceInstance('TagStatService');
+ $this->tsts =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
$this->tsts->deleteAll();
}
diff --git a/www/about.php b/www/about.php
index 878e7e5..9644320 100644
--- a/www/about.php
+++ b/www/about.php
@@ -18,7 +18,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
$tplVars['pagetitle'] = T_('About');
$tplVars['subtitle'] = T_('About');
diff --git a/www/admin.php b/www/admin.php
index b57b568..37ebe4b 100644
--- a/www/admin.php
+++ b/www/admin.php
@@ -1,71 +1,71 @@
-isLoggedOn() ) {
- header('Location: '. createURL('login', ''));
- exit();
+$tplVars['msg'] = '';
+
+if ( !$userservice->isLoggedOn() ) {
+ header('Location: '. createURL('login', ''));
+ exit();
}
-
-if ( !$currentUser->isAdmin() ) {
- header('Location: '. createURL('bookmarks', $currentUser->getUsername()));
- exit();
-}
-
+
+if ( !$currentUser->isAdmin() ) {
+ header('Location: '. createURL('bookmarks', $currentUser->getUsername()));
+ exit();
+}
+
@list($url, $action, $user) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
-
+
if ( $action
&& (strpos($_SERVER['HTTP_REFERER'], ROOT.'admin') === 0) // Prevent CSRF attacks
-) {
- switch ( $action ) {
- case 'delete':
- if ( $user && ($userinfo = $userservice->getUserByUsername($user)) ) {
- $uId = $userinfo['uId'];
+) {
+ switch ( $action ) {
+ case 'delete':
+ if ( $user && ($userinfo = $userservice->getUserByUsername($user)) ) {
+ $uId = $userinfo['uId'];
$tagcacheservice->deleteByUser($uId);
- $tag2tagservice->removeLinkedTagsForUser($uId);
- $userservice->deleteUser($uId);
+ $tag2tagservice->removeLinkedTagsForUser($uId);
+ $userservice->deleteUser($uId);
$bookmark2tagservice->deleteTagsForUser($uId);
$commondescriptionservice->deleteDescriptionsForUser($uId);
$searchhistoryservice->deleteSearchHistoryForUser($uId);
- $tagstatservice->deleteTagStatForUser($uId);
- // XXX: don't delete bookmarks before tags, else tags can't be deleted !!!
- $bookmarkservice->deleteBookmarksForUser($uId);
-
- $tplVars['msg'] = sprintf(T_('%s and all his bookmarks and tags were deleted.'), $user);
+ $tagstatservice->deleteTagStatForUser($uId);
+ // XXX: don't delete bookmarks before tags, else tags can't be deleted !!!
+ $bookmarkservice->deleteBookmarksForUser($uId);
+
+ $tplVars['msg'] = sprintf(T_('%s and all his bookmarks and tags were deleted.'), $user);
}
break;
case 'checkUrl' :
@@ -74,21 +74,21 @@ if ( $action
if(!checkUrl($bookmark['bAddress'])) {
$tplVars['error'].= T_('Problem with ').$bookmark['bAddress'].' ('. $bookmark['username'] .')
';
}
- }
- break;
- default:
- // DO NOTHING
- }
-}
-
-$templatename = 'admin.tpl';
-$users =& $userservice->getObjectUsers();
-
-if ( !is_array($users) ) {
- $users = array();
-}
-
-$tplVars['users'] =& $users;
-
-$templateservice->loadTemplate($templatename, $tplVars);
+ }
+ break;
+ default:
+ // DO NOTHING
+ }
+}
+
+$templatename = 'admin.tpl';
+$users =& $userservice->getObjectUsers();
+
+if ( !is_array($users) ) {
+ $users = array();
+}
+
+$tplVars['users'] =& $users;
+
+$templateservice->loadTemplate($templatename, $tplVars);
?>
diff --git a/www/ajax/getadminlinkedtags.php b/www/ajax/getadminlinkedtags.php
index 75aae9a..89dd1e6 100644
--- a/www/ajax/getadminlinkedtags.php
+++ b/www/ajax/getadminlinkedtags.php
@@ -21,12 +21,12 @@
/* Return a json file with list of linked tags */
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
-$bookmarkservice =& ServiceFactory::getServiceInstance('TagService');
-$tagstatservice =& ServiceFactory::getServiceInstance('TagStatService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
+$tagstatservice =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
/* Managing all possible inputs */
isset($_GET['tag']) ? define('GET_TAG', $_GET['tag']): define('GET_TAG', '');
@@ -36,7 +36,7 @@ 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 =& ServiceFactory::getServiceInstance('Tag2TagService');
+ $tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
$output = '{ id:'.rand().', name:\''.$tag.'\'';
$linkedTags = $tag2tagservice->getAdminLinkedTags($tag, '>');
diff --git a/www/ajax/getadmintags.php b/www/ajax/getadmintags.php
index e3d8025..8345516 100644
--- a/www/ajax/getadmintags.php
+++ b/www/ajax/getadmintags.php
@@ -21,11 +21,11 @@ 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*/
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
-$bookmarkservice =& ServiceFactory::getServiceInstance('TagService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
?>
diff --git a/www/ajax/getcontacttags.php b/www/ajax/getcontacttags.php
index 9c25e1a..e508655 100644
--- a/www/ajax/getcontacttags.php
+++ b/www/ajax/getcontacttags.php
@@ -21,11 +21,11 @@ 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*/
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
-$bookmarkservice =& ServiceFactory::getServiceInstance('TagService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
?>
diff --git a/www/ajax/getlinkedtags.php b/www/ajax/getlinkedtags.php
index a34805b..2a93a3d 100644
--- a/www/ajax/getlinkedtags.php
+++ b/www/ajax/getlinkedtags.php
@@ -21,12 +21,12 @@
/* Return a json file with list of linked tags */
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
-$bookmarkservice =& ServiceFactory::getServiceInstance('TagService');
-$tagstatservice =& ServiceFactory::getServiceInstance('TagStatService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
+$tagstatservice =SemanticScuttle_Service_Factory::getServiceInstance('TagStat');
/* Managing all possible inputs */
isset($_GET['tag']) ? define('GET_TAG', $_GET['tag']): define('GET_TAG', '');
@@ -36,7 +36,7 @@ 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 =& ServiceFactory::getServiceInstance('Tag2TagService');
+ $tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
$output = '{ id:'.rand().', name:\''.$tag.'\'';
$linkedTags = $tag2tagservice->getLinkedTags($tag, '>', $uId);
diff --git a/www/ajax/gettags.php b/www/ajax/gettags.php
index 7b8b33a..b6b12c7 100644
--- a/www/ajax/gettags.php
+++ b/www/ajax/gettags.php
@@ -21,11 +21,11 @@ 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*/
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
-$bookmarkservice =& ServiceFactory::getServiceInstance('TagService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag');
?>
diff --git a/www/ajaxDelete.php b/www/ajaxDelete.php
index a1119ca..f605b3a 100644
--- a/www/ajaxDelete.php
+++ b/www/ajaxDelete.php
@@ -22,10 +22,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
header('Content-Type: text/xml; charset=UTF-8');
header('Last-Modified: '. gmdate("D, d M Y H:i:s") .' GMT');
header('Cache-Control: no-cache, must-revalidate');
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService');
+$bookmarkservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark');
/* Managing all possible inputs */
isset($_GET['id']) ? define('GET_ID', $_GET['id']): define('GET_ID', '');
diff --git a/www/ajaxGetTitle.php b/www/ajaxGetTitle.php
index fc895db..5d36b72 100644
--- a/www/ajaxGetTitle.php
+++ b/www/ajaxGetTitle.php
@@ -23,7 +23,7 @@ header('Content-Type: text/xml; charset=UTF-8');
header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
header("Cache-Control: no-cache, must-revalidate");
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Managing all possible inputs */
isset($_GET['url']) ? define('GET_URL', $_GET['url']): define('GET_URL', '');
diff --git a/www/ajaxIsAvailable.php b/www/ajaxIsAvailable.php
index ffd4379..139061c 100644
--- a/www/ajaxIsAvailable.php
+++ b/www/ajaxIsAvailable.php
@@ -23,7 +23,7 @@ header('Content-Type: text/xml; charset=UTF-8');
header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
header("Cache-Control: no-cache, must-revalidate");
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
//No specific services
diff --git a/www/alltags.php b/www/alltags.php
index 95e797a..0a88288 100644
--- a/www/alltags.php
+++ b/www/alltags.php
@@ -19,11 +19,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
diff --git a/www/api/export_csv.php b/www/api/export_csv.php
index 2389642..c696001 100644
--- a/www/api/export_csv.php
+++ b/www/api/export_csv.php
@@ -1,47 +1,47 @@
-getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag, NULL, getSortOrder());
-
+require_once('httpauth.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
+
+/* Service creation: only useful services are created */
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+
+// Check to see if a tag was specified.
+if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != ''))
+ $tag = trim($_REQUEST['tag']);
+else
+ $tag = NULL;
+
+// Get the posts relevant to the passed-in variables.
+$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag, NULL, getSortOrder());
+
header("Content-Type: application/csv-tab-delimited-table;charset=UTF-8");
-header("Content-disposition: filename=exportBookmarks.csv");
-
+header("Content-disposition: filename=exportBookmarks.csv");
+
//columns titles
echo 'url;title;tags;description';
-echo "\n";
-
-foreach($bookmarks['bookmarks'] as $row) {
- if (is_null($row['bDescription']) || (trim($row['bDescription']) == ''))
- $description = '';
- else
- $description = filter(str_replace(array("\r\n", "\n", "\r"),"", $row['bDescription']), 'xml');
-
- $taglist = '';
- if (count($row['tags']) > 0) {
- foreach($row['tags'] as $tag)
- $taglist .= convertTag($tag) .',';
- $taglist = substr($taglist, 0, -1);
- } else {
- $taglist = 'system:unfiled';
- }
-
+echo "\n";
+
+foreach($bookmarks['bookmarks'] as $row) {
+ if (is_null($row['bDescription']) || (trim($row['bDescription']) == ''))
+ $description = '';
+ else
+ $description = filter(str_replace(array("\r\n", "\n", "\r"),"", $row['bDescription']), 'xml');
+
+ $taglist = '';
+ if (count($row['tags']) > 0) {
+ foreach($row['tags'] as $tag)
+ $taglist .= convertTag($tag) .',';
+ $taglist = substr($taglist, 0, -1);
+ } else {
+ $taglist = 'system:unfiled';
+ }
+
echo '"'.filter($row['bAddress'], 'xml') .'";"'. filter($row['bTitle'], 'xml') .'";"'. filter($taglist, 'xml') .'";"'. $description .'"';
- echo "\n";
-}
-
-
-?>
+ echo "\n";
+}
+
+
+?>
diff --git a/www/api/export_gcs.php b/www/api/export_gcs.php
index 6f1f4c2..1eed961 100644
--- a/www/api/export_gcs.php
+++ b/www/api/export_gcs.php
@@ -5,7 +5,7 @@
// Force HTTP authentication first!
//require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
if($GLOBALS['enableGoogleCustomSearch'] == false) {
echo "Google Custom Search disabled. You can enable it into the config.inc.php file.";
@@ -13,7 +13,7 @@ if($GLOBALS['enableGoogleCustomSearch'] == false) {
}
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
/*
diff --git a/www/api/export_html.php b/www/api/export_html.php
index 55553c2..922901a 100644
--- a/www/api/export_html.php
+++ b/www/api/export_html.php
@@ -1,54 +1,54 @@
-getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag, NULL, getSortOrder());
-
-
-// Set up the XML file and output all the posts.
+require_once('httpauth.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
+
+/* Service creation: only useful services are created */
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+
+// Check to see if a tag was specified.
+if (isset($_REQUEST['tag']) && (trim($_REQUEST['tag']) != ''))
+ $tag = trim($_REQUEST['tag']);
+else
+ $tag = NULL;
+
+// Get the posts relevant to the passed-in variables.
+$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag, NULL, getSortOrder());
+
+
+// Set up the XML file and output all the posts.
echo ''."\r\n";
-echo '';
-echo ''."\r\n";
-echo 'Bookmarks'."\r\n";
-echo 'Bookmarks for '. htmlspecialchars($currentUser->getUsername()) .''. (is_null($tag) ? '' : ' tag="'. htmlspecialchars($tag) .'"') ." from " . $sitename ."
\r\n";
-echo ''."\r\n";
-
-
-
-foreach($bookmarks['bookmarks'] as $row) {
- if (is_null($row['bDescription']) || (trim($row['bDescription']) == ''))
- $description = '';
- else
- $description = 'description="'. filter($row['bDescription'], 'xml') .'" ';
-
- $taglist = '';
- if (count($row['tags']) > 0) {
- foreach($row['tags'] as $tag)
- $taglist .= convertTag($tag) .',';
- $taglist = substr($taglist, 0, -1);
- } else {
- $taglist = 'system:unfiled';
- }
-
- echo "\t
- " . filter($row['bTitle'], 'xml') ."\r\n";
-}
-
-
-echo '
';
-?>
+echo '';
+echo ''."\r\n";
+echo '
Bookmarks'."\r\n";
+echo 'Bookmarks for '. htmlspecialchars($currentUser->getUsername()) .''. (is_null($tag) ? '' : ' tag="'. htmlspecialchars($tag) .'"') ." from " . $sitename ."
\r\n";
+echo ''."\r\n";
+
+
+
+foreach($bookmarks['bookmarks'] as $row) {
+ if (is_null($row['bDescription']) || (trim($row['bDescription']) == ''))
+ $description = '';
+ else
+ $description = 'description="'. filter($row['bDescription'], 'xml') .'" ';
+
+ $taglist = '';
+ if (count($row['tags']) > 0) {
+ foreach($row['tags'] as $tag)
+ $taglist .= convertTag($tag) .',';
+ $taglist = substr($taglist, 0, -1);
+ } else {
+ $taglist = 'system:unfiled';
+ }
+
+ echo "\t
- " . filter($row['bTitle'], 'xml') ."\r\n";
+}
+
+
+echo '
';
+?>
diff --git a/www/api/export_sioc.php b/www/api/export_sioc.php
index 746d0ea..90713e7 100644
--- a/www/api/export_sioc.php
+++ b/www/api/export_sioc.php
@@ -1,12 +1,12 @@
"; ?>
diff --git a/www/api/httpauth.inc.php b/www/api/httpauth.inc.php
index 5dd7444..23e3a5e 100644
--- a/www/api/httpauth.inc.php
+++ b/www/api/httpauth.inc.php
@@ -1,5 +1,5 @@
-
-
-
-
- UTF-8
-
- Jan Seifert "jan.seifert@uid.com"
- semanticscuttle bookmark web
- data:image/gif;base64,R0lGODlhEAAQAMZ9ANaPE9mREteTHtSXLdmXIdiXJtaYKdiYJ9iYKNeaLtKdP9CdRd2dLNWfQuWiFMqjX9+hNMykXt6jPOCkPM2oaM+paeCpQuGoR+OqOeKpR+GqS9+uWeSwU+ayS+uzOeWxVeWxWOSyWOu0POazXOS0YOm8Zee8cOy+WOm9a/jBLum+bPbCNurAbe7BYuvBc/LDV/LEV+zEdv/KKf/KLP/KLf/LLuzHe//MNP/NN/nMTv/OOf/OPP/OP/jNW//PPvnOVv/QQv7QRv/QRP/RR/HOhP/SSf/STPnRav/TT//TUPfScf/UUvzUXP/UVP/VV/bTfv/WWf/WW//WXP7XYf/XX//XYP/YZPPVmf/ZZv/ZZ/vYeP/aaf/aa//abP/abf/abvvaef/bb//bcfzbfP/ccv/cc//cdP/cdf/dd//deP/def3egP/ee//efP/efv/ffv/ggf/gg//ghP/ghfrfmv/hif/ii//ijP/jkfzjm//kkv7klv/lmP///////////yH5BAEKAH8ALAAAAAAQABAAAAergH+Cg38hhIeHIFcmiIgDLnt0Go2EE1pyd0QbjQMQDC9bZGprKBcjA4IfAQMrQUhOVFlhaGNPMRl/Aw4yMzc7QkZNUlZdZmASqAJKcW1WPDpARUtQUx0RgyR5fHpzUTU4PkMiqIMVNnh2c25lSTQpAIgqdXJvaWReXz0JiCxwbWhiuGCp8uMAohJszhw5AYMJlBwFEHFoYQHBAwUEMHgwgKjBA0QLKFAaKSgQADs=
-
-
+
+
+
+
+ UTF-8
+
+ Jan Seifert "jan.seifert@uid.com"
+ semanticscuttle bookmark web
+ data:image/gif;base64,R0lGODlhEAAQAMZ9ANaPE9mREteTHtSXLdmXIdiXJtaYKdiYJ9iYKNeaLtKdP9CdRd2dLNWfQuWiFMqjX9+hNMykXt6jPOCkPM2oaM+paeCpQuGoR+OqOeKpR+GqS9+uWeSwU+ayS+uzOeWxVeWxWOSyWOu0POazXOS0YOm8Zee8cOy+WOm9a/jBLum+bPbCNurAbe7BYuvBc/LDV/LEV+zEdv/KKf/KLP/KLf/LLuzHe//MNP/NN/nMTv/OOf/OPP/OP/jNW//PPvnOVv/QQv7QRv/QRP/RR/HOhP/SSf/STPnRav/TT//TUPfScf/UUvzUXP/UVP/VV/bTfv/WWf/WW//WXP7XYf/XX//XYP/YZPPVmf/ZZv/ZZ/vYeP/aaf/aa//abP/abf/abvvaef/bb//bcfzbfP/ccv/cc//cdP/cdf/dd//deP/def3egP/ee//efP/efv/ffv/ggf/gg//ghP/ghfrfmv/hif/ii//ijP/jkfzjm//kkv7klv/lmP///////////yH5BAEKAH8ALAAAAAAQABAAAAergH+Cg38hhIeHIFcmiIgDLnt0Go2EE1pyd0QbjQMQDC9bZGprKBcjA4IfAQMrQUhOVFlhaGNPMRl/Aw4yMzc7QkZNUlZdZmASqAJKcW1WPDpARUtQUx0RgyR5fHpzUTU4PkMiqIMVNnh2c25lSTQpAIgqdXJvaWReXz0JiCxwbWhiuGCp8uMAohJszhw5AYMJlBwFEHFoYQHBAwUEMHgwgKjBA0QLKFAaKSgQADs=
+
+
diff --git a/www/api/posts_add.php b/www/api/posts_add.php
index ba3e02c..f396b5e 100644
--- a/www/api/posts_add.php
+++ b/www/api/posts_add.php
@@ -11,10 +11,10 @@
// Force HTTP authentication
require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
// Get all the bookmark's passed-in information
if (isset($_REQUEST['url']) && (trim($_REQUEST['url']) != ''))
diff --git a/www/api/posts_all.php b/www/api/posts_all.php
index 4ecbd7e..4c280c7 100644
--- a/www/api/posts_all.php
+++ b/www/api/posts_all.php
@@ -6,10 +6,10 @@
// Force HTTP authentication first!
require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
// Check to see if a tag was specified.
diff --git a/www/api/posts_dates.php b/www/api/posts_dates.php
index d4962ff..5f002d1 100644
--- a/www/api/posts_dates.php
+++ b/www/api/posts_dates.php
@@ -4,10 +4,10 @@
// Force HTTP authentication first!
require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
// Check to see if a tag was specified.
diff --git a/www/api/posts_delete.php b/www/api/posts_delete.php
index d24ba59..7ad332f 100644
--- a/www/api/posts_delete.php
+++ b/www/api/posts_delete.php
@@ -8,10 +8,10 @@
// Force HTTP authentication first!
require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
// Note that del.icio.us only errors out if no URL was passed in; there's no error on attempting
diff --git a/www/api/posts_get.php b/www/api/posts_get.php
index 34d192e..a6a6102 100644
--- a/www/api/posts_get.php
+++ b/www/api/posts_get.php
@@ -11,10 +11,10 @@
// Force HTTP authentication first!
require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
// Check to see if a tag was specified.
diff --git a/www/api/posts_public.php b/www/api/posts_public.php
index f7aa955..2ade45e 100644
--- a/www/api/posts_public.php
+++ b/www/api/posts_public.php
@@ -6,10 +6,10 @@
// Force HTTP authentication first!
//require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
// Check to see if a tag was specified.
diff --git a/www/api/posts_recent.php b/www/api/posts_recent.php
index daa9d39..e8bc644 100644
--- a/www/api/posts_recent.php
+++ b/www/api/posts_recent.php
@@ -8,10 +8,10 @@ $countMax = 100;
// Force HTTP authentication first!
require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
// Check to see if a tag was specified.
diff --git a/www/api/posts_update.php b/www/api/posts_update.php
index 6ea50e2..18e5676 100644
--- a/www/api/posts_update.php
+++ b/www/api/posts_update.php
@@ -6,10 +6,10 @@
// Force HTTP authentication first!
require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
// Get the posts relevant to the passed-in variables.
diff --git a/www/api/tags_get.php b/www/api/tags_get.php
index cee36ee..043b629 100644
--- a/www/api/tags_get.php
+++ b/www/api/tags_get.php
@@ -6,10 +6,10 @@
// Force HTTP authentication first!
require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
// Get the tags relevant to the passed-in variables.
diff --git a/www/api/tags_rename.php b/www/api/tags_rename.php
index dd16339..bf78b39 100644
--- a/www/api/tags_rename.php
+++ b/www/api/tags_rename.php
@@ -6,10 +6,10 @@
// Force HTTP authentication first!
require_once('httpauth.inc.php');
-require_once('../header.inc.php');
+require_once '../../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
// Get the tag info.
if (isset($_REQUEST['old']) && (trim($_REQUEST['old']) != ''))
diff --git a/www/bookmarkcommondescriptionedit.php b/www/bookmarkcommondescriptionedit.php
index ac1890e..8a46313 100644
--- a/www/bookmarkcommondescriptionedit.php
+++ b/www/bookmarkcommondescriptionedit.php
@@ -19,11 +19,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService');
-$cdservice = & ServiceFactory :: getServiceInstance('CommonDescriptionService');
+$bookmarkservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark');
+$cdservice = SemanticScuttle_Service_Factory :: getServiceInstance('CommonDescription');
/* Managing all possible inputs */
isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
diff --git a/www/bookmarks.php b/www/bookmarks.php
index 91d0999..32bdba0 100644
--- a/www/bookmarks.php
+++ b/www/bookmarks.php
@@ -19,11 +19,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
/* Managing all possible inputs */
isset($_GET['action']) ? define('GET_ACTION', $_GET['action']): define('GET_ACTION', '');
diff --git a/www/edit.php b/www/edit.php
index 005493d..6f30d3c 100644
--- a/www/edit.php
+++ b/www/edit.php
@@ -20,10 +20,10 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService');
+$bookmarkservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark');
/* Managing all possible inputs */
isset($_POST['submitted']) ? define('POST_SUBMITTED', $_POST['submitted']): define('POST_SUBMITTED', '');
diff --git a/www/gsearch/context.php b/www/gsearch/context.php
index e4599ad..80c02cb 100644
--- a/www/gsearch/context.php
+++ b/www/gsearch/context.php
@@ -1,5 +1,5 @@
isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
function startElement($parser, $name, $attrs) {
global $depth, $status, $tplVars, $userservice;
- $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+ $bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
if ($name == 'POST') {
while(list($attrTitle, $attrVal) = each($attrs)) {
diff --git a/www/importNetscape.php b/www/importNetscape.php
index 4580429..ad5b414 100644
--- a/www/importNetscape.php
+++ b/www/importNetscape.php
@@ -19,10 +19,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
/* Managing all possible inputs */
diff --git a/www/importStructure.php b/www/importStructure.php
index 89780f5..c5f5fa0 100644
--- a/www/importStructure.php
+++ b/www/importStructure.php
@@ -19,10 +19,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$tag2tagservice =& ServiceFactory::getServiceInstance('Tag2TagService');
+$tag2tagservice =SemanticScuttle_Service_Factory::getServiceInstance('Tag2Tag');
/* Managing current logged user */
$currentUser = $userservice->getCurrentObjectUser();
diff --git a/www/index.php b/www/index.php
index df55b05..28bf678 100644
--- a/www/index.php
+++ b/www/index.php
@@ -19,11 +19,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
/* Managing all possible inputs */
isset($_GET['action']) ? define('GET_ACTION', $_GET['action']): define('GET_ACTION', '');
diff --git a/www/jsScuttle.php b/www/jsScuttle.php
index 0e8b96a..474d45f 100644
--- a/www/jsScuttle.php
+++ b/www/jsScuttle.php
@@ -1,6 +1,6 @@
diff --git a/www/login.php b/www/login.php
index 0fa820c..18d055f 100644
--- a/www/login.php
+++ b/www/login.php
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
diff --git a/www/password.php b/www/password.php
index ba7be8d..3a822c4 100644
--- a/www/password.php
+++ b/www/password.php
@@ -18,7 +18,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
// No specific services
diff --git a/www/populartags.php b/www/populartags.php
index 6429bf7..2f501da 100644
--- a/www/populartags.php
+++ b/www/populartags.php
@@ -19,11 +19,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$b2tservice =& ServiceFactory::getServiceInstance('Bookmark2TagService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
+$b2tservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark2Tag');
+$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
@list($url, $user) = isset($_SERVER['PATH_INFO']) ? explode('/', $_SERVER['PATH_INFO']) : NULL;
diff --git a/www/profile.php b/www/profile.php
index 2d00101..0c2776e 100644
--- a/www/profile.php
+++ b/www/profile.php
@@ -19,7 +19,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
// No specific services
diff --git a/www/register.php b/www/register.php
index 3b64873..6a0e1be 100644
--- a/www/register.php
+++ b/www/register.php
@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
// No specific services
diff --git a/www/rss.php b/www/rss.php
index 3a2b54a..672f4cd 100644
--- a/www/rss.php
+++ b/www/rss.php
@@ -19,11 +19,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
header('Content-Type: application/xml');
diff --git a/www/search.php b/www/search.php
index ce47236..4a15053 100644
--- a/www/search.php
+++ b/www/search.php
@@ -19,7 +19,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Managing all possible inputs */
isset($_POST['terms']) ? define('POST_TERMS', $_POST['terms']): define('POST_TERMS', '');
@@ -36,8 +36,8 @@ if (POST_TERMS != '') {
// GET
} else {
/* Service creation: only useful services are created */
- $bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
- $searchhistoryservice =& ServiceFactory::getServiceInstance('SearchHistoryService');
+ $bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+ $searchhistoryservice =SemanticScuttle_Service_Factory::getServiceInstance('SearchHistory');
/* Managing current logged user */
$currentUserId = $userservice->getCurrentUserId();
diff --git a/www/tag2tagadd.php b/www/tag2tagadd.php
index 15ee6af..cc1ecb4 100644
--- a/www/tag2tagadd.php
+++ b/www/tag2tagadd.php
@@ -19,10 +19,10 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2TagService');
+$tag2tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Tag2Tag');
/* Managing all possible inputs */
isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
diff --git a/www/tag2tagdelete.php b/www/tag2tagdelete.php
index 78016e7..dd71a87 100644
--- a/www/tag2tagdelete.php
+++ b/www/tag2tagdelete.php
@@ -19,10 +19,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2TagService');
+$tag2tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Tag2Tag');
/* Managing all possible inputs */
isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
diff --git a/www/tag2tagedit.php b/www/tag2tagedit.php
index c707253..750e550 100644
--- a/www/tag2tagedit.php
+++ b/www/tag2tagedit.php
@@ -19,10 +19,10 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2TagService');
+$tag2tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Tag2Tag');
/* Managing all possible inputs */
diff --git a/www/tagcommondescriptionedit.php b/www/tagcommondescriptionedit.php
index aba7c43..84ca5e3 100644
--- a/www/tagcommondescriptionedit.php
+++ b/www/tagcommondescriptionedit.php
@@ -19,11 +19,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService');
-$cdservice = & ServiceFactory :: getServiceInstance('CommonDescriptionService');
+$b2tservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tag');
+$cdservice = SemanticScuttle_Service_Factory :: getServiceInstance('CommonDescription');
/* Managing all possible inputs */
isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
diff --git a/www/tagdelete.php b/www/tagdelete.php
index 61d2546..9ba18fd 100644
--- a/www/tagdelete.php
+++ b/www/tagdelete.php
@@ -19,10 +19,10 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService');
+$b2tservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tag');
/* Managing all possible inputs */
diff --git a/www/tagedit.php b/www/tagedit.php
index e7b46a1..5a3fbb4 100644
--- a/www/tagedit.php
+++ b/www/tagedit.php
@@ -19,10 +19,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$tagservice = & ServiceFactory :: getServiceInstance('TagService');
+$tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Tag');
/* Managing all possible inputs */
isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
diff --git a/www/tagrename.php b/www/tagrename.php
index bead5e7..735e2e8 100644
--- a/www/tagrename.php
+++ b/www/tagrename.php
@@ -19,12 +19,12 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$b2tservice = & ServiceFactory :: getServiceInstance('Bookmark2TagService');
-$tagservice = & ServiceFactory :: getServiceInstance('TagService');
-$tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2tagService');
+$b2tservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tag');
+$tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Tag');
+$tag2tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Tag2Tag');
/* Managing all possible inputs */
isset($_POST['confirm']) ? define('POST_CONFIRM', $_POST['confirm']): define('POST_CONFIRM', '');
diff --git a/www/tags.php b/www/tags.php
index 376d9fe..52bf289 100644
--- a/www/tags.php
+++ b/www/tags.php
@@ -19,11 +19,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
/* Managing all possible inputs */
isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0);
diff --git a/www/upgrade.php b/www/upgrade.php
index a2fb606..39b82db 100644
--- a/www/upgrade.php
+++ b/www/upgrade.php
@@ -34,8 +34,8 @@ exit();
/////////////////
// This part below will be executed once you comment the two lines above
/////////////////
-require_once('header.inc.php');
-$tagstatservice = & ServiceFactory :: getServiceInstance('TagStatService');
+require_once '../src/SemanticScuttle/header.php';
+$tagstatservice = SemanticScuttle_Service_Factory :: getServiceInstance('TagStat');
?>
Upgrade
diff --git a/www/users.php b/www/users.php
index e2689e6..111e512 100644
--- a/www/users.php
+++ b/www/users.php
@@ -19,11 +19,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
/* Managing current logged user */
$currentUser = $userservice->getCurrentObjectUser();
diff --git a/www/watch.php b/www/watch.php
index 01a6bcc..64dd316 100644
--- a/www/watch.php
+++ b/www/watch.php
@@ -19,7 +19,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
//No specific services
diff --git a/www/watchlist.php b/www/watchlist.php
index 8780395..289a478 100644
--- a/www/watchlist.php
+++ b/www/watchlist.php
@@ -18,11 +18,11 @@ 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
***************************************************************************/
-require_once('header.inc.php');
+require_once '../src/SemanticScuttle/header.php';
/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-$cacheservice =& ServiceFactory::getServiceInstance('CacheService');
+$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark');
+$cacheservice =SemanticScuttle_Service_Factory::getServiceInstance('Cache');
/* Managing all possible inputs */
isset($_GET['page']) ? define('GET_PAGE', $_GET['page']): define('GET_PAGE', 0);
--
cgit v1.2.3-54-g00ecf