elma-commit Mailing List for Exim Ldap Mail Administrator

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 276
          http://elma.svn.sourceforge.net/elma/?rev=276&view=rev
Author:   adan0s
Date:     2009-11-19 16:52:12 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
smaller fixes done
it's possible to create domainaliases now

there's a FIXME on domain_edit. the validation for the domainaliases needs to be done

Modified Paths:
--------------
    trunk/includes/eximfilter.inc.php
    trunk/includes/ldap_functions.inc.php
    trunk/modules/content_domain_edit.php
    trunk/modules/content_domains_list.php
    trunk/templates/simple/content_domain_edit.tpl
    trunk/templates/simple/content_domains_list.tpl
    trunk/templates/simple/content_user_edit.tpl
    trunk/templates/simple/style.css

Modified: trunk/includes/eximfilter.inc.php
===================================================================

--- trunk/includes/eximfilter.inc.php	2009-11-19 12:14:25 UTC (rev 275)
+++ trunk/includes/eximfilter.inc.php	2009-11-19 16:52:12 UTC (rev 276)
@@ -15,6 +15,12 @@
     $eximFilter["filtertype"]["template"] = '%STATUS% Exim filter';
     $eximFilter["filtertype"]["regex"] = '/^(.*) Exim filter$/i';
     $eximFilter["filtertype"]["values"] = array("STATUS" => "#");
+    
+    // DomainAlias Template
+    $eximFilter["maildomainalias"]["template"] = '%STATUS%deliver $local_part@%TARGETDOMAIN% # DOMAINALIAS';
+    $eximFilter["maildomainalias"]["regex"] = '/^(.*)deliver \$local_part@(.*) # DOMAINALIAS$/i';
+    $eximFilter["maildomainalias"]["values"] = array("STATUS" => "#",
+	    					"TARGETDOMAIN" => "");
 
     // Redirect Template
     $eximFilter["redirect"]["template"] = '%STATUS%deliver %RECIPIENT% # REDIRECT';
@@ -28,7 +34,6 @@
     $eximFilter["keep"]["values"] = array("STATUS" => "#",
 	    					"RECIPIENT" => "");
 
-
     // Spamfilter Template
     $eximFilter["spamfilter"]["template"] = '%STATUS%if $header_X-Spam-Flag: contains "YES" then %FILTERACTION% endif # SPAMFILTER %ACTION%';
     $eximFilter["spamfilter"]["regex"] = '/^(.*)if \$header_X-Spam-Flag: contains "YES" then (.*) endif # SPAMFILTER (.*)$/i';

Modified: trunk/includes/ldap_functions.inc.php
===================================================================
--- trunk/includes/ldap_functions.inc.php	2009-11-19 12:14:25 UTC (rev 275)
+++ trunk/includes/ldap_functions.inc.php	2009-11-19 16:52:12 UTC (rev 276)
@@ -107,7 +107,7 @@
      * @attribute       array   array of ldap attributes to return, empty array returns everything
      */
     function listDomains ($active="*", $attributes=array() ) {
-        $domains = $this->getDomain("*", $active="*", $attributes=array());
+        $domains = $this->getDomain("*", $active="*", $attributes);
         return $domains;
     }
 

Modified: trunk/modules/content_domain_edit.php
===================================================================
--- trunk/modules/content_domain_edit.php	2009-11-19 12:14:25 UTC (rev 275)
+++ trunk/modules/content_domain_edit.php	2009-11-19 16:52:12 UTC (rev 276)
@@ -80,9 +80,21 @@
                     $my_domain["mailstatus"] = "TRUE";
                 } else {
                     $my_domain["mailstatus"] = "FALSE";
+		}
+
+                $eximFilterValues["maildomainalias"]["values"] = array( "STATUS" => "",
+                                                              "TARGETDOMAIN" => $_POST["nlo_maildomainaliastarget"]);
+                if (! isset($_POST["nlo_maildomainalias"])) {
+                    $eximFilterValues["maildomainalias"]["values"]["STATUS"] = "#";
                 }
