diff options
author | cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f> | 2009-10-03 21:52:30 +0000 |
---|---|---|
committer | cweiske <cweiske@b3834d28-1941-0410-a4f8-b48e95affb8f> | 2009-10-03 21:52:30 +0000 |
commit | d5f09b7e4d802cdc2d5f3f876c48ea918c961488 (patch) | |
tree | aa1eb37219c17bef03b1515e5074b4743f89a9a3 /www | |
parent | b7345f833dea849e94f2ce23fdbe6ab58ba98be3 (diff) | |
download | semanticscuttle-d5f09b7e4d802cdc2d5f3f876c48ea918c961488.tar.gz semanticscuttle-d5f09b7e4d802cdc2d5f3f876c48ea918c961488.tar.bz2 |
make the application work again
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@388 b3834d28-1941-0410-a4f8-b48e95affb8f
Diffstat (limited to 'www')
57 files changed, 301 insertions, 301 deletions
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 @@ -<?php
-/***************************************************************************
- Copyright (C) 2007 - 2008 SemanticScuttle project (fork from Scuttle)
- 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
- ***************************************************************************/
-
-require_once('header.inc.php');
+<?php +/*************************************************************************** + Copyright (C) 2007 - 2008 SemanticScuttle project (fork from Scuttle) + http://sourceforge.net/projects/semanticscuttle/ -/* Service creation: only useful services are created */
-$bookmark2tagservice = & ServiceFactory :: getServiceInstance('Bookmark2Tagservice');
-$bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService'); -$tag2tagservice = & ServiceFactory :: getServiceInstance('Tag2TagService'); -$tagcacheservice = & ServiceFactory :: getServiceInstance('TagCacheService'); -$commondescriptionservice = & ServiceFactory :: getServiceInstance('CommonDescriptionService'); -$searchhistoryservice = & ServiceFactory :: getServiceInstance('SearchHistoryService'); -$tagstatservice = & ServiceFactory :: getServiceInstance('TagStatService');
-
-// Header variables
-$tplVars['subtitle'] = T_('Manage users');
+ 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 + ***************************************************************************/ + +require_once '../src/SemanticScuttle/header.php'; + +/* Service creation: only useful services are created */ +$bookmark2tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark2Tagservice'); +$bookmarkservice = SemanticScuttle_Service_Factory :: getServiceInstance('Bookmark'); +$tag2tagservice = SemanticScuttle_Service_Factory :: getServiceInstance('Tag2Tag'); +$tagcacheservice = SemanticScuttle_Service_Factory :: getServiceInstance('TagCache'); +$commondescriptionservice = SemanticScuttle_Service_Factory :: getServiceInstance('CommonDescription'); +$searchhistoryservice = SemanticScuttle_Service_Factory :: getServiceInstance('SearchHistory'); +$tagstatservice = SemanticScuttle_Service_Factory :: getServiceInstance('TagStat'); + +// Header variables +$tplVars['subtitle'] = T_('Manage users'); $tplVars['loadjs'] = true; $tplVars['sidebar_blocks'] = array('users' ); $tplVars['error'] = ''; -$tplVars['msg'] = '';
-
-if ( !$userservice->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'] .')<br/>'; } - }
- 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 @@ -<?php
-// Export in CSV format in order to allow the import into a spreadsheet tool like Excel
-
+<?php +// Export in CSV format in order to allow the import into a spreadsheet tool like Excel + // Force HTTP authentication first! -require_once('httpauth.inc.php');
-require_once('../header.inc.php');
- -/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-
-// 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());
-
+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 @@ -<?php
-// Implements the del.icio.us API request for all a user's posts, optionally filtered by tag.
-
-// del.icio.us behavior:
-// - doesn't include the filtered tag as an attribute on the root element (we do)
-
+<?php +// Implements the del.icio.us API request for all a user's posts, optionally filtered by tag. + +// del.icio.us behavior: +// - doesn't include the filtered tag as an attribute on the root element (we do) + // Force HTTP authentication first! -require_once('httpauth.inc.php');
-require_once('../header.inc.php');
- -/* Service creation: only useful services are created */
-$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
-
-// 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.
+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 '<!DOCTYPE NETSCAPE-Bookmark-file-1>'."\r\n"; -echo '<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">';
-echo '<!-- This is an automatically generated file. -->'."\r\n";
-echo '<TITLE>Bookmarks</TITLE>'."\r\n";
-echo '<H1 LAST_MODIFIED="'. date('U') .'">Bookmarks for '. htmlspecialchars($currentUser->getUsername()) .''. (is_null($tag) ? '' : ' tag="'. htmlspecialchars($tag) .'"') ." from " . $sitename ."</H1>\r\n";
-echo '<DL><p>'."\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<dt><a href=\"". filter($row['bAddress'], 'xml') .'" '. $description .' hash="'. md5($row['bAddress']) .'" tags="'. filter($taglist, 'xml') .'" ADD_DATE="'. date('U', strtotime($row['bDatetime'])) ."\" >" . filter($row['bTitle'], 'xml') ."</a>\r\n";
-}
-
-
-echo '</DL><p>';
-?>
+echo '<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">'; +echo '<!-- This is an automatically generated file. -->'."\r\n"; +echo '<TITLE>Bookmarks</TITLE>'."\r\n"; +echo '<H1 LAST_MODIFIED="'. date('U') .'">Bookmarks for '. htmlspecialchars($currentUser->getUsername()) .''. (is_null($tag) ? '' : ' tag="'. htmlspecialchars($tag) .'"') ." from " . $sitename ."</H1>\r\n"; +echo '<DL><p>'."\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<dt><a href=\"". filter($row['bAddress'], 'xml') .'" '. $description .' hash="'. md5($row['bAddress']) .'" tags="'. filter($taglist, 'xml') .'" ADD_DATE="'. date('U', strtotime($row['bDatetime'])) ."\" >" . filter($row['bTitle'], 'xml') ."</a>\r\n"; +} + + +echo '</DL><p>'; +?> 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 @@ <?php -/* Export data with semantic format (SIOC: http://sioc-project.org/, FOAF, SKOS, Annotea Ontology) */
-
-require_once('../header.inc.php'); -header('Content-Type: text/xml; charset=utf-8'); //we change headers html defined in headers.inc.php
+/* Export data with semantic format (SIOC: http://sioc-project.org/, FOAF, SKOS, Annotea Ontology) */ -/* Service creation: only useful services are created */
-$userservice =& ServiceFactory::getServiceInstance('UserService'); -$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService'); +require_once '../../src/SemanticScuttle/header.php'; +header('Content-Type: text/xml; charset=utf-8'); //we change headers html defined in headers.inc.php + +/* Service creation: only useful services are created */ +$userservice =SemanticScuttle_Service_Factory::getServiceInstance('User'); +$bookmarkservice =SemanticScuttle_Service_Factory::getServiceInstance('Bookmark'); ?> <?php echo "<?xml version=\"1.0\" encoding=\"utf-8\"\n?>"; ?> 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 @@ <?php -require_once('../header.inc.php'); +require_once '../../src/SemanticScuttle/header.php'; // Provides HTTP Basic authentication of a user, and sets two variables, sId and username, // with the user's info. diff --git a/www/api/opensearch.php b/www/api/opensearch.php index a6f79f8..4226957 100644 --- a/www/api/opensearch.php +++ b/www/api/opensearch.php @@ -1,18 +1,18 @@ <?php -require_once('../header.inc.php'); +require_once '../../src/SemanticScuttle/header.php'; header("Content-type: text/xml"); ?> -<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"
- xmlns:moz="http://www.mozilla.org/2006/browser/search/">
- <ShortName><?php echo $GLOBALS['sitename']?></ShortName>
- <LongName></LongName>
- <Description><?php echo $GLOBALS['welcomeMessage']?></Description>
- <InputEncoding>UTF-8</InputEncoding>
- <Contact><?php echo $GLOBALS['adminemail']?></Contact>
- <Developer>Jan Seifert "jan.seifert@uid.com"</Developer>
- <Tags>semanticscuttle bookmark web</Tags>
- <Image width="16" height="16">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=</Image>
- <Url type="text/html" template="<?php echo $GLOBALS['root']?>search.php/all/{searchTerms}"/>
- <moz:SearchForm><?php echo $GLOBALS['root']?></moz:SearchForm>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" + xmlns:moz="http://www.mozilla.org/2006/browser/search/"> + <ShortName><?php echo $GLOBALS['sitename']?></ShortName> + <LongName></LongName> + <Description><?php echo $GLOBALS['welcomeMessage']?></Description> + <InputEncoding>UTF-8</InputEncoding> + <Contact><?php echo $GLOBALS['adminemail']?></Contact> + <Developer>Jan Seifert "jan.seifert@uid.com"</Developer> + <Tags>semanticscuttle bookmark web</Tags> + <Image width="16" height="16">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=</Image> + <Url type="text/html" template="<?php echo $GLOBALS['root']?>search.php/all/{searchTerms}"/> + <moz:SearchForm><?php echo $GLOBALS['root']?></moz:SearchForm> </OpenSearchDescription> 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 @@ <?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."; diff --git a/www/gsearch/index.php b/www/gsearch/index.php index 47839f4..aabc56a 100644 --- a/www/gsearch/index.php +++ b/www/gsearch/index.php @@ -1,4 +1,4 @@ -<?php require_once('../header.inc.php'); +<?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."; diff --git a/www/history.php b/www/history.php index b676515..a7c2024 100644 --- a/www/history.php +++ b/www/history.php @@ -19,11 +19,11 @@ 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); diff --git a/www/import.php b/www/import.php index d9ea009..8f6e386 100644 --- a/www/import.php +++ b/www/import.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 @@ -67,7 +67,7 @@ if ($userservice->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 @@ <?php header('Content-Type: text/javascript'); -require_once('header.inc.php'); +require_once '../src/SemanticScuttle/header.php'; require_once('functions.inc.php'); $player_root = ROOT .'includes/player/'; ?> 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'); ?> <h1>Upgrade</h1> 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); |