Falko Timme
2013-10-22 d5473beac0fb8fdd2b11be1f7fd286d2aaed1649
- Display server name in all web domains select fields so that you know which domain from which server you select.
13 files modified
47 ■■■■■ changed files
interface/lib/classes/custom_datasource.inc.php 4 ●●●● patch | view | raw | blame | history
interface/lib/classes/tform.inc.php 5 ●●●●● patch | view | raw | blame | history
interface/web/sites/form/cron.tform.php 4 ●●●● patch | view | raw | blame | history
interface/web/sites/form/database.tform.php 4 ●●●● patch | view | raw | blame | history
interface/web/sites/form/ftp_user.tform.php 4 ●●●● patch | view | raw | blame | history
interface/web/sites/form/shell_user.tform.php 4 ●●●● patch | view | raw | blame | history
interface/web/sites/form/web_aliasdomain.tform.php 4 ●●●● patch | view | raw | blame | history
interface/web/sites/form/web_folder.tform.php 4 ●●●● patch | view | raw | blame | history
interface/web/sites/form/web_folder_user.tform.php 4 ●●● patch | view | raw | blame | history
interface/web/sites/form/web_subdomain.tform.php 4 ●●●● patch | view | raw | blame | history
interface/web/sites/form/web_vhost_subdomain.tform.php 4 ●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/de_cron.lng 1 ●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/en_cron.lng 1 ●●●● patch | view | raw | blame | history
interface/lib/classes/custom_datasource.inc.php
@@ -77,13 +77,13 @@
        }
        if(count($server_ids) == 0) return array();
        $server_ids = implode(',', $server_ids);
        $records = $app->db->queryAllRecords("SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND server_id IN (".$server_ids.") AND ".$app->tform->getAuthSQL('r')." ORDER BY domain");
        $records = $app->db->queryAllRecords("SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id IN (".$server_ids.") AND web_domain.server_id = server.server_id AND ".$app->tform->getAuthSQL('r', 'web_domain')." ORDER BY web_domain.domain");
        
        $records_new = array();
        if(is_array($records)) {
            foreach($records as $rec) {
                $key = $rec['domain_id'];
                $records_new[$key] = $rec['domain'];
                $records_new[$key] = $rec['parent_domain'];
            }
        }
        return $records_new;
interface/lib/classes/tform.inc.php
@@ -251,6 +251,7 @@
                        unset($tmp_recordid);
                        
                        $querystring = str_replace("{AUTHSQL}",$this->getAuthSQL('r'),$querystring);
                        $querystring = preg_replace_callback('@{AUTHSQL::(.+?)}@', "self::table_auth_sql", $querystring);
                        
                        // Getting the records
                        $tmp_records = $app->db->queryAllRecords($querystring);
@@ -292,6 +293,10 @@
        }
        
        function table_auth_sql($matches){
            return $this->getAuthSQL('r', $matches[1]);
        }
        //* If the parameter 'valuelimit' is set
        function applyValueLimit($limit,$values) {
            
interface/web/sites/form/cron.tform.php
@@ -79,9 +79,9 @@
            'formtype'  => 'SELECT',
            'default'   => '',
            'datasource'    => array (  'type'  => 'SQL',
                                        'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
                                        'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
                                        'keyfield'=> 'domain_id',
                                        'valuefield'=> 'domain'
                                        'valuefield'=> 'parent_domain'
                                     ),
            'value'     => ''
        ),
interface/web/sites/form/database.tform.php
@@ -79,9 +79,9 @@
            'formtype'    => 'SELECT',
            'default'    => '',
            'datasource'    => array (     'type'    => 'SQL',
                                        'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
                                        'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
                                        'keyfield'=> 'domain_id',
                                        'valuefield'=> 'domain'
                                        'valuefield'=> 'parent_domain'
                                     ),
            'value'        => array('0' => 'select_site_txt')
        ),
interface/web/sites/form/ftp_user.tform.php
@@ -79,9 +79,9 @@
            'formtype'    => 'SELECT',
            'default'    => '',
            'datasource'    => array (     'type'    => 'SQL',
                                        'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
                                        'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
                                        'keyfield'=> 'domain_id',
                                        'valuefield'=> 'domain'
                                        'valuefield'=> 'parent_domain'
                                     ),
            'value'        => ''
        ),
interface/web/sites/form/shell_user.tform.php
@@ -79,9 +79,9 @@
            'formtype'    => 'SELECT',
            'default'    => '',
            'datasource'    => array (     'type'    => 'SQL',
                                        'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
                                        'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
                                        'keyfield'=> 'domain_id',
                                        'valuefield'=> 'domain'
                                        'valuefield'=> 'parent_domain'
                                     ),
            'value'        => ''
        ),
