bring back mail list and cleanup some issues which popped out with full PHP warnings

6 files changed, 10 insertions, 8 deletions

diff --git a/boot.php b/boot.php
index fc5408887..d3226c804 100755
--- a/boot.php
+++ b/boot.php
@@ -2327,7 +2327,9 @@ function argc() {
 }
 
 function argv($x) {
-	return get_app()->argv[$x];
+	if(array_key_exists($x,get_app()->argv))
+		return get_app()->argv[$x];
+	return '';
 }
 
 function dba_timer() {
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index ca212796f..e5f778e49 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -70,11 +70,11 @@ function fileas_widget($baseurl,$selected = '') {
 
 function categories_widget($baseurl,$selected = '') {
 
+	$a = get_app();
+	
 	if(! feature_enabled($a->profile['profile_uid'],'categories'))
 		return '';
 
-	$a = get_app();
-
 	$terms = array();
 	$r = q("select distinct(term) from term where uid = %d and type = %d order by term asc",
 		intval($a->profile['profile_uid']),
diff --git a/include/dba/dba_mysqli.php b/include/dba/dba_mysqli.php
index f1a50cc3f..19907705b 100755
--- a/include/dba/dba_mysqli.php
+++ b/include/dba/dba_mysqli.php
@@ -70,7 +70,7 @@ class dba_mysqli extends dba_driver {
 	function close() {
 		if($this->db)
 			$this->db->close();
-		$this->connected = flase;
+		$this->connected = false;
 	}
 
 }
\ No newline at end of file
diff --git a/mod/acl.php b/mod/acl.php
index 1b7a1ea8b..b886b7e58 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -51,7 +51,7 @@ function acl_init(&$a){
 		$r = q("SELECT COUNT(abook_id) AS c FROM abook left join xchan on abook_xchan = xchan_hash 
 				WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2" ,
 			intval(local_user()),
-			intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVE)
+			intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED)
 		);
 		$contact_count = (int)$r[0]['c'];
 	} 
@@ -127,7 +127,7 @@ function acl_init(&$a){
 				FROM abook left join xchan on abook_xchan = xchan_hash 
 				WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2 order by xchan_name asc" ,
 			intval(local_user()),
-			intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVE)
+			intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED)
 		);
 	}
 	elseif($type == 'm') {
diff --git a/mod/network.php b/mod/network.php
index e44a604de..39e6fe215 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -386,7 +386,7 @@ function network_content(&$a, $update = 0, $load = false) {
 
 		nav_set_selected('network');
 
-		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
+		$celeb = false;
 
 		$x = array(
 			'is_owner' => true,
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 1105bb4bb..4d0f6bbcf 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -3495,7 +3495,7 @@ ul.menu-popup {
 .shared_header img { margin-right: 10px; }
 
 
-.mail-list-wrapper {
+#mail-list-wrapper {
 
 border-bottom: 1px solid #ccc;
 padding: 20px;