summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Finkhäuser <alex@elaon.de>2015-04-18 00:27:35 +0200
committerFlorian Pritz <bluewind@xinu.at>2015-04-18 09:24:37 +0200
commit55a6c74e0a2a78acddd9242fcbb155ede5736ba8 (patch)
tree61ae4f221b1add52c6ef7f050b776dcfc3140ae2
parent84b8cf26000c8709c49ff8811dc6c7c34b1406f0 (diff)
Added config option max_invitation_keys
-rw-r--r--application/config/config.php3
-rw-r--r--application/controllers/user.php2
2 files changed, 4 insertions, 1 deletions
diff --git a/application/config/config.php b/application/config/config.php
index 633d37f26..9fe49d15f 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -398,6 +398,9 @@ $config['tarball_max_size'] = 1024*1024*50; // 50MiB
// Changing this is not recommended
$config['tarball_cache_time'] = 60*5; // 5 minutes
+// The maximum number of active invitation keys per account.
+$config['max_invitation_keys'] = 3; //3 keys
+
// Possible values:
// - apc: needs the apc module and is only useful on long running php processes
diff --git a/application/controllers/user.php b/application/controllers/user.php
index 33d0efb6b..1e0416c73 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -135,7 +135,7 @@ class User extends MY_Controller {
->where('action', 'invitation')
->count_all_results();
- if ($invitations + 1 > 3) {
+ if ($invitations + 1 > $this->config->item('max_invitation_keys')) {
throw new \exceptions\PublicApiException("user/invitation-limit", "You can't create more invitation keys at this time.");
}