mexon/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Michael Vogel 2012-12-10 23:34:28 +01:00
parent 13c97f1aaa 0adfd83b65
commit 57232bcaa4
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
forumlist.tgz
View file

Binary file not shown.

15
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;
@ -122,7 +126,6 @@ function forumlist_profile_advanced($a,&$b) {
function forumlist_plugin_settings_post($a,$post) { function forumlist_plugin_settings_post($a,$post) {
if(! local_user() || (! x($_POST,'forumlist-settings-submit'))) if(! local_user() || (! x($_POST,'forumlist-settings-submit')))
return; return;
// 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']));

2
group_text/group_text.php
View file

@ -43,7 +43,7 @@ function group_text_settings_post($a,$post) {
return; return;
set_pconfig(local_user(),'system','groupedit_image_limit',intval($_POST['group_text'])); set_pconfig(local_user(),'system','groupedit_image_limit',intval($_POST['group_text']));
info( t('Editplain settings updated.') . EOL); info( t('Group Text settings updated.') . EOL);
} }