Changeset 192
- Timestamp:
- 09/13/07 20:45:09 (16 months ago)
- Location:
- trunk
- Files:
-
- 7 modified
-
ChangeLog (modified) (1 diff)
-
includes/func.inc.php (modified) (2 diffs)
-
includes/sites/domain_view.php (modified) (1 diff)
-
includes/sites/email_view.php (modified) (5 diffs)
-
sql_upgrades (modified) (1 diff)
-
templates/domain_view.tpl (modified) (1 diff)
-
templates/email_view.tpl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r191 r192 1 1 CpVES 0.08 YYYY-MM-DD - Jonas Genannt - <jonas.genannt@brachium-system.net> 2 2 o Added: policyd-weight per user/domain configuration 3 o Added: greylisting per user/domain configuration 3 4 CpVES 0.07 2007-09-13 - Jonas Genannt - <jonas.genannt@brachium-system.net> 4 5 o Fixed: mail_system.sql -
trunk/includes/func.inc.php
r179 r192 202 202 $do="p_autores_xheader"; 203 203 break; 204 case 'check_polw': 205 $do="p_check_polw"; 206 break; 207 case 'check_grey': 208 $do="p_check_grey"; 209 break; 204 210 default: 205 211 return false; … … 211 217 $result=&$db->query($sql); 212 218 if ($result) { 219 220 if (preg_match("/p_check_/", $do) ==1) { 221 $sql=sprintf("UPDATE users SET %s='%s' WHERE domainid='%s'", 222 $do, 223 $db->escapeSimple($state), 224 $db->escapeSimple($did)); 225 $result=&$db->query($sql); 226 $sql=sprintf("UPDATE forwardings SET %s='%s' WHERE domainid='%s'", 227 $do, 228 $db->escapeSimple($state), 229 $db->escapeSimple($did)); 230 $result=&$db->query($sql); 231 } 213 232 return true; 214 233 } -
trunk/includes/sites/domain_view.php
r171 r192 208 208 $smarty->assign('p_webinterface', $data['p_webinterface']); 209 209 $smarty->assign('p_autores_xheader', $data['p_autores_xheader']); 210 $smarty->assign('p_check_polw', $data['p_check_polw']); 211 $smarty->assign('p_check_grey', $data['p_check_grey']); 210 212 211 213 $smarty->assign('max_emails', $data['max_email']); -
trunk/includes/sites/email_view.php
r169 r192 47 47 $smarty->assign('if_webinterface', $data['p_webinterface']); 48 48 $smarty->assign('if_autores_xheader', $data['p_autores_xheader']); 49 $smarty->assign('if_check_polw', $data['p_check_polw']); 50 $smarty->assign('if_check_grey', $data['p_check_grey']); 49 51 $sql=sprintf("SELECT passwd,cpasswd,email FROM users WHERE id='%s'", 50 52 $db->escapeSimple($_GET['id'])); … … 490 492 else { 491 493 $autores_xheader=0; 494 } 495 if (isset($_POST['check_polw']) && $_POST['check_polw'] == "enable" && check_domain_feature($_GET['did'], 'p_check_polw')) { 496 $check_polw=1; 497 } 498 else { 499 $check_polw=0; 500 } 501 if (isset($_POST['check_grey']) && $_POST['check_grey'] == "enable" && check_domain_feature($_GET['did'], 'p_check_grey')) { 502 $check_grey=1; 503 } 504 else { 505 $check_grey=0; 492 506 } 493 507 if (isset($_POST['forwarding']) && $_POST['forwarding'] == "enable" ) { … … 528 542 if (!$error) 529 543 { 530 $sql=sprintf("UPDATE users SET passwd='%s', full_name='%s',p_imap='%d', p_pop3='%d',p_webmail='%d', cpasswd='%s', p_forwarding='%s',p_spamassassin='%s',p_mailarchive='%d',p_bogofilter='%d',p_spam_del='%d',p_sa_learn='%d',p_fetchmail='%d',p_webinterface='%d',p_autores_xheader='%d' WHERE id='%d' ",544 $sql=sprintf("UPDATE users SET passwd='%s', full_name='%s',p_imap='%d', p_pop3='%d',p_webmail='%d', cpasswd='%s', p_forwarding='%s',p_spamassassin='%s',p_mailarchive='%d',p_bogofilter='%d',p_spam_del='%d',p_sa_learn='%d',p_fetchmail='%d',p_webinterface='%d',p_autores_xheader='%d',p_check_polw='%d',p_check_grey='%d' WHERE id='%d' ", 531 545 $db->escapeSimple($cleartext), 532 546 $db->escapeSimple($_POST['full_name']), … … 544 558 $db->escapeSimple($webinterface), 545 559 $db->escapeSimple($autores_xheader), 560 $db->escapeSimple($check_polw), 561 $db->escapeSimple($check_grey), 546 562 $db->escapeSimple($_GET['id'])) ; 547 563 $result=&$db->query($sql); … … 573 589 $smarty->assign('if_fetchmail_value',$edata['p_fetchmail']); 574 590 $smarty->assign('if_autores_xheader_value',$edata['p_autores_xheader']); 591 $smarty->assign('if_check_polw_value',$edata['p_check_polw']); 592 $smarty->assign('if_check_grey_value',$edata['p_check_grey']); 575 593 if ( !empty($edata['move_spam']) && $edata['move_spam']!=NULL) { 576 594 $smarty->assign('sa_move_spam',$edata['move_spam'] ); -
trunk/sql_upgrades
r175 r192 138 138 ALTER TABLE `adm_users` ADD `web_lang` VARCHAR( 8 ) NOT NULL ; 139 139 140 Version 0.07 to 0.08 141 ALTER TABLE `users` ADD `p_check_polw` TINYINT( 1 ) DEFAULT '1' NOT NULL ; 142 ALTER TABLE `users` ADD `p_check_grey` TINYINT( 1 ) DEFAULT '0' NOT NULL ; 143 144 ALTER TABLE `forwardings` ADD `p_check_polw` TINYINT( 1 ) DEFAULT '1' NOT NULL ; 145 ALTER TABLE `forwardings` ADD `p_check_grey` TINYINT( 1 ) DEFAULT '0' NOT NULL ; 146 147 ALTER TABLE `domains` ADD `p_check_polw` TINYINT( 1 ) DEFAULT '1' NOT NULL ; 148 ALTER TABLE `domains` ADD `p_check_grey` TINYINT( 1 ) DEFAULT '0' NOT NULL ; 149 150 DROP VIEW IF EXISTS smtpd_recipient_classes; 151 CREATE VIEW smtpd_recipient_classes AS SELECT email,if(p_check_polw=1,'check_polw','') AS polw,if(p_check_grey=1,'check_grey','') AS grey FROM users WHERE access=1 AND p_check_polw!=0 AND p_check_polw!=0 UNION SELECT efrom,if(p_check_polw=1,'check_polw','') AS polw,if(p_check_grey=1,'check_grey','') AS grey FROM forwardings WHERE access=1 AND p_check_polw!=0 AND p_check_polw!=0; 152 -
trunk/templates/domain_view.tpl
r186 r192 174 174 </tr> 175 175 <tr> 176 <td>{t}Policyd-Weight{/t}:</td> 177 <td></td> 178 <td style="text-align:right;"> 179 {if $p_check_polw == 0 } 180 <a href="?module=domain_view&did={$did}&fstate=1&f=check_polw"> 181 <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate policyd-weight.{/t}" /></a> 182 {else} 183 <a href="?module=domain_view&did={$did}&fstate=0&f=check_polw"> 184 <img src="img/icons/button_ok.png" style="border:0px;" title="{t}deactivate policyd-weight.{/t}" /></a> 185 {/if}</td> 186 </tr> 187 <tr> 188 <td>{t}Greylisting{/t}:</td> 189 <td></td> 190 <td style="text-align:right;"> 191 {if $p_check_grey == 0 } 192 <a href="?module=domain_view&did={$did}&fstate=1&f=check_grey"> 193 <img src="img/icons/button_cancel.png" style="border:0px;" title="{t}activate greylisting.{/t}" /></a> 194 {else} 195 <a href="?module=domain_view&did={$did}&fstate=0&f=check_grey"> 196 <img src="img/icons/button_ok.png" style="border:0px;" title="{t}deactivate greylisting.{/t}" /></a> 197 {/if}</td> 198 </tr> 199 <tr> 176 200 <td>{t}access to CpVES webinterface{/t}:</td> 177 201 <td></td> -
trunk/templates/email_view.tpl
r186 r192 46 46 <option value="enable">{t}yes{/t}</option> 47 47 {if $if_webmail_value == 0 } 48 <option value="disable" selected="selected" >{t}no{/t}</option> 49 {else} 50 <option value="disable" >{t}no{/t}</option> 51 {/if} 52 </select></td> 53 </tr> 54 {/if} 55 {if $if_check_polw == 1 } 56 <tr> 57 <td>{t}policyd-weight available{/t}:</td> 58 <td><select name="check_polw"> 59 <option value="enable">{t}yes{/t}</option> 60 {if $if_check_polw_value == 0 } 61 <option value="disable" selected="selected" >{t}no{/t}</option> 62 {else} 63 <option value="disable" >{t}no{/t}</option> 64 {/if} 65 </select></td> 66 </tr> 67 {/if} 68 {if $if_check_grey == 1 } 69 <tr> 70 <td>{t}greylisting available{/t}:</td> 71 <td><select name="check_grey"> 72 <option value="enable">{t}yes{/t}</option> 73 {if $if_check_grey_value == 0 } 48 74 <option value="disable" selected="selected" >{t}no{/t}</option> 49 75 {else}
