renamed include files identity.php (channel.php) and Contact.php (connections.php)

12 files changed, 15 insertions, 30 deletions

diff --git a/include/account.php b/include/account.php
index 5998609d4..e367e002d 100644
--- a/include/account.php
+++ b/include/account.php
@@ -11,7 +11,7 @@ require_once('include/text.php');
 require_once('include/language.php');
 require_once('include/datetime.php');
 require_once('include/crypto.php');
-require_once('include/identity.php');
+require_once('include/channel.php');
 
 
 function check_account_email($email) {
diff --git a/include/api.php b/include/api.php
index 4a462d1e8..ba36cc01a 100644
--- a/include/api.php
+++ b/include/api.php
@@ -514,7 +514,7 @@ require_once('include/api_auth.php');
 			return false;
 		}
 
-		require_once('include/identity.php');
+		require_once('include/channel.php');
 		
 		json_return_and_die(identity_basic_export(api_user(),(($_REQUEST['posts']) ? intval($_REQUEST['posts']) : 0 )));	
 	}
diff --git a/include/apps.php b/include/apps.php
index 7439be6d4..e300bc50d 100644
--- a/include/apps.php
+++ b/include/apps.php
@@ -6,7 +6,7 @@
  */
 
 require_once('include/plugin.php');
-require_once('include/identity.php');
+require_once('include/channel.php');
 
 function get_system_apps($translate = true) {
 
diff --git a/include/identity.php b/include/channel.php
index 4ef1105ea..050c4824b 100644
--- a/include/identity.php
+++ b/include/channel.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @file include/identity.php
+ * @file include/channel.php
  */
 
 require_once('include/zot.php');
@@ -847,7 +847,7 @@ function profile_load(&$a, $nickname, $profile = '') {
 
 		$extra_fields = array();
 
-		require_once('include/identity.php');
+		require_once('include/channel.php');
 		$profile_fields_basic    = get_profile_fields_basic();
 		$profile_fields_advanced = get_profile_fields_advanced();
 
@@ -1004,8 +1004,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 
 	call_hooks('profile_sidebar_enter', $profile);
 
-	require_once('include/Contact.php');
-
 	if($show_connect) {
 
 		// This will return an empty string if we're already connected.
diff --git a/include/Contact.php b/include/connections.php
index e50670a89..c55ffd817 100644
--- a/include/Contact.php
+++ b/include/connections.php
@@ -198,7 +198,7 @@ function account_remove($account_id,$local = true,$unset_session=true) {
 
 	// Don't let anybody nuke the only admin account.
 
-	$r = q("select account_id from account where (account_roles & %d)>0",
+	$r = q("select account_id from account where (account_roles & %d) > 0",
 		intval(ACCOUNT_ROLE_ADMIN)
 	);
 
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index e62d57aa2..14d26e257 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -3,9 +3,6 @@
 
 
 function findpeople_widget() {
-	require_once('include/Contact.php');
-
-	$a = get_app();
 
 	if(get_config('system','invitation_only')) {
 		$x = get_pconfig(local_channel(),'system','invites_remaining');
@@ -37,7 +34,6 @@ function findpeople_widget() {
 
 
 function fileas_widget($baseurl,$selected = '') {
-	$a = get_app();
 
 	if(! local_channel())
 		return '';
@@ -65,8 +61,6 @@ function fileas_widget($baseurl,$selected = '') {
 }
 
 function categories_widget($baseurl,$selected = '') {
-
-	$a = get_app();
 	
 	if(! feature_enabled(App::$profile['profile_uid'],'categories'))
 		return '';
@@ -108,8 +102,6 @@ function categories_widget($baseurl,$selected = '') {
 
 function common_friends_visitor_widget($profile_uid) {
 
-	$a = get_app();
-
 	if(local_channel() == $profile_uid)
 		return;
 
diff --git a/include/conversation.php b/include/conversation.php
index fca07a91d..ca73a7a07 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1107,7 +1107,6 @@ function status_editor($a, $x, $popup = false) {
 
 	$o = '';
 
-	require_once('include/Contact.php');
 	$c = channelx_by_n($x['profile_uid']);
 	if($c && $c['channel_moved'])
 		return $o;
@@ -1160,7 +1159,7 @@ function status_editor($a, $x, $popup = false) {
 		$layoutselect = '<input type="hidden" name="layout_mid" value="' . $layout . '" />';
 
 	if(array_key_exists('channel_select',$x) && $x['channel_select']) {
-		require_once('include/identity.php');
+		require_once('include/channel.php');
 		$id_select = identity_selector();
 	}
 	else
diff --git a/include/feedutils.php b/include/feedutils.php
index 700198ff8..f370c540a 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -1087,7 +1087,6 @@ function update_feed_item($uid,$datarray) {
 
 function handle_feed($uid,$abook_id,$url) {
 
-	require_once('include/Contact.php');
 	$channel = channelx_by_n($uid);
 	if(! $channel)
 		return;
diff --git a/include/items.php b/include/items.php
index a25be72b3..de0941c3c 100755
--- a/include/items.php
+++ b/include/items.php
@@ -77,7 +77,7 @@ function collect_recipients($item, &$private_envelope) {
 		// by the directives in $item['public_policy'].
 
 		$private_envelope = false;
-		require_once('include/identity.php');
+		require_once('include/channel.php');
 		//$sys = get_sys_channel();
 
 		if(array_key_exists('public_policy',$item) && $item['public_policy'] !== 'self') {
diff --git a/include/text.php b/include/text.php
index df6dac056..91aeae989 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1319,7 +1319,7 @@ function theme_attachments(&$item) {
  			
 			$title = t('Size') . ' ' . (($r['length']) ? userReadableSize($r['length']) : t('unknown'));
 
-			require_once('include/identity.php');
+			require_once('include/channel.php');
 			if(is_foreigner($item['author_xchan']))
 				$url = $r['href'];
 			else
@@ -1486,7 +1486,7 @@ function format_event($jobject) {
 }
 
 function prepare_body(&$item,$attach = false) {
-	require_once('include/identity.php');
+	require_once('include/channel.php');
 
 	call_hooks('prepare_body_init', $item); 
 
@@ -2261,7 +2261,7 @@ function design_tools() {
 	$sys = false;
 
 	if(App::$is_sys && is_site_admin()) {
-		require_once('include/identity.php');
+		require_once('include/channel.php');
 		$channel = get_sys_channel();
 		$sys = true;
 	}
diff --git a/include/widgets.php b/include/widgets.php
index 2641a718e..a158633ad 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -8,7 +8,7 @@
 require_once('include/dir_fns.php');
 require_once('include/contact_widgets.php');
 require_once('include/attach.php');
-require_once('include/Contact.php');
+
 
 function widget_profile($args) {
 
@@ -806,7 +806,6 @@ function widget_photo_albums($arr) {
 
 
 function widget_vcard($arr) {
-	require_once ('include/Contact.php');
 	return vcard_from_xchan('', App::get_observer());
 }
 
@@ -1052,7 +1051,7 @@ function widget_photo($arr) {
 
 function widget_cover_photo($arr) {
 
-	require_once('include/identity.php');
+	require_once('include/channel.php');
 	$o = '';
 	
 	if(App::$module == 'channel' && $_REQUEST['mid'])
diff --git a/include/zot.php b/include/zot.php
index f5fb87e12..4b780db2a 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1332,7 +1332,7 @@ function zot_import($arr, $sender_url) {
  */
 function public_recips($msg) {
 
-	require_once('include/identity.php');
+	require_once('include/channel.php');
 
 	$check_mentions = false;
 	$include_sys = false;
@@ -3222,7 +3222,6 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 				$clean = array();
 				if($abook['abook_xchan'] && $abook['entry_deleted']) {
 					logger('process_channel_sync_delivery: removing abook entry for ' . $abook['abook_xchan']);
-					require_once('include/Contact.php');
 
 					$r = q("select abook_id, abook_feed from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1",
 						dbesc($abook['abook_xchan']),
@@ -3926,7 +3925,7 @@ function zotinfo($arr) {
 
 		$ret['site']['accounts'] = account_total();
 	
-		require_once('include/identity.php');
+		require_once('include/channel.php');
 		$ret['site']['channels'] = channel_total();
 
 
@@ -4421,7 +4420,6 @@ function zot_reply_purge($sender,$recipients) {
 		$arr = $sender;
 		$sender_hash = make_xchan_hash($arr['guid'],$arr['guid_sig']);
 
-		require_once('include/Contact.php');
 		remove_all_xchan_resources($sender_hash);	
 
 		$ret['success'] = true;