From 2527d26198a0222a05145c58e96494af1d316bb9 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 21 Feb 2016 11:58:22 -0500
Subject: [PATCH] fixed last commit
---
install/sql/ispconfig3.sql | 4 ++--
install/sql/incremental/upd_dev_collection.sql | 4 ++--
interface/web/sites/database_user_edit.php | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/install/sql/incremental/upd_dev_collection.sql b/install/sql/incremental/upd_dev_collection.sql
index 07c5391..ed23e82 100644
--- a/install/sql/incremental/upd_dev_collection.sql
+++ b/install/sql/incremental/upd_dev_collection.sql
@@ -223,6 +223,6 @@
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;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 7e706f9..0c9b893 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -230,7 +230,7 @@
`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 @@
`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',
diff --git a/interface/web/sites/database_user_edit.php b/interface/web/sites/database_user_edit.php
index 88e05d6..a7bee2b 100644
--- a/interface/web/sites/database_user_edit.php
+++ b/interface/web/sites/database_user_edit.php
@@ -55,10 +55,10 @@
// 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"]);
}
}
--
Gitblit v1.9.1