Florian Schaal
2014-09-22 d15bceb288a8555ca5d81b8f0f5a62c9153872af
allow only mail-server as datasource for mail-related settings
8 files modified
16 ■■■■ changed files
interface/web/mail/form/mail_blacklist.tform.php 2 ●●● patch | view | raw | blame | history
interface/web/mail/form/mail_content_filter.tform.php 2 ●●● patch | view | raw | blame | history
interface/web/mail/form/mail_get.tform.php 2 ●●● patch | view | raw | blame | history
interface/web/mail/form/mail_relay_recipient.tform.php 2 ●●● patch | view | raw | blame | history
interface/web/mail/form/mail_whitelist.tform.php 2 ●●● patch | view | raw | blame | history
interface/web/mail/form/spamfilter_blacklist.tform.php 2 ●●● patch | view | raw | blame | history
interface/web/mail/form/spamfilter_users.tform.php 2 ●●● patch | view | raw | blame | history
interface/web/mail/form/spamfilter_whitelist.tform.php 2 ●●● patch | view | raw | blame | history
interface/web/mail/form/mail_blacklist.tform.php
@@ -63,7 +63,7 @@
            'formtype' => 'SELECT',
            'default' => '',
            'datasource' => array (  'type' => 'SQL',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'keyfield'=> 'server_id',
                'valuefield'=> 'server_name'
            ),
interface/web/mail/form/mail_content_filter.tform.php
@@ -63,7 +63,7 @@
            'formtype' => 'SELECT',
            'default' => '',
            'datasource' => array (  'type' => 'SQL',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'keyfield'=> 'server_id',
                'valuefield'=> 'server_name'
            ),
interface/web/mail/form/mail_get.tform.php
@@ -68,7 +68,7 @@
            'formtype' => 'SELECT',
            'default' => '',
            'datasource' => array (  'type' => 'SQL',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'keyfield'=> 'server_id',
                'valuefield'=> 'server_name'
            ),
interface/web/mail/form/mail_relay_recipient.tform.php
@@ -63,7 +63,7 @@
            'formtype' => 'SELECT',
            'default' => '',
            'datasource' => array (  'type' => 'SQL',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_servr_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'keyfield'=> 'server_id',
                'valuefield'=> 'server_name'
            ),
interface/web/mail/form/mail_whitelist.tform.php
@@ -63,7 +63,7 @@
            'formtype' => 'SELECT',
            'default' => '',
            'datasource' => array (  'type' => 'SQL',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} ORDER BY server_name',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'keyfield'=> 'server_id',
                'valuefield'=> 'server_name'
            ),
interface/web/mail/form/spamfilter_blacklist.tform.php
@@ -63,7 +63,7 @@
            'formtype' => 'SELECT',
            'default' => '',
            'datasource' => array (  'type' => 'SQL',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'keyfield'=> 'server_id',
                'valuefield'=> 'server_name'
            ),
interface/web/mail/form/spamfilter_users.tform.php
@@ -63,7 +63,7 @@
            'formtype' => 'SELECT',
            'default' => '',
            'datasource' => array (  'type' => 'SQL',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'keyfield'=> 'server_id',
                'valuefield'=> 'server_name'
            ),
interface/web/mail/form/spamfilter_whitelist.tform.php
@@ -63,7 +63,7 @@
            'formtype' => 'SELECT',
            'default' => '',
            'datasource' => array (  'type' => 'SQL',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'querystring' => 'SELECT server_id,server_name FROM server WHERE mail_server = 1 AND mirror_server_id = 0 AND {AUTHSQL} ORDER BY server_name',
                'keyfield'=> 'server_id',
                'valuefield'=> 'server_name'
            ),