Skip to content

Commit d8b8b07

Browse files
tbrehmtbrehm
committed
Made links to phpmyadmin and webmail in the database and mailbox lists configurable.
1 parent 91433cc commit d8b8b07

File tree

12 files changed

+262
-160
lines changed

12 files changed

+262
-160
lines changed

‎install/tpl/system.ini.master‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
[dns]
88

99
[mail]
10+
mailboxlist_webmail_link=y
1011

1112
[monitor]
1213

@@ -15,5 +16,6 @@ dbname_prefix=[CLIENTNAME]_
1516
dbuser_prefix=[CLIENTNAME]
1617
ftpuser_prefix=[CLIENTNAME]
1718
shelluser_prefix=[CLIENTNAME]
19+
dblist_phpmyadmin_link=y
1820

1921
[tools]

‎interface/lib/classes/listform_actions.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private function getQueryString() {
132132
}
133133

134134

135-
private function onShow()
135+
public function onShow()
136136
{
137137
global $app;
138138

‎interface/web/admin/form/system_config.tform.php‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,32 @@
106106
'width' => '30',
107107
'maxlength' => '255'
108108
),
109+
'dblist_phpmyadmin_link' => array (
110+
'datatype' => 'VARCHAR',
111+
'formtype' => 'CHECKBOX',
112+
'default' => 'n',
113+
'value' => array(0 => 'n',1 => 'y')
114+
),
115+
##################################
116+
# ENDE Datatable fields
117+
##################################
118+
)
119+
);
120+
121+
$form["tabs"]['mail'] = array (
122+
'title' => "Mail",
123+
'width' => 70,
124+
'template' => "templates/system_config_mail_edit.htm",
125+
'fields' => array (
126+
##################################
127+
# Begin Datatable fields
128+
##################################
129+
'mailboxlist_webmail_link' => array (
130+
'datatype' => 'VARCHAR',
131+
'formtype' => 'CHECKBOX',
132+
'default' => 'n',
133+
'value' => array(0 => 'n',1 => 'y')
134+
),
109135
##################################
110136
# ENDE Datatable fields
111137
##################################

‎interface/web/admin/lib/lang/en_system_config.lng‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ $wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.';
99
$wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.';
1010
$wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
1111
$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
12+
$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
13+
$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
1214

1315
?>

‎interface/web/admin/system_config_edit.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ function onShowEdit() {
6262
$server_id = $this->id;
6363

6464
$this->dataRecord = $app->getconf->get_global_config($section);
65+
6566
}
6667

6768
$record = $app->tform->getHTML($this->dataRecord, $this->active_tab,'EDIT');
@@ -78,9 +79,8 @@ function onUpdateSave($sql) {
7879
$app->uses('ini_parser,getconf');
7980

8081
$section = $app->tform->getCurrentTab();
81-
$server_id = $this->id;
8282

83-
$server_config_array = $app->getconf->get_global_config($server_id);
83+
$server_config_array = $app->getconf->get_global_config();
8484
$server_config_array[$section] = $app->tform->encode($this->dataRecord,$section);
8585
$server_config_str = $app->ini_parser->get_ini_string($server_config_array);
8686

‎interface/web/admin/templates/system_config_mail_edit.htm‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
3+
<div class="panel panel_system_config">
4+
5+
<div class="pnl_formsarea">
6+
<fieldset id="wf_area_system_config"><legend>Mail</legend>
7+
<span class="wf_oneField">
8+
<label for="mailboxlist_webmail_link" class="wf_preField">{tmpl_var name='mailboxlist_webmail_link_txt'}</label> <span class="">
9+
{tmpl_var name='mailboxlist_webmail_link'}
10+
</span>
11+
</span>
12+
</fieldset>
13+
14+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
15+
16+
<div class="wf_actions buttons">
17+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
18+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
19+
</div>
20+
</div>
21+
22+
</div>

‎interface/web/admin/templates/system_config_sites_edit.htm‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,38 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
2-
3-
<div class="panel panel_system_config">
4-
5-
<div class="pnl_formsarea">
6-
<fieldset id="wf_area_system_config"><legend>Sites</legend>
7-
<p>{tmpl_var name='warning'}</p>
8-
<span class="wf_oneField">
9-
<label for="dbname_prefix" class="wf_preField">{tmpl_var name='dbname_prefix_txt'}</label>
10-
<input type="text" id="dbname_prefix" name="dbname_prefix" value="{tmpl_var name='dbname_prefix'}" size="30" maxlength="255">
11-
</span>
12-
<span class="wf_oneField">
13-
<label for="dbuser_prefix" class="wf_preField">{tmpl_var name='dbuser_prefix_txt'}</label>
14-
<input type="text" id="dbuser_prefix" name="dbuser_prefix" value="{tmpl_var name='dbuser_prefix'}" size="30" maxlength="255">
15-
</span>
16-
<span class="wf_oneField">
17-
<label for="ftpuser_prefix" class="wf_preField">{tmpl_var name='ftpuser_prefix_txt'}</label>
18-
<input type="text" id="ftpuser_prefix" name="ftpuser_prefix" value="{tmpl_var name='ftpuser_prefix'}" size="30" maxlength="255">
19-
</span>
20-
<span class="wf_oneField">
21-
<label for="shelluser_prefix" class="wf_preField">{tmpl_var name='shelluser_prefix_txt'}</label>
22-
<input type="text" id="shelluser_prefix" name="shelluser_prefix" value="{tmpl_var name='shelluser_prefix'}" size="30" maxlength="255">
23-
</span>
24-
</fieldset>
25-
26-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
27-
28-
<div class="wf_actions buttons">
29-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
30-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
31-
</div>
32-
</div>
33-
34-
</div>
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
3+
<div class="panel panel_system_config">
4+
5+
<div class="pnl_formsarea">
6+
<fieldset id="wf_area_system_config"><legend>Sites</legend>
7+
<span class="wf_oneField">
8+
<label for="dbname_prefix" class="wf_preField">{tmpl_var name='dbname_prefix_txt'}</label>
9+
<input type="text" id="dbname_prefix" name="dbname_prefix" value="{tmpl_var name='dbname_prefix'}" size="30" maxlength="255">
10+
</span>
11+
<span class="wf_oneField">
12+
<label for="dbuser_prefix" class="wf_preField">{tmpl_var name='dbuser_prefix_txt'}</label>
13+
<input type="text" id="dbuser_prefix" name="dbuser_prefix" value="{tmpl_var name='dbuser_prefix'}" size="30" maxlength="255">
14+
</span>
15+
<span class="wf_oneField">
16+
<label for="ftpuser_prefix" class="wf_preField">{tmpl_var name='ftpuser_prefix_txt'}</label>
17+
<input type="text" id="ftpuser_prefix" name="ftpuser_prefix" value="{tmpl_var name='ftpuser_prefix'}" size="30" maxlength="255">
18+
</span>
19+
<span class="wf_oneField">
20+
<label for="shelluser_prefix" class="wf_preField">{tmpl_var name='shelluser_prefix_txt'}</label>
21+
<input type="text" id="shelluser_prefix" name="shelluser_prefix" value="{tmpl_var name='shelluser_prefix'}" size="30" maxlength="255">
22+
</span>
23+
<span class="wf_oneField">
24+
<label for="dblist_phpmyadmin_link" class="wf_preField">{tmpl_var name='dblist_phpmyadmin_link_txt'}</label> <span class="">
25+
{tmpl_var name='dblist_phpmyadmin_link'}
26+
</span>
27+
</span>
28+
</fieldset>
29+
30+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
31+
32+
<div class="wf_actions buttons">
33+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/system_config_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
34+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
35+
</div>
36+
</div>
37+
38+
</div>

‎interface/web/mail/mail_user_list.php‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,30 @@
1515
//* Check permissions for module
1616
$app->auth->check_module_permissions('mail');
1717

18-
$app->uses('listform_actions');
19-
20-
$app->listform_actions->onLoad();
18+
$app->load('listform_actions');
19+
20+
21+
class list_action extends listform_actions {
22+
23+
function onShow() {
24+
global $app,$conf;
25+
26+
$app->uses('getconf');
27+
$global_config = $app->getconf->get_global_config('mail');
28+
29+
if($global_config['mailboxlist_webmail_link'] == 'y') {
30+
$app->tpl->setVar('mailboxlist_webmail_link',1);
31+
} else {
32+
$app->tpl->setVar('mailboxlist_webmail_link',0);
33+
}
34+
35+
parent::onShow();
36+
}
37+
38+
}
39+
40+
$list = new list_action;
41+
$list->onLoad();
2142

2243

2344
?>

‎interface/web/mail/templates/mail_user_list.htm‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
2-
3-
<div class="panel panel_list_mail_user">
4-
5-
<div class="pnl_toolsarea">
6-
<fieldset><legend>Tools</legend>
7-
<div class="buttons">
8-
<button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_edit.php');">
9-
<span>{tmpl_var name="add_new_record_txt"}</span>
10-
</button>
11-
</div>
12-
</fieldset>
13-
</div>
14-
15-
<div class="pnl_listarea">
16-
<fieldset><legend><tmpl_var name="list_head_txt"></legend>
17-
<table class="list">
18-
<thead>
19-
<tr>
20-
<th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
21-
<th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
22-
<th class="tbl_col_buttons" scope="col">&nbsp;</th>
23-
</tr>
24-
<tr>
25-
<td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
26-
<td class="tbl_col_autoresponder"><input type="text" name="search_autoresponder" value="{tmpl_var name='search_autoresponder'}" /></td>
27-
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
28-
</tr>
29-
</thead>
30-
<tbody>
31-
<tmpl_loop name="records">
32-
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
33-
<td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
34-
<td class="tbl_col_autoresponder"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="autoresponder"}</a></td>
35-
<td class="tbl_col_buttons">
36-
<div class="buttons icons16">
37-
<a class="icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name='delete_txt'}</span></a>
38-
<a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
39-
</div>
40-
</td>
41-
</tr>
42-
</tmpl_loop>
43-
</tbody>
44-
45-
<tfoot>
46-
<tr>
47-
<td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
48-
</tr>
49-
</tfoot>
50-
</table>
51-
</fieldset>
52-
</div>
53-
54-
</div>
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
3+
<div class="panel panel_list_mail_user">
4+
5+
<div class="pnl_toolsarea">
6+
<fieldset><legend>Tools</legend>
7+
<div class="buttons">
8+
<button class="iconstxt icoAdd" type="button" onClick="loadContent('mail/mail_user_edit.php');">
9+
<span>{tmpl_var name="add_new_record_txt"}</span>
10+
</button>
11+
</div>
12+
</fieldset>
13+
</div>
14+
15+
<div class="pnl_listarea">
16+
<fieldset><legend><tmpl_var name="list_head_txt"></legend>
17+
<table class="list">
18+
<thead>
19+
<tr>
20+
<th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
21+
<th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
22+
<th class="tbl_col_buttons" scope="col">&nbsp;</th>
23+
</tr>
24+
<tr>
25+
<td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
26+
<td class="tbl_col_autoresponder"><input type="text" name="search_autoresponder" value="{tmpl_var name='search_autoresponder'}" /></td>
27+
<td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
28+
</tr>
29+
</thead>
30+
<tbody>
31+
<tmpl_loop name="records">
32+
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
33+
<td class="tbl_col_email"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="email"}</a></td>
34+
<td class="tbl_col_autoresponder"><a href="#" onClick="loadContent('mail/mail_user_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="autoresponder"}</a></td>
35+
<td class="tbl_col_buttons">
36+
<div class="buttons icons16">
37+
<tmpl_if name="mailboxlist_webmail_link"><a class="icons16 icoWebmailer" href="mail/webmailer.php?id={tmpl_var name='id'}" target="webmail"><span>{tmpl_var name='delete_txt'}</span></a></tmpl_if>
38+
<a class="icons16 icoDelete" href="javascript: del_record('mail/mail_user_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
39+
</div>
40+
</td>
41+
</tr>
42+
</tmpl_loop>
43+
</tbody>
44+
45+
<tfoot>
46+
<tr>
47+
<td class="tbl_footer tbl_paging" colspan="3"><tmpl_var name="paging"></td>
48+
</tr>
49+
</tfoot>
50+
</table>
51+
</fieldset>
52+
</div>
53+
54+
</div>

‎interface/web/sites/database_list.php‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,30 @@
4444
//* Check permissions for module
4545
$app->auth->check_module_permissions('sites');
4646

47-
$app->uses('listform_actions');
47+
$app->load('listform_actions');
4848

49-
$app->listform_actions->onLoad();
49+
50+
class list_action extends listform_actions {
51+
52+
function onShow() {
53+
global $app,$conf;
54+
55+
$app->uses('getconf');
56+
$global_config = $app->getconf->get_global_config('sites');
57+
58+
if($global_config['dblist_phpmyadmin_link'] == 'y') {
59+
$app->tpl->setVar('dblist_phpmyadmin_link',1);
60+
} else {
61+
$app->tpl->setVar('dblist_phpmyadmin_link',0);
62+
}
63+
64+
parent::onShow();
65+
}
66+
67+
}
68+
69+
$list = new list_action;
70+
$list->onLoad();
5071

5172

5273
?>

0 commit comments

Comments
 (0)