yohan/SemanticScuttle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove php4-style object reference passing #2

Browse Source
This commit is contained in:
Christian Weiske 2013-03-20 20:00:25 +01:00
parent fc4c79df8a
commit 85e2ccd942
23 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/templates/default/dynamictags.inc.php
View File

@ -25,13 +25,13 @@ $b2tservice = SemanticScuttle_Service_Factory :: get('Bookmark2Tag');
$logged_on_userid = $userservice->getCurrentUserId(); $logged_on_userid = $userservice->getCurrentUserId();
//tags from current user //tags from current user
$userPopularTags =& $b2tservice->getPopularTags($logged_on_userid, 25, $logged_on_userid); $userPopularTags = $b2tservice->getPopularTags($logged_on_userid, 25, $logged_on_userid);
$userPopularTagsCloud =& $b2tservice->tagCloud($userPopularTags, 5, 90, 175); $userPopularTagsCloud = $b2tservice->tagCloud($userPopularTags, 5, 90, 175);
$userPopularTagsCount = count($userPopularTags); $userPopularTagsCount = count($userPopularTags);
//tags from all users //tags from all users
$allPopularTags =& $b2tservice->getPopularTags(null, 5, $logged_on_userid); $allPopularTags = $b2tservice->getPopularTags(null, 5, $logged_on_userid);
$allPopularTagsCloud =& $b2tservice->tagCloud($allPopularTags, 5, 90, 175); $allPopularTagsCloud = $b2tservice->tagCloud($allPopularTags, 5, 90, 175);
$allPopularTagsCount = count($allPopularTags); $allPopularTagsCount = count($allPopularTags);

4
data/templates/default/sidebar.block.common.php
View File

@ -1,7 +1,7 @@
<?php <?php
$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag'); $b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
$commonTags =& $b2tservice->getRelatedTagsByHash($hash); $commonTags = $b2tservice->getRelatedTagsByHash($hash);
$commonTags =& $b2tservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc'); $commonTags = $b2tservice->tagCloud($commonTags, 5, 90, 225, 'alphabet_asc');
if ($commonTags && count($commonTags) > 0) { if ($commonTags && count($commonTags) > 0) {
?> ?>

4
data/templates/default/sidebar.block.popular.php
View File

@ -14,8 +14,8 @@ $logged_on_userid = $userservice->getCurrentUserId();
if ($logged_on_userid === false) { if ($logged_on_userid === false) {
$logged_on_userid = NULL; $logged_on_userid = NULL;
} }
$popularTags =& $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid); $popularTags = $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid);
$popularTags =& $b2tservice->tagCloud($popularTags, 5, 90, 225, 'alphabet_asc'); $popularTags = $b2tservice->tagCloud($popularTags, 5, 90, 225, 'alphabet_asc');
if ($popularTags && count($popularTags) > 0) { if ($popularTags && count($popularTags) > 0) {
?> ?>

2
data/templates/default/sidebar.block.recent.php
View File

@ -10,7 +10,7 @@ if ($logged_on_userid === false) {
$logged_on_userid = NULL; $logged_on_userid = NULL;
} }
$recentTags = $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid, $GLOBALS['defaultRecentDays']); $recentTags = $b2tservice->getPopularTags($userid, $popCount, $logged_on_userid, $GLOBALS['defaultRecentDays']);
$recentTags =& $b2tservice->tagCloud($recentTags, 5, 90, 225, 'alphabet_asc'); $recentTags = $b2tservice->tagCloud($recentTags, 5, 90, 225, 'alphabet_asc');
if ($recentTags && count($recentTags) > 0) { if ($recentTags && count($recentTags) > 0) {
?> ?>

4
tests/BookmarkTest.php
View File

@ -129,9 +129,9 @@ class BookmarkTest extends TestBase
$bs = $this->bs; $bs = $this->bs;
$bs->addBookmark("http://site1.com", "title", "éèüaàê", "status", array('tag1'), null, false, false, 1); $bs->addBookmark("http://site1.com", "title", "éèüaàê", "status", array('tag1'), null, false, false, 1);
$bookmarks =& $bs->getBookmarks(0, NULL, NULL, NULL, $terms = "eeaae"); //void $bookmarks = $bs->getBookmarks(0, NULL, NULL, NULL, $terms = "eeaae"); //void
$this->assertEquals(0, $bookmarks['total']); $this->assertEquals(0, $bookmarks['total']);
$bookmarks =& $bs->getBookmarks(0, NULL, NULL, NULL, $terms = "eeuaae"); $bookmarks = $bs->getBookmarks(0, NULL, NULL, NULL, $terms = "eeuaae");
$this->assertEquals(1, $bookmarks['total']); $this->assertEquals(1, $bookmarks['total']);
}*/ }*/