interface/web/sites/form/web_aliasdomain.tform.php
@@ -106,9 +106,9 @@
            'formtype'    => 'SELECT',
            'default'    => '',
            'datasource'    => array (     'type'    => 'SQL',
                                        'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
                                        'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
                                        'keyfield'=> 'domain_id',
                                        'valuefield'=> 'domain'
                                        'valuefield'=> 'parent_domain'
                                     ),
            'value'        => ''
        ),
interface/web/sites/form/web_folder.tform.php
@@ -74,9 +74,9 @@
            'formtype'    => 'SELECT',
            'default'    => '',
            'datasource'    => array (     'type'    => 'SQL',
                                        'querystring' => "SELECT domain_id,domain FROM web_domain WHERE (type = 'vhost' OR type = 'vhostsubdomain') AND {AUTHSQL} ORDER BY domain",
                                        'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE (web_domain.type = 'vhost' OR web_domain.type = 'vhostsubdomain') AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
                                        'keyfield'=> 'domain_id',
                                        'valuefield'=> 'domain'
                                        'valuefield'=> 'parent_domain'
                                     ),
            'value'        => ''
        ),
interface/web/sites/form/web_folder_user.tform.php
@@ -50,8 +50,6 @@
$form["auth_preset"]["perm_group"] = 'riud'; //r = read, i = insert, u = update, d = delete
$form["auth_preset"]["perm_other"] = ''; //r = read, i = insert, u = update, d = delete
$auth_sql = (isset($app->tform) ? $app->tform->getAuthSQL('r', 'web_domain') : '1');
$form["tabs"]['user'] = array (
    'title'     => "Folder",
    'width'     => 100,
@@ -76,7 +74,7 @@
            'formtype'    => 'SELECT',
            'default'    => '',
            'datasource'    => array (     'type'    => 'SQL',
                                        'querystring' => "Select concat(web_domain.domain,' ',web_folder.path) as name, web_folder.web_folder_id from web_domain, web_folder WHERE web_domain.domain_id = web_folder.parent_domain_id AND ".$auth_sql." ORDER BY web_domain.domain",
                                        'querystring' => "Select concat(web_domain.domain,' ',web_folder.path, ' :: ', server.server_name) as name, web_folder.web_folder_id from web_domain, web_folder, server WHERE web_domain.domain_id = web_folder.parent_domain_id AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
                                        'keyfield'=> 'web_folder_id',
                                        'valuefield'=> 'name'
                                     ),
interface/web/sites/form/web_subdomain.tform.php
@@ -106,9 +106,9 @@
            'formtype'    => 'SELECT',
            'default'    => '',
            'datasource'    => array (     'type'    => 'SQL',
                                        'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
                                        'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
                                        'keyfield'=> 'domain_id',
                                        'valuefield'=> 'domain'
                                        'valuefield'=> 'parent_domain'
                                     ),
            'value'        => '',
            'searchable' => 2
interface/web/sites/form/web_vhost_subdomain.tform.php
@@ -140,9 +140,9 @@
            'formtype'    => 'SELECT',
            'default'    => '',
            'datasource'    => array (     'type'    => 'SQL',
                                        'querystring' => "SELECT domain_id,domain FROM web_domain WHERE type = 'vhost' AND {AUTHSQL} ORDER BY domain",
                                        'querystring' => "SELECT web_domain.domain_id, CONCAT(web_domain.domain, ' :: ', server.server_name) AS parent_domain FROM web_domain, server WHERE web_domain.type = 'vhost' AND web_domain.server_id = server.server_id AND {AUTHSQL::web_domain} ORDER BY web_domain.domain",
                                        'keyfield'=> 'domain_id',
                                        'valuefield'=> 'domain'
                                        'valuefield'=> 'parent_domain'
                                     ),
            'value'        => ''
        ),
interface/web/sites/lib/lang/de_cron.lng
@@ -18,4 +18,5 @@
$wb['run_wday_error_format'] = 'Das Format für Wochentage ist nicht korrekt.';
$wb['command_error_format'] = 'Das Format für den Befehl ist nicht korrekt. Beachten Sie, dass bei einem URL Aufruf nur http und https erlaubt ist.';
$wb['unknown_fieldtype_error'] = 'Es wurde ein unbekanntes Feld verwendet.';
$wb['server_id_error_empty'] = 'Die Server-ID ist leer.';
?>
interface/web/sites/lib/lang/en_cron.lng
@@ -18,4 +18,5 @@
$wb['run_wday_error_format'] = 'Invalid format for days of the week.';
$wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
$wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
$wb['server_id_error_empty'] = 'The server ID is empty.';
?>