fixed last commit

Author: Florian Schaal

install/sql/incremental/upd_dev_collection.sql

@@ -223,6 +223,6 @@ ALTER TABLE `sys_user`
 
 ALTER TABLE `web_database` ADD COLUMN `quota_exceeded` enum('n','y') NOT NULL DEFAULT 'n' AFTER `database_quota`;
 
-ALTER TABLE `client` ADD COLUMN `limit_database_users` int(11) NOT NULL DEFAULT '-1' after limit_database;
-ALTER TABLE `client_template` ADD COLUMN `limit_database_users` int(11) NOT NULL DEFAULT '-1' after limit_database;
+ALTER TABLE `client` ADD COLUMN `limit_database_user` int(11) NOT NULL DEFAULT '-1' after limit_database;
+ALTER TABLE `client_template` ADD COLUMN `limit_database_user` int(11) NOT NULL DEFAULT '-1' after limit_database;
 

install/sql/ispconfig3.sql

@@ -230,7 +230,7 @@ CREATE TABLE `client` (
   `default_dbserver` int(11) NOT NULL DEFAULT '1',
   `dns_servers` blob,
   `limit_database` int(11) NOT NULL DEFAULT '-1',
-  `limit_database_users` int(11) NOT NULL DEFAULT '-1',
+  `limit_database_user` int(11) NOT NULL DEFAULT '-1',
   `limit_database_quota` int(11) NOT NULL default '-1',
   `limit_cron` int(11) NOT NULL DEFAULT '0',
   `limit_cron_type` enum('url','chrooted','full') NOT NULL DEFAULT 'url',
@@ -352,7 +352,7 @@ CREATE TABLE `client_template` (
   `limit_dns_slave_zone` int(11) NOT NULL default '-1',
   `limit_dns_record` int(11) NOT NULL default '-1',
   `limit_database` int(11) NOT NULL default '-1',
-  `limit_database_users` int(11) NOT NULL DEFAULT '-1',
+  `limit_database_user` int(11) NOT NULL DEFAULT '-1',
   `limit_database_quota` int(11) NOT NULL default '-1',
   `limit_cron` int(11) NOT NULL default '0',
   `limit_cron_type` enum('url','chrooted','full') NOT NULL default 'url',

interface/web/sites/database_user_edit.php

@@ -55,10 +55,10 @@ function onShowNew() {
 
 		// we will check only users, not admins
 		if($_SESSION['s']['user']['typ'] == 'user') {
-			if(!$app->tform->checkClientLimit('limit_database_users')) {
+			if(!$app->tform->checkClientLimit('limit_database_user')) {
 				$app->error($app->tform->wordbook["limit_database_user_txt"]);
 			}
-			if(!$app->tform->checkResellerLimit('limit_database_users')) {
+			if(!$app->tform->checkResellerLimit('limit_database_user')) {
 				$app->error('Reseller: '.$app->tform->wordbook["limit_database_user_txt"]);
 			}
 		}