Introduced handling of max user count.

diff --git a/WEB-INF/lib/ttUserHelper.class.php b/WEB-INF/lib/ttUserHelper.class.php
index 26ced93..b3a5e36 100644 (file)
--- a/WEB-INF/lib/ttUserHelper.class.php
+++ b/WEB-INF/lib/ttUserHelper.class.php
@@ -386,4 +386,22 @@ class ttUserHelper {
     $sql = "update tt_users set accessed = now(), accessed_ip = $accessed_ip where id = $user->id";
     $mdb2->exec($sql);
   }
+
+  // canAdd determines if we can add a user in case there is a limit.
+  static function canAdd() {
+    $mdb2 = getConnection();
+    $sql = "select param_value from tt_site_config where param_name = 'max_users'";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    if (!$val) return true; // No limit.
+
+    $max_count = $val['param_value'];
+    $sql = "select count(*) as user_count from tt_users where status is not null";
+    $res = $mdb2->query($sql);
+    $val = $res->fetchRow();
+    if ($val['user_count'] < $max_count)
+      return true; // Limit not reached.
+
+    return false;
+  }
 }

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index b4d8699..f38bcab 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -116,6 +116,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d12be15..baf085b 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -118,6 +118,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index c497451..051b6f8 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -110,6 +110,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index eab807e..6c75c7e 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -104,6 +104,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index aadf6f5..687f19d 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -101,6 +101,7 @@ $i18n_key_words = array(
 'error.xml' => 'Error in XML file at line %d: %s.',
 'error.cannot_import' => 'Cannot import: %s.',
 'error.format' => 'Invalid file format.',
+'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 'warn.sure' => 'Are you sure?',

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index cc4fe03..fbf7076 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -114,6 +114,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index a29929a..860b8cd 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -119,6 +119,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index f1a37b4..3ec01e2 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -117,6 +117,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 065f71c..4895713 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -112,6 +112,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 4c6d767..5e00366 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -110,6 +110,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 6be29a0..6e7b32e 100644 (file)
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -105,6 +105,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index d27edb8..daedb00 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -127,6 +127,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 27642b4..fcd4c25 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -116,6 +116,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 8f35a78..36f8ab3 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -109,6 +109,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index ea15879..4cb224f 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -120,6 +120,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 27cbe66..2c0a898 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -119,6 +119,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index b0ada31..d98188f 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -101,6 +101,8 @@ $i18n_key_words = array(
 'error.xml' => 'Fout in XML bestand in regel line %d: %s.',
 'error.cannot_import' => 'Kan het volgende niet importeren: %s.',
 'error.format' => 'Bestandsformaat niet valide.',
+// TODO: translate the following.
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 34f4f6d..650957e 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -119,6 +119,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index a9220c4..11b6c4b 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -114,6 +114,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index ee699e1..3e36200 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -111,6 +111,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 8a96bc8..c3ef6c5 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -113,6 +113,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 4f027f6..01ecded 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -120,6 +120,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 466f7cd..f68e063 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -100,6 +100,7 @@ $i18n_key_words = array(
 'error.xml' => 'Ошибка в файле XML на строке %d: %s.',
 'error.cannot_import' => 'Невозможно импортировать: %s.',
 'error.format' => 'Неверный формат файла.',
+'error.user_count' => 'Ограничение на количество пользователей.',
 
 // Warning messages.
 'warn.sure' => 'Вы уверены?',

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index 0077e71..33622c9 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -116,6 +116,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 9be563c..6b3881a 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -110,6 +110,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 270984d..3b12961 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -111,6 +111,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 815ad80..5ddd55d 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -109,6 +109,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 720475b..fafeeaa 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -123,6 +123,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index aa9e7de..656eb45 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -111,6 +111,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 7346c9a..0bdb2e0 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -117,6 +117,7 @@ $i18n_key_words = array(
 // 'error.xml' => 'Error in XML file at line %d: %s.',
 // 'error.cannot_import' => 'Cannot import: %s.',
 // 'error.format' => 'Invalid file format.',
+// 'error.user_count' => 'Limit on user count.',
 
 // Warning messages.
 // TODO: translate the following.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 57e9425..d163b71 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.36.4686 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.36.4687 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/mobile/user_add.php b/mobile/user_add.php
index b1d155a..c821c7d 100644 (file)
--- a/mobile/user_add.php
+++ b/mobile/user_add.php
@@ -149,6 +149,7 @@ if ($request->isPost()) {
   if (!ttValidEmail($cl_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.email'));
   if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
   if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
+  if (!ttUserHelper::canAdd()) $err->add($i18n->get('error.user_count'));
 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {

diff --git a/user_add.php b/user_add.php
index a999519..cf233d5 100644 (file)
--- a/user_add.php
+++ b/user_add.php
@@ -152,6 +152,7 @@ if ($request->isPost()) {
   if ($user->isPluginEnabled('cl') && ttRoleHelper::isClientRole($cl_role_id) && !$cl_client_id) $err->add($i18n->get('error.client'));
   if (!ttValidFloat($cl_rate, true)) $err->add($i18n->get('error.field'), $i18n->get('form.users.default_rate'));
   if (!ttValidFloat($cl_quota_percent, true)) $err->add($i18n->get('error.field'), $i18n->get('label.quota'));
+  if (!ttUserHelper::canAdd()) $err->add($i18n->get('error.user_count'));
 
   if ($err->no()) {
     if (!ttUserHelper::getUserByLogin($cl_login)) {