tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Some SQL fixes

Browse source
This commit is contained in:
Michael Vogel 2015-11-17 20:31:40 +01:00
parent a9444ec774
commit cd059aa68f
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/forums.php
View file

@ -2,13 +2,13 @@
/** /**
* @file include/forums.php * @file include/forums.php
* @brief Functions related to forum functionality * * @brief Functions related to forum functionality *
*/ */
/** /**
* @brief Function to list all forums a user is connected with * @brief Function to list all forums a user is connected with
* *
* @param int $uid of the profile owner * @param int $uid of the profile owner
* @param boolean $showhidden * @param boolean $showhidden
* Show frorums which are not hidden * Show frorums which are not hidden
@ -16,7 +16,7 @@
* Sort by lastitem * Sort by lastitem
* @param boolean $showprivate * @param boolean $showprivate
* Show private groups * Show private groups
* *
* @returns array * @returns array
* 'url' => forum url * 'url' => forum url
* 'name' => forum name * 'name' => forum name
@ -27,16 +27,17 @@ function get_forumlist($uid, $showhidden = true, $lastitem, $showprivate = false
$forumlist = array(); $forumlist = array();
$order = (($showhidden) ? '' : ' AND `hidden` = 0 '); $order = (($showhidden) ? '' : ' AND NOT `hidden` ');
$order .= (($lastitem) ? ' ORDER BY `last-item` ASC ' : ' ORDER BY `name` ASC '); $order .= (($lastitem) ? ' ORDER BY `last-item` DESC ' : ' ORDER BY `name` ASC ');
$select = '`forum` = 1'; $select = '`forum` ';
if ($showprivate) { if ($showprivate) {
$select = '( `forum` = 1 OR `prv` = 1 )'; $select = '(`forum` OR `prv`)';
} }
$contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro` FROM contact $contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro` FROM `contact`
WHERE `network`= 'dfrn' AND $select AND `uid` = %d WHERE `network`= 'dfrn' AND $select AND `uid` = %d
AND `blocked` = 0 AND `hidden` = 0 AND `pending` = 0 AND `archive` = 0 AND NOT `blocked` AND NOT `hidden` AND NOT `pending` AND NOT `archive`
AND `success_update` > `failure_update`
$order ", $order ",
intval($uid) intval($uid)
); );