Changeset 205

Timestamp:

07/02/08 22:15:38 (2 months ago)

Author:

llaumgui

Message:

Amélioration et fermeture de #51. Livraison de la Milestone eZFluxBB 1.0 RC1

Location:

ez_publish/ezfluxbb/trunk

Files:

• classes/ezfluxbb.php (modified) (1 diff)
• classes/ezfluxbbfetchfonctions.php (modified) (2 diffs)
• modules/ezfluxbb/function_definition.php (modified) (1 diff)

ez_publish/ezfluxbb/trunk/classes/ezfluxbb.php

@@ -203 +203 @@
                 $db             = eZFluxBBDB::instance();
                 
-                $select         = 't.id topic_id, t.poster, t.subject, t.num_replies';
-                $leftJoin       = '';
+                $select         =       't.id topic_id, t.subject topic_name, t.poster creator, t.num_replies, t.posted published, ' .
+                                                't.last_post_id, t.last_post last_post_published, t.last_poster last_post_creator';
+                $leftJoin       = array();
+                $innerJoin      = array();
+                $where          = array();
+                
+                /* Jointure groupe_id */
+                if ( $params['group_id'] )
+                {
+                        $select                 .= ', f.id forum_id, f.forum_name';
+                        $innerJoin[]    = 'INNER JOIN '.$this->fluxBBConfig['db_prefix'].'forums AS f ON f.id=t.forum_id';
+                        $leftJoin[]             = 'LEFT JOIN '.$this->fluxBBConfig['db_prefix'].'forum_perms AS fp ON (fp.forum_id=f.id AND fp.group_id=' . $params['group_id'] . ')';
+                        $where[]                = '(fp.read_forum IS NULL OR fp.read_forum=1)';
+                        $where[]                = 't.moved_to IS NULL';
+                }
                 
                 /* Jointure avec les messages */
                 if ( $params['get_first_message'] )
                 {
-                        $select         .= ' ,p.id post_id, p.message';
-                        $leftJoin       .= 'LEFT JOIN '.$this->fluxBBConfig['db_prefix'].'posts p ON (p.topic_id=t.id AND t.posted = p.posted)';
+                        $select                 .= ', p.id post_id, p.message';
+                        $leftJoin[]             = 'LEFT JOIN '.$this->fluxBBConfig['db_prefix'].'posts p ON (p.topic_id=t.id AND t.posted = p.posted)';
+                }
+                
+                if ( count($where) > 0 )
+                {
+                        $where  = ' AND ' . implode( ' AND ', $where) . ' ';
+                }
+                else
+                {
+                        $where  = '';   
                 }
                 
                 $topics         = $db->arrayQuery(      'SELECT ' . $select . ' ' .
                                                                                 'FROM '.$this->fluxBBConfig['db_prefix'].'topics t ' .
-                                                                                        $leftJoin . ' ' .
-                                                                                'WHERE forum_id ' . $params['forum_id'] . ' ' .
+                                                                                        implode( ' ', $innerJoin) . ' ' .
+                                                                                        implode( ' ', $leftJoin) . ' ' .
+                                                                                'WHERE t.forum_id ' . $params['forum_id'] . ' ' .
+                                                                                $where . ' ' .
                                                                                 'ORDER BY ' . $params['sort_by'] .' ' .
                                                                                 'LIMIT ' . $params['offset'] . ', ' . $params['limit']);

ez_publish/ezfluxbb/trunk/classes/ezfluxbbfetchfonctions.php

@@ -100 +100 @@
          * @return array
          */
-        function fetchTopics( $forum_id_filter_type, $forum_id_filter_array, $limit, $offset, $sort_by, $get_first_message )
+        function fetchTopics( $forum_id_filter_type, $forum_id_filter_array, $limit, $offset, $sort_by, $group_id, $get_first_message )
         {
                 $sortingString          = 't.posted';
@@ -154 +154 @@
                                                                         'offset'                                        => $offset,
                                                                         'sort_by'                                       => $sortingString . ' ' . $sortingOrder,
+                                                                        'group_id'                                      => $group_id,
                                                                         'get_first_message'             => $get_first_message);
                 

ez_publish/ezfluxbb/trunk/modules/ezfluxbb/function_definition.php

@@ -106 +106 @@
                                 'default'  => array( 't.posted', false )
                 ),
+                array(  'name'     => 'group_id',
+                                'type'     => 'integer',
+                                'required' => false,
+                                'default'  => false
+                ),
                 array(  'name'     => 'get_first_message',
                                 'type'     => 'boolean',