aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2013-11-11 12:50:29 -0200
committerMarcello Coutinho <marcellocoutinho@gmail.com>2013-11-11 12:50:29 -0200
commit97883d9c11717d4cc86d82a29d01fa6b940613e1 (patch)
tree000fce6ec96b829a44fa684aa1d895cd85010122
parent141c6b63a6b630415d3862b5d530cd4f49bf789d (diff)
downloadpfsense-packages-97883d9c11717d4cc86d82a29d01fa6b940613e1.tar.gz
pfsense-packages-97883d9c11717d4cc86d82a29d01fa6b940613e1.tar.bz2
pfsense-packages-97883d9c11717d4cc86d82a29d01fa6b940613e1.zip
postfix - add shortcut inc file and change text fields style on gui
-rwxr-xr-xconfig/postfix/pkg_postfix.inc11
-rwxr-xr-xconfig/postfix/postfix.inc1
-rw-r--r--config/postfix/postfix.xml5
-rw-r--r--config/postfix/postfix_acl.xml10
-rw-r--r--config/postfix/postfix_recipients.xml17
5 files changed, 33 insertions, 11 deletions
diff --git a/config/postfix/pkg_postfix.inc b/config/postfix/pkg_postfix.inc
new file mode 100755
index 00000000..18da1c11
--- /dev/null
+++ b/config/postfix/pkg_postfix.inc
@@ -0,0 +1,11 @@
+<?php
+
+global $shortcuts;
+
+$shortcuts['postfix'] = array();
+$shortcuts['postfix']['main'] = "pkg_edit.php?xml=postfix.xml";
+$shortcuts['postfix']['log'] = "diag_logs_resolver.php";
+$shortcuts['postfix']['status'] = "status_services.php";
+$shortcuts['postfix']['service'] = "postfix";
+
+?>
diff --git a/config/postfix/postfix.inc b/config/postfix/postfix.inc
index 193ec6c7..cf7cd786 100755
--- a/config/postfix/postfix.inc
+++ b/config/postfix/postfix.inc
@@ -29,6 +29,7 @@
POSSIBILITY OF SUCH DAMAGE.
*/
+$shortcut_section = "postfix";
require_once("util.inc");
require_once("functions.inc");
require_once("pkg-utils.inc");
diff --git a/config/postfix/postfix.xml b/config/postfix/postfix.xml
index 25f7a81d..33744770 100644
--- a/config/postfix/postfix.xml
+++ b/config/postfix/postfix.xml
@@ -145,6 +145,11 @@
<prefix>/usr/local/bin/</prefix>
<chmod>0755</chmod>
</additional_files_needed>
+ <additional_files_needed>
+ <prefix>/usr/local/www/shortcuts/</prefix>
+ <chmod>0755</chmod>
+ <item>http://www.pfsense.org/packages/config/postfix-dev/pkg_postfix.inc</item>
+ </additional_files_needed>
<tabs>
<tab>
<text>General</text>
diff --git a/config/postfix/postfix_acl.xml b/config/postfix/postfix_acl.xml
index 4eeda7a4..d704c189 100644
--- a/config/postfix/postfix_acl.xml
+++ b/config/postfix/postfix_acl.xml
@@ -110,7 +110,7 @@
See http://www.postfix.org/header_checks.5.html for more help]]>
</description>
<type>textarea</type>
- <cols>83</cols>
+ <cols>80</cols>
<rows>15</rows>
<encoding>base64</encoding>
</field>
@@ -124,7 +124,7 @@
See http://www.postfix.org/postconf.5.html#smtpd_helo_restrictions for more help]]>
</description>
<type>textarea</type>
- <cols>83</cols>
+ <cols>80</cols>
<rows>15</rows>
<encoding>base64</encoding>
</field>
@@ -142,7 +142,7 @@
<strong>Note: a result of "OK" in this field is not allowed/wanted for safety reasons(it may accept forged senders as it will not do other spam checks). Instead, use DUNNO in order to exclude specific hosts from blacklists.</strong>]]>
</description>
<type>textarea</type>
- <cols>83</cols>
+ <cols>80</cols>
<rows>15</rows>
<encoding>base64</encoding>
</field>
@@ -154,7 +154,7 @@
/^Content-(Disposition|Type):\s+.+?(?:file)?name="?.+?\.(386|ad[ept]|drv|em(ai)?l|ex[_e]|xms|\{[\da-f]{8}(?:-[\da-f]{4}){3}-[\da-f]{12}\})\b/ REJECT ".$2" file attachment types not allowed]]>
</description>
<type>textarea</type>
- <cols>83</cols>
+ <cols>80</cols>
<rows>15</rows>
<encoding>base64</encoding>
</field>
@@ -166,7 +166,7 @@
~^[[:alnum:]+/]{60,}$~ OK]]>
</description>
<type>textarea</type>
- <cols>83</cols>
+ <cols>80</cols>
<rows>15</rows>
<encoding>base64</encoding>
</field>
diff --git a/config/postfix/postfix_recipients.xml b/config/postfix/postfix_recipients.xml
index 97e39fb2..2b07bae8 100644
--- a/config/postfix/postfix_recipients.xml
+++ b/config/postfix/postfix_recipients.xml
@@ -9,7 +9,7 @@
/*
postfix_recipients.xml
part of the Postfix package for pfSense
- Copyright (C) 2011 Marcello Coutinho
+ Copyright (C) 2011-2013 Marcello Coutinho
All rights reserved.
*/
/* ========================================================================== */
@@ -119,33 +119,38 @@
Before using LDAP fetch you must install p5-perl-ldap package(hint: <strong>/usr/sbin/pkg_add -r p5-perl-ldap</strong>)]]></description>
</field>
<field>
- <fielddescr><![CDATA[<strong>HINTS</strong><br>Hostname:<br>dc1.mysite.com<br><br>Domain:<br>dc=mysite,dc=com<br><br>Username:<br>cn=antispam,cn=Users<br>]]></fielddescr>
<fieldname>none</fieldname>
<type>rowhelper</type>
+ <dontdisplayname/>
+ <usecolspan2/>
+ <movable>on</movable>
<rowhelper>
<rowhelperfield>
<fielddescr>Hostname</fielddescr>
+ <description><![CDATA[<strong>Hostname Hint:</strong><br>dc1.mysite.com]]></description>
<fieldname>dc</fieldname>
<type>input</type>
- <size>20</size>
+ <size>23</size>
</rowhelperfield>
<rowhelperfield>
<fielddescr>Domain</fielddescr>
+ <description><![CDATA[<strong>Domain Hint:</strong><br>dc=mysite,dc=com]]></description>
<fieldname>cn</fieldname>
<type>input</type>
- <size>22</size>
+ <size>25</size>
</rowhelperfield>
<rowhelperfield>
<fielddescr>Username</fielddescr>
+ <description><![CDATA[<strong>Username Hint:</strong><br>Username:cn=antispam,cn=Users]]></description>
<fieldname>username</fieldname>
<type>input</type>
- <size>20</size>
+ <size>24</size>
</rowhelperfield>
<rowhelperfield>
<fielddescr>Password</fielddescr>
<fieldname>password</fieldname>
<type>password</type>
- <size>10</size>
+ <size>12</size>
</rowhelperfield>
</rowhelper>
</field>