Changeset 3346

Timestamp:

10/13/10 17:34:38 (14 years ago)

Author:

rafaelraymundo

Message:

Ticket #1355 - Corrige pasta corrente na navegacao e reseta contagem da pagina na troca de pastas.

Location:

branches/2.2/mobile/inc

Files:

• class.mobiletemplate.inc.php (modified) (2 diffs)
• class.ui_mobilemail.inc.php (modified) (5 diffs)

branches/2.2/mobile/inc/class.mobiletemplate.inc.php

@@ -51 +51 @@
                         $this-> template->set_var('href_newmail', 'index.php?menuaction=mobile.ui_mobilemail.new_msg&clk=01');
                         $this-> template->set_var('lang_newmail', lang('Create mail'));
-                        $this-> template->set_var('href_email', "index.php?menuaction=mobile.ui_mobilemail.mail_list");
+                        $this-> template->set_var('href_email', "index.php?menuaction=mobile.ui_mobilemail.change_folder&folder=0");
                         $this-> template->set_var('lang_email', lang('E-mail'));
 
@@ -61 +61 @@
                         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] = $save_in_folder;
                                                 
-                        $this-> template->set_var('href_sent', "index.php?menuaction=mobile.ui_mobilemail.mail_list&folder=".$folder_number);
+                        $this-> template->set_var('href_sent', "index.php?menuaction=mobile.ui_mobilemail.change_folder&folder=".$folder_number);
                         $this-> template->set_var('lang_sent', str_replace('*','',lang(str_replace('INBOX/','',$save_in_folder))));
                         $this-> template->set_var('href_more', 'index.php?menuaction=mobile.ui_mobilemail.list_folders');

branches/2.2/mobile/inc/class.ui_mobilemail.inc.php

@@ -75 +75 @@
                         {
                                 $this->current_folder = $current_folder;
+                                $current_page = 1;
                         }
                         else
@@ -572 +573 @@
                                                 $p->set_var('end_strong', '');
                                                 $p->set_var('end_anchor', trim($p->fp('mobilemail_t', 'end_anchor')));
-                                                $p->set_var('begin_anchor_href', "index.php?menuaction=mobile.ui_mobilemail.change_page&page=$i");
+                                                $p->set_var('begin_anchor_href', "index.php?menuaction=mobile.ui_mobilemail.change_page&folder=$this->current_folder&page=$i");
                                                 $p->set_var('begin_anchor', trim($p->fp('mobilemail_t', 'begin_anchor')));
                                         }
@@ -609 +610 @@
                                         else
                                         {
-                                                $p->set_var('next_href', "index.php?menuaction=mobile.ui_mobilemail.change_page&page=$next_page");
+                                                $p->set_var('next_href', "index.php?menuaction=mobile.ui_mobilemail.change_page&folder=$this->current_folder&page=$next_page");
                                                 $p->set_var('next', trim($p->fp('mobilemail_t', 'next')));
                                         }
@@ -618 +619 @@
                                         // Se for a última página, não imprime o link "próximo"
                                         $p->set_var('next', '');
-                                        $p->set_var('previous_href', "index.php?menuaction=mobile.ui_mobilemail.change_page&page=$previous_page");
+                                        $p->set_var('previous_href', "index.php?menuaction=mobile.ui_mobilemail.change_page&folder=$this->current_folder&page=$previous_page");
                                         $p->set_var('previous', trim($p->fp('mobilemail_t', 'previous')));
                                 }
@@ -624 +625 @@
                                 {
                                         // Senão, imprime os links "anterior" e "próximo"
-                                        $p->set_var('previous_href', "index.php?menuaction=mobile.ui_mobilemail.change_page&page=$previous_page");
+                                        $p->set_var('previous_href', "index.php?menuaction=mobile.ui_mobilemail.change_page&folder=$this->current_folder&page=$previous_page");
                                         $p->set_var('previous', trim($p->fp('mobilemail_t', 'previous')));
 
-                                        $p->set_var('next_href', "index.php?menuaction=mobile.ui_mobilemail.change_page&page=$next_page");
+                                        $p->set_var('next_href', "index.php?menuaction=mobile.ui_mobilemail.change_page&folder=$this->current_folder&page=$next_page");
                                         $p->set_var('next', trim($p->fp('mobilemail_t', 'next')));
                                 }