Changeset 117
- Timestamp:
- 11/28/07 14:26:51 (16 years ago)
- Location:
- trunk/expressoMail1_2
- Files:
-
- 7 edited
-
inc/class.imap_functions.inc.php (modified) (2 diffs)
-
inc/class.phpmailer.php (modified) (2 diffs)
-
inc/class.smtp.php (modified) (1 diff)
-
index.php (modified) (3 diffs)
-
setup/phpgw_pt-br.lang (modified) (previous)
-
setup/setup.inc.php (modified) (1 diff)
-
templates/default/config.tpl (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/class.imap_functions.inc.php
r115 r117 1203 1203 $mail->ConfirmReadingTo = $_SESSION['phpgw_info']['expressomail']['user']['email']; 1204 1204 //////////////////////////////////////////////////////////////////////////////////////////////////// 1205 if(!$mail->Send()) 1205 $sent = $mail->Send(); 1206 if(!$sent) 1206 1207 { 1207 1208 return $mail->ErrorInfo; … … 1209 1210 else 1210 1211 { 1212 if($_SESSION['phpgw_info']['server']['expressomail']['expressoMail_enable_log_messages'] == "True") 1213 { 1214 $userid = $_SESSION['phpgw_info']['expressomail']['user']['userid']; 1215 $userip = $_SESSION['phpgw_info']['expressomail']['user']['session_ip']; 1216 $now = date("d/m/y H:i:s"); 1217 $addrs = $toaddress.$ccaddress.$ccoaddress; 1218 $sent = trim($sent); 1219 error_log("$now - $userip - $sent [$subject] - $userid => $addrs\r\n", 3, "/home/expressolivre/mail_senders.log"); 1220 } 1211 1221 return true; 1212 1222 } -
trunk/expressoMail1_2/inc/class.phpmailer.php
r27 r117 514 514 return false; 515 515 } 516 if(!$this->smtp->Data($header . $body)) 516 $smtpSent = $this->smtp->Data($header . $body); 517 if(!$smtpSent) 517 518 { 518 519 $this->SetError($this->Lang("data_not_accepted") .' '. $this->smtp->error['error'] .','. $this->smtp->error['smtp_code'].','. $this->smtp->error['smtp_msg']); … … 552 553 } 553 554 554 return true;555 return $smtpSent; 555 556 } 556 557 -
trunk/expressoMail1_2/inc/class.smtp.php
r2 r117 384 384 return false; 385 385 } 386 return true;386 return $code == 250 ? substr($rply,-13) : true; 387 387 } 388 388 -
trunk/expressoMail1_2/index.php
r116 r117 41 41 'save_in_folder' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] : "-1", 42 42 'line_height' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['line_height'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['line_height'] : "30", 43 'font_size' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['font_size'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['font_size'] : "11" 43 'font_size' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['font_size'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['font_size'] : "11", 44 'use_shortcuts' => $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'] : "0" 45 44 46 ); 45 47 … … 73 75 $c = CreateObject('phpgwapi.config','expressoMail1_2'); 74 76 $c->read_repository(); 75 $current_config = $c->config_data; 77 $current_config = $c->config_data; 78 $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_enable_log_messages'] = $current_config['expressoMail_enable_log_messages']; 76 79 // Begin Set Anti-Spam options. 77 80 $_SESSION['phpgw_info']['server']['expressomail']['expressoMail_command_for_ham'] = $current_config['expressoMail_command_for_ham']; … … 117 120 $GLOBALS['phpgw_info']['flags']['update_version']); 118 121 122 if ($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts']) 123 { 124 echo $obj -> getFilesJs("js/shortcut_pack.js", $GLOBALS['phpgw_info']['flags']['update_version']); 125 } 126 119 127 // Get Preferences or redirect to preferences page. 120 128 $GLOBALS['phpgw']->preferences->read_repository(); -
trunk/expressoMail1_2/setup/setup.inc.php
r110 r117 12 12 $setup_info['expressoMail1_2']['name'] = 'expressoMail1_2'; 13 13 $setup_info['expressoMail1_2']['title'] = 'ExpressoMail 1.2'; 14 $setup_info['expressoMail1_2']['version'] = '1.210 4';14 $setup_info['expressoMail1_2']['version'] = '1.2105'; 15 15 $setup_info['expressoMail1_2']['app_order'] = 2; 16 16 // $setup_info['expressoMail1_2']['tables'][] = 'phpgw_expressoMail1_2'; -
trunk/expressoMail1_2/templates/default/config.tpl
r96 r117 14 14 </tr> 15 15 <tr bgcolor="{row_on}"> 16 <td>{lang_Do_you_want_to_log_the_sent_messages?}</td> 17 <td> 18 <select name="newsettings[expressoMail_enable_log_messages]"> 19 <option value=""{selected_expressoMail_enable_log_messages_False}>{lang_No}</option> 20 <option value="True"{selected_expressoMail_enable_log_messages_True}>{lang_Yes}</option> 21 </select> path: /home/expresso/mail_senders.log 22 </td> 23 </tr> 24 <tr bgcolor="{row_off}"> 16 25 <td>{lang_Do_you_want_to_use_the_spam_filter?}</td> 17 26 <td> … … 22 31 </td> 23 32 </tr> 24 <tr bgcolor="{row_o ff}">33 <tr bgcolor="{row_on}"> 25 34 <td>{lang_Command_for_spam}</td> 26 35 <td> 27 36 <input type="text" name="newsettings[expressoMail_command_for_spam]" value="{value_expressoMail_command_for_spam}" size="60" /> 28 37 </td> 29 <tr bgcolor="{row_o n}">38 <tr bgcolor="{row_off}"> 30 39 <td>{lang_Command_for_unmark_spam}</td> 31 40 <td> … … 33 42 </td> 34 43 </tr> 44 <tr bgcolor="{row_on}"> 45 <td colspan="2"><b>{lang_Imap_Folders_Properties}</b></td></tr> 35 46 <tr bgcolor="{row_off}"> 36 <td><td colspan="2"><b>{lang_Imap_Folders_Properties}</b></td></tr>37 <tr bgcolor="{row_on}">38 47 <td>{lang_Trash_Folder_name}</td> 39 48 <td> <input type="text" name="newsettings[expressoMail_trash_folder]" value="{value_expressoMail_trash_folder}" size="60" /></td></tr> 40 <tr bgcolor="{row_o ff}">49 <tr bgcolor="{row_on}"> 41 50 <td>{lang_Drafts_Folder_name}</td> 42 51 <td> <input type="text" name="newsettings[expressoMail_drafts_folder]" value="{value_expressoMail_drafts_folder}" size="60" /></td></tr> 43 <tr bgcolor="{row_o n}">52 <tr bgcolor="{row_off}"> 44 53 <td>{lang_Sent_Folder_name}</td> 45 54 <td> <input type="text" name="newsettings[expressoMail_sent_folder]" value="{value_expressoMail_sent_folder}" size="60" /></td></tr> 46 <tr bgcolor="{row_o ff}">55 <tr bgcolor="{row_on}"> 47 56 <td>{lang_Spam_Folder_name}</td> 48 57 <td> <input type="text" name="newsettings[expressoMail_spam_folder]" value="{value_expressoMail_spam_folder}" size="60" /></td></tr>
Note: See TracChangeset
for help on using the changeset viewer.