+
+		#FIXME!!
+		if(($eximFilterValues["maildomainalias"]["values"]["STATUS"] == "") && ($eximFilterValues["maildomainalias"]["values"]["TARGETDOMAIN"] == "")) {
+		    die("Please set a Targetdomain when enabling Domainaliasing!");
+		}
+
                 $my_domain["mailSieveFilter"] = createEximFilter( $eximFilterValues );
-                
+
                 $this->ldap->modifyDomain($my_domain);
 
                 $admins_cur = $this->ldap->listAdminUsers($domain, TRUE);
@@ -165,6 +177,8 @@
         /* parse Exim filter and assign values */
         $eximFilterValues = parseEximFilter($my_domain["mailsievefilter"][0]);
         $this->smarty->assign("spamfiltersettings",$eximFilterValues["spamfilter"]["values"]);
+	$this->smarty->assign("maildomainaliassettings",$eximFilterValues["maildomainalias"]["values"]);
+
     }
 
     /**

Modified: trunk/modules/content_domains_list.php
===================================================================
--- trunk/modules/content_domains_list.php	2009-11-19 12:14:25 UTC (rev 275)
+++ trunk/modules/content_domains_list.php	2009-11-19 16:52:12 UTC (rev 276)
@@ -51,10 +51,13 @@
 
         $my_domains = array();
 
-        $domains = $this->ldap->listDomains();
-        for ( $i = 0; $i < $domains["count"]; $i++ ) {
+	$domains = $this->ldap->listDomains();
+	for ( $i = 0; $i < $domains["count"]; $i++ ) {
+	    $eximFilterValues = parseEximFilter($domains[$i]['mailsievefilter'][0]);
             $domain['dc'] = $domains[$i]["dc"][0]; 
-            $domain['mailstatus'] = $domains[$i]["mailstatus"][0];
+	    $domain['mailstatus'] = $domains[$i]["mailstatus"][0];
+	    $domain['maildomainaliasstatus'] = (($eximFilterValues['maildomainalias']['values']['STATUS'] == '') && ($eximFilterValues['maildomainalias']['values']['TARGETDOMAIN'] != ''))?1:0;
+	    $domain['maildomainaliastarget'] = $eximFilterValues['maildomainalias']['values']['TARGETDOMAIN'];
             $domain['userslink'] = $_SERVER['PHP_SELF']."?module=users_list&amp;domain=".$domain['dc'];
             $domain['deletelink'] = $_SERVER['PHP_SELF']."?module=domain_delete&amp;domain=".$domain['dc'];
             $domain['editlink'] = $_SERVER['PHP_SELF']."?module=domain_edit&amp;domain=".$domain['dc']; 
@@ -65,7 +68,7 @@
             array_push($my_domains,$domain);
         }
         $this->smarty->assign("link_newdomain",$_SERVER['PHP_SELF']."?module=domain_new");
-        $this->smarty->assign('domains',$my_domains);   
+	$this->smarty->assign('domains',$my_domains);
 	}
 
     /**

Modified: trunk/templates/simple/content_domain_edit.tpl
===================================================================
--- trunk/templates/simple/content_domain_edit.tpl	2009-11-19 12:14:25 UTC (rev 275)
+++ trunk/templates/simple/content_domain_edit.tpl	2009-11-19 16:52:12 UTC (rev 276)
@@ -39,6 +39,27 @@
                                     <hr />
                                 </td>
                             </tr>
+	               	    <tr>
+			        <td>
+                                    {t}Use Domain as Alias?{/t}
+                                </td>
+                                <td>
+                                    <input type="checkbox" name="nlo_maildomainalias" {if $maildomainaliassettings.STATUS eq "#"}{else}checked="checked"{/if} />
+                                </td>
+			    </tr>
+	               	    <tr>
+			        <td>
+                                    {t}Targetdomain{/t}
+                                </td>
+                                <td>
+                                    <input type="text" name="nlo_maildomainaliastarget" value="{$maildomainaliassettings.TARGETDOMAIN}" />
+                                </td>
+			    </tr>
+                            <tr>
+                                <td colspan="2">
+                                    <hr />
+                                </td>
+                            </tr>
                             {if @in_array("domain_edit.spamfilter",$acl) }
                             <tr>
                                 <td>

Modified: trunk/templates/simple/content_domains_list.tpl
===================================================================
--- trunk/templates/simple/content_domains_list.tpl	2009-11-19 12:14:25 UTC (rev 275)
+++ trunk/templates/simple/content_domains_list.tpl	2009-11-19 16:52:12 UTC (rev 276)
@@ -11,7 +11,12 @@
 		            {section name=domains_sec loop=$domains}
 		            <tr>
                         <td>
-                            <a href="{$domains[domains_sec].userslink}">{$domains[domains_sec].dc}</a>
+                            {if $domains[domains_sec].maildomainaliasstatus == 0}
+				<a href="{$domains[domains_sec].userslink}">{$domains[domains_sec].dc}</a>
+			    {else}
+				{$domains[domains_sec].dc}<br />
+				<span class="isAliasFor">({t}Alias for{/t} {$domains[domains_sec].maildomainaliastarget})</span>
+			    {/if}
                         </td>
                         <td class="status">
                             {$domains[domains_sec].users}/{$domains[domains_sec].usersactive}

Modified: trunk/templates/simple/content_user_edit.tpl
===================================================================
--- trunk/templates/simple/content_user_edit.tpl	2009-11-19 12:14:25 UTC (rev 275)
+++ trunk/templates/simple/content_user_edit.tpl	2009-11-19 16:52:12 UTC (rev 276)
@@ -56,7 +56,7 @@
                                     <input type="checkbox" name="nlo_redirectstatus" onchange="switchRedirect()" {if $redirectsettings.STATUS eq "#"}{else}checked="checked"{/if}/>
                                 </td>
 				            </tr>
-			                <tr id="keepoption">
+			                <tr id="keepoption" {if $redirectsettings.STATUS eq "#"}style="display:none"{/if}>
 				                <td>
                                     {t}Local delivery{/t}
                                 </td>
@@ -64,7 +64,7 @@
                                     <input type="checkbox" name="nlo_keepstatus" {if $keepsettings.STATUS eq "#"}{else}checked="checked"{/if} />
                                 </td>
 				            </tr>
-			                <tr id="recipientoption">
+			                <tr id="recipientoption" {if $redirectsettings.STATUS eq "#"}style="display:none"{/if}>
 				                <td>
                                     {t}Recipient:{/t}
                                 </td>

Modified: trunk/templates/simple/style.css
===================================================================
--- trunk/templates/simple/style.css	2009-11-19 12:14:25 UTC (rev 275)
+++ trunk/templates/simple/style.css	2009-11-19 16:52:12 UTC (rev 276)
@@ -263,3 +263,8 @@
   margin: 0;
   text-align: center;
 }
+
+span.isAliasFor {
+  font-size: 9pt;
+  padding-left: 10px;
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan	Feb	Mar	Apr (23)	May (11)	Jun (24)	Jul (18)	Aug (7)	Sep (6)	Oct (34)	Nov (6)	Dec (23)
2008	Jan (3)	Feb	Mar	Apr	May	Jun	Jul (1)	Aug (16)	Sep (12)	Oct (2)	Nov	Dec (6)
2009	Jan	Feb	Mar (1)	Apr	May	Jun (4)	Jul (1)	Aug (2)	Sep (1)	Oct	Nov (4)	Dec

elma-commit Mailing List for Exim Ldap Mail Administrator

elma-commit — SVN commit messages