Changeset 204

Timestamp:

07/02/08 20:45:58 (6 months ago)

Author:

llaumgui

Message:

Jointure facultative

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();
                 
-                                
-                $topics         = $db->arrayQuery(      'SELECT t.id topic_id, t.poster, t.subject, t.num_replies, p.id post_id, p.message ' .
+                $select         = 't.id topic_id, t.poster, t.subject, t.num_replies';
+                $leftJoin       = '';
+                
+                /* 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)';
+                }
+                
+                $topics         = $db->arrayQuery(      'SELECT ' . $select . ' ' .
                                                                                 'FROM '.$this->fluxBBConfig['db_prefix'].'topics t ' .
-                                                                                /* TODO : Rendre la jointure paramÚtrable */
-                                                                                        'LEFT JOIN '.$this->fluxBBConfig['db_prefix'].'posts p ON (p.topic_id=t.id AND t.posted = p.posted) ' .
+                                                                                        $leftJoin . ' ' .
                                                                                 'WHERE forum_id ' . $params['forum_id'] . ' ' .
                                                                                 'ORDER BY ' . $params['sort_by'] .' ' .

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 )
+        function fetchTopics( $forum_id_filter_type, $forum_id_filter_array, $limit, $offset, $sort_by, $get_first_message )
         {
                 $sortingString          = 't.posted';
@@ -129 +129 @@
                 
                 /* $forum_id */
-        if ( $forum_id_filter_type == 'exclude' )
-        {
-                $sortingForum_id        = 'NOT IN';
-        }
-        if ( is_array( $forum_id_filter_array ) )
-        {
-                $sortingForum_id        .= ' (' . implode( ', ', $forum_id_filter_array) . ')';
-        }
-        else
-        {
-                $sortingForum_id        .= ' (' . $forum_id_filter_array . ')';
-        }
-                                
+                if ( $forum_id_filter_array )
+                {
+                if ( $forum_id_filter_type == 'exclude' )
+                {
+                        $sortingForum_id        = 'NOT IN';
+                }
+                if ( is_array( $forum_id_filter_array ) )
+                {
+                        $sortingForum_id        .= ' (' . implode( ', ', $forum_id_filter_array) . ')';
+                }
+                else
+                {
+                        $sortingForum_id        .= ' (' . $forum_id_filter_array . ')';
+                }
+                }
+                else
+                {
+                        $sortingForum_id        = "";
+                }
+                
                 $eZFluxBB               = eZFluxBB::instance();
                 $params                 = array(        'forum_id'                                      => $sortingForum_id,
                                                                         'limit'                                         => $limit,
                                                                         'offset'                                        => $offset,
-                                                                        'sort_by'                                       => $sortingString . ' ' . $sortingOrder );
+                                                                        'sort_by'                                       => $sortingString . ' ' . $sortingOrder,
+                                                                        'get_first_message'             => $get_first_message);
                 
                 $topics                 = $eZFluxBB->getTopics( $params );

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

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