6
www/admin.php
View File

@ -70,7 +70,7 @@ if ($action
} }
break; break;
case 'checkUrl' : case 'checkUrl' :
$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, NULL, NULL, getSortOrder()); $bookmarks = $bookmarkservice->getBookmarks(0, NULL, NULL, NULL, NULL, getSortOrder());
foreach($bookmarks['bookmarks'] as $bookmark) { foreach($bookmarks['bookmarks'] as $bookmark) {
if(!checkUrl($bookmark['bAddress'])) { if(!checkUrl($bookmark['bAddress'])) {
$tplVars['error'].= T_('Problem with ').$bookmark['bAddress'].' ('. $bookmark['username'] .')<br/>'; $tplVars['error'].= T_('Problem with ').$bookmark['bAddress'].' ('. $bookmark['username'] .')<br/>';
@ -83,13 +83,13 @@ if ($action
} }
$templatename = 'admin.tpl'; $templatename = 'admin.tpl';
$users =& $userservice->getObjectUsers(); $users = $userservice->getObjectUsers();
if ( !is_array($users) ) { if ( !is_array($users) ) {
$users = array(); $users = array();
} }
$tplVars['users'] =& $users; $tplVars['users'] = $users;
$templateservice->loadTemplate($templatename, $tplVars); $templateservice->loadTemplate($templatename, $tplVars);
?> ?>

4
www/alltags.php
View File

@ -63,8 +63,8 @@ if (isset($user) && $user != '') {
$userid = NULL; $userid = NULL;
} }
$tags =& $b2tservice->getTags($userid); $tags = $b2tservice->getTags($userid);
$tplVars['tags'] =& $b2tservice->tagCloud($tags, 5, 90, 225, getSortOrder()); $tplVars['tags'] = $b2tservice->tagCloud($tags, 5, 90, 225, getSortOrder());
$tplVars['user'] = $user; $tplVars['user'] = $user;
if (isset($userid)) { if (isset($userid)) {

2
www/api/export_gcs.php
View File

@ -36,7 +36,7 @@ else
$tag = NULL; $tag = NULL;
// Get the posts relevant to the passed-in variables. // Get the posts relevant to the passed-in variables.
$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, $tag, NULL, getSortOrder()); $bookmarks = $bookmarkservice->getBookmarks(0, NULL, NULL, $tag, NULL, getSortOrder());
// Set up the plain file and output all the posts. // Set up the plain file and output all the posts.

2
www/api/export_sioc.php
View File

@ -61,7 +61,7 @@ No page for usergroup (users/admin) for the moment
<?php <?php
//bookmarks are described using Annotea ontology //bookmarks are described using Annotea ontology
$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, NULL); $bookmarks = $bookmarkservice->getBookmarks(0, NULL, NULL, NULL);
?> ?>
<?php foreach($bookmarks['bookmarks'] as $bookmark): ?> <?php foreach($bookmarks['bookmarks'] as $bookmark): ?>

2
www/api/posts_all.php
View File

@ -19,7 +19,7 @@ else
$tag = NULL; $tag = NULL;
// Get the posts relevant to the passed-in variables. // Get the posts relevant to the passed-in variables.
$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag); $bookmarks = $bookmarkservice->getBookmarks(0, NULL, $userservice->getCurrentUserId(), $tag);
// Set up the XML file and output all the posts. // Set up the XML file and output all the posts.
echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; echo '<?xml version="1.0" standalone="yes" ?'.">\r\n";

2
www/api/posts_public.php
View File

@ -20,7 +20,7 @@ else
$tag = NULL; $tag = NULL;
// Get the posts relevant to the passed-in variables. // Get the posts relevant to the passed-in variables.
$bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, $tag); $bookmarks = $bookmarkservice->getBookmarks(0, NULL, NULL, $tag);
// Set up the XML file and output all the posts. // Set up the XML file and output all the posts.
echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; echo '<?xml version="1.0" standalone="yes" ?'.">\r\n";

2
www/api/tags_get.php
View File

@ -13,7 +13,7 @@ $b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
// Get the tags relevant to the passed-in variables. // Get the tags relevant to the passed-in variables.
$tags =& $b2tservice->getTags($userservice->getCurrentUserId()); $tags = $b2tservice->getTags($userservice->getCurrentUserId());
// Set up the XML file and output all the tags. // Set up the XML file and output all the tags.
echo '<?xml version="1.0" standalone="yes" ?'.">\r\n"; echo '<?xml version="1.0" standalone="yes" ?'.">\r\n";

