include re-organisation and more doco, post_to_red fix ampersands in categories

3 files changed, 20 insertions, 32 deletions

diff --git a/mod/channel.php b/mod/channel.php
index f36636023..2014cd08b 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -1,5 +1,14 @@
 <?php
 
+require_once('include/contact_widgets.php');
+require_once('include/items.php');
+require_once("include/bbcode.php");
+require_once('include/security.php');
+require_once('include/conversation.php');
+require_once('include/acl_selectors.php');
+require_once('include/permissions.php');
+
+
 function channel_init(&$a) {
 
 	$which = null;
@@ -37,8 +46,6 @@ function channel_init(&$a) {
 
 function channel_aside(&$a) {
 
-	require_once('include/contact_widgets.php');
-	require_once('include/items.php');
 
 	if(! $a->profile['profile_uid'])
 		return;
@@ -64,16 +71,6 @@ function channel_content(&$a, $update = 0, $load = false) {
 
 	$category = $datequery = $datequery2 = '';
 
-	// if(argc() > 2) {
-	//	for($x = 2; $x < argc(); $x ++) {
-	//		if(is_a_date_arg(argv($x))) {
-	//			if($datequery)
-	//				$datequery2 = escape_tags(argv($x));
-	//			else
-	//				$datequery = escape_tags(argv($x));
-	//		}
-	//	}
-	// }
 	$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']) : '');
 
@@ -81,16 +78,6 @@ function channel_content(&$a, $update = 0, $load = false) {
 			return login();
 	}
 
-
-
-	require_once("include/bbcode.php");
-	require_once('include/security.php');
-	require_once('include/conversation.php');
-	require_once('include/acl_selectors.php');
-	require_once('include/items.php');
-	require_once('include/permissions.php');
-
-
 	$category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : '');
 
 	$groups = array();
diff --git a/mod/post.php b/mod/post.php
index e65cb0968..627e13fa0 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -196,9 +196,9 @@ function post_init(&$a) {
 
 		} else {
 			logger('mod_zot: magic-auth failure - not authenticated: ' . $x[0]['xchan_addr']);
-			q("update hubloc set hubloc_status =  (hubloc_status | %d ) where hubloc_addr = '%s'",
+			q("update hubloc set hubloc_status =  (hubloc_status | %d ) where hubloc_id = %d ",
 				intval(HUBLOC_RECEIVE_ERROR),
-				dbesc($x[0]['xchan_addr'])
+				intval($x[0]['hubloc_id'])
 			);
 		}
 
diff --git a/mod/profile.php b/mod/profile.php
index cd5c3eeef..a307905e6 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -1,4 +1,12 @@
-<?php
+<?php /** @file */
+
+require_once('include/contact_widgets.php');
+require_once('include/items.php');
+require_once("include/bbcode.php");
+require_once('include/security.php');
+require_once('include/conversation.php');
+require_once('include/acl_selectors.php');
+
 
 function profile_init(&$a) {
 
@@ -45,8 +53,6 @@ function profile_init(&$a) {
 
 function profile_aside(&$a) {
 
-	require_once('include/contact_widgets.php');
-	require_once('include/items.php');
 
 	profile_create_sidebar($a);
 
@@ -60,11 +66,6 @@ function profile_content(&$a, $update = 0) {
 	}
 
 
-	require_once("include/bbcode.php");
-	require_once('include/security.php');
-	require_once('include/conversation.php');
-	require_once('include/acl_selectors.php');
-	require_once('include/items.php');
 
 	$groups = array();