harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
friendica 2013-08-27 22:30:06 -07:00
parent e8a0005d29
commit e8cd3b7040
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -2327,7 +2327,9 @@ function argc() {
} }
function argv($x) { 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() { function dba_timer() {

4
include/contact_widgets.php
View File

@ -70,11 +70,11 @@ function fileas_widget($baseurl,$selected = '') {
function categories_widget($baseurl,$selected = '') { function categories_widget($baseurl,$selected = '') {
$a = get_app();
if(! feature_enabled($a->profile['profile_uid'],'categories')) if(! feature_enabled($a->profile['profile_uid'],'categories'))
return ''; return '';
$a = get_app();
$terms = array(); $terms = array();
$r = q("select distinct(term) from term where uid = %d and type = %d order by term asc", $r = q("select distinct(term) from term where uid = %d and type = %d order by term asc",
intval($a->profile['profile_uid']), intval($a->profile['profile_uid']),

2
include/dba/dba_mysqli.php
View File

@ -70,7 +70,7 @@ class dba_mysqli extends dba_driver {
function close() { function close() {
if($this->db) if($this->db)
$this->db->close(); $this->db->close();
$this->connected = flase; $this->connected = false;
} }
} }

4
mod/acl.php
View File

@ -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 $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" , WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2" ,
intval(local_user()), 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']; $contact_count = (int)$r[0]['c'];
} }
@ -127,7 +127,7 @@ function acl_init(&$a){
FROM abook left join xchan on abook_xchan = xchan_hash 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" , WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2 order by xchan_name asc" ,
intval(local_user()), 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') { elseif($type == 'm') {

2
mod/network.php
View File

@ -386,7 +386,7 @@ function network_content(&$a, $update = 0, $load = false) {
nav_set_selected('network'); nav_set_selected('network');
$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); $celeb = false;
$x = array( $x = array(
'is_owner' => true, 'is_owner' => true,

2
view/theme/redbasic/css/style.css
View File

@ -3495,7 +3495,7 @@ ul.menu-popup {
.shared_header img { margin-right: 10px; } .shared_header img { margin-right: 10px; }
.mail-list-wrapper { #mail-list-wrapper {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
padding: 20px; padding: 20px;