Changeset 6486 for sandbox/expressoServiceImap/prototype/services/ImapServiceAdapter.php

Timestamp:

06/14/12 01:17:45 (12 years ago)

Author:

natan

Message:

Ticket #2845 - Atualizacao da API na busca de mensagens - Migracao do anexar mensagens para API atual

File:

• sandbox/expressoServiceImap/prototype/services/ImapServiceAdapter.php (modified) (4 diffs)

sandbox/expressoServiceImap/prototype/services/ImapServiceAdapter.php

@@ -89 +89 @@
                         {
                                 //begin: for grid       
-                                $page  = isset($criteria['page']) ? $criteria['page'] : 1 ; //{1}    get the requested page
-                                $limit = isset($criteria['rows']) ? $criteria['rows'] : 10 ; //{10}   get how many rows we want to have into the grid
-                                $sidx  = isset($criteria['sidx']) ? $criteria['sidx'] : 0; //{id}   get index row - i.e. user click to sort
-                                $sord  = isset($criteria['sord']) ? $criteria['sord'] : ''; //{desc} get the direction
+//                              $page  = isset($criteria['page']) ? $criteria['page'] : 1 ; //{1}    get the requested page
+//                              $limit = isset($criteria['rows']) ? $criteria['rows'] : 10 ; //{10}   get how many rows we want to have into the grid
+//                              $sidx  = isset($criteria['sidx']) ? $criteria['sidx'] : 0; //{id}   get index row - i.e. user click to sort
+//                              $sord  = isset($criteria['sord']) ? $criteria['sord'] : ''; //{desc} get the direction
 
                                 $filter =  isset($criteria['filter']) ? $criteria['filter'] : '';
 
-                                if( !$sidx ) $sidx = 1;
+//                              if( !$sidx ) $sidx = 1;
 
                                 $folder_name =  isset($URI['folder']) ?  $URI['folder'] : str_replace( '.', $this->imap_delimiter, isset($context['folder']) ?  $context['folder'] : 'INBOX');
                         
                                 $count = imap_num_msg( $this->open_mbox( $folder_name ) );
-
-                                $total_pages = $count > 0 ? ceil( $count/$limit ) : 0;
-
-                                if( $page > $total_pages )
-                                        $page = $total_pages;
-
-                                $start = $limit * $page - $limit;
+// 
+//                              $total_pages = $count > 0 ? ceil( $count/$limit ) : 0;
+// 
+//                              if( $page > $total_pages )
+//                                      $page = $total_pages;
+// 
+//                              $start = $limit * $page - $limit;
+
                                 // do not put $limit*($page - 1)
                                 //end: for grid
@@ -162 +163 @@
                                         if( $filter[0] !== 'msgNumber' )
                                         {
-                                        for( $i = 0; $i < count($filter); $i++ )
-                                        {
-                                                if( count( $filter[$i] ) === 4 )
-                                                $criteria['isExact'] = ( array_shift( $filter[$i] ) === 'AND' );
-
-                                                $criteria[ $filter[$i][0] ] = array( 'criteria' => $filter[$i][2], 'filter' => $filter[$i][1] );
-                                        }
-
-                                        return $this->searchSieveRule($criteria);
-                                        }
-
-                                        $msgNumber = array();
-
-                                        for( $i = $start; $i < $start + $limit && isset( $filter[2][$i] ); $i++ )
-                                          $msgNumber[] = $filter[2][$i];
-
-                                        if( empty( $msgNumber ) )
-                                        return( false );
+                                            for( $i = 0; $i < count($filter); $i++ )
+                                            {
+                                                    if( count( $filter[$i] ) === 4 )
+                                                    $criteria['isExact'] = ( array_shift( $filter[$i] ) === 'AND' );
+
+                                                    $criteria[ $filter[$i][0] ] = array( 'criteria' => $filter[$i][2], 'filter' => $filter[$i][1] );
+                                            }
+
+                                            return $this->searchSieveRule($criteria);
+                                        }
+
+//                                      $msgNumber = array();
+// 
+//                                      for( $i = $start; $i < $start + $limit && isset( $filter[2][$i] ); $i++ )
+//                                        $msgNumber[] = $filter[2][$i];
+// 
+//                                      if( empty( $msgNumber ) )
+//                                      return( false );
 
                                         $result = $this->get_info_msgs( array( 'folder' => $folder_name, 
-                                                                           'msgs_number' => implode( ',', $msgNumber ) ) );
+                                                                           'msgs_number' => implode( ',', $filter[2] ) ) );
 
                                         foreach( $result as $i => $val )
@@ -193 +194 @@
                                                 array( 
                                                         'folder' => $folder_name, //INBOX
-                                                        'msg_range_begin' => $start + 1, //??
-                                                        'msg_range_end' => $start + $limit, //$limit = $_GET['rows']; // get how many rows we want to have into the grid
+                                                        'msg_range_begin' => $criteria['offset'] + 1, //??
+                                                        'msg_range_end' => $criteria['limit'], //$limit = $_GET['rows']; // get how many rows we want to have into the grid
                                                         'sort_box_type' => 'SORTARRIVAL', 
                                                         'search_box_type' => 'ALL',
@@ -203 +204 @@
                                 //return var_export($result);
 
-                                $response = array( "page" => $page, "total" => $total_pages, "records" => $count );
+                                $response = array( "page" => $count > 0 ? ceil( $criteria['offset'] / $criteria['limit'] ) + 1 : 0, 
+                                                   "total" => $count > 0 ? ceil( $count/$criteria['limit'] ) : 0, 
+                                                   "records" => $count );
                                 
                                 for ($i=0; $i<count($result); $i++)