Skip to content

Commit dc1d321

Browse files
tbrehmtbrehm
committed
Changed database prefix to client ID instead of client name to better use the limited username length of mysql.
1 parent 7562bdf commit dc1d321

File tree

2 files changed

+69
-69
lines changed

2 files changed

+69
-69
lines changed

‎install/tpl/system.ini.master‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ mailboxlist_webmail_link=y
1212
[monitor]
1313

1414
[sites]
15-
dbname_prefix=[CLIENTNAME]
16-
dbuser_prefix=[CLIENTNAME]
15+
dbname_prefix=db[CLIENTID]
16+
dbuser_prefix=u[CLIENTID]
1717
ftpuser_prefix=[CLIENTNAME]
1818
shelluser_prefix=[CLIENTNAME]
1919
dblist_phpmyadmin_link=y

‎interface/web/sites/templates/database_edit.htm‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
<h2><tmpl_var name="list_head_txt"></h2>
2-
3-
<div class="panel panel_database">
4-
5-
<div class="pnl_formsarea">
6-
<fieldset id="wf_area_database"><legend>Database</legend>
7-
<tmpl_if name="is_admin">
8-
<span class="wf_oneField">
9-
<label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
10-
<select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
11-
</span>
12-
<span class="wf_oneField">
13-
<label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
14-
<select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
15-
</span>
16-
</tmpl_if>
17-
<tmpl_if name="is_reseller">
18-
<span class="wf_oneField">
19-
<label for="client_group_id" class="wf_preField">{tmpl_var name='client_id_txt'}</label>
20-
<select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
21-
</span>
22-
</tmpl_if>
23-
<span class="wf_oneField">
24-
<label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
25-
<select id="type" name="type">{tmpl_var name='type'}</select>
26-
</span>
27-
<span class="wf_oneField">
28-
<label for="database_name" class="wf_preField">{tmpl_var name='database_name_txt'}</label>
29-
{tmpl_var name='database_name_prefix'}
30-
<input type="text" id="database_name" name="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="255" class="wf_required"><span class="wf_reqMark">*</span><br>
31-
</span>
32-
<span class="wf_oneField">
33-
<label for="database_user" class="wf_preField">{tmpl_var name='database_user_txt'}</label>
34-
{tmpl_var name='database_user_prefix'}
35-
<input type="text" id="database_user" name="database_user" value="{tmpl_var name='database_user'}" size="30" maxlength="255" class="wf_required"><span class="wf_reqMark">*</span><br>
36-
</span>
37-
<span class="wf_oneField">
38-
<label for="database_password" class="wf_preField">{tmpl_var name='database_password_txt'}</label>
39-
<input type="password" id="database_password" name="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" class="wf_required" onkeyup="pass_check(this.value)"><span class="wf_reqMark">*</span><br>
40-
</span>
41-
<span class="wf_oneField">
42-
<span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
43-
<span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</span></span>
44-
</span>
45-
<span class="wf_oneField">
46-
<label for="database_charset" class="wf_preField">{tmpl_var name='database_charset_txt'}</label>
47-
<select id="database_charset" name="database_charset">{tmpl_var name='database_charset'}</select>
48-
</span>
49-
<span class="wf_oneField">
50-
<label for="remote_access" class="wf_preField">{tmpl_var name='remote_access_txt'}</label>
51-
<span class="">{tmpl_var name='remote_access'}</span>
52-
</span>
53-
<span class="wf_oneField">
54-
<label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
55-
<span class="">{tmpl_var name='active'}</span>
56-
</span>
57-
</fieldset>
58-
59-
<input type="hidden" name="id" value="{tmpl_var name='id'}">
60-
61-
<div class="wf_actions buttons">
62-
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/database_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
63-
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/database_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
64-
</div>
65-
</div>
66-
67-
</div>
1+
<h2><tmpl_var name="list_head_txt"></h2>
2+
3+
<div class="panel panel_database">
4+
5+
<div class="pnl_formsarea">
6+
<fieldset id="wf_area_database"><legend>Database</legend>
7+
<tmpl_if name="is_admin">
8+
<span class="wf_oneField">
9+
<label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
10+
<select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
11+
</span>
12+
<span class="wf_oneField">
13+
<label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
14+
<select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
15+
</span>
16+
</tmpl_if>
17+
<tmpl_if name="is_reseller">
18+
<span class="wf_oneField">
19+
<label for="client_group_id" class="wf_preField">{tmpl_var name='client_id_txt'}</label>
20+
<select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
21+
</span>
22+
</tmpl_if>
23+
<span class="wf_oneField">
24+
<label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
25+
<select id="type" name="type">{tmpl_var name='type'}</select>
26+
</span>
27+
<span class="wf_oneField">
28+
<label for="database_name" class="wf_preField">{tmpl_var name='database_name_txt'}</label>
29+
{tmpl_var name='database_name_prefix'}
30+
<input type="text" id="database_name" name="database_name" value="{tmpl_var name='database_name'}" size="30" maxlength="64" class="wf_required"><span class="wf_reqMark">*</span><br>
31+
</span>
32+
<span class="wf_oneField">
33+
<label for="database_user" class="wf_preField">{tmpl_var name='database_user_txt'}</label>
34+
{tmpl_var name='database_user_prefix'}
35+
<input type="text" id="database_user" name="database_user" value="{tmpl_var name='database_user'}" size="10" maxlength="10" class="wf_required"><span class="wf_reqMark">*</span><br>
36+
</span>
37+
<span class="wf_oneField">
38+
<label for="database_password" class="wf_preField">{tmpl_var name='database_password_txt'}</label>
39+
<input type="password" id="database_password" name="database_password" value="{tmpl_var name='database_password'}" size="30" maxlength="255" class="wf_required" onkeyup="pass_check(this.value)"><span class="wf_reqMark">*</span><br>
40+
</span>
41+
<span class="wf_oneField">
42+
<span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
43+
<span class="wf_passwordStrength"><div id="passBar"></div><span id="passText">&nbsp;</span></span>
44+
</span>
45+
<span class="wf_oneField">
46+
<label for="database_charset" class="wf_preField">{tmpl_var name='database_charset_txt'}</label>
47+
<select id="database_charset" name="database_charset">{tmpl_var name='database_charset'}</select>
48+
</span>
49+
<span class="wf_oneField">
50+
<label for="remote_access" class="wf_preField">{tmpl_var name='remote_access_txt'}</label>
51+
<span class="">{tmpl_var name='remote_access'}</span>
52+
</span>
53+
<span class="wf_oneField">
54+
<label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
55+
<span class="">{tmpl_var name='active'}</span>
56+
</span>
57+
</fieldset>
58+
59+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
60+
61+
<div class="wf_actions buttons">
62+
<button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/database_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
63+
<button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/database_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
64+
</div>
65+
</div>
66+
67+
</div>

0 commit comments

Comments
 (0)