From 64181abc6f46085a3772166cfdaa427fce4722ed Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Wed, 28 Jan 2015 17:34:53 -0800 Subject: fix implicit boolean --- mod/sitelist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/sitelist.php b/mod/sitelist.php index 95a53c9a4..12911cbd4 100644 --- a/mod/sitelist.php +++ b/mod/sitelist.php @@ -28,7 +28,7 @@ function sitelist_init(&$a) { $result = array('success' => false); - $r = q("select count(site_url) as total from site where 1 $sql_extra "); + $r = q("select count(site_url) as total from site where true $sql_extra "); if($r) $result['total'] = intval($r[0]['total']); -- cgit v1.2.3 From a4960360669daa0a0c842427185ce1ada3b4ab97 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 28 Jan 2015 20:56:04 -0800 Subject: local_user => local_channel --- mod/acl.php | 16 ++--- mod/admin.php | 2 +- mod/api.php | 10 +-- mod/appman.php | 16 ++--- mod/apps.php | 4 +- mod/authtest.php | 2 +- mod/blocks.php | 2 +- mod/bookmarks.php | 14 ++-- mod/channel.php | 12 ++-- mod/chanview.php | 6 +- mod/chat.php | 18 ++--- mod/cloud.php | 2 +- mod/connect.php | 6 +- mod/connections.php | 30 ++++----- mod/connedit.php | 46 ++++++------- mod/contactgroup.php | 10 +-- mod/dav.php | 2 +- mod/delegate.php | 12 ++-- mod/directory.php | 20 +++--- mod/display.php | 14 ++-- mod/editblock.php | 2 +- mod/editlayout.php | 2 +- mod/editpost.php | 12 ++-- mod/editwebpage.php | 2 +- mod/events.php | 32 ++++----- mod/fbrowser.php | 8 +-- mod/filer.php | 10 +-- mod/filerm.php | 4 +- mod/filestorage.php | 4 +- mod/follow.php | 6 +- mod/fsuggest.php | 16 ++--- mod/group.php | 30 ++++----- mod/hcard.php | 4 +- mod/home.php | 10 +-- mod/impel.php | 10 +-- mod/invite.php | 14 ++-- mod/item.php | 10 +-- mod/layouts.php | 2 +- mod/lockview.php | 2 +- mod/locs.php | 4 +- mod/login.php | 2 +- mod/magic.php | 4 +- mod/mail.php | 32 ++++----- mod/manage.php | 4 +- mod/match.php | 4 +- mod/menu.php | 4 +- mod/message.php | 8 +-- mod/mitem.php | 6 +- mod/mood.php | 6 +- mod/network.php | 34 +++++----- mod/notes.php | 4 +- mod/notifications.php | 10 +-- mod/notify.php | 10 +-- mod/oexchange.php | 4 +- mod/pdledit.php | 10 +-- mod/photos.php | 20 +++--- mod/ping.php | 52 +++++++-------- mod/poke.php | 8 +-- mod/post.php | 2 +- mod/profile.php | 6 +- mod/profile_photo.php | 44 ++++++------- mod/profiles.php | 106 ++++++++++++++--------------- mod/profperm.php | 20 +++--- mod/rbmark.php | 2 +- mod/regmod.php | 2 +- mod/removeaccount.php | 4 +- mod/removeme.php | 6 +- mod/rmagic.php | 2 +- mod/rpost.php | 6 +- mod/search.php | 14 ++-- mod/search_ac.php | 4 +- mod/service_limits.php | 2 +- mod/settings.php | 172 ++++++++++++++++++++++++------------------------ mod/share.php | 6 +- mod/sharedwithme.php | 12 ++-- mod/sources.php | 24 +++---- mod/starred.php | 6 +- mod/subthread.php | 2 +- mod/suggest.php | 8 +-- mod/tagger.php | 4 +- mod/tagrm.php | 10 +-- mod/thing.php | 32 ++++----- mod/uexport.php | 6 +- mod/viewconnections.php | 6 +- mod/viewsrc.php | 6 +- mod/webpages.php | 2 +- mod/zping.php | 2 +- 87 files changed, 584 insertions(+), 584 deletions(-) (limited to 'mod') diff --git a/mod/acl.php b/mod/acl.php index 8eff93a9a..5a048ddee 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -24,7 +24,7 @@ function acl_init(&$a){ $search = $_REQUEST['query']; } - if(!(local_user())) + if(!(local_channel())) if(!($type == 'x' || $type == 'c')) killme(); @@ -58,7 +58,7 @@ function acl_init(&$a){ ORDER BY `groups`.`name` LIMIT %d OFFSET %d", db_concat('group_member.xchan', ','), - intval(local_user()), + intval(local_channel()), intval($count), intval($start) ); @@ -88,14 +88,14 @@ function acl_init(&$a){ $extra_channels_sql = substr($extra_channels_sql,1); // Remove initial comma // Getting info from the abook is better for local users because it contains info about permissions - if(local_user()) { + if(local_channel()) { if($extra_channels_sql != '') $extra_channels_sql = " OR (abook_channel IN ($extra_channels_sql)) and not (abook_flags & ". intval(ABOOK_FLAG_HIDDEN) . ') > 0'; $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags FROM abook left join xchan on abook_xchan = xchan_hash WHERE (abook_channel = %d $extra_channels_sql) AND not ( abook_flags & %d )>0 and not (xchan_flags & %d )>0 $sql_extra2 order by $order_extra2 xchan_name asc" , - intval(local_user()), + intval(local_channel()), intval(ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED), intval(XCHAN_FLAGS_DELETED) ); @@ -147,7 +147,7 @@ function acl_init(&$a){ }); } } - if(intval(get_config('system','taganyone')) || intval(get_pconfig(local_user(),'system','taganyone'))) { + if(intval(get_config('system','taganyone')) || intval(get_pconfig(local_channel(),'system','taganyone'))) { if((! $r) && $type == 'c') { $r = q("SELECT substr(xchan_hash,1,18) as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags FROM xchan @@ -165,7 +165,7 @@ function acl_init(&$a){ and not (xchan_flags & %d)>0 $sql_extra3 ORDER BY `xchan_name` ASC ", - intval(local_user()), + intval(local_channel()), intval(PERMS_W_MAIL), intval(XCHAN_FLAGS_DELETED) ); @@ -177,7 +177,7 @@ function acl_init(&$a){ and not (xchan_flags & %d)>0 $sql_extra3 ORDER BY xchan_name ASC ", - intval(local_user()), + intval(local_channel()), intval(XCHAN_FLAGS_DELETED) ); @@ -263,7 +263,7 @@ function navbar_complete(&$a) { // logger('navbar_complete'); - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { return; } diff --git a/mod/admin.php b/mod/admin.php index 1503bf18e..3efa533c1 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -289,7 +289,7 @@ function admin_page_site_post(&$a){ } else { require_once('include/text.php'); - linkify_tags($a, $admininfo, local_user()); + linkify_tags($a, $admininfo, local_channel()); set_config('system','admininfo', $admininfo); } set_config('system','language', $language); diff --git a/mod/api.php b/mod/api.php index 4fa911f14..08978ee96 100644 --- a/mod/api.php +++ b/mod/api.php @@ -22,12 +22,12 @@ function oauth_get_client($request){ function api_post(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } - if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) { + if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -57,8 +57,8 @@ function api_content(&$a) { if (is_null($app)) return "Invalid request. Unknown token."; $consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']); - $verifier = md5($app['secret'].local_user()); - set_config("oauth", $verifier, local_user()); + $verifier = md5($app['secret'].local_channel()); + set_config("oauth", $verifier, local_channel()); if ($consumer->callback_url!=null) { @@ -84,7 +84,7 @@ function api_content(&$a) { } - if(! local_user()) { + if(! local_channel()) { //TODO: we need login form to redirect to this page notice( t('Please login to continue.') . EOL ); return login(false,'api-login',$request->get_parameters()); diff --git a/mod/appman.php b/mod/appman.php index f0a3c8a70..db22df883 100644 --- a/mod/appman.php +++ b/mod/appman.php @@ -4,7 +4,7 @@ require_once('include/apps.php'); function appman_post(&$a) { - if(! local_user()) + if(! local_channel()) return; if($_POST['url']) { @@ -22,9 +22,9 @@ function appman_post(&$a) { 'sig' => escape_tags($_REQUEST['sig']) ); - $_REQUEST['appid'] = app_install(local_user(),$arr); + $_REQUEST['appid'] = app_install(local_channel(),$arr); - if(app_installed(local_user(),$arr)) + if(app_installed(local_channel(),$arr)) info( t('App installed.') . EOL); return; @@ -39,13 +39,13 @@ function appman_post(&$a) { } if($_POST['install']) { - app_install(local_user(),$papp); - if(app_installed(local_user(),$papp)) + app_install(local_channel(),$papp); + if(app_installed(local_channel(),$papp)) info( t('App installed.') . EOL); } if($_POST['delete']) { - app_destroy(local_user(),$papp); + app_destroy(local_channel(),$papp); } if($_POST['edit']) { @@ -62,7 +62,7 @@ function appman_post(&$a) { function appman_content(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -73,7 +73,7 @@ function appman_content(&$a) { if($_REQUEST['appid']) { $r = q("select * from app where app_id = '%s' and app_channel = %d limit 1", dbesc($_REQUEST['appid']), - dbesc(local_user()) + dbesc(local_channel()) ); if($r) $app = $r[0]; diff --git a/mod/apps.php b/mod/apps.php index 8c9706d2f..be9b54307 100644 --- a/mod/apps.php +++ b/mod/apps.php @@ -13,8 +13,8 @@ function apps_content(&$a) { $syslist = get_system_apps(); - if(local_user()) { - $list = app_list(local_user()); + if(local_channel()) { + $list = app_list(local_channel()); if($list) { foreach($list as $x) { $syslist[] = app_encode($x); diff --git a/mod/authtest.php b/mod/authtest.php index b6d940db2..6ef6c22ad 100644 --- a/mod/authtest.php +++ b/mod/authtest.php @@ -9,7 +9,7 @@ function authtest_content(&$a) { $auth_success = false; $o .= '

Magic-Auth Diagnostic

'; - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return $o; } diff --git a/mod/blocks.php b/mod/blocks.php index 6237a645b..f755f92b0 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -33,7 +33,7 @@ function blocks_content(&$a) { $which = argv(1); - $uid = local_user(); + $uid = local_channel(); $owner = 0; $channel = null; $observer = $a->get_observer(); diff --git a/mod/bookmarks.php b/mod/bookmarks.php index 6b2476a8e..a5b9c473f 100644 --- a/mod/bookmarks.php +++ b/mod/bookmarks.php @@ -1,7 +1,7 @@ ' . t('My Bookmarks') . ''; - $x = menu_list(local_user(),'',MENU_BOOKMARK); + $x = menu_list(local_channel(),'',MENU_BOOKMARK); if($x) { foreach($x as $xx) { - $y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash()); + $y = menu_fetch($xx['menu_name'],local_channel(),get_observer_hash()); $o .= menu_render($y,'',true); } } @@ -71,11 +71,11 @@ function bookmarks_content(&$a) { $o .= '

' . t('My Connections Bookmarks') . '

'; - $x = menu_list(local_user(),'',MENU_SYSTEM|MENU_BOOKMARK); + $x = menu_list(local_channel(),'',MENU_SYSTEM|MENU_BOOKMARK); if($x) { foreach($x as $xx) { - $y = menu_fetch($xx['menu_name'],local_user(),get_observer_hash()); + $y = menu_fetch($xx['menu_name'],local_channel(),get_observer_hash()); $o .= menu_render($y,'',true); } } diff --git a/mod/channel.php b/mod/channel.php index c8ac83baf..493730e8a 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -15,7 +15,7 @@ function channel_init(&$a) { if(argc() > 1) $which = argv(1); if(! $which) { - if(local_user()) { + if(local_channel()) { $channel = $a->get_channel(); if($channel && $channel['channel_address']) $which = $channel['channel_address']; @@ -29,7 +29,7 @@ function channel_init(&$a) { $profile = 0; $channel = $a->get_channel(); - if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { + if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) { $which = $channel['channel_address']; $profile = argv(1); } @@ -68,12 +68,12 @@ function channel_content(&$a, $update = 0, $load = false) { $a->profile['profile_uid'] = $a->profile_uid = $update; } else { - if($a->profile['profile_uid'] == local_user()) { + if($a->profile['profile_uid'] == local_channel()) { nav_set_selected('home'); } } - $is_owner = (((local_user()) && ($a->profile['profile_uid'] == local_user())) ? true : false); + $is_owner = (((local_channel()) && ($a->profile['profile_uid'] == local_channel())) ? true : false); $channel = $a->get_channel(); $observer = $a->get_observer(); @@ -185,7 +185,7 @@ function channel_content(&$a, $update = 0, $load = false) { $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); } - $itemspage = get_pconfig(local_user(),'system','itemspage'); + $itemspage = get_pconfig(local_channel(),'system','itemspage'); $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval($a->pager['itemspage']), intval($a->pager['start'])); @@ -322,7 +322,7 @@ function channel_content(&$a, $update = 0, $load = false) { intval(ITEM_UNSEEN), intval(ITEM_UNSEEN), intval(ITEM_WALL), - intval(local_user()) + intval(local_channel()) ); } diff --git a/mod/chanview.php b/mod/chanview.php index 3bf0f3268..0cbcb2e57 100644 --- a/mod/chanview.php +++ b/mod/chanview.php @@ -20,11 +20,11 @@ function chanview_content(&$a) { dbesc($_REQUEST['address']) ); } - elseif(local_user() && intval($_REQUEST['cid'])) { + elseif(local_channel() && intval($_REQUEST['cid'])) { $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", - intval(local_user()), + intval(local_channel()), intval($_REQUEST['cid']) ); } @@ -90,7 +90,7 @@ function chanview_content(&$a) { // let somebody over-ride the iframed viewport presentation // or let's just declare this a failed experiment. -// if((! local_user()) || (get_pconfig(local_user(),'system','chanview_full'))) +// if((! local_channel()) || (get_pconfig(local_channel(),'system','chanview_full'))) goaway($url); diff --git a/mod/chat.php b/mod/chat.php index e2428f1f7..c54d29313 100644 --- a/mod/chat.php +++ b/mod/chat.php @@ -9,7 +9,7 @@ function chat_init(&$a) { if(argc() > 1) $which = argv(1); if(! $which) { - if(local_user()) { + if(local_channel()) { $channel = $a->get_channel(); if($channel && $channel['channel_address']) $which = $channel['channel_address']; @@ -23,7 +23,7 @@ function chat_init(&$a) { $profile = 0; $channel = $a->get_channel(); - if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { + if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) { $which = $channel['channel_address']; $profile = argv(1); } @@ -42,7 +42,7 @@ function chat_post(&$a) { if($_POST['room_name']) $room = strip_tags(trim($_POST['room_name'])); - if((! $room) || (! local_user())) + if((! $room) || (! local_channel())) return; $channel = $a->get_channel(); @@ -65,7 +65,7 @@ function chat_post(&$a) { $x = q("select cr_id from chatroom where cr_name = '%s' and cr_uid = %d limit 1", dbesc($room), - intval(local_user()) + intval(local_channel()) ); if($x) @@ -81,7 +81,7 @@ function chat_post(&$a) { function chat_content(&$a) { - if(local_user()) + if(local_channel()) $channel = $a->get_channel(); $ob = $a->get_observer(); @@ -169,7 +169,7 @@ function chat_content(&$a) { } $o = replace_macros(get_markup_template('chat.tpl'),array( - '$is_owner' => ((local_user() && local_user() == $x[0]['cr_uid']) ? true : false), + '$is_owner' => ((local_channel() && local_channel() == $x[0]['cr_uid']) ? true : false), '$room_name' => $room_name, '$room_id' => $room_id, '$baseurl' => z_root(), @@ -190,7 +190,7 @@ function chat_content(&$a) { - if(local_user() && argc() > 2 && argv(2) === 'new') { + if(local_channel() && argc() > 2 && argv(2) === 'new') { @@ -217,7 +217,7 @@ function chat_content(&$a) { require_once('include/conversation.php'); - $o = profile_tabs($a,((local_user() && local_user() == $a->profile['profile_uid']) ? true : false),$a->profile['channel_address']); + $o = profile_tabs($a,((local_channel() && local_channel() == $a->profile['profile_uid']) ? true : false),$a->profile['channel_address']); require_once('include/widgets.php'); @@ -227,7 +227,7 @@ function chat_content(&$a) { '$nickname' => $channel['channel_address'], '$rooms' => widget_chatroom_list(array()), '$newroom' => t('New Chatroom'), - '$is_owner' => ((local_user() && local_user() == $a->profile['profile_uid']) ? 1 : 0) + '$is_owner' => ((local_channel() && local_channel() == $a->profile['profile_uid']) ? 1 : 0) )); return $o; diff --git a/mod/cloud.php b/mod/cloud.php index ad85eba34..b36e6c482 100644 --- a/mod/cloud.php +++ b/mod/cloud.php @@ -58,7 +58,7 @@ function cloud_init(&$a) { $ob_hash = get_observer_hash(); if ($ob_hash) { - if (local_user()) { + if (local_channel()) { $channel = $a->get_channel(); $auth->setCurrentUser($channel['channel_address']); $auth->channel_id = $channel['channel_id']; diff --git a/mod/connect.php b/mod/connect.php index 396fca645..c36aef433 100644 --- a/mod/connect.php +++ b/mod/connect.php @@ -30,7 +30,7 @@ function connect_post(&$a) { if(! array_key_exists('channel', $a->data)) return; - $edit = ((local_user() && (local_user() == $a->data['channel']['channel_id'])) ? true : false); + $edit = ((local_channel() && (local_channel() == $a->data['channel']['channel_id'])) ? true : false); if($edit) { $has_premium = (($a->data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0); @@ -41,7 +41,7 @@ function connect_post(&$a) { $r = q("update channel set channel_pageflags = ( channel_pageflags %s %d ) where channel_id = %d", db_getfunc('^'), intval(PAGE_PREMIUM), - intval(local_user()) + intval(local_channel()) ); proc_run('php','include/notifier.php','refresh_all',$a->data['channel']['channel_id']); } @@ -75,7 +75,7 @@ function connect_post(&$a) { function connect_content(&$a) { - $edit = ((local_user() && (local_user() == $a->data['channel']['channel_id'])) ? true : false); + $edit = ((local_channel() && (local_channel() == $a->data['channel']['channel_id'])) ? true : false); $text = get_pconfig($a->data['channel']['channel_id'],'system','selltext'); diff --git a/mod/connections.php b/mod/connections.php index d36734ccb..469d3a62f 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -10,7 +10,7 @@ require_once('include/widgets.php'); function connections_init(&$a) { - if(! local_user()) + if(! local_channel()) return; $channel = $a->get_channel(); @@ -21,7 +21,7 @@ function connections_init(&$a) { function connections_post(&$a) { - if(! local_user()) + if(! local_channel()) return; $contact_id = intval(argv(1)); @@ -30,7 +30,7 @@ function connections_post(&$a) { $orig_record = q("SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1", intval($contact_id), - intval(local_user()) + intval(local_channel()) ); if(! $orig_record) { @@ -45,7 +45,7 @@ function connections_post(&$a) { if($profile_id) { $r = q("SELECT profile_guid FROM profile WHERE profile_guid = '%s' AND `uid` = %d LIMIT 1", dbesc($profile_id), - intval(local_user()) + intval(local_channel()) ); if(! count($r)) { notice( t('Could not locate selected profile.') . EOL); @@ -87,7 +87,7 @@ function connections_post(&$a) { intval($closeness), intval($abook_flags), intval($contact_id), - intval(local_user()) + intval(local_channel()) ); if($r) @@ -105,9 +105,9 @@ function connections_post(&$a) { $default_group = $channel['channel_default_group']; if($default_group) { require_once('include/group.php'); - $g = group_rec_byhash(local_user(),$default_group); + $g = group_rec_byhash(local_channel(),$default_group); if($g) - group_add_member(local_user(),'',$a->data['abook_xchan'],$g['id']); + group_add_member(local_channel(),'',$a->data['abook_xchan'],$g['id']); } @@ -127,7 +127,7 @@ function connections_post(&$a) { $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", - intval(local_user()), + intval(local_channel()), intval($contact_id) ); if($r) { @@ -135,7 +135,7 @@ function connections_post(&$a) { } if($new_friend) { - $arr = array('channel_id' => local_user(), 'abook' => $a->data['abook']); + $arr = array('channel_id' => local_channel(), 'abook' => $a->data['abook']); call_hooks('accept_follow', $arr); } @@ -155,7 +155,7 @@ function connections_clone(&$a) { unset($clone['abook_account']); unset($clone['abook_channel']); - build_sync_packet(0 /* use the current local_user */, array('abook' => array($clone))); + build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone))); } @@ -165,7 +165,7 @@ function connections_content(&$a) { $o = ''; - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return login(); } @@ -215,7 +215,7 @@ function connections_content(&$a) { break; case 'ifpending': $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d)>0 and not ((abook_flags & %d)>0 or (xchan_flags & %d)>0)", - intval(local_user()), + intval(local_channel()), intval(ABOOK_FLAG_PENDING), intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN) @@ -339,12 +339,12 @@ function connections_content(&$a) { $sql_extra .= (($searching) ? protect_sprintf(" AND xchan_name like '%$search_txt%' ") : ""); if($_REQUEST['gid']) { - $sql_extra .= " and xchan_hash in ( select xchan from group_member where gid = " . intval($_REQUEST['gid']) . " and uid = " . intval(local_user()) . " ) "; + $sql_extra .= " and xchan_hash in ( select xchan from group_member where gid = " . intval($_REQUEST['gid']) . " and uid = " . intval(local_channel()) . " ) "; } $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and not (abook_flags & %d)>0 and not (xchan_flags & %d )>0 $sql_extra $sql_extra2 ", - intval(local_user()), + intval(local_channel()), intval(ABOOK_FLAG_SELF), intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN) ); @@ -355,7 +355,7 @@ function connections_content(&$a) { $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d and not (abook_flags & %d)>0 and not ( xchan_flags & %d)>0 $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d OFFSET %d ", - intval(local_user()), + intval(local_channel()), intval(ABOOK_FLAG_SELF), intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN), intval($a->pager['itemspage']), diff --git a/mod/connedit.php b/mod/connedit.php index 8270fa981..c082e03a8 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -21,14 +21,14 @@ require_once('include/widgets.php'); function connedit_init(&$a) { - if(! local_user()) + if(! local_channel()) return; if((argc() >= 2) && intval(argv(1))) { $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", - intval(local_user()), + intval(local_channel()), intval(argv(1)) ); if($r) { @@ -48,7 +48,7 @@ function connedit_init(&$a) { function connedit_post(&$a) { - if(! local_user()) + if(! local_channel()) return; $contact_id = intval(argv(1)); @@ -66,7 +66,7 @@ function connedit_post(&$a) { $orig_record = q("SELECT * FROM abook WHERE abook_id = %d AND abook_channel = %d LIMIT 1", intval($contact_id), - intval(local_user()) + intval(local_channel()) ); if(! $orig_record) { @@ -89,7 +89,7 @@ function connedit_post(&$a) { if($profile_id) { $r = q("SELECT profile_guid FROM profile WHERE profile_guid = '%s' AND `uid` = %d LIMIT 1", dbesc($profile_id), - intval(local_user()) + intval(local_channel()) ); if(! count($r)) { notice( t('Could not locate selected profile.') . EOL); @@ -143,7 +143,7 @@ function connedit_post(&$a) { dbesc($rating_text), intval($abook_flags), intval($contact_id), - intval(local_user()) + intval(local_channel()) ); if($orig_record[0]['abook_profile'] != $profile_id) { @@ -171,9 +171,9 @@ function connedit_post(&$a) { $default_group = $channel['channel_default_group']; if($default_group) { require_once('include/group.php'); - $g = group_rec_byhash(local_user(),$default_group); + $g = group_rec_byhash(local_channel(),$default_group); if($g) - group_add_member(local_user(),'',$a->poi['abook_xchan'],$g['id']); + group_add_member(local_channel(),'',$a->poi['abook_xchan'],$g['id']); } // Check if settings permit ("post new friend activity" is allowed, and @@ -225,7 +225,7 @@ function connedit_post(&$a) { $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_id = %d LIMIT 1", - intval(local_user()), + intval(local_channel()), intval($contact_id) ); if($r) { @@ -233,12 +233,12 @@ function connedit_post(&$a) { } if($new_friend) { - $arr = array('channel_id' => local_user(), 'abook' => $a->poi); + $arr = array('channel_id' => local_channel(), 'abook' => $a->poi); call_hooks('accept_follow', $arr); } if(! is_null($autoperms)) - set_pconfig(local_user(),'system','autoperms',(($autoperms) ? $abook_my_perms : 0)); + set_pconfig(local_channel(),'system','autoperms',(($autoperms) ? $abook_my_perms : 0)); connedit_clone($a); @@ -261,7 +261,7 @@ function connedit_clone(&$a) { unset($clone['abook_account']); unset($clone['abook_channel']); - build_sync_packet(0 /* use the current local_user */, array('abook' => array($clone))); + build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone))); } /* @brief Generate content of connection edit page @@ -274,13 +274,13 @@ function connedit_content(&$a) { $sort_type = 0; $o = ''; - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return login(); } - $my_perms = get_channel_default_perms(local_user()); - $role = get_pconfig(local_user(),'system','permissions_role'); + $my_perms = get_channel_default_perms(local_channel()); + $role = get_pconfig(local_channel(),'system','permissions_role'); if($role) { $x = get_role_perms($role); if($x['perms_accept']) @@ -313,7 +313,7 @@ function connedit_content(&$a) { $orig_record = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_id = %d AND abook_channel = %d AND NOT ( abook_flags & %d )>0 LIMIT 1", intval($contact_id), - intval(local_user()), + intval(local_channel()), intval(ABOOK_FLAG_SELF) ); @@ -412,8 +412,8 @@ function connedit_content(&$a) { // in the background there could be a race condition preventing this packet from being sent in all cases. // PLACEHOLDER - contact_remove(local_user(), $orig_record[0]['abook_id']); - build_sync_packet(0 /* use the current local_user */, + contact_remove(local_channel(), $orig_record[0]['abook_id']); + build_sync_packet(0 /* use the current local_channel */, array('abook' => array(array( 'abook_xchan' => $orig_record[0]['abook_xchan'], 'entry_deleted' => true)) @@ -512,7 +512,7 @@ function connedit_content(&$a) { $tpl = get_markup_template("abook_edit.tpl"); - if(feature_enabled(local_user(),'affinity')) { + if(feature_enabled(local_channel(),'affinity')) { $slider_tpl = get_markup_template('contact_slider.tpl'); $slide = replace_macros($slider_tpl,array( @@ -547,7 +547,7 @@ function connedit_content(&$a) { $channel = $a->get_channel(); $global_perms = get_perms(); - $existing = get_all_perms(local_user(),$contact['abook_xchan']); + $existing = get_all_perms(local_channel(),$contact['abook_xchan']); $unapproved = array('pending', t('Approve this connection'), '', t('Accept connection to allow communication')); @@ -566,7 +566,7 @@ function connedit_content(&$a) { $o .= replace_macros($tpl,array( '$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connections: settings for %s'),$contact['xchan_name'])), - '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_user(),'system','autoperms')) ? 1 : 0), ''), + '$autoperms' => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), ''), '$addr' => $contact['xchan_addr'], '$notself' => (($self) ? '' : '1'), '$self' => (($self) ? '1' : ''), @@ -611,7 +611,7 @@ function connedit_content(&$a) { '$permnote' => t('Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect.'), '$advanced' => t('Advanced Permissions'), '$quick' => t('Simple Permissions (select one and submit)'), - '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'], + '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_channel() . '/' . $contact['id'], '$all_friends' => $all_friends, '$relation_text' => $relation_text, '$visit' => sprintf( t('Visit %s\'s profile - %s'),$contact['xchan_name'],$contact['xchan_url']), @@ -630,7 +630,7 @@ function connedit_content(&$a) { '$last_update' => relative_date($contact['abook_connected']), '$udnow' => t('Update now'), '$profile_select' => contact_profile_assign($contact['abook_profile']), - '$multiprofs' => feature_enabled(local_user(),'multi_profiles'), + '$multiprofs' => feature_enabled(local_channel(),'multi_profiles'), '$contact_id' => $contact['abook_id'], '$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ), '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ), diff --git a/mod/contactgroup.php b/mod/contactgroup.php index 4515c4c4c..6138f9e19 100644 --- a/mod/contactgroup.php +++ b/mod/contactgroup.php @@ -4,14 +4,14 @@ require_once('include/group.php'); function contactgroup_content(&$a) { - if(! local_user()) { + if(! local_channel()) { killme(); } if((argc() > 2) && (intval(argv(1))) && (argv(2))) { $r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not ( abook_flags & %d )>0 limit 1", dbesc(base64url_decode(argv(2))), - intval(local_user()), + intval(local_channel()), intval(ABOOK_FLAG_SELF) ); if($r) @@ -22,7 +22,7 @@ function contactgroup_content(&$a) { $r = q("SELECT * FROM `groups` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1", intval(argv(1)), - intval(local_user()) + intval(local_channel()) ); if(! $r) { killme(); @@ -38,10 +38,10 @@ function contactgroup_content(&$a) { if($change) { if(in_array($change,$preselected)) { - group_rmv_member(local_user(),$group['name'],$change); + group_rmv_member(local_channel(),$group['name'],$change); } else { - group_add_member(local_user(),$group['name'],$change); + group_add_member(local_channel(),$group['name'],$change); } } } diff --git a/mod/dav.php b/mod/dav.php index e3719cb93..f7f89b6da 100644 --- a/mod/dav.php +++ b/mod/dav.php @@ -59,7 +59,7 @@ function dav_init(&$a) { $ob_hash = get_observer_hash(); if ($ob_hash) { - if (local_user()) { + if (local_channel()) { $channel = $a->get_channel(); $auth->setCurrentUser($channel['channel_address']); $auth->channel_id = $channel['channel_id']; diff --git a/mod/delegate.php b/mod/delegate.php index c78898b7f..cc399b6e5 100644 --- a/mod/delegate.php +++ b/mod/delegate.php @@ -2,7 +2,7 @@ function delegate_content(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -22,13 +22,13 @@ function delegate_content(&$a) { ); if(count($r)) { $r = q("select id from contact where uid = %d and nurl = '%s' limit 1", - intval(local_user()), + intval(local_channel()), dbesc(normalise_link($a->get_baseurl() . '/channel/' . $r[0]['nickname'])) ); if(count($r)) { q("insert into manage ( uid, mid ) values ( %d , %d ) ", intval($a->argv[2]), - intval(local_user()) + intval(local_channel()) ); } } @@ -44,7 +44,7 @@ function delegate_content(&$a) { q("delete from manage where uid = %d and mid = %d", intval($a->argv[2]), - intval(local_user()) + intval(local_channel()) ); goaway($a->get_baseurl() . '/delegate'); @@ -66,7 +66,7 @@ function delegate_content(&$a) { // find everybody that currently has delegated management to this account/page $r = q("select * from user where uid in ( select uid from manage where mid = %d ) ", - intval(local_user()) + intval(local_channel()) ); if(count($r)) @@ -87,7 +87,7 @@ function delegate_content(&$a) { $r = q("select nurl from contact where substring_index(contact.nurl,'/',3) = '%s' and contact.uid = %d and contact.self = 0 and network = '%s' ", dbesc(normalise_link($a->get_baseurl())), - intval(local_user()), + intval(local_channel()), dbesc(NETWORK_DFRN) ); diff --git a/mod/directory.php b/mod/directory.php index 2a07208a4..defa8db7e 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -10,7 +10,7 @@ function directory_init(&$a) { if(x($_GET,'ignore')) { q("insert into xign ( uid, xchan ) values ( %d, '%s' ) ", - intval(local_user()), + intval(local_channel()), dbesc($_GET['ignore']) ); } @@ -18,7 +18,7 @@ function directory_init(&$a) { function directory_content(&$a) { - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { notice( t('Public access denied.') . EOL); return; } @@ -51,17 +51,17 @@ function directory_content(&$a) { $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); - if(strpos($search,'=') && local_user() && get_pconfig(local_user(),'feature','expert')) + if(strpos($search,'=') && local_channel() && get_pconfig(local_channel(),'feature','expert')) $advanced = $search; $keywords = (($_GET['keywords']) ? $_GET['keywords'] : ''); // Suggest channels if no search terms or keywords are given - $suggest = (local_user() && x($_REQUEST,'suggest')) ? $_REQUEST['suggest'] : ''; + $suggest = (local_channel() && x($_REQUEST,'suggest')) ? $_REQUEST['suggest'] : ''; if($suggest) { - $r = suggestion_query(local_user(),get_observer_hash()); + $r = suggestion_query(local_channel(),get_observer_hash()); // Remember in which order the suggestions were $addresses = array(); @@ -96,9 +96,9 @@ function directory_content(&$a) { $contacts = array(); - if(local_user()) { + if(local_channel()) { $x = q("select abook_xchan from abook where abook_channel = %d", - intval(local_user()) + intval(local_channel()) ); if($x) { foreach($x as $xx) @@ -161,7 +161,7 @@ function directory_content(&$a) { $profile_link = chanlink_url($rr['url']); $pdesc = (($rr['description']) ? $rr['description'] . '
' : ''); - $connect_link = ((local_user()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); + $connect_link = ((local_channel()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); // Checking status is disabled ATM until someone checks the performance impact more carefully //$online = remote_online_status($rr['address']); @@ -219,9 +219,9 @@ function directory_content(&$a) { $karr = explode(' ', $keywords); if($karr) { - if(local_user()) { + if(local_channel()) { $r = q("select keywords from profile where uid = %d and is_default = 1 limit 1", - intval(local_user()) + intval(local_channel()) ); if($r) { $keywords = str_replace(',',' ', $r[0]['keywords']); diff --git a/mod/display.php b/mod/display.php index f14aca6da..943af4206 100644 --- a/mod/display.php +++ b/mod/display.php @@ -5,7 +5,7 @@ function display_content(&$a, $update = 0, $load = false) { // logger("mod-display: update = $update load = $load"); - if(intval(get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { notice( t('Public access denied.') . EOL); return; } @@ -36,7 +36,7 @@ function display_content(&$a, $update = 0, $load = false) { $observer_is_owner = false; - if(local_user() && (! $update)) { + if(local_channel() && (! $update)) { $channel = $a->get_channel(); @@ -58,7 +58,7 @@ function display_content(&$a, $update = 0, $load = false) { 'acl' => populate_acl($channel_acl), 'bang' => '', 'visitor' => true, - 'profile_uid' => local_user(), + 'profile_uid' => local_channel(), 'return_path' => 'channel/' . $channel['channel_address'] ); @@ -109,7 +109,7 @@ function display_content(&$a, $update = 0, $load = false) { $o .= '
' . "\r\n"; - $o .= "\r\n"; $a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( @@ -160,13 +160,13 @@ function display_content(&$a, $update = 0, $load = false) { $sys = get_sys_channel(); $sysid = $sys['channel_id']; - if(local_user()) { + if(local_channel()) { $r = q("SELECT * from item WHERE item_restrict = 0 and uid = %d and mid = '%s' limit 1", - intval(local_user()), + intval(local_channel()), dbesc($target_item['parent_mid']) ); if($r) { @@ -235,7 +235,7 @@ function display_content(&$a, $update = 0, $load = false) { WHERE (item_flags & %d)>0 AND uid = %d and parent = %d ", intval(ITEM_UNSEEN), intval(ITEM_UNSEEN), - intval(local_user()), + intval(local_channel()), intval($r[0]['parent']) ); } diff --git a/mod/editblock.php b/mod/editblock.php index 6ec840af7..46126f94e 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -33,7 +33,7 @@ function editblock_content(&$a) { $which = argv(1); - $uid = local_user(); + $uid = local_channel(); $owner = 0; $channel = null; $observer = $a->get_observer(); diff --git a/mod/editlayout.php b/mod/editlayout.php index d76aa484d..847a64320 100644 --- a/mod/editlayout.php +++ b/mod/editlayout.php @@ -32,7 +32,7 @@ function editlayout_content(&$a) { $which = argv(1); - $uid = local_user(); + $uid = local_channel(); $owner = 0; $channel = null; $observer = $a->get_observer(); diff --git a/mod/editpost.php b/mod/editpost.php index dfbc8766e..1d9855c95 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -9,7 +9,7 @@ function editpost_content(&$a) { $o = ''; - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -23,7 +23,7 @@ function editpost_content(&$a) { $itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d and author_xchan = '%s' LIMIT 1", intval($post_id), - intval(local_user()), + intval(local_channel()), dbesc(get_observer_hash()) ); @@ -33,7 +33,7 @@ function editpost_content(&$a) { } $plaintext = true; -// if(feature_enabled(local_user(),'richtext')) +// if(feature_enabled(local_channel(),'richtext')) // $plaintext = false; $channel = $a->get_channel(); @@ -77,7 +77,7 @@ function editpost_content(&$a) { $category = ''; - $catsenabled = ((feature_enabled(local_user(),'categories')) ? 'categories' : ''); + $catsenabled = ((feature_enabled(local_channel(),'categories')) ? 'categories' : ''); if ($catsenabled){ $itm = fetch_post_tags($itm); @@ -136,8 +136,8 @@ function editpost_content(&$a) { '$lockstate' => $lockstate, '$acl' => '', '$bang' => '', - '$profile_uid' => local_user(), - '$preview' => true, // ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), + '$profile_uid' => local_channel(), + '$preview' => true, // ((feature_enabled(local_channel(),'preview')) ? t('Preview') : ''), '$jotplugins' => $jotplugins, '$sourceapp' => t($a->sourcename), '$catsenabled' => $catsenabled, diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 191c9a9ac..c07efc7ee 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -32,7 +32,7 @@ function editwebpage_content(&$a) { $which = argv(1); - $uid = local_user(); + $uid = local_channel(); $owner = 0; $channel = null; $observer = $a->get_observer(); diff --git a/mod/events.php b/mod/events.php index 28a816ea4..9347331d8 100755 --- a/mod/events.php +++ b/mod/events.php @@ -8,14 +8,14 @@ require_once('include/items.php'); function events_post(&$a) { - if(! local_user()) + if(! local_channel()) return; $event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0); $event_hash = ((x($_POST,'event_hash')) ? $_POST['event_hash'] : ''); $xchan = ((x($_POST,'xchan')) ? dbesc($_POST['xchan']) : ''); - $uid = local_user(); + $uid = local_channel(); $start_text = escape_tags($_REQUEST['start_text']); $finish_text = escape_tags($_REQUEST['finish_text']); @@ -76,8 +76,8 @@ function events_post(&$a) { $type = 'event'; require_once('include/text.php'); - linkify_tags($a, $desc, local_user()); - linkify_tags($a, $location, local_user()); + linkify_tags($a, $desc, local_channel()); + linkify_tags($a, $location, local_channel()); $action = ($event_hash == '') ? 'new' : "event/" . $event_hash; $onerror_url = $a->get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish"; @@ -98,7 +98,7 @@ function events_post(&$a) { if($event_id) { $x = q("select * from event where id = %d and uid = %d limit 1", intval($event_id), - intval(local_user()) + intval(local_channel()) ); if(! $x) { notice( t('Event not found.') . EOL); @@ -166,7 +166,7 @@ function events_post(&$a) { $datarray['type'] = $type; $datarray['adjust'] = $adjust; $datarray['nofinish'] = $nofinish; - $datarray['uid'] = local_user(); + $datarray['uid'] = local_channel(); $datarray['account'] = get_account_id(); $datarray['event_xchan'] = $channel['channel_hash']; $datarray['allow_cid'] = $str_contact_allow; @@ -195,7 +195,7 @@ function events_post(&$a) { function events_content(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -205,21 +205,21 @@ function events_content(&$a) { if((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) { $r = q("update event set ignore = 1 where id = %d and uid = %d", intval(argv(2)), - intval(local_user()) + intval(local_channel()) ); } if((argc() > 2) && (argv(1) === 'unignore') && intval(argv(2))) { $r = q("update event set ignore = 0 where id = %d and uid = %d", intval(argv(2)), - intval(local_user()) + intval(local_channel()) ); } $plaintext = true; -// if(feature_enabled(local_user(),'richtext')) +// if(feature_enabled(local_channel(),'richtext')) // $plaintext = false; @@ -265,7 +265,7 @@ function events_content(&$a) { } if($mode === 'add') { - event_addtocal($item_id,local_user()); + event_addtocal($item_id,local_channel()); killme(); } @@ -326,7 +326,7 @@ function events_content(&$a) { if (x($_GET,'id')){ $r = q("SELECT event.*, item.plink, item.item_flags, item.author_xchan, item.owner_xchan from event left join item on resource_id = event_hash where resource_type = 'event' and event.uid = %d and event.id = %d limit 1", - intval(local_user()), + intval(local_channel()), intval($_GET['id']) ); } else { @@ -341,7 +341,7 @@ function events_content(&$a) { where resource_type = 'event' and event.uid = %d and event.ignore = %d AND (( `adjust` = 0 AND ( `finish` >= '%s' or nofinish = 1 ) AND `start` <= '%s' ) OR ( `adjust` = 1 AND ( `finish` >= '%s' or nofinish = 1 ) AND `start` <= '%s' )) ", - intval(local_user()), + intval(local_channel()), intval($ignored), dbesc($start), dbesc($finish), @@ -463,7 +463,7 @@ function events_content(&$a) { if($mode === 'edit' && $event_id) { $r = q("SELECT * FROM `event` WHERE event_hash = '%s' AND `uid` = %d LIMIT 1", dbesc($event_id), - intval(local_user()) + intval(local_channel()) ); if(count($r)) $orig_event = $r[0]; @@ -534,14 +534,14 @@ function events_content(&$a) { if(! $f) $f = 'ymd'; - $catsenabled = feature_enabled(local_user(),'categories'); + $catsenabled = feature_enabled(local_channel(),'categories'); $category = ''; if($catsenabled && x($orig_event)){ $itm = q("select * from item where resource_type = 'event' and resource_id = '%s' and uid = %d limit 1", dbesc($orig_event['event_hash']), - intval(local_user()) + intval(local_channel()) ); $itm = fetch_post_tags($itm); if($itm) { diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 19bd77914..90b554edd 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -12,7 +12,7 @@ require_once('include/photo/photo_driver.php'); */ function fbrowser_content($a){ - if (!local_user()) + if (!local_channel()) killme(); if ($a->argc==1) @@ -29,7 +29,7 @@ function fbrowser_content($a){ if ($a->argc==2){ $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ", - intval(local_user()) + intval(local_channel()) ); // anon functions only from 5.3.0... meglio tardi che mai.. function folder1($el){return array(bin2hex($el['album']),$el['album']);} @@ -48,7 +48,7 @@ function fbrowser_content($a){ $r = q("SELECT `resource_id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `description` FROM `photo` WHERE `uid` = %d $sql_extra GROUP BY `resource_id` $sql_extra2", - intval(local_user()) + intval(local_channel()) ); function files1($rr){ @@ -87,7 +87,7 @@ function fbrowser_content($a){ case "file": if ($a->argc==2){ $files = q("SELECT id, filename, filetype FROM `attach` WHERE `uid` = %d ", - intval(local_user()) + intval(local_channel()) ); function files2($rr){ global $a; diff --git a/mod/filer.php b/mod/filer.php index 9a409177c..e8160bba2 100644 --- a/mod/filer.php +++ b/mod/filer.php @@ -7,7 +7,7 @@ require_once('include/items.php'); function filer_content(&$a) { - if(! local_user()) { + if(! local_channel()) { killme(); } @@ -18,26 +18,26 @@ function filer_content(&$a) { if($item_id && strlen($term)){ // file item - store_item_tag(local_user(),$item_id,TERM_OBJ_POST,TERM_FILE,$term,''); + store_item_tag(local_channel(),$item_id,TERM_OBJ_POST,TERM_FILE,$term,''); // protect the entire conversation from periodic expiration $r = q("select parent from item where id = %d and uid = %d limit 1", intval($item_id), - intval(local_user()) + intval(local_channel()) ); if($r) { $x = q("update item set item_flags = ( item_flags | %d ) where id = %d and uid = %d", intval(ITEM_RETAINED), intval($r[0]['parent']), - intval(local_user()) + intval(local_channel()) ); } } else { $filetags = array(); $r = q("select distinct(term) from term where uid = %d and type = %d order by term asc", - intval(local_user()), + intval(local_channel()), intval(TERM_FILE) ); if(count($r)) { diff --git a/mod/filerm.php b/mod/filerm.php index 900cfe60b..bd8ce7cfc 100644 --- a/mod/filerm.php +++ b/mod/filerm.php @@ -2,7 +2,7 @@ function filerm_content(&$a) { - if(! local_user()) { + if(! local_channel()) { killme(); } @@ -19,7 +19,7 @@ function filerm_content(&$a) { if($item_id && strlen($term)) { $r = q("delete from term where uid = %d and type = %d and oid = %d and term = '%s'", - intval(local_user()), + intval(local_channel()), intval(($category) ? TERM_CATEGORY : TERM_FILE), intval($item_id), dbesc($term) diff --git a/mod/filestorage.php b/mod/filestorage.php index 05f6a79e6..92474f336 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -14,7 +14,7 @@ function filestorage_post(&$a) { $channel_id = ((x($_POST, 'uid')) ? intval($_POST['uid']) : 0); - if((! $channel_id) || (! local_user()) || ($channel_id != local_user())) { + if((! $channel_id) || (! local_channel()) || ($channel_id != local_channel())) { notice( t('Permission denied.') . EOL); return; } @@ -76,7 +76,7 @@ function filestorage_content(&$a) { // Since we have ACL'd files in the wild, but don't have ACL here yet, we // need to return for anyone other than the owner, despite the perms check for now. - $is_owner = (((local_user()) && ($owner == local_user())) ? true : false); + $is_owner = (((local_channel()) && ($owner == local_channel())) ? true : false); if(! $is_owner) { info( t('Permission Denied.') . EOL ); return; diff --git a/mod/follow.php b/mod/follow.php index e480a0964..79e2a4fa5 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -5,11 +5,11 @@ require_once('include/follow.php'); function follow_init(&$a) { - if(! local_user()) { + if(! local_channel()) { return; } - $uid = local_user(); + $uid = local_channel(); $url = notags(trim($_REQUEST['url'])); $return_url = $_SESSION['return_url']; $confirm = intval($_REQUEST['confirm']); @@ -35,7 +35,7 @@ function follow_init(&$a) { function follow_content(&$a) { - if(! local_user()) { + if(! local_channel()) { return login(); } } \ No newline at end of file diff --git a/mod/fsuggest.php b/mod/fsuggest.php index 2f4f9606b..ec87af6ae 100644 --- a/mod/fsuggest.php +++ b/mod/fsuggest.php @@ -3,7 +3,7 @@ function fsuggest_post(&$a) { - if(! local_user()) { + if(! local_channel()) { return; } @@ -14,7 +14,7 @@ function fsuggest_post(&$a) { $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($contact_id), - intval(local_user()) + intval(local_channel()) ); if(! count($r)) { notice( t('Contact not found.') . EOL); @@ -31,13 +31,13 @@ function fsuggest_post(&$a) { if($new_contact) { $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($new_contact), - intval(local_user()) + intval(local_channel()) ); if(count($r)) { $x = q("INSERT INTO `fsuggest` ( `uid`,`cid`,`name`,`url`,`request`,`photo`,`note`,`created`) VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')", - intval(local_user()), + intval(local_channel()), intval($contact_id), dbesc($r[0]['name']), dbesc($r[0]['url']), @@ -48,14 +48,14 @@ function fsuggest_post(&$a) { ); $r = q("SELECT `id` FROM `fsuggest` WHERE `note` = '%s' AND `uid` = %d LIMIT 1", dbesc($hash), - intval(local_user()) + intval(local_channel()) ); if(count($r)) { $fsuggest_id = $r[0]['id']; q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($note), intval($fsuggest_id), - intval(local_user()) + intval(local_channel()) ); proc_run('php', 'include/notifier.php', 'suggest' , $fsuggest_id); } @@ -74,7 +74,7 @@ function fsuggest_content(&$a) { require_once('include/acl_selectors.php'); - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -86,7 +86,7 @@ function fsuggest_content(&$a) { $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($contact_id), - intval(local_user()) + intval(local_channel()) ); if(! count($r)) { notice( t('Contact not found.') . EOL); diff --git a/mod/group.php b/mod/group.php index f67623a83..66297d6ac 100644 --- a/mod/group.php +++ b/mod/group.php @@ -5,7 +5,7 @@ require_once('include/group.php'); function group_post(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -15,10 +15,10 @@ function group_post(&$a) { $name = notags(trim($_POST['groupname'])); $public = intval($_POST['public']); - $r = group_add(local_user(),$name,$public); + $r = group_add(local_channel(),$name,$public); if($r) { info( t('Collection created.') . EOL ); - $r = group_byname(local_user(),$name); + $r = group_byname(local_channel(),$name); if($r) goaway($a->get_baseurl() . '/group/' . $r); } @@ -32,7 +32,7 @@ function group_post(&$a) { $r = q("SELECT * FROM `groups` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval(argv(1)), - intval(local_user()) + intval(local_channel()) ); if(! $r) { notice( t('Collection not found.') . EOL ); @@ -47,7 +47,7 @@ function group_post(&$a) { $r = q("UPDATE `groups` SET `name` = '%s', visible = %d WHERE `uid` = %d AND `id` = %d", dbesc($groupname), intval($public), - intval(local_user()), + intval(local_channel()), intval($group['id']) ); if($r) @@ -64,14 +64,14 @@ function group_content(&$a) { logger('mod_group: ' . $a->cmd,LOGGER_DEBUG); - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied') . EOL); return; } // Switch to text mode interface if we have more than 'n' contacts or group members - $switchtotext = get_pconfig(local_user(),'system','groupedit_image_limit'); + $switchtotext = get_pconfig(local_channel(),'system','groupedit_image_limit'); if($switchtotext === false) $switchtotext = get_config('system','groupedit_image_limit'); if($switchtotext === false) @@ -99,10 +99,10 @@ function group_content(&$a) { if(intval(argv(2))) { $r = q("SELECT `name` FROM `groups` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval(argv(2)), - intval(local_user()) + intval(local_channel()) ); if($r) - $result = group_rmv(local_user(),$r[0]['name']); + $result = group_rmv(local_channel(),$r[0]['name']); if($result) info( t('Collection removed.') . EOL); else @@ -119,7 +119,7 @@ function group_content(&$a) { $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and not (xchan_flags & %d)>0 and not (abook_flags & %d)>0 and not (abook_flags & %d)>0 limit 1", dbesc(base64url_decode(argv(2))), - intval(local_user()), + intval(local_channel()), intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_BLOCKED), intval(ABOOK_FLAG_PENDING) @@ -134,7 +134,7 @@ function group_content(&$a) { require_once('include/acl_selectors.php'); $r = q("SELECT * FROM `groups` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1", intval(argv(1)), - intval(local_user()) + intval(local_channel()) ); if(! $r) { notice( t('Collection not found.') . EOL ); @@ -155,10 +155,10 @@ function group_content(&$a) { if($change) { if(in_array($change,$preselected)) { - group_rmv_member(local_user(),$group['name'],$change); + group_rmv_member(local_channel(),$group['name'],$change); } else { - group_add_member(local_user(),$group['name'],$change); + group_add_member(local_channel(),$group['name'],$change); } $members = group_get_members($group['id']); @@ -208,11 +208,11 @@ function group_content(&$a) { $groupeditor['members'][] = micropro($member,true,'mpgroup', $textmode); } else - group_rmv_member(local_user(),$group['name'],$member['xchan_hash']); + group_rmv_member(local_channel(),$group['name'],$member['xchan_hash']); } $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d)>0 and not (xchan_flags & %d)>0 and not (abook_flags & %d)>0 order by xchan_name asc", - intval(local_user()), + intval(local_channel()), intval(ABOOK_FLAG_BLOCKED), intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_PENDING) diff --git a/mod/hcard.php b/mod/hcard.php index 3cb2fa01e..014a63b35 100644 --- a/mod/hcard.php +++ b/mod/hcard.php @@ -13,12 +13,12 @@ function hcard_init(&$a) { $profile = ''; $channel = $a->get_channel(); - if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { + if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) { $which = $channel['channel_address']; $profile = argv(1); $r = q("select profile_guid from profile where id = %d and uid = %d limit 1", intval($profile), - intval(local_user()) + intval(local_channel()) ); if(! $r) $profile = ''; diff --git a/mod/home.php b/mod/home.php index 2e57a2ab9..733789991 100644 --- a/mod/home.php +++ b/mod/home.php @@ -12,10 +12,10 @@ function home_init(&$a) { $splash = ((argc() > 1 && argv(1) === 'splash') ? true : false); $channel = $a->get_channel(); - if(local_user() && $channel && $channel['xchan_url'] && ! $splash) { + if(local_channel() && $channel && $channel['xchan_url'] && ! $splash) { $dest = $channel['channel_startpage']; if(! $dest) - $dest = get_pconfig(local_user(),'system','startpage'); + $dest = get_pconfig(local_channel(),'system','startpage'); if(! $dest) $dest = get_config('system','startpage'); if(! $dest) @@ -100,7 +100,7 @@ function home_content(&$a, $update = 0, $load = false) { if($sitename) $o .= '

' . sprintf( t("Welcome to %s") ,$sitename) . '

'; - if(intval(get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { // If there's nothing special happening, just spit out a login box if (! $a->config['system']['no_login_on_homepage']) @@ -121,14 +121,14 @@ function home_content(&$a, $update = 0, $load = false) { $maxheight = 75; $o .= '
' . "\r\n"; - $o .= "\r\n"; $a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( '$baseurl' => z_root(), '$pgtype' => 'home', - '$uid' => ((local_user()) ? local_user() : '0'), + '$uid' => ((local_channel()) ? local_channel() : '0'), '$gid' => '0', '$cid' => '0', '$cmin' => '0', diff --git a/mod/impel.php b/mod/impel.php index 60e80ff9f..1b641b301 100644 --- a/mod/impel.php +++ b/mod/impel.php @@ -7,7 +7,7 @@ function impel_init(&$a) { $ret = array('success' => false); - if(! local_user()) + if(! local_channel()) json_return_and_die($ret); logger('impel: ' . print_r($_REQUEST,true), LOGGER_DATA); @@ -46,7 +46,7 @@ function impel_init(&$a) { logger('mod_impel: unrecognised element type' . print_r($j,true)); break; } - $arr['uid'] = local_user(); + $arr['uid'] = local_channel(); $arr['aid'] = $channel['channel_account_id']; $arr['title'] = $j['title']; $arr['body'] = $j['body']; @@ -76,7 +76,7 @@ function impel_init(&$a) { if($arr['mimetype'] === 'application/x-php') { $z = q("select account_id, account_roles, channel_pageflags from account left join channel on channel_account_id = account_id where channel_id = %d limit 1", - intval(local_user()) + intval(local_channel()) ); if($z && (($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) || ($z[0]['channel_pageflags'] & PAGE_ALLOWCODE))) { @@ -89,11 +89,11 @@ function impel_init(&$a) { $z = q("select * from item_id where sid = '%s' and service = '%s' and uid = %d limit 1", dbesc($pagetitle), dbesc($namespace), - intval(local_user()) + intval(local_channel()) ); $i = q("select id from item where mid = '%s' and uid = %d limit 1", dbesc($arr['mid']), - intval(local_user()) + intval(local_channel()) ); if($z && $i) { $remote_id = $z[0]['id']; diff --git a/mod/invite.php b/mod/invite.php index 12080c4d9..e197278d1 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -9,7 +9,7 @@ function invite_post(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -20,7 +20,7 @@ function invite_post(&$a) { if(! $max_invites) $max_invites = 50; - $current_invites = intval(get_pconfig(local_user(),'system','sent_invites')); + $current_invites = intval(get_pconfig(local_channel(),'system','sent_invites')); if($current_invites > $max_invites) { notice( t('Total invitation limit exceeded.') . EOL); return; @@ -34,7 +34,7 @@ function invite_post(&$a) { if(get_config('system','invitation_only')) { $invonly = true; - $x = get_pconfig(local_user(),'system','invites_remaining'); + $x = get_pconfig(local_channel(),'system','invites_remaining'); if((! $x) && (! is_site_admin())) return; } @@ -62,7 +62,7 @@ function invite_post(&$a) { if(! is_site_admin()) { $x --; if($x >= 0) - set_pconfig(local_user(),'system','invites_remaining',$x); + set_pconfig(local_channel(),'system','invites_remaining',$x); else return; } @@ -82,7 +82,7 @@ function invite_post(&$a) { if($res) { $total ++; $current_invites ++; - set_pconfig(local_user(),'system','sent_invites',$current_invites); + set_pconfig(local_channel(),'system','sent_invites',$current_invites); if($current_invites > $max_invites) { notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL); return; @@ -100,7 +100,7 @@ function invite_post(&$a) { function invite_content(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -110,7 +110,7 @@ function invite_content(&$a) { if(get_config('system','invitation_only')) { $invonly = true; - $x = get_pconfig(local_user(),'system','invites_remaining'); + $x = get_pconfig(local_channel(),'system','invites_remaining'); if((! $x) && (! is_site_admin())) { notice( t('You have no more invitations available') . EOL); return ''; diff --git a/mod/item.php b/mod/item.php index b3370fecf..26f6fb43d 100644 --- a/mod/item.php +++ b/mod/item.php @@ -26,12 +26,12 @@ function item_post(&$a) { // This will change. Figure out who the observer is and whether or not // they have permission to post here. Else ignore the post. - if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter'))) + if((! local_channel()) && (! remote_user()) && (! x($_REQUEST,'commenter'))) return; require_once('include/security.php'); - $uid = local_user(); + $uid = local_channel(); $channel = null; $observer = null; @@ -640,7 +640,7 @@ function item_post(&$a) { } } - if(local_user() != $profile_uid) + if(local_channel() != $profile_uid) $item_flags |= ITEM_UNSEEN; if($post_type === 'wall' || $post_type === 'wall-comment') @@ -905,7 +905,7 @@ function item_post(&$a) { function item_content(&$a) { - if((! local_user()) && (! remote_user())) + if((! local_channel()) && (! remote_user())) return; require_once('include/security.php'); @@ -920,7 +920,7 @@ function item_content(&$a) { if($i) { $can_delete = false; $local_delete = false; - if(local_user() && local_user() == $i[0]['uid']) + if(local_channel() && local_channel() == $i[0]['uid']) $local_delete = true; $ob_hash = get_observer_hash(); diff --git a/mod/layouts.php b/mod/layouts.php index aaf5db0ef..74a713cf1 100644 --- a/mod/layouts.php +++ b/mod/layouts.php @@ -33,7 +33,7 @@ function layouts_content(&$a) { $which = argv(1); - $uid = local_user(); + $uid = local_channel(); $owner = 0; $channel = null; $observer = $a->get_observer(); diff --git a/mod/lockview.php b/mod/lockview.php index e39f2707b..a46fb6d69 100644 --- a/mod/lockview.php +++ b/mod/lockview.php @@ -27,7 +27,7 @@ function lockview_content(&$a) { $item = $r[0]; - if($item['uid'] != local_user()) { + if($item['uid'] != local_channel()) { echo '
  • ' . t('Remote privacy information not available.') . '
    • '; killme(); } diff --git a/mod/locs.php b/mod/locs.php index bf2737718..5b04bb343 100644 --- a/mod/locs.php +++ b/mod/locs.php @@ -3,7 +3,7 @@ function locs_post(&$a) { - if(! local_user()) + if(! local_channel()) return; $channel = $a->get_channel(); @@ -73,7 +73,7 @@ function locs_content(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } diff --git a/mod/login.php b/mod/login.php index 8ad4704a3..12c7d339e 100644 --- a/mod/login.php +++ b/mod/login.php @@ -1,7 +1,7 @@ config['system']['register_policy'] == REGISTER_CLOSED) ? false : true); } diff --git a/mod/magic.php b/mod/magic.php index aead559a7..c31fa71ae 100644 --- a/mod/magic.php +++ b/mod/magic.php @@ -76,7 +76,7 @@ function magic_init(&$a) { // By default, we'll proceed without asking. $arr = array( - 'channel_id' => local_user(), + 'channel_id' => local_channel(), 'xchan' => $x[0], 'destination' => $dest, 'proceed' => true @@ -103,7 +103,7 @@ function magic_init(&$a) { goaway($dest); } - if(local_user()) { + if(local_channel()) { $channel = $a->get_channel(); $token = random_string(); diff --git a/mod/mail.php b/mod/mail.php index 37679aebf..1b0ea17c4 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -9,7 +9,7 @@ require_once('include/Contact.php'); function mail_post(&$a) { - if(! local_user()) + if(! local_channel()) return; $replyto = ((x($_REQUEST,'replyto')) ? notags(trim($_REQUEST['replyto'])) : ''); @@ -79,12 +79,12 @@ function mail_post(&$a) { } } -// if(feature_enabled(local_user(),'richtext')) { +// if(feature_enabled(local_channel(),'richtext')) { // $body = fix_mce_lf($body); // } require_once('include/text.php'); - linkify_tags($a, $body, local_user()); + linkify_tags($a, $body, local_channel()); if(! $recipient) { notice('No recipient found.'); @@ -93,7 +93,7 @@ function mail_post(&$a) { return; } - // We have a local_user, let send_message use the session channel and save a lookup + // We have a local_channel, let send_message use the session channel and save a lookup $ret = send_message(0, $recipient, $body, $subject, $replyto, $expires); @@ -110,7 +110,7 @@ function mail_content(&$a) { $o = ''; nav_set_selected('messages'); - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return login(); } @@ -119,7 +119,7 @@ function mail_content(&$a) { head_set_icon($channel['xchan_photo_s']); - $cipher = get_pconfig(local_user(),'system','default_cipher'); + $cipher = get_pconfig(local_channel(),'system','default_cipher'); if(! $cipher) $cipher = 'aes256'; @@ -134,7 +134,7 @@ function mail_content(&$a) { return; $cmd = argv(1); - $r = private_messages_drop(local_user(), argv(2)); + $r = private_messages_drop(local_channel(), argv(2)); if($r) { info( t('Message deleted.') . EOL ); } @@ -148,7 +148,7 @@ function mail_content(&$a) { $r = q("update mail set mail_flags = mail_flags | %d where id = %d and channel_id = %d", intval(MAIL_RECALLED), intval(argv(2)), - intval(local_user()) + intval(local_channel()) ); proc_run('php','include/notifier.php','mail',intval(argv(2))); @@ -184,7 +184,7 @@ function mail_content(&$a) { if(x($_REQUEST,'hash')) { $r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_xchan = '%s' limit 1", - intval(local_user()), + intval(local_channel()), dbesc($_REQUEST['hash']) ); if($r) { @@ -199,7 +199,7 @@ function mail_content(&$a) { if($preselect) { $r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_id = %d limit 1", - intval(local_user()), + intval(local_channel()), intval(argv(2)) ); if($r) { @@ -241,9 +241,9 @@ function mail_content(&$a) { '$wait' => t('Please wait'), '$submit' => t('Send'), '$defexpire' => '', - '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? true : false), + '$feature_expire' => ((feature_enabled(local_channel(),'content_expire')) ? true : false), '$expires' => t('Set expiration date'), - '$feature_encrypt' => ((feature_enabled(local_user(),'content_encrypt')) ? true : false), + '$feature_encrypt' => ((feature_enabled(local_channel(),'content_encrypt')) ? true : false), '$encrypt' => t('Encrypt text'), '$cipher' => $cipher, @@ -260,10 +260,10 @@ function mail_content(&$a) { $plaintext = true; -// if( local_user() && feature_enabled(local_user(),'richtext') ) +// if( local_channel() && feature_enabled(local_channel(),'richtext') ) // $plaintext = false; - $messages = private_messages_fetch_conversation(local_user(), argv(1), true); + $messages = private_messages_fetch_conversation(local_channel(), argv(1), true); if(! $messages) { info( t('Message not found.') . EOL); @@ -355,9 +355,9 @@ function mail_content(&$a) { '$submit' => t('Submit'), '$wait' => t('Please wait'), '$defexpire' => '', - '$feature_expire' => ((feature_enabled(local_user(),'content_expire')) ? true : false), + '$feature_expire' => ((feature_enabled(local_channel(),'content_expire')) ? true : false), '$expires' => t('Set expiration date'), - '$feature_encrypt' => ((feature_enabled(local_user(),'content_encrypt')) ? true : false), + '$feature_encrypt' => ((feature_enabled(local_channel(),'content_encrypt')) ? true : false), '$encrypt' => t('Encrypt text'), '$cipher' => $cipher, diff --git a/mod/manage.php b/mod/manage.php index b6e10bf46..4a7b25068 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -40,7 +40,7 @@ function manage_content(&$a) { $channels = null; - if(local_user()) { + if(local_channel()) { $r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and not ( channel_pageflags & %d )>0 order by channel_name ", intval(get_account_id()), intval(PAGE_REMOVED) @@ -149,7 +149,7 @@ function manage_content(&$a) { $o = replace_macros(get_markup_template('channels.tpl'), array( '$header' => t('Channel Manager'), '$msg_selected' => t('Current Channel'), - '$selected' => local_user(), + '$selected' => local_channel(), '$desc' => t('Switch to one of your channels by selecting it.'), '$msg_default' => t('Default Channel'), '$msg_make_default' => t('Make Default'), diff --git a/mod/match.php b/mod/match.php index 5447f755d..5a01ba645 100644 --- a/mod/match.php +++ b/mod/match.php @@ -8,7 +8,7 @@ function match_content(&$a) { $o = ''; - if(! local_user()) + if(! local_channel()) return; $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; @@ -16,7 +16,7 @@ function match_content(&$a) { $o .= '

    ' . t('Profile Match') . '

    '; $r = q("SELECT `keywords` FROM `profile` WHERE `is_default` = 1 AND `uid` = %d LIMIT 1", - intval(local_user()) + intval(local_channel()) ); if(! count($r)) return; diff --git a/mod/menu.php b/mod/menu.php index 92923e1ff..7e9c580a8 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -5,7 +5,7 @@ require_once('include/identity.php'); function menu_post(&$a) { - $uid = local_user(); + $uid = local_channel(); if(array_key_exists('sys',$_REQUEST) && $_REQUEST['sys'] && is_site_admin()) { $sys = get_sys_channel(); @@ -50,7 +50,7 @@ function menu_post(&$a) { function menu_content(&$a) { - $uid = local_user(); + $uid = local_channel(); if($a->is_sys && is_site_admin()) { $sys = get_sys_channel(); diff --git a/mod/message.php b/mod/message.php index 7f3b6180a..4a1ff26d1 100644 --- a/mod/message.php +++ b/mod/message.php @@ -12,7 +12,7 @@ function message_content(&$a) { $o = ''; nav_set_selected('messages'); - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return login(); } @@ -20,7 +20,7 @@ function message_content(&$a) { $channel = $a->get_channel(); head_set_icon($channel['xchan_photo_s']); - $cipher = get_pconfig(local_user(),'system','default_cipher'); + $cipher = get_pconfig(local_channel(),'system','default_cipher'); if(! $cipher) $cipher = 'aes256'; @@ -36,7 +36,7 @@ function message_content(&$a) { if(! intval(argv(2))) return; $cmd = argv(1); - $r = private_messages_drop(local_user(), argv(2), true); + $r = private_messages_drop(local_channel(), argv(2), true); if($r) info( t('Conversation removed.') . EOL ); goaway($a->get_baseurl(true) . '/message' ); @@ -50,7 +50,7 @@ function message_content(&$a) { // private_messages_list() can do other more complicated stuff, for now keep it simple - $r = private_messages_list(local_user(), '', $a->pager['start'], $a->pager['itemspage']); + $r = private_messages_list(local_channel(), '', $a->pager['start'], $a->pager['itemspage']); if(! $r) { info( t('No messages.') . EOL); diff --git a/mod/mitem.php b/mod/mitem.php index 7098d7489..b561ec7d6 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -5,7 +5,7 @@ require_once('include/acl_selectors.php'); function mitem_init(&$a) { - $uid = local_user(); + $uid = local_channel(); if(array_key_exists('sys',$_REQUEST) && $_REQUEST['sys'] && is_site_admin()) { $sys = get_sys_channel(); @@ -30,7 +30,7 @@ function mitem_init(&$a) { function mitem_post(&$a) { - $uid = local_user(); + $uid = local_channel(); if($a->is_sys && is_site_admin()) { $sys = get_sys_channel(); @@ -89,7 +89,7 @@ function mitem_post(&$a) { function mitem_content(&$a) { - $uid = local_user(); + $uid = local_channel(); $channel = $a->get_channel(); $observer = $a->get_observer(); diff --git a/mod/mood.php b/mod/mood.php index e6f4760e0..4fe1ceb59 100755 --- a/mod/mood.php +++ b/mod/mood.php @@ -7,10 +7,10 @@ require_once('include/items.php'); function mood_init(&$a) { - if(! local_user()) + if(! local_channel()) return; - $uid = local_user(); + $uid = local_channel(); $channel = $a->get_channel(); $verb = notags(trim($_GET['verb'])); @@ -108,7 +108,7 @@ function mood_init(&$a) { function mood_content(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } diff --git a/mod/network.php b/mod/network.php index 65332e3f6..9a4707b4d 100644 --- a/mod/network.php +++ b/mod/network.php @@ -8,13 +8,13 @@ require_once('include/acl_selectors.php'); function network_init(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } $channel = $a->get_channel(); - $a->profile_uid = local_user(); + $a->profile_uid = local_channel(); head_set_icon($channel['xchan_photo_s']); } @@ -22,7 +22,7 @@ function network_init(&$a) { function network_content(&$a, $update = 0, $load = false) { - if(! local_user()) { + if(! local_channel()) { $_SESSION['return_url'] = $a->query_string; return login(false); } @@ -54,7 +54,7 @@ function network_content(&$a, $update = 0, $load = false) { if(strpos($search,'@') === 0) { $r = q("select abook_id from abook left join xchan on abook_xchan = xchan_hash where xchan_name = '%s' and abook_channel = %d limit 1", dbesc(substr($search,1)), - intval(local_user()) + intval(local_channel()) ); if($r) { $_GET['cid'] = $r[0]['abook_id']; @@ -76,7 +76,7 @@ function network_content(&$a, $update = 0, $load = false) { if($gid) { $r = q("SELECT * FROM groups WHERE id = %d AND uid = %d LIMIT 1", intval($gid), - intval(local_user()) + intval(local_channel()) ); if(! $r) { if($update) @@ -140,7 +140,7 @@ function network_content(&$a, $update = 0, $load = false) { 'acl' => populate_acl((($group || $cid) ? $def_acl : $channel_acl)), 'bang' => (($group || $cid) ? '!' : ''), 'visitor' => true, - 'profile_uid' => local_user() + 'profile_uid' => local_channel() ); $o .= status_editor($a,$x); @@ -178,7 +178,7 @@ function network_content(&$a, $update = 0, $load = false) { $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent and item_restrict = 0 ) "; - $x = group_rec_byhash(local_user(), $group_hash); + $x = group_rec_byhash(local_channel(), $group_hash); if($x) $o = '

    ' . t('Collection: ') . $x['name'] . '

    ' . $o; @@ -190,10 +190,10 @@ function network_content(&$a, $update = 0, $load = false) { $r = q("SELECT abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d and not ( abook_flags & " . intval(ABOOK_FLAG_BLOCKED) . ") > 0 limit 1", intval($cid), - intval(local_user()) + intval(local_channel()) ); if($r) { - $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_user()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) and item_restrict = 0 ) "; + $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) and item_restrict = 0 ) "; $o = '

    ' . t('Connection: ') . $r[0]['xchan_name'] . '

    ' . $o; } else { @@ -217,20 +217,20 @@ function network_content(&$a, $update = 0, $load = false) { if($gid || $cid || $cmin || ($cmax != 99) || $star || $liked || $conv || $spam || $nouveau || $list) $firehose = 0; - $maxheight = get_pconfig(local_user(),'system','network_divmore_height'); + $maxheight = get_pconfig(local_channel(),'system','network_divmore_height'); if(! $maxheight) $maxheight = 400; $o .= '
    ' . "\r\n"; - $o .= "\r\n"; $a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( '$baseurl' => z_root(), '$pgtype' => 'network', - '$uid' => ((local_user()) ? local_user() : '0'), + '$uid' => ((local_channel()) ? local_channel() : '0'), '$gid' => (($gid) ? $gid : '0'), '$cid' => (($cid) ? $cid : '0'), '$cmin' => (($cmin) ? $cmin : '0'), @@ -304,7 +304,7 @@ function network_content(&$a, $update = 0, $load = false) { } else { - $itemspage = get_pconfig(local_user(),'system','itemspage'); + $itemspage = get_pconfig(local_channel(),'system','itemspage'); $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval($a->pager['itemspage']), intval($a->pager['start'])); } @@ -338,10 +338,10 @@ function network_content(&$a, $update = 0, $load = false) { $a->data['firehose'] = intval($sys['channel_id']); } else { - $uids = " and item.uid = " . local_user() . " "; + $uids = " and item.uid = " . local_channel() . " "; } - if(get_pconfig(local_user(),'system','network_list_mode')) + if(get_pconfig(local_channel(),'system','network_list_mode')) $page_mode = 'list'; else $page_mode = 'client'; @@ -435,7 +435,7 @@ function network_content(&$a, $update = 0, $load = false) { dbesc($parents_str) ); - xchan_query($items,true,(($firehose) ? local_user() : 0)); + xchan_query($items,true,(($firehose) ? local_channel() : 0)); $items = fetch_post_tags($items,true); $items = conv_sort($items,$ordering); } @@ -469,7 +469,7 @@ function network_content(&$a, $update = 0, $load = false) { WHERE (item_flags & %d) > 0 AND uid = %d $update_unseen ", intval(ITEM_UNSEEN), intval(ITEM_UNSEEN), - intval(local_user()) + intval(local_channel()) ); $mode = (($nouveau) ? 'network-new' : 'network'); diff --git a/mod/notes.php b/mod/notes.php index 84f8a7093..4bb97fc9e 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -2,13 +2,13 @@ function notes_init(&$a) { - if(! local_user()) + if(! local_channel()) return; $ret = array('success' => true); if($_REQUEST['note_text'] || $_REQUEST['note_text'] == '') { $body = escape_tags($_REQUEST['note_text']); - set_pconfig(local_user(),'notes','text',$body); + set_pconfig(local_channel(),'notes','text',$body); } // push updates to channel clones diff --git a/mod/notifications.php b/mod/notifications.php index 5507ee7e2..f679fbb3b 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -2,7 +2,7 @@ function notifications_post(&$a) { - if(! local_user()) { + if(! local_channel()) { goaway(z_root()); } @@ -15,7 +15,7 @@ function notifications_post(&$a) { $r = q("SELECT * FROM `intro` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($request_id), - intval(local_user()) + intval(local_channel()) ); if(count($r)) { @@ -43,7 +43,7 @@ function notifications_post(&$a) { $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1", intval($contact_id), - intval(local_user()) + intval(local_channel()) ); } goaway($a->get_baseurl(true) . '/notifications/intros'); @@ -62,7 +62,7 @@ function notifications_post(&$a) { function notifications_content(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -77,7 +77,7 @@ function notifications_content(&$a) { require_once('include/bbcode.php'); $r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc", - intval(local_user()) + intval(local_channel()) ); if (count($r) > 0) { diff --git a/mod/notify.php b/mod/notify.php index 72534c7fd..4c9d1977b 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -2,20 +2,20 @@ function notify_init(&$a) { - if(! local_user()) + if(! local_channel()) return; if(argc() > 2 && argv(1) === 'view' && intval(argv(2))) { $r = q("select * from notify where id = %d and uid = %d limit 1", intval(argv(2)), - intval(local_user()) + intval(local_channel()) ); if($r) { q("update notify set seen = 1 where (( parent != '' and parent = '%s' and otype = '%s' ) or link = '%s' ) and uid = %d", dbesc($r[0]['parent']), dbesc($r[0]['otype']), dbesc($r[0]['link']), - intval(local_user()) + intval(local_channel()) ); goaway($r[0]['link']); } @@ -27,7 +27,7 @@ function notify_init(&$a) { function notify_content(&$a) { - if(! local_user()) + if(! local_channel()) return login(); $notif_tpl = get_markup_template('notifications.tpl'); @@ -36,7 +36,7 @@ function notify_content(&$a) { require_once('include/bbcode.php'); $r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc", - intval(local_user()) + intval(local_channel()) ); if($r) { diff --git a/mod/oexchange.php b/mod/oexchange.php index 27c8b388d..637f4f384 100644 --- a/mod/oexchange.php +++ b/mod/oexchange.php @@ -14,7 +14,7 @@ function oexchange_init(&$a) { function oexchange_content(&$a) { - if(! local_user()) { + if(! local_channel()) { if(remote_user()) { $observer = $a->get_observer(); if($observer && $observer['xchan_url']) { @@ -57,7 +57,7 @@ function oexchange_content(&$a) { $post = array(); - $post['profile_uid'] = local_user(); + $post['profile_uid'] = local_channel(); $post['return'] = '/oexchange/done' ; $post['body'] = $s; $post['type'] = 'wall'; diff --git a/mod/pdledit.php b/mod/pdledit.php index 36b9a0c14..93b8d52e6 100644 --- a/mod/pdledit.php +++ b/mod/pdledit.php @@ -1,15 +1,15 @@ argv[2]) ); @@ -354,7 +354,7 @@ function photos_post(&$a) { require_once('include/text.php'); $profile_uid = $a->profile['profile_uid']; - $results = linkify_tags($a, $rawtags, (local_user()) ? local_user() : $profile_uid); + $results = linkify_tags($a, $rawtags, (local_channel()) ? local_channel() : $profile_uid); $success = $results['success']; $post_tags = array(); @@ -425,7 +425,7 @@ function photos_content(&$a) { // photos/name/image/xxxxx - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { notice( t('Public access denied.') . EOL); return; } @@ -494,7 +494,7 @@ function photos_content(&$a) { // tabs - $_is_owner = (local_user() && (local_user() == $owner_uid)); + $_is_owner = (local_channel() && (local_channel() == $owner_uid)); $o .= profile_tabs($a,$_is_owner, $a->data['channel']['channel_address']); /** @@ -876,11 +876,11 @@ function photos_content(&$a) { } } - if((local_user()) && (local_user() == $link_item['uid'])) { + if((local_channel()) && (local_channel() == $link_item['uid'])) { q("UPDATE `item` SET item_flags = (item_flags & ~%d) WHERE parent = %d and uid = %d and (item_flags & %d)>0", intval(ITEM_UNSEEN), intval($link_item['parent']), - intval(local_user()), + intval(local_channel()), intval(ITEM_UNSEEN) ); } diff --git a/mod/ping.php b/mod/ping.php index 1cebd152d..c69f42a6f 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -43,9 +43,9 @@ function ping_init(&$a) { $vnotify = false; - if(local_user()) { - $vnotify = get_pconfig(local_user(),'system','vnotify'); - $evdays = intval(get_pconfig(local_user(),'system','evdays')); + if(local_channel()) { + $vnotify = get_pconfig(local_channel(),'system','vnotify'); + $evdays = intval(get_pconfig(local_channel(),'system','evdays')); $ob_hash = get_observer_hash(); } @@ -64,7 +64,7 @@ function ping_init(&$a) { * of the now current channel. */ - $result['invalid'] = ((intval($_GET['uid'])) && (intval($_GET['uid']) != local_user()) ? 1 : 0); + $result['invalid'] = ((intval($_GET['uid'])) && (intval($_GET['uid']) != local_channel()) ? 1 : 0); /** * Send all system messages (alerts) to the browser. @@ -133,7 +133,7 @@ function ping_init(&$a) { db_utcnow(), db_quoteinterval('3 MINUTE') ); - if((! local_user()) || ($result['invalid'])) { + if((! local_channel()) || ($result['invalid'])) { echo json_encode($result); killme(); } @@ -148,13 +148,13 @@ function ping_init(&$a) { */ // mark all items read - if(x($_REQUEST, 'markRead') && local_user()) { + if(x($_REQUEST, 'markRead') && local_channel()) { switch($_REQUEST['markRead']) { case 'network': $r = q("update item set item_flags = ( item_flags & ~%d ) where (item_flags & %d) > 0 and uid = %d", intval(ITEM_UNSEEN), intval(ITEM_UNSEEN), - intval(local_user()) + intval(local_channel()) ); break; case 'home': @@ -162,24 +162,24 @@ function ping_init(&$a) { intval(ITEM_UNSEEN), intval(ITEM_UNSEEN), intval(ITEM_WALL), - intval(local_user()) + intval(local_channel()) ); break; case 'messages': $r = q("update mail set mail_flags = ( mail_flags | %d ) where channel_id = %d and not (mail_flags & %d) > 0", intval(MAIL_SEEN), - intval(local_user()), + intval(local_channel()), intval(MAIL_SEEN) ); break; case 'all_events': $r = q("update event set `ignore` = 1 where `ignore` = 0 and uid = %d", - intval(local_user()) + intval(local_channel()) ); break; case 'notify': $r = q("update notify set seen = 1 where uid = %d", - intval(local_user()) + intval(local_channel()) ); break; default: @@ -187,11 +187,11 @@ function ping_init(&$a) { } } - if(x($_REQUEST, 'markItemRead') && local_user()) { + if(x($_REQUEST, 'markItemRead') && local_channel()) { $r = q("update item set item_flags = ( item_flags & ~%d ) where parent = %d and uid = %d", intval(ITEM_UNSEEN), intval($_REQUEST['markItemRead']), - intval(local_user()) + intval(local_channel()) ); } @@ -204,22 +204,22 @@ function ping_init(&$a) { if(argc() > 1 && argv(1) === 'notify') { $t = q("select count(*) as total from notify where uid = %d and seen = 0", - intval(local_user()) + intval(local_channel()) ); if($t && intval($t[0]['total']) > 49) { $z = q("select * from notify where uid = %d and seen = 0 order by date desc limit 50", - intval(local_user()) + intval(local_channel()) ); } else { $z1 = q("select * from notify where uid = %d and seen = 0 order by date desc limit 50", - intval(local_user()) + intval(local_channel()) ); $z2 = q("select * from notify where uid = %d and seen = 1 order by date desc limit %d", - intval(local_user()), + intval(local_channel()), intval(50 - intval($t[0]['total'])) ); $z = array_merge($z1,$z2); @@ -248,7 +248,7 @@ function ping_init(&$a) { $t = q("select mail.*, xchan.* from mail left join xchan on xchan_hash = from_xchan where channel_id = %d and not ( mail_flags & %d ) > 0 and not (mail_flags & %d ) > 0 and from_xchan != '%s' order by created desc limit 50", - intval(local_user()), + intval(local_channel()), intval(MAIL_SEEN), intval(MAIL_DELETED), dbesc($channel['channel_hash']) @@ -280,7 +280,7 @@ function ping_init(&$a) { and author_xchan != '%s' ORDER BY created DESC", intval(ITEM_VISIBLE), intval(ITEM_UNSEEN), - intval(local_user()), + intval(local_channel()), dbesc($ob_hash) ); @@ -301,7 +301,7 @@ function ping_init(&$a) { $result = array(); $r = q("SELECT * FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or (xchan_flags & %d) > 0) ORDER BY abook_created DESC", - intval(local_user()), + intval(local_channel()), intval(ABOOK_FLAG_PENDING), intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN) @@ -333,7 +333,7 @@ function ping_init(&$a) { $r = q("SELECT * FROM event left join xchan on event_xchan = xchan_hash WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0 ORDER BY `start` DESC ", - intval(local_user()), + intval(local_channel()), dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')), dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) ); @@ -374,7 +374,7 @@ function ping_init(&$a) { if($vnotify & VNOTIFY_SYSTEM) { $t = q("select count(*) as total from notify where uid = %d and seen = 0", - intval(local_user()) + intval(local_channel()) ); if($t) $result['notify'] = intval($t[0]['total']); @@ -388,7 +388,7 @@ function ping_init(&$a) { and author_xchan != '%s'", intval(ITEM_VISIBLE), intval(ITEM_UNSEEN), - intval(local_user()), + intval(local_channel()), dbesc($ob_hash) ); @@ -414,7 +414,7 @@ function ping_init(&$a) { if($vnotify & VNOTIFY_INTRO) { $intr = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and (abook_flags & %d) > 0 and not ((abook_flags & %d) > 0 or (xchan_flags & %d) > 0)", - intval(local_user()), + intval(local_channel()), intval(ABOOK_FLAG_PENDING), intval(ABOOK_FLAG_SELF|ABOOK_FLAG_IGNORED), intval(XCHAN_FLAGS_DELETED|XCHAN_FLAGS_ORPHAN) @@ -432,7 +432,7 @@ function ping_init(&$a) { if($vnotify & VNOTIFY_MAIL) { $mails = q("SELECT count(id) as total from mail WHERE channel_id = %d AND not (mail_flags & %d) > 0 and from_xchan != '%s' ", - intval(local_user()), + intval(local_channel()), intval(MAIL_SEEN), dbesc($channel['channel_hash']) ); @@ -456,7 +456,7 @@ function ping_init(&$a) { $events = q("SELECT type, start, adjust FROM `event` WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0 ORDER BY `start` ASC ", - intval(local_user()), + intval(local_channel()), dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')), dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) ); diff --git a/mod/poke.php b/mod/poke.php index b22f7d9d5..6257a2821 100755 --- a/mod/poke.php +++ b/mod/poke.php @@ -18,10 +18,10 @@ require_once('include/items.php'); function poke_init(&$a) { - if(! local_user()) + if(! local_channel()) return; - $uid = local_user(); + $uid = local_channel(); $channel = $a->get_channel(); $verb = notags(trim($_REQUEST['verb'])); @@ -124,7 +124,7 @@ function poke_init(&$a) { function poke_content(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -136,7 +136,7 @@ function poke_content(&$a) { $r = q("select abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d and abook_channel = %d limit 1", intval($_REQUEST['c']), - intval(local_user()) + intval(local_channel()) ); if($r) { $name = $r[0]['xchan_name']; diff --git a/mod/post.php b/mod/post.php index 9e818a7e2..91a1d4877 100644 --- a/mod/post.php +++ b/mod/post.php @@ -219,7 +219,7 @@ function post_init(&$a) { $DNT = $j['DNT']; } // everything is good... maybe - if(local_user()) { + if(local_channel()) { // tell them to logout if they're logged in locally as anything but the target remote account // in which case just shut up because they don't need to be doing this at all. diff --git a/mod/profile.php b/mod/profile.php index 792bf34c5..e37aea863 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -21,12 +21,12 @@ function profile_init(&$a) { $profile = ''; $channel = $a->get_channel(); - if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { + if((local_channel()) && (argc() > 2) && (argv(2) === 'view')) { $which = $channel['channel_address']; $profile = argv(1); $r = q("select profile_guid from profile where id = %d and uid = %d limit 1", intval($profile), - intval(local_user()) + intval(local_channel()) ); if(! $r) $profile = ''; @@ -66,7 +66,7 @@ function profile_content(&$a, $update = 0) { } - $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false); + $is_owner = ((local_channel()) && (local_channel() == $a->profile['profile_uid']) ? true : false); if($a->profile['hidewall'] && (! $is_owner) && (! remote_user())) { notice( t('Permission denied.') . EOL); diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 13d3cd756..fd5ea2af2 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -22,8 +22,8 @@ function profile_photo_set_profile_perms($profileid = '') { } else { - logger('Resetting permissions on default-profile-photo for user'.local_user()); - $r = q("SELECT photo, profile_guid, id, is_default, uid FROM profile WHERE profile.uid = %d AND is_default = 1 LIMIT 1", intval(local_user()) ); //If no profile is given, we update the default profile + logger('Resetting permissions on default-profile-photo for user'.local_channel()); + $r = q("SELECT photo, profile_guid, id, is_default, uid FROM profile WHERE profile.uid = %d AND is_default = 1 LIMIT 1", intval(local_channel()) ); //If no profile is given, we update the default profile } $profile = $r[0]; @@ -32,7 +32,7 @@ function profile_photo_set_profile_perms($profileid = '') { $resource_id = $resource_id[0]; if (intval($profile['is_default']) != 1) { - $r0 = q("SELECT channel_hash FROM channel WHERE channel_id = %d LIMIT 1", intval(local_user()) ); + $r0 = q("SELECT channel_hash FROM channel WHERE channel_id = %d LIMIT 1", intval(local_channel()) ); $r1 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%d' ", intval($profile['id'])); //Should not be needed in future. Catches old int-profile-ids. $r2 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%s'", dbesc($profile['profile_guid'])); $allowcid = "<" . $r0[0]['channel_hash'] . ">"; @@ -62,7 +62,7 @@ function profile_photo_set_profile_perms($profileid = '') { function profile_photo_init(&$a) { - if(! local_user()) { + if(! local_channel()) { return; } @@ -80,7 +80,7 @@ function profile_photo_init(&$a) { function profile_photo_post(&$a) { - if(! local_user()) { + if(! local_channel()) { return; } @@ -94,7 +94,7 @@ function profile_photo_post(&$a) { if($_REQUEST['profile']) { $r = q("select id, is_default from profile where id = %d and uid = %d limit 1", intval($_REQUEST['profile']), - intval(local_user()) + intval(local_channel()) ); if(($r) && (! intval($r[0]['is_default']))) $is_default_profile = 0; @@ -124,7 +124,7 @@ function profile_photo_post(&$a) { $r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND scale = %d LIMIT 1", dbesc($image_id), - dbesc(local_user()), + dbesc(local_channel()), intval($scale)); if($r) { @@ -139,7 +139,7 @@ function profile_photo_post(&$a) { $aid = get_account_id(); - $p = array('aid' => $aid, 'uid' => local_user(), 'resource_id' => $base_image['resource_id'], + $p = array('aid' => $aid, 'uid' => local_channel(), 'resource_id' => $base_image['resource_id'], 'filename' => $base_image['filename'], 'album' => t('Profile Photos')); $p['scale'] = 4; @@ -162,7 +162,7 @@ function profile_photo_post(&$a) { notice( t('Image resize failed.') . EOL ); $x = q("delete from photo where resource_id = '%s' and uid = %d and scale >= 4 ", dbesc($base_image['resource_id']), - local_user() + local_channel() ); return; } @@ -172,14 +172,14 @@ function profile_photo_post(&$a) { if($is_default_profile) { $r = q("UPDATE photo SET profile = 0 WHERE profile = 1 AND resource_id != '%s' AND `uid` = %d", dbesc($base_image['resource_id']), - intval(local_user()) + intval(local_channel()) ); $r = q("UPDATE photo SET photo_flags = ( photo_flags & ~%d ) WHERE ( photo_flags & %d )>0 AND resource_id != '%s' AND `uid` = %d", intval(PHOTO_PROFILE), intval(PHOTO_PROFILE), dbesc($base_image['resource_id']), - intval(local_user()) + intval(local_channel()) ); } else { @@ -187,7 +187,7 @@ function profile_photo_post(&$a) { dbesc($a->get_baseurl() . '/photo/' . $base_image['resource_id'] . '-4'), dbesc($a->get_baseurl() . '/photo/' . $base_image['resource_id'] . '-5'), intval($_REQUEST['profile']), - intval(local_user()) + intval(local_channel()) ); } @@ -260,7 +260,7 @@ function profile_photo_post(&$a) { if(! function_exists('profile_photo_content')) { function profile_photo_content(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL ); return; } @@ -284,7 +284,7 @@ function profile_photo_content(&$a) { $r = q("SELECT id, album, scale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY scale ASC", - intval(local_user()), + intval(local_channel()), dbesc($resource_id) ); if(! $r) { @@ -302,21 +302,21 @@ function profile_photo_content(&$a) { if(($r[0]['album'] == t('Profile Photos')) && ($havescale)) { // unset any existing profile photos $r = q("UPDATE photo SET profile = 0 WHERE profile = 1 AND uid = %d", - intval(local_user())); + intval(local_channel())); $r = q("UPDATE photo SET photo_flags = (photo_flags & ~%d ) WHERE (photo_flags & %d )>0 AND uid = %d", intval(PHOTO_PROFILE), intval(PHOTO_PROFILE), - intval(local_user())); + intval(local_channel())); // set all sizes of this one as profile photos $r = q("UPDATE photo SET profile = 1 WHERE uid = %d AND resource_id = '%s'", - intval(local_user()), + intval(local_channel()), dbesc($resource_id) ); $r = q("UPDATE photo SET photo_flags = ( photo_flags | %d ) WHERE uid = %d AND resource_id = '%s'", intval(PHOTO_PROFILE), - intval(local_user()), + intval(local_channel()), dbesc($resource_id) ); @@ -327,13 +327,13 @@ function profile_photo_content(&$a) { ); profile_photo_set_profile_perms(); //Reset default photo permissions to public - proc_run('php','include/directory.php',local_user()); + proc_run('php','include/directory.php',local_channel()); goaway($a->get_baseurl() . '/profiles'); } $r = q("SELECT `data`, `type` FROM photo WHERE id = %d and uid = %d limit 1", intval($r[0]['id']), - intval(local_user()) + intval(local_channel()) ); if(! $r) { @@ -347,7 +347,7 @@ function profile_photo_content(&$a) { } $profiles = q("select id, profile_name as name, is_default from profile where uid = %d", - intval(local_user()) + intval(local_channel()) ); if(! x($a->data,'imagecrop')) { @@ -420,7 +420,7 @@ function profile_photo_crop_ui_head(&$a, $ph){ $hash = photo_new_resource(); $smallest = 0; - $p = array('aid' => get_account_id(), 'uid' => local_user(), 'resource_id' => $hash, + $p = array('aid' => get_account_id(), 'uid' => local_channel(), 'resource_id' => $hash, 'filename' => $filename, 'album' => t('Profile Photos'), 'scale' => 0); $r = $ph->save($p); diff --git a/mod/profiles.php b/mod/profiles.php index ef5f6b379..19e5ffc50 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -5,14 +5,14 @@ function profiles_init(&$a) { nav_set_selected('profiles'); - if(! local_user()) { + if(! local_channel()) { return; } if((argc() > 2) && (argv(1) === "drop") && intval(argv(2))) { $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is_default` = 0 LIMIT 1", intval(argv(2)), - intval(local_user()) + intval(local_channel()) ); if(! count($r)) { notice( t('Profile not found.') . EOL); @@ -26,13 +26,13 @@ function profiles_init(&$a) { // move every contact using this profile as their default to the user default $r = q("UPDATE abook SET abook_profile = (SELECT profile_guid AS FROM profile WHERE is_default = 1 AND uid = %d LIMIT 1) WHERE abook_profile = '%s' AND abook_channel = %d ", - intval(local_user()), + intval(local_channel()), dbesc($profile_guid), - intval(local_user()) + intval(local_channel()) ); $r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d", intval(argv(2)), - intval(local_user()) + intval(local_channel()) ); if($r) info( t('Profile deleted.') . EOL); @@ -50,18 +50,18 @@ function profiles_init(&$a) { // check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't'); $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d", - intval(local_user())); + intval(local_channel())); $num_profiles = count($r0); $name = t('Profile-') . ($num_profiles + 1); $r1 = q("SELECT `name`, `photo`, `thumb` FROM `profile` WHERE `uid` = %d AND `is_default` = 1 LIMIT 1", - intval(local_user())); + intval(local_channel())); $r2 = q("INSERT INTO `profile` (`aid`, `uid` , `profile_guid`, `profile_name` , `name`, `photo`, `thumb`) VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s' )", intval(get_account_id()), - intval(local_user()), + intval(local_channel()), dbesc(random_string()), dbesc($name), dbesc($r1[0]['name']), @@ -70,7 +70,7 @@ function profiles_init(&$a) { ); $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile_name` = '%s' LIMIT 1", - intval(local_user()), + intval(local_channel()), dbesc($name) ); @@ -86,12 +86,12 @@ function profiles_init(&$a) { check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't'); $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d", - intval(local_user())); + intval(local_channel())); $num_profiles = count($r0); $name = t('Profile-') . ($num_profiles + 1); $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1", - intval(local_user()), + intval(local_channel()), intval($a->argv[2]) ); if(! count($r1)) { @@ -114,7 +114,7 @@ function profiles_init(&$a) { . "')" ); $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile_name` = '%s' LIMIT 1", - intval(local_user()), + intval(local_channel()), dbesc($name) ); info( t('New profile created.') . EOL); @@ -129,7 +129,7 @@ function profiles_init(&$a) { if((argc() > 2) && (argv(1) === 'export')) { $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1", - intval(local_user()), + intval(local_channel()), intval(argv(2)) ); if(! $r1) { @@ -156,19 +156,19 @@ function profiles_init(&$a) { // Run profile_load() here to make sure the theme is set before // we start loading content - if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_user(),'multi_profiles')) { - if(feature_enabled(local_user(),'multi_profiles')) + if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_channel(),'multi_profiles')) { + if(feature_enabled(local_channel(),'multi_profiles')) $id = $a->argv[1]; else { $x = q("select id from profile where uid = %d and is_default = 1", - intval(local_user()) + intval(local_channel()) ); if($x) $id = $x[0]['id']; } $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($id), - intval(local_user()) + intval(local_channel()) ); if(! count($r)) { notice( t('Profile not found.') . EOL); @@ -184,7 +184,7 @@ function profiles_init(&$a) { function profiles_post(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -225,7 +225,7 @@ function profiles_post(&$a) { if((argc() > 1) && (argv(1) !== "new") && intval(argv(1))) { $orig = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($a->argv[1]), - intval(local_user()) + intval(local_channel()) ); if(! count($orig)) { notice( t('Profile not found.') . EOL); @@ -299,20 +299,20 @@ function profiles_post(&$a) { $hide_friends = ((intval($_POST['hide_friends'])) ? 1: 0); require_once('include/text.php'); - linkify_tags($a, $likes, local_user()); - linkify_tags($a, $dislikes, local_user()); - linkify_tags($a, $about, local_user()); - linkify_tags($a, $interest, local_user()); - linkify_tags($a, $interest, local_user()); - linkify_tags($a, $contact, local_user()); - linkify_tags($a, $channels, local_user()); - linkify_tags($a, $music, local_user()); - linkify_tags($a, $book, local_user()); - linkify_tags($a, $tv, local_user()); - linkify_tags($a, $film, local_user()); - linkify_tags($a, $romance, local_user()); - linkify_tags($a, $work, local_user()); - linkify_tags($a, $education, local_user()); + linkify_tags($a, $likes, local_channel()); + linkify_tags($a, $dislikes, local_channel()); + linkify_tags($a, $about, local_channel()); + linkify_tags($a, $interest, local_channel()); + linkify_tags($a, $interest, local_channel()); + linkify_tags($a, $contact, local_channel()); + linkify_tags($a, $channels, local_channel()); + linkify_tags($a, $music, local_channel()); + linkify_tags($a, $book, local_channel()); + linkify_tags($a, $tv, local_channel()); + linkify_tags($a, $film, local_channel()); + linkify_tags($a, $romance, local_channel()); + linkify_tags($a, $work, local_channel()); + linkify_tags($a, $education, local_channel()); $with = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : ''); @@ -338,12 +338,12 @@ function profiles_post(&$a) { $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_name = '%s' AND abook_channel = %d LIMIT 1", dbesc($newname), - intval(local_user()) + intval(local_channel()) ); if(! $r) { $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE xchan_addr = '%s' AND abook_channel = %d LIMIT 1", dbesc($lookup . '@%'), - intval(local_user()) + intval(local_channel()) ); } if($r) { @@ -364,7 +364,7 @@ function profiles_post(&$a) { $profile_fields_basic = get_profile_fields_basic(); $profile_fields_advanced = get_profile_fields_advanced(); - $advanced = ((feature_enabled(local_user(),'advanced_profiles')) ? true : false); + $advanced = ((feature_enabled(local_channel(),'advanced_profiles')) ? true : false); if($advanced) $fields = $profile_fields_advanced; else @@ -375,7 +375,7 @@ function profiles_post(&$a) { foreach($z as $zz) { if(array_key_exists($zz['field_name'],$fields)) { $w = q("select * from profext where channel_id = %d and hash = '%s' and k = '%s' limit 1", - intval(local_user()), + intval(local_channel()), dbesc($orig[0]['profile_guid']), dbesc($zz['field_name']) ); @@ -387,7 +387,7 @@ function profiles_post(&$a) { } else { q("insert into profext ( channel_id, hash, k, v ) values ( %d, '%s', '%s', '%s') ", - intval(local_user()), + intval(local_channel()), dbesc($orig[0]['profile_guid']), dbesc($zz['field_name']), dbesc(escape_tags(trim($_POST[$zz['field_name']]))) @@ -530,7 +530,7 @@ function profiles_post(&$a) { dbesc($education), intval($hide_friends), intval(argv(1)), - intval(local_user()) + intval(local_channel()) ); if($r) @@ -538,11 +538,11 @@ function profiles_post(&$a) { $r = q("select * from profile where id = %d and uid = %d limit 1", intval(argv(1)), - intval(local_user()) + intval(local_channel()) ); if($r) { require_once('include/zot.php'); - build_sync_packet(local_user(),array('profile' => $r)); + build_sync_packet(local_channel(),array('profile' => $r)); } $channel = $a->get_channel(); @@ -558,7 +558,7 @@ function profiles_post(&$a) { if($is_default) { // reload the info for the sidebar widget - why does this not work? profile_load($a,$channel['channel_address']); - proc_run('php','include/directory.php',local_user()); + proc_run('php','include/directory.php',local_channel()); } } } @@ -572,7 +572,7 @@ function profiles_content(&$a) { $channel = $a->get_channel(); - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } @@ -582,19 +582,19 @@ function profiles_content(&$a) { $profile_fields_basic = get_profile_fields_basic(); $profile_fields_advanced = get_profile_fields_advanced(); - if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_user(),'multi_profiles')) { - if(feature_enabled(local_user(),'multi_profiles')) + if(((argc() > 1) && (intval(argv(1)))) || !feature_enabled(local_channel(),'multi_profiles')) { + if(feature_enabled(local_channel(),'multi_profiles')) $id = $a->argv[1]; else { $x = q("select id from profile where uid = %d and is_default = 1", - intval(local_user()) + intval(local_channel()) ); if($x) $id = $x[0]['id']; } $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($id), - intval(local_user()) + intval(local_channel()) ); if(! count($r)) { notice( t('Profile not found.') . EOL); @@ -605,7 +605,7 @@ function profiles_content(&$a) { $editselect = 'none'; -// if(feature_enabled(local_user(),'richtext')) +// if(feature_enabled(local_channel(),'richtext')) // $editselect = 'textareas'; $a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array( @@ -613,7 +613,7 @@ function profiles_content(&$a) { '$editselect' => $editselect, )); - $advanced = ((feature_enabled(local_user(),'advanced_profiles')) ? true : false); + $advanced = ((feature_enabled(local_channel(),'advanced_profiles')) ? true : false); if($advanced) $fields = $profile_fields_advanced; else @@ -636,7 +636,7 @@ function profiles_content(&$a) { $mine = q("select v from profext where k = '%s' and hash = '%s' and channel_id = %d limit 1", dbesc($qq['field_name']), dbesc($r[0]['profile_guid']), - intval(local_user()) + intval(local_channel()) ); if(array_key_exists($qq['field_name'],$fields)) { @@ -656,7 +656,7 @@ function profiles_content(&$a) { $o .= replace_macros($tpl,array( '$form_security_token' => get_form_security_token("profile_edit"), - '$profile_clone_link' => ((feature_enabled(local_user(),'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' + '$profile_clone_link' => ((feature_enabled(local_channel(),'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ''), '$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"), @@ -671,7 +671,7 @@ function profiles_content(&$a) { '$cr_prof' => t('Create a new profile using these settings'), '$cl_prof' => t('Clone this profile'), '$del_prof' => t('Delete this profile'), - '$exportable' => feature_enabled(local_user(),'profile_export'), + '$exportable' => feature_enabled(local_channel(),'profile_export'), '$lbl_import' => t('Import profile from file'), '$lbl_export' => t('Export profile to file'), '$lbl_profname' => t('Profile Name:'), @@ -763,7 +763,7 @@ function profiles_content(&$a) { else { $r = q("SELECT * FROM `profile` WHERE `uid` = %d", - local_user()); + local_channel()); if(count($r)) { $tpl_header = get_markup_template('profile_listing_header.tpl'); diff --git a/mod/profperm.php b/mod/profperm.php index 55dc8cc77..4556119a4 100644 --- a/mod/profperm.php +++ b/mod/profperm.php @@ -4,7 +4,7 @@ require_once('include/Contact.php'); function profperm_init(&$a) { - if(! local_user()) + if(! local_channel()) return; $channel = $a->get_channel(); @@ -19,7 +19,7 @@ function profperm_init(&$a) { function profperm_content(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied') . EOL); return; } @@ -32,7 +32,7 @@ function profperm_content(&$a) { // Switch to text mod interface if we have more than 'n' contacts or group members - $switchtotext = get_pconfig(local_user(),'system','groupedit_image_limit'); + $switchtotext = get_pconfig(local_channel(),'system','groupedit_image_limit'); if($switchtotext === false) $switchtotext = get_config('system','groupedit_image_limit'); if($switchtotext === false) @@ -42,7 +42,7 @@ function profperm_content(&$a) { if((argc() > 2) && intval(argv(1)) && intval(argv(2))) { $r = q("SELECT abook_id FROM abook WHERE abook_id = %d and abook_channel = %d limit 1", intval(argv(2)), - intval(local_user()) + intval(local_channel()) ); if($r) $change = intval(argv(2)); @@ -52,7 +52,7 @@ function profperm_content(&$a) { if((argc() > 1) && (intval(argv(1)))) { $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is_default` = 0 LIMIT 1", intval(argv(1)), - intval(local_user()) + intval(local_channel()) ); if(! $r) { notice( t('Invalid profile identifier.') . EOL ); @@ -62,7 +62,7 @@ function profperm_content(&$a) { $profile = $r[0]; $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = '%s'", - intval(local_user()), + intval(local_channel()), dbesc($profile['profile_guid']) ); @@ -77,14 +77,14 @@ function profperm_content(&$a) { if(in_array($change,$ingroup)) { q("UPDATE abook SET abook_profile = '' WHERE abook_id = %d AND abook_channel = %d", intval($change), - intval(local_user()) + intval(local_channel()) ); } else { q("UPDATE abook SET abook_profile = '%s' WHERE abook_id = %d AND abook_channel = %d", dbesc($profile['profile_guid']), intval($change), - intval(local_user()) + intval(local_channel()) ); } @@ -95,7 +95,7 @@ function profperm_content(&$a) { profile_photo_set_profile_perms($profile['id']); $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = '%s'", - intval(local_user()), + intval(local_channel()), dbesc($profile['profile_guid']) ); @@ -140,7 +140,7 @@ function profperm_content(&$a) { $o .= ''; $o .= '
    '; - $r = abook_connections(local_user()); + $r = abook_connections(local_channel()); if($r) { $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); diff --git a/mod/rbmark.php b/mod/rbmark.php index e35c2494a..cbd32098b 100644 --- a/mod/rbmark.php +++ b/mod/rbmark.php @@ -48,7 +48,7 @@ function rbmark_content(&$a) { $o = ''; - if(! local_user()) { + if(! local_channel()) { // The login procedure is going to bugger our $_REQUEST variables // so save them in the session. diff --git a/mod/regmod.php b/mod/regmod.php index d75355d5f..bdb794347 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -7,7 +7,7 @@ function regmod_content(&$a) { $_SESSION['return_url'] = $a->cmd; - if(! local_user()) { + if(! local_channel()) { info( t('Please login.') . EOL); $o .= '

    ' . login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1); return $o; diff --git a/mod/removeaccount.php b/mod/removeaccount.php index 70979c07d..18aaa2517 100644 --- a/mod/removeaccount.php +++ b/mod/removeaccount.php @@ -2,7 +2,7 @@ function removeaccount_post(&$a) { - if(! local_user()) + if(! local_channel()) return; if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) @@ -44,7 +44,7 @@ function removeaccount_post(&$a) { function removeaccount_content(&$a) { - if(! local_user()) + if(! local_channel()) goaway(z_root()); $hash = random_string(); diff --git a/mod/removeme.php b/mod/removeme.php index d2ff013b8..492738b77 100644 --- a/mod/removeme.php +++ b/mod/removeme.php @@ -2,7 +2,7 @@ function removeme_post(&$a) { - if(! local_user()) + if(! local_channel()) return; if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) @@ -35,7 +35,7 @@ function removeme_post(&$a) { $global_remove = intval($_POST['global']); - channel_remove(local_user(),1 - $global_remove,true); + channel_remove(local_channel(),1 - $global_remove,true); } @@ -43,7 +43,7 @@ function removeme_post(&$a) { function removeme_content(&$a) { - if(! local_user()) + if(! local_channel()) goaway(z_root()); $hash = random_string(); diff --git a/mod/rmagic.php b/mod/rmagic.php index de81cdcde..49525bd32 100644 --- a/mod/rmagic.php +++ b/mod/rmagic.php @@ -3,7 +3,7 @@ function rmagic_init(&$a) { - if(local_user()) + if(local_channel()) goaway(z_root()); $me = get_my_address(); diff --git a/mod/rpost.php b/mod/rpost.php index 933db24e3..187605dca 100644 --- a/mod/rpost.php +++ b/mod/rpost.php @@ -29,7 +29,7 @@ function rpost_content(&$a) { $o = ''; - if(! local_user()) { + if(! local_channel()) { if(remote_user()) { // redirect to your own site. // We can only do this with a GET request so you'll need to keep the text short or risk getting truncated @@ -83,7 +83,7 @@ function rpost_content(&$a) { } $plaintext = true; -// if(feature_enabled(local_user(),'richtext')) +// if(feature_enabled(local_channel(),'richtext')) // $plaintext = false; if(array_key_exists('type', $_REQUEST) && $_REQUEST['type'] === 'html') { @@ -119,7 +119,7 @@ function rpost_content(&$a) { 'bang' => '', // 'channel_select' => true, 'visitor' => true, - 'profile_uid' => local_user(), + 'profile_uid' => local_channel(), 'title' => $_REQUEST['title'], 'body' => $_REQUEST['body'], 'source' => ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''), diff --git a/mod/search.php b/mod/search.php index 5b15b0593..ff7eb0731 100644 --- a/mod/search.php +++ b/mod/search.php @@ -9,7 +9,7 @@ function search_init(&$a) { function search_content(&$a,$update = 0, $load = false) { if((get_config('system','block_public')) || (get_config('system','block_public_search'))) { - if ((! local_user()) && (! remote_user())) { + if ((! local_channel()) && (! remote_user())) { notice( t('Public access denied.') . EOL); return; } @@ -44,8 +44,8 @@ function search_content(&$a,$update = 0, $load = false) { $search = ((x($_GET,'tag')) ? trim(rawurldecode($_GET['tag'])) : ''); } - if((! local_user()) || (! feature_enabled(local_user(),'savedsearch'))) - $o .= search($search,'search-box','/search',((local_user()) ? true : false)); + if((! local_channel()) || (! feature_enabled(local_channel(),'savedsearch'))) + $o .= search($search,'search-box','/search',((local_channel()) ? true : false)); if(strpos($search,'#') === 0) { $tag = true; @@ -87,7 +87,7 @@ function search_content(&$a,$update = 0, $load = false) { // because browser prefetching might change it on us. We have to deliver it with the page. $o .= '' . "\r\n"; - $o .= "\r\n"; $a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( @@ -128,7 +128,7 @@ function search_content(&$a,$update = 0, $load = false) { $sys = get_sys_channel(); if(($update) && ($load)) { - $itemspage = get_pconfig(local_user(),'system','itemspage'); + $itemspage = get_pconfig(local_channel(),'system','itemspage'); $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval($a->pager['itemspage']), intval($a->pager['start'])); @@ -147,14 +147,14 @@ function search_content(&$a,$update = 0, $load = false) { $prefix = 'distinct'; $suffix = 'group by mid ORDER BY created DESC'; } - if(local_user()) { + if(local_channel()) { $r = q("SELECT $prefix mid, item.id as item_id, item.* from item WHERE item_restrict = 0 AND ((( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND item_private = 0 ) OR ( `item`.`uid` = %d )) OR item.owner_xchan = '%s' ) $sql_extra $suffix $pager_sql ", - intval(local_user()), + intval(local_channel()), dbesc($sys['xchan_hash']) ); } diff --git a/mod/search_ac.php b/mod/search_ac.php index b4f5c9600..e42945d43 100644 --- a/mod/search_ac.php +++ b/mod/search_ac.php @@ -2,7 +2,7 @@ // Autocomplete for saved searches. Should probably be put in the same place as the other autocompletes function search_ac_init(&$a){ - if(!local_user()) + if(!local_channel()) killme(); @@ -25,7 +25,7 @@ function search_ac_init(&$a){ $r = q("SELECT `abook_id`, `xchan_name`, `xchan_photo_s`, `xchan_url`, `xchan_addr` FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d $people_sql_extra ORDER BY `xchan_name` ASC ", - intval(local_user()) + intval(local_channel()) ); $results = array(); diff --git a/mod/service_limits.php b/mod/service_limits.php index 83ae2e06c..ac96668ab 100644 --- a/mod/service_limits.php +++ b/mod/service_limits.php @@ -3,7 +3,7 @@ function service_limits_content(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } diff --git a/mod/settings.php b/mod/settings.php index 902213446..8c927a97c 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -16,10 +16,10 @@ function get_theme_config_file($theme){ } function settings_init(&$a) { - if(! local_user()) + if(! local_channel()) return; - $a->profile_uid = local_user(); + $a->profile_uid = local_channel(); // default is channel settings in the absence of other arguments @@ -36,7 +36,7 @@ function settings_init(&$a) { function settings_post(&$a) { - if(! local_user()) + if(! local_channel()) return; $channel = $a->get_channel(); @@ -53,7 +53,7 @@ function settings_post(&$a) { $key = $_POST['remove']; q("DELETE FROM tokens WHERE id='%s' AND uid=%d", dbesc($key), - local_user()); + local_channel()); goaway($a->get_baseurl(true)."/settings/oauth/"); return; } @@ -92,7 +92,7 @@ function settings_post(&$a) { dbesc($name), dbesc($redirect), dbesc($icon), - local_user(), + local_channel(), dbesc($key)); } else { $r = q("INSERT INTO clients @@ -103,7 +103,7 @@ function settings_post(&$a) { dbesc($name), dbesc($redirect), dbesc($icon), - local_user()); + local_channel()); } } goaway($a->get_baseurl(true)."/settings/oauth/"); @@ -132,9 +132,9 @@ function settings_post(&$a) { } foreach($all_features as $k) { if(x($_POST,"feature_$k")) - set_pconfig(local_user(),'feature',$k, 1); + set_pconfig(local_channel(),'feature',$k, 1); else - set_pconfig(local_user(),'feature',$k, 0); + set_pconfig(local_channel(),'feature',$k, 0); } build_sync_packet(); return; @@ -170,20 +170,20 @@ function settings_post(&$a) { if ($mobile_theme == "---") - del_pconfig(local_user(),'system','mobile_theme'); + del_pconfig(local_channel(),'system','mobile_theme'); else { - set_pconfig(local_user(),'system','mobile_theme',$mobile_theme); + set_pconfig(local_channel(),'system','mobile_theme',$mobile_theme); } - set_pconfig(local_user(),'system','user_scalable',$user_scalable); - set_pconfig(local_user(),'system','update_interval', $browser_update); - set_pconfig(local_user(),'system','itemspage', $itemspage); - set_pconfig(local_user(),'system','no_smilies',$nosmile); - set_pconfig(local_user(),'system','title_tosource',$title_tosource); - set_pconfig(local_user(),'system','channel_list_mode', $channel_list_mode); - set_pconfig(local_user(),'system','network_list_mode', $network_list_mode); - set_pconfig(local_user(),'system','channel_divmore_height', $channel_divmore_height); - set_pconfig(local_user(),'system','network_divmore_height', $network_divmore_height); + set_pconfig(local_channel(),'system','user_scalable',$user_scalable); + set_pconfig(local_channel(),'system','update_interval', $browser_update); + set_pconfig(local_channel(),'system','itemspage', $itemspage); + set_pconfig(local_channel(),'system','no_smilies',$nosmile); + set_pconfig(local_channel(),'system','title_tosource',$title_tosource); + set_pconfig(local_channel(),'system','channel_list_mode', $channel_list_mode); + set_pconfig(local_channel(),'system','network_list_mode', $network_list_mode); + set_pconfig(local_channel(),'system','channel_divmore_height', $channel_divmore_height); + set_pconfig(local_channel(),'system','network_divmore_height', $network_divmore_height); if ($theme == $a->channel['channel_theme']){ // call theme_post only if theme has not been changed @@ -195,7 +195,7 @@ function settings_post(&$a) { $r = q("UPDATE channel SET channel_theme = '%s' WHERE channel_id = %d", dbesc($theme), - intval(local_user()) + intval(local_channel()) ); call_hooks('display_settings_post', $_POST); @@ -284,7 +284,7 @@ function settings_post(&$a) { $set_perms = ''; $role = ((x($_POST,'permissions_role')) ? notags(trim($_POST['permissions_role'])) : ''); - $oldrole = get_pconfig(local_user(),'system','permissions_role'); + $oldrole = get_pconfig(local_channel(),'system','permissions_role'); if(($role != $oldrole) || ($role === 'custom')) { @@ -294,7 +294,7 @@ function settings_post(&$a) { $def_group = ((x($_POST,'group-selection')) ? notags(trim($_POST['group-selection'])) : ''); $r = q("update channel set channel_default_group = '%s' where channel_id = %d", dbesc($def_group), - intval(local_user()) + intval(local_channel()) ); $global_perms = get_perms(); @@ -313,7 +313,7 @@ function settings_post(&$a) { dbesc($str_group_allow), dbesc($str_contact_deny), dbesc($str_group_deny), - intval(local_user()) + intval(local_channel()) ); } else { @@ -325,15 +325,15 @@ function settings_post(&$a) { $hide_presence = 1 - (intval($role_permissions['online'])); if($role_permissions['default_collection']) { $r = q("select hash from groups where uid = %d and name = '%s' limit 1", - intval(local_user()), + intval(local_channel()), dbesc( t('Friends') ) ); if(! $r) { require_once('include/group.php'); - group_add(local_user(), t('Friends')); - group_add_member(local_user(),t('Friends'),$channel['channel_hash']); + group_add(local_channel(), t('Friends')); + group_add_member(local_channel(),t('Friends'),$channel['channel_hash']); $r = q("select hash from groups where uid = %d and name = '%s' limit 1", - intval(local_user()), + intval(local_channel()), dbesc( t('Friends') ) ); } @@ -341,7 +341,7 @@ function settings_post(&$a) { q("update channel set channel_default_group = '%s', channel_allow_gid = '%s', channel_allow_cid = '', channel_deny_gid = '', channel_deny_cid = '' where channel_id = %d", dbesc($r[0]['hash']), dbesc('<' . $r[0]['hash'] . '>'), - intval(local_user()) + intval(local_channel()) ); } else { @@ -353,16 +353,16 @@ function settings_post(&$a) { else { q("update channel set channel_default_group = '', channel_allow_gid = '', channel_allow_cid = '', channel_deny_gid = '', channel_deny_cid = '' where channel_id = %d", - intval(local_user()) + intval(local_channel()) ); } $r = q("update abook set abook_my_perms = %d where abook_channel = %d and (abook_flags & %d)>0", intval(($role_permissions['perms_auto']) ? intval($role_permissions['perms_accept']) : 0), - intval(local_user()), + intval(local_channel()), intval(ABOOK_FLAG_SELF) ); - set_pconfig(local_user(),'system','autoperms',(($role_permissions['perms_auto']) ? intval($role_permissions['perms_accept']) : 0)); + set_pconfig(local_channel(),'system','autoperms',(($role_permissions['perms_auto']) ? intval($role_permissions['perms_accept']) : 0)); foreach($role_permissions as $p => $v) { if(strpos($p,'channel_') !== false) { @@ -374,8 +374,8 @@ function settings_post(&$a) { } } - set_pconfig(local_user(),'system','hide_online_status',$hide_presence); - set_pconfig(local_user(),'system','permissions_role',$role); + set_pconfig(local_channel(),'system','hide_online_status',$hide_presence); + set_pconfig(local_channel(),'system','permissions_role',$role); } $username = ((x($_POST,'username')) ? notags(trim($_POST['username'])) : ''); @@ -481,16 +481,16 @@ function settings_post(&$a) { date_default_timezone_set($timezone); } - set_pconfig(local_user(),'system','use_browser_location',$allow_location); - set_pconfig(local_user(),'system','suggestme', $suggestme); - set_pconfig(local_user(),'system','post_newfriend', $post_newfriend); - set_pconfig(local_user(),'system','post_joingroup', $post_joingroup); - set_pconfig(local_user(),'system','post_profilechange', $post_profilechange); - set_pconfig(local_user(),'system','blocktags',$blocktags); - set_pconfig(local_user(),'system','channel_menu',$channel_menu); - set_pconfig(local_user(),'system','vnotify',$vnotify); - set_pconfig(local_user(),'system','always_show_in_notices',$always_show_in_notices); - set_pconfig(local_user(),'system','evdays',$evdays); + set_pconfig(local_channel(),'system','use_browser_location',$allow_location); + set_pconfig(local_channel(),'system','suggestme', $suggestme); + set_pconfig(local_channel(),'system','post_newfriend', $post_newfriend); + set_pconfig(local_channel(),'system','post_joingroup', $post_joingroup); + set_pconfig(local_channel(),'system','post_profilechange', $post_profilechange); + set_pconfig(local_channel(),'system','blocktags',$blocktags); + set_pconfig(local_channel(),'system','channel_menu',$channel_menu); + set_pconfig(local_channel(),'system','vnotify',$vnotify); + set_pconfig(local_channel(),'system','always_show_in_notices',$always_show_in_notices); + set_pconfig(local_channel(),'system','evdays',$evdays); $r = q("update channel set channel_name = '%s', channel_pageflags = %d, channel_timezone = '%s', channel_location = '%s', channel_notifyflags = %d, channel_max_anon_mail = %d, channel_max_friend_req = %d, channel_expire_days = %d $set_perms where channel_id = %d", dbesc($username), @@ -501,7 +501,7 @@ function settings_post(&$a) { intval($unkmail), intval($maxreq), intval($expire), - intval(local_user()) + intval(local_channel()) ); if($r) info( t('Settings updated.') . EOL); @@ -509,7 +509,7 @@ function settings_post(&$a) { if(! is_null($publish)) { $r = q("UPDATE profile SET publish = %d WHERE is_default = 1 AND uid = %d", intval($publish), - intval(local_user()) + intval(local_channel()) ); } @@ -525,7 +525,7 @@ function settings_post(&$a) { ); } - proc_run('php','include/directory.php',local_user()); + proc_run('php','include/directory.php',local_channel()); build_sync_packet(); @@ -550,7 +550,7 @@ function settings_content(&$a) { nav_set_selected('settings'); - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL ); return login(); } @@ -588,7 +588,7 @@ function settings_content(&$a) { if((argc() > 3) && (argv(2) === 'edit')) { $r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d", dbesc(argv(3)), - local_user()); + local_channel()); if (!count($r)){ notice(t("You can't edit this application.")); @@ -616,7 +616,7 @@ function settings_content(&$a) { $r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d", dbesc(argv(3)), - local_user()); + local_channel()); goaway($a->get_baseurl(true)."/settings/oauth/"); return; } @@ -626,8 +626,8 @@ function settings_content(&$a) { FROM clients LEFT JOIN tokens ON clients.client_id=tokens.client_id WHERE clients.uid IN (%d,0)", - local_user(), - local_user()); + local_channel(), + local_channel()); $tpl = get_markup_template("settings_oauth.tpl"); @@ -706,7 +706,7 @@ function settings_content(&$a) { $arr[$fname] = array(); $arr[$fname][0] = $fdata[0]; foreach(array_slice($fdata,1) as $f) { - $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); + $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_channel(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); } } @@ -795,19 +795,19 @@ function settings_content(&$a) { $theme_selected = (!x($_SESSION,'theme')? $default_theme : $_SESSION['theme']); $mobile_theme_selected = (!x($_SESSION,'mobile_theme')? $default_mobile_theme : $_SESSION['mobile_theme']); - $user_scalable = get_pconfig(local_user(),'system','user_scalable'); + $user_scalable = get_pconfig(local_channel(),'system','user_scalable'); $user_scalable = (($user_scalable===false)? '1': $user_scalable); // default if not set: 1 - $browser_update = intval(get_pconfig(local_user(), 'system','update_interval')); + $browser_update = intval(get_pconfig(local_channel(), 'system','update_interval')); $browser_update = (($browser_update == 0) ? 80 : $browser_update / 1000); // default if not set: 40 seconds - $itemspage = intval(get_pconfig(local_user(), 'system','itemspage')); + $itemspage = intval(get_pconfig(local_channel(), 'system','itemspage')); $itemspage = (($itemspage > 0 && $itemspage < 101) ? $itemspage : 20); // default if not set: 20 items - $nosmile = get_pconfig(local_user(),'system','no_smilies'); + $nosmile = get_pconfig(local_channel(),'system','no_smilies'); $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0 - $title_tosource = get_pconfig(local_user(),'system','title_tosource'); + $title_tosource = get_pconfig(local_channel(),'system','title_tosource'); $title_tosource = (($title_tosource===false)? '0': $title_tosource); // default if not set: 0 $theme_config = ""; @@ -822,7 +822,7 @@ function settings_content(&$a) { '$form_security_token' => get_form_security_token("settings_display"), '$submit' => t('Submit'), '$baseurl' => $a->get_baseurl(true), - '$uid' => local_user(), + '$uid' => local_channel(), '$theme' => array('theme', t('Display Theme:'), $theme_selected, '', $themes, 'preview'), '$mobile_theme' => array('mobile_theme', t('Mobile Theme:'), $mobile_theme_selected, '', $mobile_themes, ''), @@ -833,11 +833,11 @@ function settings_content(&$a) { '$title_tosource' => array('title_tosource', t("Link post titles to source"), $title_tosource, ''), '$layout_editor' => t('System Page Layout Editor - (advanced)'), '$theme_config' => $theme_config, - '$expert' => feature_enabled(local_user(),'expert'), - '$channel_list_mode' => array('channel_list_mode', t('Use blog/list mode on channel page'), get_pconfig(local_user(),'system','channel_list_mode'), t('(comments displayed separately)')), - '$network_list_mode' => array('network_list_mode', t('Use blog/list mode on matrix page'), get_pconfig(local_user(),'system','network_list_mode'), t('(comments displayed separately)')), - '$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_user(),'system','channel_divmore_height')) ? get_pconfig(local_user(),'system','channel_divmore_height') : 400), t('click to expand content exceeding this height')), - '$network_divmore_height' => array('network_divmore_height', t('Matrix page max height of content (in pixels)'), ((get_pconfig(local_user(),'system','network_divmore_height')) ? get_pconfig(local_user(),'system','network_divmore_height') : 400) , t('click to expand content exceeding this height')), + '$expert' => feature_enabled(local_channel(),'expert'), + '$channel_list_mode' => array('channel_list_mode', t('Use blog/list mode on channel page'), get_pconfig(local_channel(),'system','channel_list_mode'), t('(comments displayed separately)')), + '$network_list_mode' => array('network_list_mode', t('Use blog/list mode on matrix page'), get_pconfig(local_channel(),'system','network_list_mode'), t('(comments displayed separately)')), + '$channel_divmore_height' => array('channel_divmore_height', t('Channel page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','channel_divmore_height')) ? get_pconfig(local_channel(),'system','channel_divmore_height') : 400), t('click to expand content exceeding this height')), + '$network_divmore_height' => array('network_divmore_height', t('Matrix page max height of content (in pixels)'), ((get_pconfig(local_channel(),'system','network_divmore_height')) ? get_pconfig(local_channel(),'system','network_divmore_height') : 400) , t('click to expand content exceeding this height')), )); @@ -856,12 +856,12 @@ function settings_content(&$a) { $p = q("SELECT * FROM `profile` WHERE `is_default` = 1 AND `uid` = %d LIMIT 1", - intval(local_user()) + intval(local_channel()) ); if(count($p)) $profile = $p[0]; - load_pconfig(local_user(),'expire'); + load_pconfig(local_channel(),'expire'); $channel = $a->get_channel(); @@ -910,38 +910,38 @@ function settings_content(&$a) { // $unkmail = $a->user['unkmail']; // $cntunkmail = $a->user['cntunkmail']; - $hide_presence = intval(get_pconfig(local_user(), 'system','hide_online_status')); + $hide_presence = intval(get_pconfig(local_channel(), 'system','hide_online_status')); - $expire_items = get_pconfig(local_user(), 'expire','items'); + $expire_items = get_pconfig(local_channel(), 'expire','items'); $expire_items = (($expire_items===false)? '1' : $expire_items); // default if not set: 1 - $expire_notes = get_pconfig(local_user(), 'expire','notes'); + $expire_notes = get_pconfig(local_channel(), 'expire','notes'); $expire_notes = (($expire_notes===false)? '1' : $expire_notes); // default if not set: 1 - $expire_starred = get_pconfig(local_user(), 'expire','starred'); + $expire_starred = get_pconfig(local_channel(), 'expire','starred'); $expire_starred = (($expire_starred===false)? '1' : $expire_starred); // default if not set: 1 - $expire_photos = get_pconfig(local_user(), 'expire','photos'); + $expire_photos = get_pconfig(local_channel(), 'expire','photos'); $expire_photos = (($expire_photos===false)? '0' : $expire_photos); // default if not set: 0 - $expire_network_only = get_pconfig(local_user(), 'expire','network_only'); + $expire_network_only = get_pconfig(local_channel(), 'expire','network_only'); $expire_network_only = (($expire_network_only===false)? '0' : $expire_network_only); // default if not set: 0 - $suggestme = get_pconfig(local_user(), 'system','suggestme'); + $suggestme = get_pconfig(local_channel(), 'system','suggestme'); $suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0 - $post_newfriend = get_pconfig(local_user(), 'system','post_newfriend'); + $post_newfriend = get_pconfig(local_channel(), 'system','post_newfriend'); $post_newfriend = (($post_newfriend===false)? '0': $post_newfriend); // default if not set: 0 - $post_joingroup = get_pconfig(local_user(), 'system','post_joingroup'); + $post_joingroup = get_pconfig(local_channel(), 'system','post_joingroup'); $post_joingroup = (($post_joingroup===false)? '0': $post_joingroup); // default if not set: 0 - $post_profilechange = get_pconfig(local_user(), 'system','post_profilechange'); + $post_profilechange = get_pconfig(local_channel(), 'system','post_profilechange'); $post_profilechange = (($post_profilechange===false)? '0': $post_profilechange); // default if not set: 0 - $blocktags = get_pconfig(local_user(),'system','blocktags'); + $blocktags = get_pconfig(local_channel(),'system','blocktags'); $blocktags = (($blocktags===false) ? '0' : $blocktags); $timezone = date_default_timezone_get(); @@ -985,31 +985,31 @@ function settings_content(&$a) { require_once('include/group.php'); - $group_select = mini_group_select(local_user(),$channel['channel_default_group']); + $group_select = mini_group_select(local_channel(),$channel['channel_default_group']); require_once('include/menu.php'); - $m1 = menu_list(local_user()); + $m1 = menu_list(local_channel()); $menu = false; if($m1) { $menu = array(); - $current = get_pconfig(local_user(),'system','channel_menu'); + $current = get_pconfig(local_channel(),'system','channel_menu'); $menu[] = array('name' => '', 'selected' => ((! $current) ? true : false)); foreach($m1 as $m) { $menu[] = array('name' => htmlspecialchars($m['menu_name'],ENT_COMPAT,'UTF-8'), 'selected' => (($m['menu_name'] === $current) ? ' selected="selected" ' : false)); } } - $evdays = get_pconfig(local_user(),'system','evdays'); + $evdays = get_pconfig(local_channel(),'system','evdays'); if(! $evdays) $evdays = 3; - $permissions_role = get_pconfig(local_user(),'system','permissions_role'); + $permissions_role = get_pconfig(local_channel(),'system','permissions_role'); if(! $permissions_role) $permissions_role = 'custom'; $permissions_set = (($permissions_role != 'custom') ? true : false); - $vnotify = get_pconfig(local_user(),'system','vnotify'); - $always_show_in_notices = get_pconfig(local_user(),'system','always_show_in_notices'); + $vnotify = get_pconfig(local_channel(),'system','vnotify'); + $always_show_in_notices = get_pconfig(local_channel(),'system','always_show_in_notices'); if($vnotify === false) $vnotify = (-1); @@ -1018,7 +1018,7 @@ function settings_content(&$a) { '$submit' => t('Submit'), '$baseurl' => $a->get_baseurl(true), - '$uid' => local_user(), + '$uid' => local_channel(), '$form_security_token' => get_form_security_token("settings"), '$nickname_block' => $prof_addr, '$h_basic' => t('Basic Settings'), @@ -1026,7 +1026,7 @@ function settings_content(&$a) { '$email' => array('email', t('Email Address:'), $email, ''), '$timezone' => array('timezone_select' , t('Your Timezone:'), $timezone, '', get_timezones()), '$defloc' => array('defloc', t('Default Post Location:'), $defloc, t('Geographical location to display on your posts')), - '$allowloc' => array('allow_location', t('Use Browser Location:'), ((get_pconfig(local_user(),'system','use_browser_location')) ? 1 : ''), ''), + '$allowloc' => array('allow_location', t('Use Browser Location:'), ((get_pconfig(local_channel(),'system','use_browser_location')) ? 1 : ''), ''), '$adult' => array('adult', t('Adult Content'), $adult_flag, t('This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)')), @@ -1098,7 +1098,7 @@ function settings_content(&$a) { '$h_advn' => t('Advanced Account/Page Type Settings'), '$h_descadvn' => t('Change the behaviour of this account for special situations'), '$pagetype' => $pagetype, - '$expert' => feature_enabled(local_user(),'expert'), + '$expert' => feature_enabled(local_channel(),'expert'), '$hint' => t('Please enable expert mode (in Settings > Additional features) to adjust!'), '$lbl_misc' => t('Miscellaneous Settings'), '$menus' => $menu, diff --git a/mod/share.php b/mod/share.php index d70336ed1..2fb3d95cc 100644 --- a/mod/share.php +++ b/mod/share.php @@ -10,7 +10,7 @@ function share_init(&$a) { if(! $post_id) killme(); - if(! (local_user() || remote_user())) + if(! (local_channel() || remote_user())) killme(); @@ -39,7 +39,7 @@ function share_init(&$a) { // on your home site. // When that works remove this next bit: - if(! local_user()) + if(! local_channel()) killme(); xchan_query($r); @@ -60,7 +60,7 @@ function share_init(&$a) { $o.= "[/share]"; } - if(local_user()) { + if(local_channel()) { echo $o; killme(); } diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php index 56cbc35ec..d91987027 100644 --- a/mod/sharedwithme.php +++ b/mod/sharedwithme.php @@ -3,20 +3,20 @@ require_once('include/conversation.php'); require_once('include/text.php'); function sharedwithme_content(&$a) { - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } $channel = $a->get_channel(); - $is_owner = (local_user() && (local_user() == $channel['channel_id'])); + $is_owner = (local_channel() && (local_channel() == $channel['channel_id'])); //maintenance - see if a file got dropped and remove it systemwide - this should possibly go to include/poller $x = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d", dbesc(ACTIVITY_UPDATE), dbesc(ACTIVITY_OBJ_FILE), - intval(local_user()) + intval(local_channel()) ); if($x) { @@ -47,7 +47,7 @@ function sharedwithme_content(&$a) { q("DELETE FROM item WHERE id = %d AND uid = %d", intval($id), - intval(local_user()) + intval(local_channel()) ); goaway(z_root() . '/sharedwithme'); @@ -59,7 +59,7 @@ function sharedwithme_content(&$a) { q("DELETE FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d", dbesc(ACTIVITY_POST), dbesc(ACTIVITY_OBJ_FILE), - intval(local_user()) + intval(local_channel()) ); goaway(z_root() . '/sharedwithme'); @@ -69,7 +69,7 @@ function sharedwithme_content(&$a) { $r = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d AND owner_xchan != '%s'", dbesc(ACTIVITY_POST), dbesc(ACTIVITY_OBJ_FILE), - intval(local_user()), + intval(local_channel()), dbesc($channel['channel_hash']) ); diff --git a/mod/sources.php b/mod/sources.php index 73d78bbbf..0aaaa82b1 100644 --- a/mod/sources.php +++ b/mod/sources.php @@ -1,10 +1,10 @@ 1) $message_id = intval(argv(1)); @@ -13,7 +13,7 @@ function starred_init(&$a) { killme(); $r = q("SELECT item_flags FROM item WHERE uid = %d AND id = %d LIMIT 1", - intval(local_user()), + intval(local_channel()), intval($message_id) ); if(! count($r)) @@ -23,7 +23,7 @@ function starred_init(&$a) { $r = q("UPDATE item SET item_flags = %d WHERE uid = %d and id = %d", intval($item_flags), - intval(local_user()), + intval(local_channel()), intval($message_id) ); diff --git a/mod/subthread.php b/mod/subthread.php index f0f54f4a6..00ec87070 100755 --- a/mod/subthread.php +++ b/mod/subthread.php @@ -7,7 +7,7 @@ require_once('include/items.php'); function subthread_content(&$a) { - if((! local_user()) && (! remote_user())) { + if((! local_channel()) && (! remote_user())) { return; } diff --git a/mod/suggest.php b/mod/suggest.php index 8a6b50b22..fec0e85a4 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -6,12 +6,12 @@ require_once('include/widgets.php'); function suggest_init(&$a) { - if(! local_user()) + if(! local_channel()) return; if(x($_GET,'ignore')) { q("insert into xign ( uid, xchan ) values ( %d, '%s' ) ", - intval(local_user()), + intval(local_channel()), dbesc($_GET['ignore']) ); } @@ -22,14 +22,14 @@ function suggest_init(&$a) { function suggest_content(&$a) { $o = ''; - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); return; } $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; - $r = suggestion_query(local_user(),get_observer_hash()); + $r = suggestion_query(local_channel(),get_observer_hash()); if(! $r) { info( t('No suggestions available. If this is a new site, please try again in 24 hours.')); diff --git a/mod/tagger.php b/mod/tagger.php index bfda114d2..68792ab5f 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -7,7 +7,7 @@ require_once('include/items.php'); function tagger_content(&$a) { - if(! local_user() && ! remote_user()) { + if(! local_channel() && ! remote_user()) { return; } @@ -27,7 +27,7 @@ function tagger_content(&$a) { $r = q("SELECT * FROM item left join xchan on xchan_hash = author_xchan WHERE id = '%s' and uid = %d LIMIT 1", dbesc($item_id), - intval(local_user()) + intval(local_channel()) ); if((! $item_id) || (! $r)) { diff --git a/mod/tagrm.php b/mod/tagrm.php index 38787cb0b..56e842fb8 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -4,7 +4,7 @@ require_once('bbcode.php'); function tagrm_post(&$a) { - if(! local_user()) + if(! local_channel()) goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); @@ -16,7 +16,7 @@ function tagrm_post(&$a) { $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($item), - intval(local_user()) + intval(local_channel()) ); if(! $r) @@ -52,7 +52,7 @@ function tagrm_post(&$a) { function tagrm_content(&$a) { - if(! local_user()) { + if(! local_channel()) { goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); // NOTREACHED } @@ -65,7 +65,7 @@ function tagrm_content(&$a) { $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($item), - intval(local_user()) + intval(local_channel()) ); if(! $r) @@ -105,7 +105,7 @@ function tagrm_content(&$a) { $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($item), - intval(local_user()) + intval(local_channel()) ); if(! $r) diff --git a/mod/thing.php b/mod/thing.php index f53a6ab7b..4ec10f5a6 100644 --- a/mod/thing.php +++ b/mod/thing.php @@ -6,7 +6,7 @@ require_once('include/contact_selectors.php'); function thing_init(&$a) { - if(! local_user()) + if(! local_channel()) return; @@ -90,7 +90,7 @@ function thing_init(&$a) { dbesc(($url) ? $url : z_root() . '/thing/' . $term_hash), dbesc($local_photo), dbesc($term_hash), - intval(local_user()) + intval(local_channel()) ); info( t('Thing updated') . EOL); @@ -99,7 +99,7 @@ function thing_init(&$a) { $sql = (($profile_guid) ? " and profile_guid = '" . dbesc($profile_guid) . "' " : " and is_default = 1 "); $p = q("select profile_guid, is_default from profile where uid = %d $sql limit 1", - intval(local_user()) + intval(local_channel()) ); if($p) @@ -117,7 +117,7 @@ function thing_init(&$a) { $r = q("select * from term where uid = %d and otype = %d and type = %d and term = '%s' limit 1", - intval(local_user()), + intval(local_channel()), intval(TERM_OBJ_THING), intval(TERM_THING), dbesc($name) @@ -126,7 +126,7 @@ function thing_init(&$a) { $r = q("insert into term ( aid, uid, oid, otype, type, term, url, imgurl, term_hash ) values( %d, %d, %d, %d, %d, '%s', '%s', '%s', '%s' ) ", intval($account_id), - intval(local_user()), + intval(local_channel()), 0, intval(TERM_OBJ_THING), intval(TERM_THING), @@ -136,7 +136,7 @@ function thing_init(&$a) { dbesc($hash) ); $r = q("select * from term where uid = %d and otype = %d and type = %d and term = '%s' limit 1", - intval(local_user()), + intval(local_channel()), intval(TERM_OBJ_THING), intval(TERM_THING), dbesc($name) @@ -148,7 +148,7 @@ function thing_init(&$a) { dbesc($profile['profile_guid']), dbesc($verb), intval(TERM_OBJ_THING), - intval(local_user()), + intval(local_channel()), dbesc($term['term_hash']) ); @@ -201,7 +201,7 @@ function thing_init(&$a) { $arr['item_private'] = true; $str = ''; $r = q("select abook_xchan from abook where abook_channel = %d and abook_profile = '%s'", - intval(local_user()), + intval(local_channel()), dbesc($profile_guid) ); if($r) { @@ -232,7 +232,7 @@ function thing_content(&$a) { '$header' => t('Show Thing'), '$edit' => t('Edit'), '$delete' => t('Delete'), - '$canedit' => ((local_user() && local_user() == $r[0]['obj_channel']) ? true : false), + '$canedit' => ((local_channel() && local_channel() == $r[0]['obj_channel']) ? true : false), '$thing' => $r[0] )); } else { @@ -243,7 +243,7 @@ function thing_content(&$a) { $channel = $a->get_channel(); - if(! (local_user() && $channel)) { + if(! (local_channel() && $channel)) { notice( t('Permission denied.') . EOL); return; } @@ -260,7 +260,7 @@ function thing_content(&$a) { dbesc($thing_hash) ); - if((! $r) || ($r[0]['obj_channel'] != local_user())) { + if((! $r) || ($r[0]['obj_channel'] != local_channel())) { notice( t('Permission denied.') . EOL); return ''; } @@ -268,7 +268,7 @@ function thing_content(&$a) { $o .= replace_macros(get_markup_template('thing_edit.tpl'),array( '$thing_hdr' => t('Edit Thing'), - '$multiprof' => feature_enabled(local_user(),'multi_profiles'), + '$multiprof' => feature_enabled(local_channel(),'multi_profiles'), '$profile_lbl' => t('Select a profile'), '$profile_select' => contact_profile_assign($r[0]['obj_page']), '$verb_lbl' => $channel['channel_name'], @@ -295,7 +295,7 @@ function thing_content(&$a) { dbesc($thing_hash) ); - if((! $r) || ($r[0]['obj_channel'] != local_user())) { + if((! $r) || ($r[0]['obj_channel'] != local_channel())) { notice( t('Permission denied.') . EOL); return ''; } @@ -304,18 +304,18 @@ function thing_content(&$a) { $x = q("delete from obj where obj_obj = '%s' and obj_type = %d and obj_channel = %d", dbesc($thing_hash), intval(TERM_OBJ_THING), - intval(local_user()) + intval(local_channel()) ); $x = q("delete from term where term_hash = '%s' and uid = %d", dbesc($thing_hash), - intval(local_user()) + intval(local_channel()) ); return $o; } $o .= replace_macros(get_markup_template('thing_input.tpl'),array( '$thing_hdr' => t('Add Thing to your Profile'), - '$multiprof' => feature_enabled(local_user(),'multi_profiles'), + '$multiprof' => feature_enabled(local_channel(),'multi_profiles'), '$profile_lbl' => t('Select a profile'), '$profile_select' => contact_profile_assign(''), '$verb_lbl' => $channel['channel_name'], diff --git a/mod/uexport.php b/mod/uexport.php index 250a001a2..edcb2fa84 100644 --- a/mod/uexport.php +++ b/mod/uexport.php @@ -1,7 +1,7 @@ 1) { @@ -14,7 +14,7 @@ function uexport_init(&$a) { if(argc() > 1 && argv(1) === 'basic') { - echo json_encode(identity_basic_export(local_user())); + echo json_encode(identity_basic_export(local_channel())); killme(); } @@ -22,7 +22,7 @@ function uexport_init(&$a) { // It probably needs to be built at the CLI and offered to download as a tarball. Maybe stored in the members dav. if(argc() > 1 && argv(1) === 'complete') { - echo json_encode(identity_basic_export(local_user(),true)); + echo json_encode(identity_basic_export(local_channel(),true)); killme(); } } diff --git a/mod/viewconnections.php b/mod/viewconnections.php index aab136c43..1be5c157f 100644 --- a/mod/viewconnections.php +++ b/mod/viewconnections.php @@ -4,7 +4,7 @@ require_once('include/Contact.php'); function viewconnections_init(&$a) { - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { return; } if(argc() > 1) @@ -13,7 +13,7 @@ function viewconnections_init(&$a) { function viewconnections_content(&$a) { - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { notice( t('Public access denied.') . EOL); return; } @@ -28,7 +28,7 @@ function viewconnections_content(&$a) { return; } - $is_owner = ((local_user() && local_user() == $a->profile['uid']) ? true : false); + $is_owner = ((local_channel() && local_channel() == $a->profile['uid']) ? true : false); $abook_flags = ABOOK_FLAG_PENDING|ABOOK_FLAG_SELF; $xchan_flags = XCHAN_FLAGS_ORPHAN|XCHAN_FLAGS_DELETED; diff --git a/mod/viewsrc.php b/mod/viewsrc.php index 982d1c417..983a0e725 100644 --- a/mod/viewsrc.php +++ b/mod/viewsrc.php @@ -10,7 +10,7 @@ function viewsrc_content(&$a) { $item_id = ((argc() > 1) ? intval(argv(1)) : 0); $json = ((argc() > 2 && argv(2) === 'json') ? true : false); - if(! local_user()) { + if(! local_channel()) { notice( t('Permission denied.') . EOL); } @@ -20,9 +20,9 @@ function viewsrc_content(&$a) { notice( t('Item not found.') . EOL); } - if(local_user() && $item_id) { + if(local_channel() && $item_id) { $r = q("select item_flags, body from item where item_restrict = 0 and uid in (%d , %d) and id = %d limit 1", - intval(local_user()), + intval(local_channel()), intval($sys['channel_id']), intval($item_id) ); diff --git a/mod/webpages.php b/mod/webpages.php index baddebec8..6aff72a5e 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -33,7 +33,7 @@ function webpages_content(&$a) { $which = argv(1); - $uid = local_user(); + $uid = local_channel(); $owner = 0; $channel = null; $observer = $a->get_observer(); diff --git a/mod/zping.php b/mod/zping.php index 76f4470c1..311517701 100644 --- a/mod/zping.php +++ b/mod/zping.php @@ -12,7 +12,7 @@ function zping_content(&$a) { // Remember to add '/post' to the url - if(! local_user()) + if(! local_channel()) return; $url = $_REQUEST['url']; -- cgit v1.2.3 From e157371c39121db472cbc45b59ac89d847788648 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 28 Jan 2015 20:58:59 -0800 Subject: remote_user => remote_channel --- mod/acl.php | 2 +- mod/channel.php | 2 +- mod/directory.php | 2 +- mod/display.php | 2 +- mod/home.php | 2 +- mod/item.php | 4 ++-- mod/oexchange.php | 2 +- mod/photos.php | 8 ++++---- mod/post.php | 2 +- mod/profile.php | 4 ++-- mod/rpost.php | 2 +- mod/search.php | 2 +- mod/share.php | 2 +- mod/subthread.php | 2 +- mod/tagger.php | 2 +- mod/viewconnections.php | 4 ++-- mod/zotfeed.php | 2 +- 17 files changed, 23 insertions(+), 23 deletions(-) (limited to 'mod') diff --git a/mod/acl.php b/mod/acl.php index 5a048ddee..6ae803596 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -263,7 +263,7 @@ function navbar_complete(&$a) { // logger('navbar_complete'); - if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { return; } diff --git a/mod/channel.php b/mod/channel.php index 493730e8a..1a471718d 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -52,7 +52,7 @@ function channel_content(&$a, $update = 0, $load = false) { $datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : ''); $datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : ''); - if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) { + if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) { return login(); } diff --git a/mod/directory.php b/mod/directory.php index defa8db7e..21940d57b 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -18,7 +18,7 @@ function directory_init(&$a) { function directory_content(&$a) { - if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { notice( t('Public access denied.') . EOL); return; } diff --git a/mod/display.php b/mod/display.php index 943af4206..467c476da 100644 --- a/mod/display.php +++ b/mod/display.php @@ -5,7 +5,7 @@ function display_content(&$a, $update = 0, $load = false) { // logger("mod-display: update = $update load = $load"); - if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { + if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { notice( t('Public access denied.') . EOL); return; } diff --git a/mod/home.php b/mod/home.php index 733789991..854e2df26 100644 --- a/mod/home.php +++ b/mod/home.php @@ -100,7 +100,7 @@ function home_content(&$a, $update = 0, $load = false) { if($sitename) $o .= '

    ' . sprintf( t("Welcome to %s") ,$sitename) . '

    '; - if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { + if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { // If there's nothing special happening, just spit out a login box if (! $a->config['system']['no_login_on_homepage']) diff --git a/mod/item.php b/mod/item.php index 26f6fb43d..d8cbeadc7 100644 --- a/mod/item.php +++ b/mod/item.php @@ -26,7 +26,7 @@ function item_post(&$a) { // This will change. Figure out who the observer is and whether or not // they have permission to post here. Else ignore the post. - if((! local_channel()) && (! remote_user()) && (! x($_REQUEST,'commenter'))) + if((! local_channel()) && (! remote_channel()) && (! x($_REQUEST,'commenter'))) return; require_once('include/security.php'); @@ -905,7 +905,7 @@ function item_post(&$a) { function item_content(&$a) { - if((! local_channel()) && (! remote_user())) + if((! local_channel()) && (! remote_channel())) return; require_once('include/security.php'); diff --git a/mod/oexchange.php b/mod/oexchange.php index 637f4f384..a684bd5d8 100644 --- a/mod/oexchange.php +++ b/mod/oexchange.php @@ -15,7 +15,7 @@ function oexchange_init(&$a) { function oexchange_content(&$a) { if(! local_channel()) { - if(remote_user()) { + if(remote_channel()) { $observer = $a->get_observer(); if($observer && $observer['xchan_url']) { $parsed = @parse_url($observer['xchan_url']); diff --git a/mod/photos.php b/mod/photos.php index 108f4c524..dbe165f60 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -11,7 +11,7 @@ require_once('include/Contact.php'); function photos_init(&$a) { - if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { return; } @@ -122,8 +122,8 @@ function photos_post(&$a) { // get the list of photos we are about to delete - if(remote_user() && (! local_channel())) { - $str = photos_album_get_db_idstr($page_owner_uid,$album,remote_user()); + if(remote_channel() && (! local_channel())) { + $str = photos_album_get_db_idstr($page_owner_uid,$album,remote_channel()); } elseif(local_channel()) { $str = photos_album_get_db_idstr(local_channel(),$album); @@ -425,7 +425,7 @@ function photos_content(&$a) { // photos/name/image/xxxxx - if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { notice( t('Public access denied.') . EOL); return; } diff --git a/mod/post.php b/mod/post.php index 91a1d4877..c90997335 100644 --- a/mod/post.php +++ b/mod/post.php @@ -148,7 +148,7 @@ function post_init(&$a) { // If they are already authenticated and haven't changed credentials, // we can save an expensive network round trip and improve performance. - $remote = remote_user(); + $remote = remote_channel(); $result = null; $remote_service_class = ''; $remote_level = 0; diff --git a/mod/profile.php b/mod/profile.php index e37aea863..430d039e9 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -51,7 +51,7 @@ function profile_init(&$a) { function profile_content(&$a, $update = 0) { - if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) { + if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) { return login(); } @@ -68,7 +68,7 @@ function profile_content(&$a, $update = 0) { $is_owner = ((local_channel()) && (local_channel() == $a->profile['profile_uid']) ? true : false); - if($a->profile['hidewall'] && (! $is_owner) && (! remote_user())) { + if($a->profile['hidewall'] && (! $is_owner) && (! remote_channel())) { notice( t('Permission denied.') . EOL); return; } diff --git a/mod/rpost.php b/mod/rpost.php index 187605dca..2bea18c43 100644 --- a/mod/rpost.php +++ b/mod/rpost.php @@ -30,7 +30,7 @@ function rpost_content(&$a) { $o = ''; if(! local_channel()) { - if(remote_user()) { + if(remote_channel()) { // redirect to your own site. // We can only do this with a GET request so you'll need to keep the text short or risk getting truncated // by the wretched beast called 'suhosin'. All the browsers now allow long GET requests, but suhosin diff --git a/mod/search.php b/mod/search.php index ff7eb0731..02b250bbe 100644 --- a/mod/search.php +++ b/mod/search.php @@ -9,7 +9,7 @@ function search_init(&$a) { function search_content(&$a,$update = 0, $load = false) { if((get_config('system','block_public')) || (get_config('system','block_public_search'))) { - if ((! local_channel()) && (! remote_user())) { + if ((! local_channel()) && (! remote_channel())) { notice( t('Public access denied.') . EOL); return; } diff --git a/mod/share.php b/mod/share.php index 2fb3d95cc..923971694 100644 --- a/mod/share.php +++ b/mod/share.php @@ -10,7 +10,7 @@ function share_init(&$a) { if(! $post_id) killme(); - if(! (local_channel() || remote_user())) + if(! (local_channel() || remote_channel())) killme(); diff --git a/mod/subthread.php b/mod/subthread.php index 00ec87070..eeb8f131d 100755 --- a/mod/subthread.php +++ b/mod/subthread.php @@ -7,7 +7,7 @@ require_once('include/items.php'); function subthread_content(&$a) { - if((! local_channel()) && (! remote_user())) { + if((! local_channel()) && (! remote_channel())) { return; } diff --git a/mod/tagger.php b/mod/tagger.php index 68792ab5f..a93609c3c 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -7,7 +7,7 @@ require_once('include/items.php'); function tagger_content(&$a) { - if(! local_channel() && ! remote_user()) { + if(! local_channel() && ! remote_channel()) { return; } diff --git a/mod/viewconnections.php b/mod/viewconnections.php index 1be5c157f..ee68c2149 100644 --- a/mod/viewconnections.php +++ b/mod/viewconnections.php @@ -4,7 +4,7 @@ require_once('include/Contact.php'); function viewconnections_init(&$a) { - if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { return; } if(argc() > 1) @@ -13,7 +13,7 @@ function viewconnections_init(&$a) { function viewconnections_content(&$a) { - if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) { notice( t('Public access denied.') . EOL); return; } diff --git a/mod/zotfeed.php b/mod/zotfeed.php index 9ad93c1d4..7bf91d4db 100644 --- a/mod/zotfeed.php +++ b/mod/zotfeed.php @@ -11,7 +11,7 @@ function zotfeed_init(&$a) { if(! $mindate) $mindate = datetime_convert('UTC','UTC', 'now - 1 month'); - if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) { + if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) { $result['message'] = 'Public access denied'; json_return_and_die($result); } -- cgit v1.2.3