Changeset 193

Timestamp:

09/13/07 21:04:27 (16 months ago)

Author:

jonas

Message:

polw/grey enable/disable per config.inc.php

Location:

trunk

Files:

• includes/config.inc.default.php (modified) (1 diff)
• includes/func.inc.php (modified) (1 diff)
• includes/sites/domain_view.php (modified) (1 diff)
• includes/sites/email_view.php (modified) (2 diffs)
• templates/domain_view.tpl (modified) (3 diffs)
• templates/email_view.tpl (modified) (2 diffs)

trunk/includes/config.inc.default.php

@@ -54 +54 @@
 $config['company_title'] = "Some Company";
 
+// use the postfix per recipient classes with policyd-weight
+$config['recipient_classes_polw']=1;
+
+// use the postfix per recipient classes with greylisting
+$config['recipient_classes_grey']=0;
+
 $ar_spam=array("cbl.abuseat.org","multi.surbl.org","sbl-xbl.spamhaus.org");
 

trunk/includes/func.inc.php

@@ -24 +24 @@
 $smarty->assign('display_mb_size',$config['display_mb_size']);
 $smarty->assign('cpves_version', $config['cpves_version']);
+$smarty->assign('config', $config);
 /*
 mailfilter prios:

trunk/includes/sites/domain_view.php

@@ -183 +183 @@
         }
         else {
+                if ($_GET['f'] == 'check_polw' && $config['recipient_classes_polw']==0) {
+                }
+                elseif($_GET['f'] == 'check_grey' && $config['recipient_classes_grey']==0) {
+                }
+                else {
                 change_domain_feature($_GET['did'],$_GET['f'],$_GET['fstate']);
+                }
         }
 

trunk/includes/sites/email_view.php

@@ -493 +493 @@
                                 $autores_xheader=0;
                         }
-                        if (isset($_POST['check_polw']) && $_POST['check_polw'] == "enable" && check_domain_feature($_GET['did'], 'p_check_polw')) {
+                        if (isset($_POST['check_polw']) && $_POST['check_polw'] == "enable" && check_domain_feature($_GET['did'], 'p_check_polw') && $config['recipient_classes_polw']) {
                                 $check_polw=1;
                         }
@@ -499 +499 @@
                                 $check_polw=0;
                         }
-                        if (isset($_POST['check_grey']) && $_POST['check_grey'] == "enable" && check_domain_feature($_GET['did'], 'p_check_grey')) {
+                        if (isset($_POST['check_grey']) && $_POST['check_grey'] == "enable" && check_domain_feature($_GET['did'], 'p_check_grey') && $config['recipient_classes_grey']) {
                                 $check_grey=1;
                         }

trunk/templates/domain_view.tpl

@@ -173 +173 @@
  {/if}</td>
 </tr>
+{if $config.recipient_classes_polw == 1}
 <tr>
  <td>{t}Policyd-Weight{/t}:</td>
@@ -185 +186 @@
  {/if}</td>
 </tr>
+{/if}
+{if $config.recipient_classes_grey == 1}
 <tr>
  <td>{t}Greylisting{/t}:</td>
@@ -197 +200 @@
  {/if}</td>
 </tr>
+{/if}
 <tr>
  <td>{t}access to CpVES webinterface{/t}:</td>

trunk/templates/email_view.tpl

@@ -53 +53 @@
 </tr>
 {/if}
-{if $if_check_polw == 1 }
+{if $if_check_polw == 1 && $config.recipient_classes_polw == 1}
 <tr>
  <td>{t}policyd-weight available{/t}:</td>
@@ -66 +66 @@
 </tr>
 {/if}
-{if $if_check_grey == 1 }
+{if $if_check_grey == 1 && $config.recipient_classes_grey }
 <tr>
  <td>{t}greylisting available{/t}:</td>