10
www/bookmarks.php
View File

@ -100,7 +100,7 @@ if ($user) {
$templateservice->loadTemplate('error.404.tpl', $tplVars); $templateservice->loadTemplate('error.404.tpl', $tplVars);
exit(); exit();
} else { } else {
$userid =& $userinfo['uId']; $userid = $userinfo['uId'];
} }
} }
$pagetitle .= ': '. $user; $pagetitle .= ': '. $user;
@ -173,7 +173,7 @@ if ($userservice->isLoggedOn() && POST_SUBMITTED != '') {
if (GET_ACTION == "add") { if (GET_ACTION == "add") {
// If the bookmark exists already, edit the original // If the bookmark exists already, edit the original
if ($bookmarkservice->bookmarkExists(stripslashes(GET_ADDRESS), $currentUserID)) { if ($bookmarkservice->bookmarkExists(stripslashes(GET_ADDRESS), $currentUserID)) {
$bookmark =& $bookmarkservice->getBookmarks(0, NULL, $currentUserID, NULL, NULL, NULL, NULL, NULL, NULL, $bookmarkservice->getHash(stripslashes(GET_ADDRESS))); $bookmark = $bookmarkservice->getBookmarks(0, NULL, $currentUserID, NULL, NULL, NULL, NULL, NULL, NULL, $bookmarkservice->getHash(stripslashes(GET_ADDRESS)));
$popup = (GET_POPUP!='') ? '?popup=1' : ''; $popup = (GET_POPUP!='') ? '?popup=1' : '';
header('Location: '. createURL('edit', $bookmark['bookmarks'][0]['bId'] . $popup)); header('Location: '. createURL('edit', $bookmark['bookmarks'][0]['bId'] . $popup));
exit(); exit();
@ -250,7 +250,7 @@ if ($templatename == 'editbookmark.tpl') {
//$tplVars['sidebar_blocks'][] = 'popular'; //$tplVars['sidebar_blocks'][] = 'popular';
$tplVars['userid'] = $userid; $tplVars['userid'] = $userid;
$tplVars['userinfo'] =& $userinfo; $tplVars['userinfo'] = $userinfo;
$tplVars['user'] = $user; $tplVars['user'] = $user;
$tplVars['range'] = 'user'; $tplVars['range'] = 'user';
@ -296,9 +296,9 @@ if ($templatename == 'editbookmark.tpl') {
$tplVars['start'] = $start; $tplVars['start'] = $start;
$tplVars['bookmarkCount'] = $start + 1; $tplVars['bookmarkCount'] = $start + 1;
$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, $userid, $cat, null, getSortOrder()); $bookmarks = $bookmarkservice->getBookmarks($start, $perpage, $userid, $cat, null, getSortOrder());
$tplVars['total'] = $bookmarks['total']; $tplVars['total'] = $bookmarks['total'];
$tplVars['bookmarks'] =& $bookmarks['bookmarks']; $tplVars['bookmarks'] = $bookmarks['bookmarks'];
$tplVars['cat_url'] = createURL('bookmarks', '%s/%s'); $tplVars['cat_url'] = createURL('bookmarks', '%s/%s');
$tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s'); $tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s');
if ($userservice->isLoggedOn() && $user == $currentUsername) { if ($userservice->isLoggedOn() && $user == $currentUsername) {

2
www/edit.php
View File

@ -108,7 +108,7 @@ if (!($row = $bookmarkservice->getBookmark(intval($bookmark), true))) {
} }
$tplVars['popup'] = (GET_POPUP) ? GET_POPUP : null; $tplVars['popup'] = (GET_POPUP) ? GET_POPUP : null;
$tplVars['row'] =& $row; $tplVars['row'] = $row;
$tplVars['formaction'] = createURL('edit', $bookmark); $tplVars['formaction'] = createURL('edit', $bookmark);
$tplVars['btnsubmit'] = T_('Save Changes'); $tplVars['btnsubmit'] = T_('Save Changes');
$tplVars['showdelete'] = true; $tplVars['showdelete'] = true;

6
www/history.php
View File

@ -55,9 +55,9 @@ if (intval(GET_PAGE) > 1) {
$start = 0; $start = 0;
} }
if ($bookmark =& $bookmarkservice->getBookmarkByHash($hash)) { if ($bookmark = $bookmarkservice->getBookmarkByHash($hash)) {
// Template variables // Template variables
$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, NULL, NULL, $hash); $bookmarks = $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, NULL, NULL, $hash);
$tplVars['pagetitle'] = T_('History') .': '. $bookmark['bAddress']; $tplVars['pagetitle'] = T_('History') .': '. $bookmark['bAddress'];
$tplVars['subtitle'] = sprintf(T_('History for %s'), $bookmark['bAddress']); $tplVars['subtitle'] = sprintf(T_('History for %s'), $bookmark['bAddress']);
$tplVars['loadjs'] = true; $tplVars['loadjs'] = true;
@ -65,7 +65,7 @@ if ($bookmark =& $bookmarkservice->getBookmarkByHash($hash)) {
$tplVars['start'] = $start; $tplVars['start'] = $start;
$tplVars['bookmarkCount'] = $start + 1; $tplVars['bookmarkCount'] = $start + 1;
$tplVars['total'] = $bookmarks['total']; $tplVars['total'] = $bookmarks['total'];
$tplVars['bookmarks'] =& $bookmarks['bookmarks']; $tplVars['bookmarks'] = $bookmarks['bookmarks'];
$tplVars['hash'] = $hash; $tplVars['hash'] = $hash;
$tplVars['popCount'] = 50; $tplVars['popCount'] = 50;
$tplVars['sidebar_blocks'] = array('common'); $tplVars['sidebar_blocks'] = array('common');

2
www/index.php
View File

@ -100,7 +100,7 @@ $tplVars['bookmarkCount'] = $start + 1;
$bookmarks = $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, 0, NULL); $bookmarks = $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, 0, NULL);
$tplVars['total'] = $bookmarks['total']; $tplVars['total'] = $bookmarks['total'];
$tplVars['bookmarks'] =& $bookmarks['bookmarks']; $tplVars['bookmarks'] = $bookmarks['bookmarks'];
$tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s'); $tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s');
$tplVars['nav_url'] = createURL('index', '%3$s'); $tplVars['nav_url'] = createURL('index', '%3$s');
$tplVars['summarizeLinkedTags'] = true; $tplVars['summarizeLinkedTags'] = true;

2
www/populartags.php
View File

@ -61,7 +61,7 @@ if (isset($user) && $user != '') {
} }
$tags = $b2tservice->getPopularTags($userid, 150); $tags = $b2tservice->getPopularTags($userid, 150);
$tplVars['tags'] =& $b2tservice->tagCloud($tags, 5, 90, 225, getSortOrder('alphabet_asc')); $tplVars['tags'] = $b2tservice->tagCloud($tags, 5, 90, 225, getSortOrder('alphabet_asc'));
$tplVars['user'] = $user; $tplVars['user'] = $user;
if (isset($userid)) { if (isset($userid)) {

2
www/profile.php
View File

@ -56,7 +56,7 @@ if ($user) {
$templateservice->loadTemplate('error.404.tpl', $tplVars); $templateservice->loadTemplate('error.404.tpl', $tplVars);
exit(); exit();
} else { } else {
$userid =& $userinfo->getId(); $userid = $userinfo->getId();
} }
} }
} else { } else {

2
www/rss.php
View File

@ -82,7 +82,7 @@ if ($user && $user != 'all') {
$userid = intval($user); $userid = intval($user);
} else { } else {
if ($userinfo = $userservice->getUserByUsername($user)) { if ($userinfo = $userservice->getUserByUsername($user)) {
$userid =& $userinfo[$userservice->getFieldName('primary')]; $userid = $userinfo[$userservice->getFieldName('primary')];
/* if user is not logged in and has valid privateKey */ /* if user is not logged in and has valid privateKey */
if (!$userservice->isLoggedOn()) { if (!$userservice->isLoggedOn()) {
if ($privateKey != null) { if ($privateKey != null) {

4
www/search.php
View File

@ -115,7 +115,7 @@ if (is_null($terms)) {
} }
} }
$bookmarks =& $bookmarkservice->getBookmarks( $bookmarks = $bookmarkservice->getBookmarks(
$start, $perpage, $s_user, NULL, $terms, getSortOrder(), $start, $perpage, $s_user, NULL, $terms, getSortOrder(),
$s_watchlist, $s_start, $s_end $s_watchlist, $s_start, $s_end
); );
@ -147,7 +147,7 @@ $tplVars['terms'] = $terms;
$tplVars['pagetitle'] = T_('Search Bookmarks'); $tplVars['pagetitle'] = T_('Search Bookmarks');
$tplVars['bookmarkCount'] = $start + 1; $tplVars['bookmarkCount'] = $start + 1;
$tplVars['total'] = $bookmarks['total']; $tplVars['total'] = $bookmarks['total'];
$tplVars['bookmarks'] =& $bookmarks['bookmarks']; $tplVars['bookmarks'] = $bookmarks['bookmarks'];
$tplVars['cat_url'] = createURL('tags', '%2$s'); $tplVars['cat_url'] = createURL('tags', '%2$s');
$tplVars['nav_url'] = createURL('search', $range .'/'. $terms .'/%3$s'); $tplVars['nav_url'] = createURL('search', $range .'/'. $terms .'/%3$s');

4
www/tags.php
View File

@ -109,9 +109,9 @@ $tplVars['currenttag'] = $cat;
$tplVars['sidebar_blocks'] = array('linked', 'related', 'menu2');//array('linked', 'related', 'popular'); $tplVars['sidebar_blocks'] = array('linked', 'related', 'menu2');//array('linked', 'related', 'popular');
$tplVars['subtitlehtml'] = $pagetitle; $tplVars['subtitlehtml'] = $pagetitle;
$tplVars['bookmarkCount'] = $start + 1; $tplVars['bookmarkCount'] = $start + 1;
$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, $cat, NULL, getSortOrder()); $bookmarks = $bookmarkservice->getBookmarks($start, $perpage, NULL, $cat, NULL, getSortOrder());
$tplVars['total'] = $bookmarks['total']; $tplVars['total'] = $bookmarks['total'];
$tplVars['bookmarks'] =& $bookmarks['bookmarks']; $tplVars['bookmarks'] = $bookmarks['bookmarks'];
$tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s'); $tplVars['cat_url'] = createURL('bookmarks', '%1$s/%2$s');
$tplVars['nav_url'] = createURL('tags', '%2$s%3$s'); $tplVars['nav_url'] = createURL('tags', '%2$s%3$s');

2
www/users.php
View File

@ -49,7 +49,7 @@ $tplVars['loadjs'] = true;
$tplVars['sidebar_blocks'] = array('recent', 'popular'); $tplVars['sidebar_blocks'] = array('recent', 'popular');
$tplVars['subtitle'] = filter($pagetitle); $tplVars['subtitle'] = filter($pagetitle);
$tplVars['users'] =& $userservice->getUsers(); $tplVars['users'] = $userservice->getUsers();
//$tplVars['cat_url'] = createURL('tags', '%2$s'); //$tplVars['cat_url'] = createURL('tags', '%2$s');
//$tplVars['nav_url'] = createURL('tags', '%2$s%3$s'); //$tplVars['nav_url'] = createURL('tags', '%2$s%3$s');

8
www/watchlist.php
View File

@ -62,7 +62,7 @@ if ($user) {
$templateservice->loadTemplate('error.404.tpl', $tplVars); $templateservice->loadTemplate('error.404.tpl', $tplVars);
exit(); exit();
} else { } else {
$userid =& $userinfo->getId(); $userid = $userinfo->getId();
} }
} }
} }
@ -73,7 +73,7 @@ $tplVars['loadjs'] = true;
if ($user) { if ($user) {
$tplVars['user'] = $user; $tplVars['user'] = $user;
$tplVars['userid'] = $userid; $tplVars['userid'] = $userid;
$tplVars['userinfo'] =& $userinfo; $tplVars['userinfo'] = $userinfo;
// Pagination // Pagination
$perpage = getPerPageCount($currentUser); $perpage = getPerPageCount($currentUser);
@ -91,12 +91,12 @@ if ($user) {
$tplVars['start'] = $start; $tplVars['start'] = $start;
$tplVars['bookmarkCount'] = $start + 1; $tplVars['bookmarkCount'] = $start + 1;
$bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, $userid, NULL, NULL, getSortOrder(), true); $bookmarks = $bookmarkservice->getBookmarks($start, $perpage, $userid, NULL, NULL, getSortOrder(), true);
$tplVars['sidebar_blocks'] = array('watchlist'); $tplVars['sidebar_blocks'] = array('watchlist');
$tplVars['watched'] = true; $tplVars['watched'] = true;
$tplVars['total'] = $bookmarks['total']; $tplVars['total'] = $bookmarks['total'];
$tplVars['bookmarks'] =& $bookmarks['bookmarks']; $tplVars['bookmarks'] = $bookmarks['bookmarks'];
$tplVars['cat_url'] = createURL('tags', '%2$s'); $tplVars['cat_url'] = createURL('tags', '%2$s');
$tplVars['nav_url'] = createURL('watchlist', '%s/%s%s'); $tplVars['nav_url'] = createURL('watchlist', '%s/%s%s');