Friendica/friendica-addons
1
1
Fork 1
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2024-11-22 13:43:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixing bug 485, making private forums visible in forumlist in the network tab but not in the profile

Browse source
This commit is contained in:
Tobias Diekershoff 2012-12-08 09:12:44 +01:00
parent 9a71985027
commit f31ff2b061
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
forumlist/forumlist.php
View file

@ -26,16 +26,20 @@ function forumlist_uninstall() {
} }
function forumlist_getpage($uid,$showhidden = true,$randomise = false) { function forumlist_getpage($uid,$showhidden = true,$randomise = false, $showprivate = false) {
$forumlist = array(); $forumlist = array();
$order = (($showhidden) ? '' : " and hidden = 0 "); $order = (($showhidden) ? '' : " and hidden = 0 ");
$order .= (($randomise) ? ' order by rand() ' : ' order by name asc '); $order .= (($randomise) ? ' order by rand() ' : ' order by name asc ');
$select = "`forum` = 1";
if ($showprivate) {
$select = "( `forum` = 1 OR `prv` = 1 )";
}
$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 `forum` = 1 AND `uid` = %d WHERE `network`= 'dfrn' AND $select AND `uid` = %d
and blocked = 0 and hidden = 0 and pending = 0 and archive = 0 and blocked = 0 and hidden = 0 and pending = 0 and archive = 0
$order ", $order ",
intval($uid) intval($uid)
@ -66,7 +70,7 @@ function forumlist_network_mod_init($a,$b) {
$randomise = intval(get_pconfig(local_user(),'forumlist','randomise')); $randomise = intval(get_pconfig(local_user(),'forumlist','randomise'));
$contacts = forumlist_getpage($a->user['uid'],true,$randomise); $contacts = forumlist_getpage($a->user['uid'],true,$randomise, true);
if(count($contacts)) { if(count($contacts)) {
foreach($contacts as $contact) { foreach($contacts as $contact) {
@ -99,7 +103,7 @@ function forumlist_profile_advanced($a,&$b) {
$randomise = true; $randomise = true;
$contacts = forumlist_getpage($a->user['uid'],false,$randomise); $contacts = forumlist_getpage($a->user['uid'],false,$randomise,false);
$total_shown = 0; $total_shown = 0;
$more = false; $more = false;
@ -120,9 +124,14 @@ function forumlist_profile_advanced($a,&$b) {
function forumlist_plugin_settings_post($a,$post) { function forumlist_plugin_settings_post($a,$post) {
logger('forum list save 1');
if(! local_user() || (! x($_POST,'forumlist-settings-submit'))) if(! local_user() || (! x($_POST,'forumlist-settings-submit')))
return; return;
logger('forum list save 2');
// set_pconfig(local_user(),'forumlist','max_forumlists',intval($_POST['forumlist_max_forumlists'])); // set_pconfig(local_user(),'forumlist','max_forumlists',intval($_POST['forumlist_max_forumlists']));
set_pconfig(local_user(),'forumlist','randomise',intval($_POST['forumlist_random'])); set_pconfig(local_user(),'forumlist','randomise',intval($_POST['forumlist_random']));
set_pconfig(local_user(),'forumlist','show_on_profile',intval($_POST['forumlist_profile'])); set_pconfig(local_user(),'forumlist','show_on_profile',intval($_POST['forumlist_profile']));