Merge pull request #2087 from tobiasd/20151118-docevents

[friendica.git] / include / forums.php

diff --git a/include/forums.php b/include/forums.php
index 425a5e623422f79e740e0080e49c42ac46a05066..d8da36cc5c694760036980f970c806ae946b9b8c 100644 (file)
--- a/include/forums.php
+++ b/include/forums.php
@@ -2,21 +2,21 @@
 
 /**
  * @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 boolean $showhidden
- *     show frorums which are not hidden
+ *     Show frorums which are not hidden
  * @param boolean $lastitem
- *     sort by lastitem
+ *     Sort by lastitem
  * @param boolean $showprivate
- *     show private groups
- * 
+ *     Show private groups
+ *
  * @returns array
  *     'url'   => forum url
  *     'name'  => forum name
@@ -27,16 +27,17 @@ function get_forumlist($uid, $showhidden = true, $lastitem, $showprivate = false
 
        $forumlist = array();
 
-       $order = (($showhidden) ? '' : " AND `hidden` = 0 ");
-       $order .= (($lastitem) ? ' ORDER BY `last-item` ASC ' : ' ORDER BY `name` ASC ');
-       $select = "`forum` = 1";
+       $order = (($showhidden) ? '' : ' AND NOT `hidden` ');
+       $order .= (($lastitem) ? ' ORDER BY `last-item` DESC ' : ' ORDER BY `name` ASC ');
+       $select = '`forum` ';
        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
-                       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 ",
                        intval($uid)
        );
@@ -53,8 +54,8 @@ function get_forumlist($uid, $showhidden = true, $lastitem, $showprivate = false
 }
 
 
-/*
- * @brief forumlist widget
+/**
+ * @brief Forumlist widget
  * 
  * Sidebar widget to show subcribed friendica forums. If activated
  * in the settings, it appears at the notwork page sidebar
@@ -95,7 +96,7 @@ function widget_forumlist($a) {
                $tpl = get_markup_template('widget_forumlist.tpl');
 
                $o .= replace_macros($tpl,array(
-                       '$title'        => t("Forums"),
+                       '$title'        => t('Forums'),
                        '$forums'       => $entries,
                        '$link_desc'    => t('External link to forum'),
                        '$total'        => $total,
@@ -107,8 +108,8 @@ function widget_forumlist($a) {
        return $o;
 }
 
-/*
- * @brief format forumlist as contact block
+/**
+ * @brief Format forumlist as contact block
  * 
  * This function is used to show the forumlist in
  * the advanced profile.
@@ -145,4 +146,4 @@ function forumlist_profile_advanced($uid) {
        if(count($contacts) > 0)
                $o .= $forumlist;
                return $o;
-}
\ No newline at end of file
+}