diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master index 2ef756e1a81cadb925774bea97db1577c2e9fd96..27f517617b7520eec48960b001f890e2b23db906 100644 --- a/install/tpl/system.ini.master +++ b/install/tpl/system.ini.master @@ -7,6 +7,7 @@ [dns] [mail] +mailboxlist_webmail_link=y [monitor] @@ -15,5 +16,6 @@ dbname_prefix=[CLIENTNAME]_ dbuser_prefix=[CLIENTNAME] ftpuser_prefix=[CLIENTNAME] shelluser_prefix=[CLIENTNAME] +dblist_phpmyadmin_link=y [tools] \ No newline at end of file diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php index e57051415bb372c48d6d77e2e268b98b275a0af9..26abeefd84e591734f02f2ee38662180041f2e6e 100644 --- a/interface/lib/classes/listform_actions.inc.php +++ b/interface/lib/classes/listform_actions.inc.php @@ -132,7 +132,7 @@ class listform_actions { } - private function onShow() + public function onShow() { global $app; diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php index c74719cc343e9f631ae9845bb5907ad819524e82..fede652fb69aee4a8ad10707a7b94f3b19a837a0 100644 --- a/interface/web/admin/form/system_config.tform.php +++ b/interface/web/admin/form/system_config.tform.php @@ -106,6 +106,32 @@ $form["tabs"]['sites'] = array ( 'width' => '30', 'maxlength' => '255' ), + 'dblist_phpmyadmin_link' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n',1 => 'y') + ), + ################################## + # ENDE Datatable fields + ################################## + ) +); + +$form["tabs"]['mail'] = array ( + 'title' => "Mail", + 'width' => 70, + 'template' => "templates/system_config_mail_edit.htm", + 'fields' => array ( + ################################## + # Begin Datatable fields + ################################## + 'mailboxlist_webmail_link' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'n', + 'value' => array(0 => 'n',1 => 'y') + ), ################################## # ENDE Datatable fields ################################## diff --git a/interface/web/admin/lib/lang/en_system_config.lng b/interface/web/admin/lib/lang/en_system_config.lng index 6214226e5a824dc87e5a428283f6ad0464e38411..331747663b1dec95cfcf350276f6d2ac8fcbb463 100644 --- a/interface/web/admin/lib/lang/en_system_config.lng +++ b/interface/web/admin/lib/lang/en_system_config.lng @@ -9,5 +9,7 @@ $wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.'; $wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.'; $wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.'; $wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.'; +$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list'; +$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list'; ?> \ No newline at end of file diff --git a/interface/web/admin/system_config_edit.php b/interface/web/admin/system_config_edit.php index 62ffef5b7120a7ca24dc7dfc1359adc76bffc73d..6107f20e4c55d59eae8cfe3d06c185b89478d4c6 100644 --- a/interface/web/admin/system_config_edit.php +++ b/interface/web/admin/system_config_edit.php @@ -62,6 +62,7 @@ class page_action extends tform_actions { $server_id = $this->id; $this->dataRecord = $app->getconf->get_global_config($section); + } $record = $app->tform->getHTML($this->dataRecord, $this->active_tab,'EDIT'); @@ -78,9 +79,8 @@ class page_action extends tform_actions { $app->uses('ini_parser,getconf'); $section = $app->tform->getCurrentTab(); - $server_id = $this->id; - $server_config_array = $app->getconf->get_global_config($server_id); + $server_config_array = $app->getconf->get_global_config(); $server_config_array[$section] = $app->tform->encode($this->dataRecord,$section); $server_config_str = $app->ini_parser->get_ini_string($server_config_array); diff --git a/interface/web/admin/templates/system_config_mail_edit.htm b/interface/web/admin/templates/system_config_mail_edit.htm new file mode 100644 index 0000000000000000000000000000000000000000..5dd2dc3ea15ad37dc8acf4311251208d6e50e219 --- /dev/null +++ b/interface/web/admin/templates/system_config_mail_edit.htm @@ -0,0 +1,22 @@ +

+ +
+ +
+
Mail + + + {tmpl_var name='mailboxlist_webmail_link'} + + +
+ + + +
+ + +
+
+ +
diff --git a/interface/web/admin/templates/system_config_sites_edit.htm b/interface/web/admin/templates/system_config_sites_edit.htm index d605962aad086f3df44c5c315bb449f7fcbd6837..8120d4caffb4185255a786d8b1cc12a43b85004b 100644 --- a/interface/web/admin/templates/system_config_sites_edit.htm +++ b/interface/web/admin/templates/system_config_sites_edit.htm @@ -1,34 +1,38 @@ -

- -
- -
-
Sites -

{tmpl_var name='warning'}

- - - - - - - - - - - - - - - - -
- - - -
- - -
-
- -
+

+ +
+ +
+
Sites + + + + + + + + + + + + + + + + + + + {tmpl_var name='dblist_phpmyadmin_link'} + + +
+ + + +
+ + +
+
+ +
diff --git a/interface/web/mail/mail_user_list.php b/interface/web/mail/mail_user_list.php index 7e728afe942acd001e7a1ca7c016269a90dd0a72..1cc8554da2b7834be5a921f34918ec89fb1f937e 100644 --- a/interface/web/mail/mail_user_list.php +++ b/interface/web/mail/mail_user_list.php @@ -15,9 +15,30 @@ $list_def_file = "list/mail_user.list.php"; //* Check permissions for module $app->auth->check_module_permissions('mail'); -$app->uses('listform_actions'); - -$app->listform_actions->onLoad(); +$app->load('listform_actions'); + + +class list_action extends listform_actions { + + function onShow() { + global $app,$conf; + + $app->uses('getconf'); + $global_config = $app->getconf->get_global_config('mail'); + + if($global_config['mailboxlist_webmail_link'] == 'y') { + $app->tpl->setVar('mailboxlist_webmail_link',1); + } else { + $app->tpl->setVar('mailboxlist_webmail_link',0); + } + + parent::onShow(); + } + +} + +$list = new list_action; +$list->onLoad(); ?> \ No newline at end of file diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm index 9b2e1c08aa387309bf3f85a21128d1f744725463..ce15a429819aefaa50d45e41ea97cef02e7a061a 100644 --- a/interface/web/mail/templates/mail_user_list.htm +++ b/interface/web/mail/templates/mail_user_list.htm @@ -1,54 +1,54 @@ -

- -
- -
-
Tools -
- -
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
{tmpl_var name="email"}{tmpl_var name="autoresponder"} -
- {tmpl_var name='delete_txt'} - {tmpl_var name='delete_txt'} -
-
-
-
- -
+

+ +
+ +
+
Tools +
+ +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
{tmpl_var name="email"}{tmpl_var name="autoresponder"} +
+ {tmpl_var name='delete_txt'} + {tmpl_var name='delete_txt'} +
+
+
+
+ +
diff --git a/interface/web/sites/database_list.php b/interface/web/sites/database_list.php index 5be0ccf812e5f5aedbb86cae3723d672b8da2cca..9ced595f4c1eb08636dbc0450baaff12712ba790 100644 --- a/interface/web/sites/database_list.php +++ b/interface/web/sites/database_list.php @@ -44,9 +44,30 @@ $list_def_file = "list/database.list.php"; //* Check permissions for module $app->auth->check_module_permissions('sites'); -$app->uses('listform_actions'); +$app->load('listform_actions'); -$app->listform_actions->onLoad(); + +class list_action extends listform_actions { + + function onShow() { + global $app,$conf; + + $app->uses('getconf'); + $global_config = $app->getconf->get_global_config('sites'); + + if($global_config['dblist_phpmyadmin_link'] == 'y') { + $app->tpl->setVar('dblist_phpmyadmin_link',1); + } else { + $app->tpl->setVar('dblist_phpmyadmin_link',0); + } + + parent::onShow(); + } + +} + +$list = new list_action; +$list->onLoad(); ?> \ No newline at end of file diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm index bebdd0a6f08e4a4d217fe33f47de6dbce495fae3..3e721c2fef33e8951cbf6a339ccbb93f7b18412e 100644 --- a/interface/web/sites/templates/database_list.htm +++ b/interface/web/sites/templates/database_list.htm @@ -1,60 +1,60 @@ -

- -
- -
-
Tools -
- -
-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
{tmpl_var name="active"}{tmpl_var name="remote_access"}{tmpl_var name="server_id"}{tmpl_var name="database_name"} -
- {tmpl_var name='admin_txt'} - {tmpl_var name='edit_txt'} - {tmpl_var name='delete_txt'} -
-
-
-
- -
+

+ +
+ +
+
Tools +
+ +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
{tmpl_var name="active"}{tmpl_var name="remote_access"}{tmpl_var name="server_id"}{tmpl_var name="database_name"} +
+ {tmpl_var name='admin_txt'} + {tmpl_var name='edit_txt'} + {tmpl_var name='delete_txt'} +
+
+
+
+ +
diff --git a/interface/web/sites/web_domain_list.php b/interface/web/sites/web_domain_list.php index 3520c287c33c2075ae32212255c4a40e71d7ec7b..da46e761cb826e7e102118f217e1888b569ef967 100644 --- a/interface/web/sites/web_domain_list.php +++ b/interface/web/sites/web_domain_list.php @@ -44,12 +44,16 @@ $list_def_file = "list/web_domain.list.php"; //* Check permissions for module $app->auth->check_module_permissions('sites'); -$app->uses('listform_actions'); +$app->load('listform_actions'); -// Limit the results to alias domains -$app->listform_actions->SQLExtWhere = "type = 'vhost'"; -$app->listform_actions->onLoad(); +class list_action extends listform_actions { + +} + +$list = new list_action; +$list->SQLExtWhere = "type = 'vhost'"; +$list->onLoad(); ?> \ No newline at end of file