diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql index ed7b36441c743d04e52e2840cee8ec25d56a3e77..dc191fe22d52ca61f3362abdd285b288915daf46 100644 --- a/install/sql/ispconfig3.sql +++ b/install/sql/ispconfig3.sql @@ -62,6 +62,8 @@ CREATE TABLE `client` ( `default_dnsserver` int(10) unsigned NOT NULL default '1', `limit_dns_zone` int(11) NOT NULL default '-1', `limit_dns_record` int(11) NOT NULL default '-1', + `default_dbserver` int(10) unsigned NOT NULL default '1', + `limit_database` int(11) NOT NULL default '-1', `limit_client` int(11) NOT NULL default '0', `parent_client_id` int(10) unsigned NOT NULL default '0', `username` varchar(255) default NULL, @@ -896,6 +898,35 @@ CREATE TABLE `web_domain` ( -- Daten für Tabelle `web_domain` -- +-- -------------------------------------------------------- + +-- +-- Tabellenstruktur für Tabelle `web_database` +-- + +CREATE TABLE `web_database` ( + `database_id` bigint(20) NOT NULL auto_increment, + `sys_userid` int(11) NOT NULL default '0', + `sys_groupid` int(11) NOT NULL default '0', + `sys_perm_user` varchar(5) default NULL, + `sys_perm_group` varchar(5) default NULL, + `sys_perm_other` varchar(5) default NULL, + `server_id` int(11) NOT NULL default '0', + `type` varchar(255) NOT NULL default 'y', + `database_name` varchar(255) default NULL, + `database_user` varchar(255) default NULL, + `database_password` varchar(255) default NULL, + `remote_access` varchar(255) NOT NULL default 'y', + `active` varchar(255) NOT NULL default 'y', + PRIMARY KEY (`database_id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ; + +-- +-- Daten für Tabelle `web_database` +-- + +-- -------------------------------------------------------- + -- -- Table for attempts login -- diff --git a/interface/lib/classes/listform_tpl_generator.inc.php b/interface/lib/classes/listform_tpl_generator.inc.php index 0233420d2c24f618dca017f36803c15fb17659ef..fb461440bc45243fb4eb7db0ceb93eb5e0535b2b 100644 --- a/interface/lib/classes/listform_tpl_generator.inc.php +++ b/interface/lib/classes/listform_tpl_generator.inc.php @@ -111,6 +111,7 @@ class listform_tpl_generator { $lang["page_back_txt"] = 'Back'; $lang["delete_txt"] = 'Delete'; $lang["filter_txt"] = 'Filter'; + $lang["add_new_record_txt"] = 'Add new record'; // speichere language Datei $this->lng_add($lang,$listDef,$module); diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php index 78f0e16ee40a4e749c2ac2a4da81ac1133eb31d0..11def8efe959be9099956f095ffb435544e6ea9c 100644 --- a/interface/web/client/form/client.tform.php +++ b/interface/web/client/form/client.tform.php @@ -594,6 +594,31 @@ $form["tabs"]['limits'] = array ( 'rows' => '', 'cols' => '' ), + 'default_dbserver' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'SELECT', + 'default' => '1', + 'datasource' => array ( 'type' => 'SQL', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE db_server = 1 AND {AUTHSQL} ORDER BY server_name', + 'keyfield'=> 'server_id', + 'valuefield'=> 'server_name' + ), + 'value' => '' + ), + 'limit_database' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'ISINT', + 'errmsg'=> 'limit_database_error_notint'), + ), + 'default' => '-1', + 'value' => '', + 'separator' => '', + 'width' => '10', + 'maxlength' => '10', + 'rows' => '', + 'cols' => '' + ), ################################## # END Datatable fields ################################## diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index 5b5d70fa74322d2996223a6320f056b3a4ce3700..1eb70e57da3fb4195afa8441ccde6234c414b32d 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -77,5 +77,7 @@ $wb["limit_shell_user_error_notint"] = 'The shell user limit must be a number.'; $wb["limit_dns_zone_error_notint"] = 'The dns zone limit must be a number.'; $wb["limit_dns_zone_error_notint"] = 'The dns record limit must be a number.'; $wb["limit_client_error_notint"] = 'The sub client limit must be a number.'; - +$wb["default_dbserver_txt"] = 'Default Database Server'; +$wb["limit_database_txt"] = 'Max. number of Databases'; +$wb["limit_database_error_notint"] = 'The database limit must be a number.'; ?> \ No newline at end of file diff --git a/interface/web/client/templates/client_edit_limits.htm b/interface/web/client/templates/client_edit_limits.htm index 45ad13a38b995b8a3330d9790a7db245bcecccb9..f645cda9aa8bd60d581386556491dbba37c8ccc8 100644 --- a/interface/web/client/templates/client_edit_limits.htm +++ b/interface/web/client/templates/client_edit_limits.htm @@ -113,6 +113,21 @@ {tmpl_var name='limit_dns_record_txt'}: + +

Database

+ + + {tmpl_var name='default_dbserver_txt'}: + + + + + + {tmpl_var name='limit_database_txt'}: + +

Clients

diff --git a/interface/web/sites/database_del.php b/interface/web/sites/database_del.php new file mode 100644 index 0000000000000000000000000000000000000000..f5f8dbce1770db37973d109d91a9b123afcec11d --- /dev/null +++ b/interface/web/sites/database_del.php @@ -0,0 +1,51 @@ +auth->check_module_permissions('sites'); + +$app->uses("tform_actions"); +$app->tform_actions->onDelete(); + +?> \ No newline at end of file diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php new file mode 100644 index 0000000000000000000000000000000000000000..4309bdc3db255c9cd74f5e591e649fb91ab04816 --- /dev/null +++ b/interface/web/sites/database_edit.php @@ -0,0 +1,228 @@ +auth->check_module_permissions('sites'); + +// Loading classes +$app->uses('tpl,tform,tform_actions'); +$app->load('tform_actions'); + +class page_action extends tform_actions { + + function onShowNew() { + global $app, $conf; + + // we will check only users, not admins + if($_SESSION["s"]["user"]["typ"] == 'user') { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT limit_database FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Check if the user may add another database. + if($client["limit_database"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(database_id) as number FROM web_database WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_database"]) { + $app->error($app->tform->wordbook["limit_database_txt"]); + } + } + } + + parent::onShowNew(); + } + + function onShowEnd() { + global $app, $conf; + + if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT default_dbserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Set the webserver to the default server of the client + $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_dbserver]"); + $app->tpl->setVar("server_id",""); + unset($tmp); + + } elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) { + + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT client_id, default_dbserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // Set the webserver to the default server of the client + $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_dbserver]"); + $app->tpl->setVar("server_id",""); + unset($tmp); + + // Fill the client select field + $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.parent_client_id AND client.parent_client_id = ".$client['client_id']; + $clients = $app->db->queryAllRecords($sql); + $client_select = ''; + if(is_array($clients)) { + foreach( $clients as $client) { + $selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':''; + $client_select .= "\r\n"; + } + } + $app->tpl->setVar("client_group_id",$client_select); + + } else { + + // The user is admin + if($this->id > 0) { + $server_id = $this->dataRecord["server_id"]; + } else { + // Get the first server ID + $tmp = $app->db->queryOneRecord("SELECT server_id FROM server WHERE web_server = 1 ORDER BY server_name LIMIT 0,1"); + $server_id = $tmp['server_id']; + } + + $sql = "SELECT ip_address FROM server_ip WHERE server_id = $server_id"; + $ips = $app->db->queryAllRecords($sql); + $ip_select = ""; + //$ip_select = ""; + if(is_array($ips)) { + foreach( $ips as $ip) { + $selected = ($ip["ip_address"] == $this->dataRecord["ip_address"])?'SELECTED':''; + $ip_select .= "\r\n"; + } + } + $app->tpl->setVar("ip_address",$ip_select); + unset($tmp); + unset($ips); + + // Fill the client select field + $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0"; + $clients = $app->db->queryAllRecords($sql); + $client_select = ""; + if(is_array($clients)) { + foreach( $clients as $client) { + $selected = @($client["groupid"] == $this->dataRecord["sys_groupid"])?'SELECTED':''; + $client_select .= "\r\n"; + } + } + $app->tpl->setVar("client_group_id",$client_select); + + } + + parent::onShowEnd(); + } + + function onSubmit() { + global $app, $conf; + + if($_SESSION["s"]["user"]["typ"] != 'admin') { + // Get the limits of the client + $client_group_id = $_SESSION["s"]["user"]["default_group"]; + $client = $app->db->queryOneRecord("SELECT default_dbserver, limit_database FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + + // When the record is updated + if($this->id > 0) { + // restore the server ID if the user is not admin and record is edited + $tmp = $app->db->queryOneRecord("SELECT server_id FROM web_database WHERE database_id = ".intval($this->id)); + $this->dataRecord["server_id"] = $tmp["server_id"]; + unset($tmp); + // When the record is inserted + } else { + // set the server ID to the default dbserver of the client + $this->dataRecord["server_id"] = $client["default_dbserver"]; + + + // Check if the user may add another database + if($client["limit_web_domain"] >= 0) { + $tmp = $app->db->queryOneRecord("SELECT count(database_id) as number FROM web_database WHERE sys_groupid = $client_group_id"); + if($tmp["number"] >= $client["limit_database"]) { + $app->error($app->tform->wordbook["limit_database_txt"]); + } + } + + } + + // Clients may not set the client_group_id, so we unset them if user is not a admin and the client is not a reseller + if(!$app->auth->has_clients($_SESSION['s']['user']['userid'])) unset($this->dataRecord["client_group_id"]); + } + + + parent::onSubmit(); + } + + function onAfterInsert() { + global $app, $conf; + + // make sure that the record belongs to the clinet group and not the admin group when a dmin inserts it + // also make sure that the user can not delete domain created by a admin + if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($this->dataRecord["client_group_id"])) { + $client_group_id = intval($this->dataRecord["client_group_id"]); + $app->db->query("UPDATE web_database SET sys_groupid = $client_group_id, sys_perm_group = 'ru' WHERE database_id = ".$this->id); + } + if($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($this->dataRecord["client_group_id"])) { + $client_group_id = intval($this->dataRecord["client_group_id"]); + $app->db->query("UPDATE web_database SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE database_id = ".$this->id); + } + } + + function onAfterUpdate() { + global $app, $conf; + + // make sure that the record belongs to the clinet group and not the admin group when a dmin inserts it + // also make sure that the user can not delete domain created by a admin + if($_SESSION["s"]["user"]["typ"] == 'admin' && isset($this->dataRecord["client_group_id"])) { + $client_group_id = intval($this->dataRecord["client_group_id"]); + $app->db->query("UPDATE web_database SET sys_groupid = $client_group_id, sys_perm_group = 'ru' WHERE database_id = ".$this->id); + } + if($app->auth->has_clients($_SESSION['s']['user']['userid']) && isset($this->dataRecord["client_group_id"])) { + $client_group_id = intval($this->dataRecord["client_group_id"]); + $app->db->query("UPDATE web_database SET sys_groupid = $client_group_id, sys_perm_group = 'riud' WHERE database_id = ".$this->id); + } + + } + +} + +$page = new page_action; +$page->onLoad(); + +?> \ No newline at end of file diff --git a/interface/web/sites/database_list.php b/interface/web/sites/database_list.php new file mode 100644 index 0000000000000000000000000000000000000000..5be0ccf812e5f5aedbb86cae3723d672b8da2cca --- /dev/null +++ b/interface/web/sites/database_list.php @@ -0,0 +1,52 @@ +auth->check_module_permissions('sites'); + +$app->uses('listform_actions'); + +$app->listform_actions->onLoad(); + + +?> \ No newline at end of file diff --git a/interface/web/sites/form/database.tform.php b/interface/web/sites/form/database.tform.php new file mode 100644 index 0000000000000000000000000000000000000000..d28971c435505236529410bf920e42278ea34aaa --- /dev/null +++ b/interface/web/sites/form/database.tform.php @@ -0,0 +1,137 @@ + 0 id must match with id of current user +$form["auth_preset"]["groupid"] = 0; // 0 = default groupid of the user, > 0 id must match with groupid of current user +$form["auth_preset"]["perm_user"] = 'riud'; //r = read, i = insert, u = update, d = delete +$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 + +$form["tabs"]['database'] = array ( + 'title' => "Database", + 'width' => 100, + 'template' => "templates/database_edit.htm", + 'fields' => array ( + ################################## + # Begin Datatable fields + ################################## + 'server_id' => array ( + 'datatype' => 'INTEGER', + 'formtype' => 'SELECT', + 'default' => '', + 'datasource' => array ( 'type' => 'SQL', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND db_server = 1 ORDER BY server_name', + 'keyfield'=> 'server_id', + 'valuefield'=> 'server_name' + ), + 'value' => '' + ), + 'type' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'SELECT', + 'default' => 'y', + 'value' => array('mysql' => 'MySQL') + ), + 'database_name' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', + 'errmsg'=> 'database_name_error_empty'), + 1 => array ( 'type' => 'UNIQUE', + 'errmsg'=> 'database_name_error_unique'), + 2 => array ( 'type' => 'REGEX', + 'regex' => '/^[a-zA-Z0-9_]{2,64}$/', + 'errmsg'=> 'database_name_error_regex'), + ), + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'database_user' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'validators' => array ( 0 => array ( 'type' => 'NOTEMPTY', + 'errmsg'=> 'database_user_error_empty'), + 1 => array ( 'type' => 'UNIQUE', + 'errmsg'=> 'database_user_error_unique'), + 2 => array ( 'type' => 'REGEX', + 'regex' => '/^[a-zA-Z0-9_]{2,64}$/', + 'errmsg'=> 'database_user_error_regex'), + ), + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'database_password' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'TEXT', + 'default' => '', + 'value' => '', + 'width' => '30', + 'maxlength' => '255' + ), + 'remote_access' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'y', + 'value' => array(0 => 'n',1 => 'y') + ), + 'active' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'CHECKBOX', + 'default' => 'y', + 'value' => array(0 => 'n',1 => 'y') + ), + ################################## + # ENDE Datatable fields + ################################## + ) +); + + +?> \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_database.lng b/interface/web/sites/lib/lang/en_database.lng new file mode 100644 index 0000000000000000000000000000000000000000..1dafa2061c939cbb2dc39a20e07a190195a21f5b --- /dev/null +++ b/interface/web/sites/lib/lang/en_database.lng @@ -0,0 +1,18 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/lang/en_database_list.lng b/interface/web/sites/lib/lang/en_database_list.lng new file mode 100644 index 0000000000000000000000000000000000000000..ac5a384db3776a7041851e3bb9df1e37216579dc --- /dev/null +++ b/interface/web/sites/lib/lang/en_database_list.lng @@ -0,0 +1,14 @@ + \ No newline at end of file diff --git a/interface/web/sites/lib/module.conf.php b/interface/web/sites/lib/module.conf.php index c863e6035ce74b93ac928648058647fd42fc8dcc..1992fbb372b54e9a83bc25327a8e5ed0ad43ef14 100644 --- a/interface/web/sites/lib/module.conf.php +++ b/interface/web/sites/lib/module.conf.php @@ -63,5 +63,21 @@ $module["nav"][] = array( 'title' => 'Shell', // clean up unset($items); +/* + Databases menu +*/ + +$items[] = array( 'title' => "Database", + 'target' => 'content', + 'link' => 'sites/database_list.php'); + + +$module["nav"][] = array( 'title' => 'Database', + 'open' => 1, + 'items' => $items); + +// clean up +unset($items); + ?> \ No newline at end of file diff --git a/interface/web/sites/list/database.list.php b/interface/web/sites/list/database.list.php new file mode 100644 index 0000000000000000000000000000000000000000..836bb4e8a254b9563981fcaa92f412ceb5123874 --- /dev/null +++ b/interface/web/sites/list/database.list.php @@ -0,0 +1,93 @@ + "active", + 'datatype' => "VARCHAR", + 'formtype' => "SELECT", + 'op' => "=", + 'prefix' => "", + 'suffix' => "", + 'width' => "", + 'value' => array('y' => "Yes",'n' => "No")); + +$liste["item"][] = array( 'field' => "remote_access", + 'datatype' => "VARCHAR", + 'formtype' => "SELECT", + 'op' => "=", + 'prefix' => "", + 'suffix' => "", + 'width' => "", + 'value' => array('y' => "Yes",'n' => "No")); + +$liste["item"][] = array( 'field' => "server_id", + 'datatype' => "VARCHAR", + 'formtype' => "SELECT", + 'op' => "like", + 'prefix' => "%", + 'suffix' => "%", + 'datasource' => array ( 'type' => 'SQL', + 'querystring' => 'SELECT server_id,server_name FROM server WHERE {AUTHSQL} AND db_server = 1 ORDER BY server_name', + 'keyfield'=> 'server_id', + 'valuefield'=> 'server_name' + ), + 'width' => "", + 'value' => ""); + +$liste["item"][] = array( 'field' => "database_name", + 'datatype' => "VARCHAR", + 'formtype' => "TEXT", + 'op' => "like", + 'prefix' => "%", + 'suffix' => "%", + 'width' => "", + 'value' => ""); + + +?> \ No newline at end of file diff --git a/interface/web/sites/templates/database_edit.htm b/interface/web/sites/templates/database_edit.htm new file mode 100644 index 0000000000000000000000000000000000000000..b68b47d9ab702b804631150b25aa1e1c330cb97f --- /dev/null +++ b/interface/web/sites/templates/database_edit.htm @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{tmpl_var name='server_id_txt'}: + +
{tmpl_var name='client_txt'}: + +
{tmpl_var name='client_txt'}: + +
{tmpl_var name='type_txt'}: + +
{tmpl_var name='database_name_txt'}:
{tmpl_var name='database_user_txt'}:
{tmpl_var name='database_password_txt'}:
{tmpl_var name='remote_access_txt'}:{tmpl_var name='remote_access'}
{tmpl_var name='active_txt'}:{tmpl_var name='active'}
  
 
  +
+
+ \ No newline at end of file diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm new file mode 100644 index 0000000000000000000000000000000000000000..dbfd53f50b70a9e13ec1fa99613980ab494435d6 --- /dev/null +++ b/interface/web/sites/templates/database_list.htm @@ -0,0 +1,31 @@ +

+


+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
{tmpl_var name="server_id"}{tmpl_var name="database_name"}[{tmpl_var name='delete_txt'}]
\ No newline at end of file diff --git a/interface/web/sites/web_domain_edit.php b/interface/web/sites/web_domain_edit.php index 8bf89c427c674ddea5da39157991b3044357c8f9..336a5389a3e2c693edb2f2ac4f85ca449352f6b5 100644 --- a/interface/web/sites/web_domain_edit.php +++ b/interface/web/sites/web_domain_edit.php @@ -94,7 +94,7 @@ class page_action extends tform_actions { // Get the limits of the client $client_group_id = $_SESSION["s"]["user"]["default_group"]; - $client = $app->db->queryOneRecord("SELECT limit_web_domain, default_webserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); + $client = $app->db->queryOneRecord("SELECT client_id, limit_web_domain, default_webserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"); // Set the webserver to the default server of the client $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]"); @@ -102,7 +102,7 @@ class page_action extends tform_actions { unset($tmp); // Fill the client select field - $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0"; + $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.parent_client_id AND client.parent_client_id = ".$client['client_id']; $clients = $app->db->queryAllRecords($sql); $client_select = ''; if(is_array($clients)) {