Changeset 1523
- Timestamp:
- 10/26/09 12:48:29 (14 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
-
emailadmin/inc/class.bo.inc.php (modified) (1 diff)
-
emailadmin/inc/class.ui.inc.php (modified) (2 diffs)
-
emailadmin/setup/phpgw_pt-br.lang (modified) (previous)
-
emailadmin/setup/setup.inc.php (modified) (1 diff)
-
emailadmin/setup/tables_current.inc.php (modified) (1 diff)
-
emailadmin/setup/tables_update.inc.php (modified) (1 diff)
-
emailadmin/templates/default/editprofile.tpl (modified) (1 diff)
-
expressoAdmin1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/emailadmin/inc/class.bo.inc.php
r187 r1523 110 110 'imapSieveServer', 111 111 'imapSievePort', 112 'imapCreateSpamFolder', 113 'imapCyrusUserPostSpam', 112 114 'imapDefaultTrashFolder', 113 115 'imapDefaultSentFolder', -
trunk/emailadmin/inc/class.ui.inc.php
r187 r1523 178 178 case 'userDefinedAccounts': 179 179 case 'imapoldcclient': 180 case 'imapCreateSpamFolder': 180 181 if($value == 'yes') 181 182 $this->t->set_var('selected_'.$key,'checked="1"'); … … 468 469 $this->t->set_var('lang_drafts_folder', lang('Drafts Folder')); 469 470 $this->t->set_var('lang_spam_folder', lang('Spam Folder')); 471 $this->t->set_var('lang_spam_settings', lang('spam settings')); 472 $this->t->set_var('lang_create_spam_folder', lang('create spam folder')); 473 $this->t->set_var('lang_cyrus_user_post_spam', lang('cyrus user post spam')); 470 474 # $this->t->set_var('',lang('')); 471 475 -
trunk/emailadmin/setup/setup.inc.php
r1323 r1523 14 14 $setup_info['emailadmin']['name'] = 'emailadmin'; 15 15 $setup_info['emailadmin']['title'] = 'EMailAdmin'; 16 $setup_info['emailadmin']['version'] = '2.0.00 0';16 $setup_info['emailadmin']['version'] = '2.0.001'; 17 17 $setup_info['emailadmin']['app_order'] = 10; 18 18 $setup_info['emailadmin']['enable'] = 2; -
trunk/emailadmin/setup/tables_current.inc.php
r2 r1523 44 44 'organisationName' => array('type' => 'varchar','precision' => '100'), 45 45 'userDefinedAccounts' => array('type' => 'varchar','precision' => '3'), 46 'imapCreateSpamFolder' => array('type' => 'varchar','precision' => '3'), 47 'imapCyrusUserPostSpam' => array('type' => 'varchar','precision' => '30'), 46 48 'imapoldcclient' => array('type' => 'varchar','precision' => '3') 47 49 ), -
trunk/emailadmin/setup/tables_update.inc.php
r1323 r1523 90 90 return $GLOBALS['setup_info']['emailadmin']['currentver']; 91 91 } 92 $test[] = '2.0.000'; 93 function emailadmin_upgrade2_0_000() 94 { 95 $GLOBALS['setup_info']['emailadmin']['currentver'] = '2.0.001'; 96 $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_emailadmin','imapcreatespamfolder', array('type' => 'varchar', 'precision' => 3)); 97 $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_emailadmin','imapcyrususerpostspam', array('type' => 'varchar', 'precision' => 30)); 98 return $GLOBALS['setup_info']['emailadmin']['currentver']; 99 } 100 92 101 ?> -
trunk/emailadmin/templates/default/editprofile.tpl
r187 r1523 393 393 <td class="td_right"><input name="imapsettings[3][imapSievePort]" maxlength="5" size="5" value="{value_imapSievePort}"></td> 394 394 </tr> 395 </table> 396 <table> 397 <tr> 398 <td colspan="2"> </td> 399 </tr> 400 </table> 401 <table width="88%" border="0" cellspacing="0" cellpading="1"> 402 <tr class="th"> 403 <td width="50%" class="td_left"> 404 <b>{lang_spam_settings}<b> 405 </td> 406 <td class="td_right"> 407 408 </td> 409 </tr> 410 <tr class="row_off"> 411 <td class="td_left">{lang_create_spam_folder}:</td> 412 <td class="td_right"> 413 <input type="checkbox" name="imapsettings[3][imapCreateSpamFolder]" {selected_imapCreateSpamFolder} value="yes"> 414 </td> 415 </tr> 416 <tr class="row_on"> 417 <td width="50%" class="td_left">{lang_cyrus_user_post_spam}:</td> 418 <td width="50%" class="td_right"><input name="imapsettings[3][imapCyrusUserPostSpam]" maxlength="80" size="40" value="{value_imapCyrusUserPostSpam}"></td> 419 </tr> 395 420 </table> 396 421 <table> -
trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php
r520 r1523 23 23 $this->imap_server = $_SESSION['phpgw_info']['expresso']['email_server']['imapServer']; 24 24 $this->imap_port = $_SESSION['phpgw_info']['expresso']['email_server']['imapPort']; 25 $this->imap_createspamfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapCreateSpamFolder']; 26 $this->imap_cyrususerspam = $_SESSION['phpgw_info']['expresso']['email_server']['imapCyrusUserPostSpam'] ? $_SESSION['phpgw_info']['expresso']['email_server']['imapCyrusUserPostSpam'] : "anonymous"; 25 27 $this->imap_trashfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultTrashFolder'] ? $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultTrashFolder'] : str_replace("*","", $this->functions->lang("trash")); 26 28 $this->imap_sentfolder = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSentFolder'] ? $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSentFolder'] : str_replace("*","", $this->functions->lang("sent")); … … 68 70 return $result; 69 71 } 70 /* Esperando correção do william (prognus) sobre a utilização do DSPAM 71 if (!empty($this->imap_sentfolder)) 72 if (!empty($this->imap_spamfolder) && $this->imap_createspamfolder == 'yes') 72 73 { 73 74 if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_spamfolder)) … … 77 78 $result['msg'] = $this->functions->lang('Error on function') . " imap_functions->create(".$this->imap_spamfolder."):" . $error[0]; 78 79 return $result; 79 } 80 } 81 */ 80 } else { 81 imap_setacl($this->imap, "user" . $this->imapDelimiter . $uid. $this->imapDelimiter . $this->imap_spamfolder , $this->imap_cyrususerspam, 'p'); 82 } 83 } 82 84 83 85 if (!imap_set_quota($this->imap,"user" . $this->imapDelimiter . $uid, ($mailquota*1024)))
Note: See TracChangeset
for help on using the changeset viewer.
