- Timestamp:
- 12/07/12 18:05:13 (12 years ago)
- Location:
- trunk/zpush
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zpush/backend/expresso/providers/imapProvider.php
r7589 r7629 88 88 $this->mboxFolder = ""; 89 89 90 91 $ldapConfig = parse_ini_file(EXPRESSO_PATH . '/prototype/config/OpenLDAP.srv' , true ); 92 $ldapConfig = $ldapConfig['config']; 93 $sr = ldap_search( $GLOBALS['connections']['ldap'] , $ldapConfig['context'] , "(uid=$username)" , array('uidNumber'), 0 , 1 ); 94 if(!$sr) return false; 95 96 $entries = ldap_get_entries( $GLOBALS['connections']['ldap'] , $sr ); 97 $uidNumber = $entries[0]['uidnumber'][0]; 98 99 100 $rs = pg_query( $GLOBALS['connections']['db'], 'Select * FROM phpgw_preferences WHERE preference_owner IN (\'-2\',\'-1\',\''.$uidNumber.'\') AND preference_app = \'expressoMail\' ORDER BY preference_owner' ); 101 102 $results = array(); 103 while( $row = pg_fetch_assoc( $rs ) ) 104 $results[] = $row; 105 106 foreach($results as $result) 107 { 108 $ra = unserialize($result['preference_value']); 109 if(isset($ra['save_in_folder'])) 110 { 111 $this->sentID = $ra['save_in_folder']; 112 break; 113 } 114 } 115 90 116 if ($this->mbox) { 91 117 ZLog::Write(LOGLEVEL_INFO, sprintf("ExpressoImapProvider->Logon(): User '%s' is authenticated on IMAP",$username)); … … 737 763 $folder->displayname = "Sent"; 738 764 $folder->type = SYNC_FOLDER_TYPE_SENTMAIL; 739 $this->sentID = $id;765 //$this->sentID = $id; 740 766 } 741 767 // courier-imap outputs and cyrus-imapd outputs … … 755 781 $folder->displayname = "Sent"; 756 782 $folder->type = SYNC_FOLDER_TYPE_SENTMAIL; 757 $this->sentID = $id;783 //$this->sentID = $id; 758 784 } 759 785 -
trunk/zpush/config.php
r7589 r7629 191 191 define('IMAP_DEFAULTFROM', ''); 192 192 // copy outgoing mail to this folder. If not set z-push will try the default folders 193 define('IMAP_SENTFOLDER', ' ');193 define('IMAP_SENTFOLDER', 'INBOX/Sent'); 194 194 // forward messages inline (default false - as attachment) 195 195 define('IMAP_INLINE_FORWARD', false);
Note: See TracChangeset
for help on using the changeset viewer.