Changeset 411

Timestamp:

09/10/08 11:01:37 (16 years ago)

Author:

rafaelraymundo

Message:

Para nova ferramenta - expressomini(mobile). Adicao da funcionalidade de leitura de e-mails. Foi preciso
fazer mudancas em phpgwapi/inc/functions.inc.php e expressoMail1_2/inc/class.imap_functions.inc.php.

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (7 diffs)
• phpgwapi/inc/functions.inc.php (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -152 +152 @@
                 $msg_folder = $params['msg_folder'];
                 
-                if(!$this->mbox)
+                if(!$this->mbox || !is_resource($this->mbox))
                         $this->mbox = $this->open_mbox($msg_folder);            
                 
@@ -926 +926 @@
                 $return['new_msgs'] = imap_num_recent($this->mbox);
                 $return['msgs_to_delete'] = $msg_to_delete;
-                if($this->mbox)
+                if($this->mbox && is_resource($this->mbox))
                         imap_close($this->mbox);
                 return $return;
@@ -1076 +1076 @@
         {
                 $folder = $params['folder'];
-                if(!$this->mbox) {
+                if(!$this->mbox || !is_resource($this->mbox)) {
                         $this->mbox = $this->open_mbox($folder);
-                        if(!$this->mbox)
+                        if(!$this->mbox || !is_resource($this->mbox))
                         return imap_last_error();
                 }               
                 $num_msgs = imap_num_msg($this->mbox);
-                if($this->mbox)
+                if($this->mbox || is_resource($this->mbox))
                         imap_close($this->mbox);
                 
@@ -1700 +1700 @@
                 $return["flag"] = $flag;
                 
-                if(!$this->mbox)
+                if(!$this->mbox && !is_resource($this->mbox))
                         $this->mbox = $this->open_mbox($folder);
                 
@@ -1718 +1718 @@
                         $return["status"] = imap_clearflag_full($this->mbox, $msgs_to_set, "\\Flagged", ST_UID);
                 
-                if($this->mbox)
+                if($this->mbox && is_resource($this->mbox))
                         imap_close($this->mbox);
                 return $return;
@@ -1805 +1805 @@
         function get_msgs($folder, $sort_box_type, $search_box_type, $sort_box_reverse){
                 
-                if(!$this->mbox)
+                if(!$this->mbox || !is_resource($this->mbox)){
                         $this->mbox = $this->open_mbox($folder);
-                
+                }
                 switch($sort_box_type){
                         case 'SORTFROM':
@@ -1918 +1918 @@
                         $folder_id = "INBOX";
                 
-                if(!$this->mbox)
+                if(!$this->mbox || !is_resource($this->mbox))
                         $this->mbox = $this->open_mbox();
 
                 $quota = imap_get_quotaroot($this->mbox, $folder_id);
-                if($this->mbox)
+                if($this->mbox && is_resource($this->mbox))
                         imap_close($this->mbox);
                         

trunk/phpgwapi/inc/functions.inc.php

@@ -450 +450 @@
                 \*************************************************************************/
                 if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
-                        $GLOBALS['phpgw_info']['flags']['currentapp'] != 'about')
+                        $GLOBALS['phpgw_info']['flags']['currentapp'] != 'about' &&
+                        $GLOBALS['phpgw_info']['flags']['currentapp'] != 'mobile')
                 {
                         // This will need to use ACL in the future