From dc1d32129d7f5590ce762a18e91a3eab0bec14a3 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sat, 14 Feb 2009 12:55:56 -0500
Subject: [PATCH] Changed database prefix to client ID instead of client name to better use the limited username length of mysql.
---
install/tpl/system.ini.master | 4
interface/web/sites/templates/database_edit.htm | 134 ++++++++++++++++++++++----------------------
2 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/install/tpl/system.ini.master b/install/tpl/system.ini.master
index 82c0abd..d02679a 100644
--- a/install/tpl/system.ini.master
+++ b/install/tpl/system.ini.master
@@ -12,8 +12,8 @@
[monitor]
[sites]
-dbname_prefix=[CLIENTNAME]
-dbuser_prefix=[CLIENTNAME]
+dbname_prefix=db[CLIENTID]
+dbuser_prefix=u[CLIENTID]
ftpuser_prefix=[CLIENTNAME]
shelluser_prefix=[CLIENTNAME]
dblist_phpmyadmin_link=y
diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm
index d0ec170..239e664 100644
--- a/interface/web/sites/templates/database_edit.htm
+++ b/interface/web/sites/templates/database_edit.htm
@@ -1,67 +1,67 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_database">
-
- <div class="pnl_formsarea">
- <fieldset id="wf_area_database"><legend>Database</legend>
- <tmpl_if name="is_admin">
- <span class="wf_oneField">
- <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
- <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
- </span>
- <span class="wf_oneField">
- <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
- <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
- </span>
- </tmpl_if>
- <tmpl_if name="is_reseller">
- <span class="wf_oneField">
- <label for="client_group_id" class="wf_preField">{tmpl_var name='client_id_txt'}</label>
- <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
- </span>
- </tmpl_if>
- <span class="wf_oneField">
- <label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
- <select id="type" name="type">{tmpl_var name='type'}</select>
- </span>
- <span class="wf_oneField">
- <label for="database_name" class="wf_preField">{tmpl_var name='database_name_txt'}</label>
- {tmpl_var name='database_name_prefix'}
- <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>
- </span>
- <span class="wf_oneField">
- <label for="database_user" class="wf_preField">{tmpl_var name='database_user_txt'}</label>
- {tmpl_var name='database_user_prefix'}
- <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>
- </span>
- <span class="wf_oneField">
- <label for="database_password" class="wf_preField">{tmpl_var name='database_password_txt'}</label>
- <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>
- </span>
- <span class="wf_oneField">
- <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
- <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText"> </span></span>
- </span>
- <span class="wf_oneField">
- <label for="database_charset" class="wf_preField">{tmpl_var name='database_charset_txt'}</label>
- <select id="database_charset" name="database_charset">{tmpl_var name='database_charset'}</select>
- </span>
- <span class="wf_oneField">
- <label for="remote_access" class="wf_preField">{tmpl_var name='remote_access_txt'}</label>
- <span class="">{tmpl_var name='remote_access'}</span>
- </span>
- <span class="wf_oneField">
- <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
- <span class="">{tmpl_var name='active'}</span>
- </span>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="wf_actions buttons">
- <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>
- <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>
- </div>
- </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+
+<div class="panel panel_database">
+
+ <div class="pnl_formsarea">
+ <fieldset id="wf_area_database"><legend>Database</legend>
+ <tmpl_if name="is_admin">
+ <span class="wf_oneField">
+ <label for="server_id" class="wf_preField">{tmpl_var name='server_id_txt'}</label>
+ <select id="server_id" name="server_id">{tmpl_var name='server_id'}</select>
+ </span>
+ <span class="wf_oneField">
+ <label for="client_group_id" class="wf_preField">{tmpl_var name='client_txt'}</label>
+ <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+ </span>
+ </tmpl_if>
+ <tmpl_if name="is_reseller">
+ <span class="wf_oneField">
+ <label for="client_group_id" class="wf_preField">{tmpl_var name='client_id_txt'}</label>
+ <select id="client_group_id" name="client_group_id">{tmpl_var name='client_group_id'}</select>
+ </span>
+ </tmpl_if>
+ <span class="wf_oneField">
+ <label for="type" class="wf_preField">{tmpl_var name='type_txt'}</label>
+ <select id="type" name="type">{tmpl_var name='type'}</select>
+ </span>
+ <span class="wf_oneField">
+ <label for="database_name" class="wf_preField">{tmpl_var name='database_name_txt'}</label>
+ {tmpl_var name='database_name_prefix'}
+ <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>
+ </span>
+ <span class="wf_oneField">
+ <label for="database_user" class="wf_preField">{tmpl_var name='database_user_txt'}</label>
+ {tmpl_var name='database_user_prefix'}
+ <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>
+ </span>
+ <span class="wf_oneField">
+ <label for="database_password" class="wf_preField">{tmpl_var name='database_password_txt'}</label>
+ <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>
+ </span>
+ <span class="wf_oneField">
+ <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
+ <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText"> </span></span>
+ </span>
+ <span class="wf_oneField">
+ <label for="database_charset" class="wf_preField">{tmpl_var name='database_charset_txt'}</label>
+ <select id="database_charset" name="database_charset">{tmpl_var name='database_charset'}</select>
+ </span>
+ <span class="wf_oneField">
+ <label for="remote_access" class="wf_preField">{tmpl_var name='remote_access_txt'}</label>
+ <span class="">{tmpl_var name='remote_access'}</span>
+ </span>
+ <span class="wf_oneField">
+ <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
+ <span class="">{tmpl_var name='active'}</span>
+ </span>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="wf_actions buttons">
+ <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>
+ <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>
+ </div>
+ </div>
+
+</div>
--
Gitblit v1.9.1