From: Nik Okuntseff <support@anuko.com>
Date: Fri, 23 Nov 2018 19:14:59 +0000 (+0000)
Subject: Made group name mandatory for subgroup support.
X-Git-Tag: timetracker_1.19-1~562
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=d27960ac5530c7c81b9adba85253b0e216f81476;p=timetracker.git

Made group name mandatory for subgroup support.
---

diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php
index a2388edf..747274f1 100644
--- a/WEB-INF/lib/ttAdmin.class.php
+++ b/WEB-INF/lib/ttAdmin.class.php
@@ -198,7 +198,7 @@ class ttAdmin {
 
     $result = true;
 
-    if (!ttValidString($fields['group_name'], true)) {
+    if (!ttValidString($fields['new_group_name'])) {
       $this->err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
       $result = false;
     }
diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php
index 8e755837..77ffb6b5 100644
--- a/WEB-INF/lib/ttRegistrator.class.php
+++ b/WEB-INF/lib/ttRegistrator.class.php
@@ -67,7 +67,7 @@ class ttRegistrator {
   function validate() {
     global $i18n;
 
-    if (!ttValidString($this->group_name, true))
+    if (!ttValidString($this->group_name))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
     if (!ttValidString($this->currency, true))
       $this->err->add($i18n->get('error.field'), $i18n->get('label.currency'));
diff --git a/WEB-INF/templates/admin_group_add.tpl b/WEB-INF/templates/admin_group_add.tpl
index fd671e9c..029b5254 100644
--- a/WEB-INF/templates/admin_group_add.tpl
+++ b/WEB-INF/templates/admin_group_add.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
-          <td align="right" nowrap>{$i18n.label.group_name}:</td>
+          <td align="right" nowrap>{$i18n.label.group_name} (*):</td>
           <td>{$forms.groupForm.group_name.control}</td>
         </tr>
         <tr>
diff --git a/WEB-INF/templates/admin_group_edit.tpl b/WEB-INF/templates/admin_group_edit.tpl
index 4c52580e..70443e32 100644
--- a/WEB-INF/templates/admin_group_edit.tpl
+++ b/WEB-INF/templates/admin_group_edit.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
-          <td align="right" nowrap>{$i18n.label.group_name}:</td>
+          <td align="right" nowrap>{$i18n.label.group_name} (*):</td>
           <td>{$forms.groupForm.group_name.control}</td>
         </tr>
         <tr><td>&nbsp;</td></tr>
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 161df020..ec0063a3 100644
--- 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.27.4503 | 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.27.4504 | 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/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl
index d1594489..8ccb258f 100644
--- a/WEB-INF/templates/group_edit.tpl
+++ b/WEB-INF/templates/group_edit.tpl
@@ -28,7 +28,7 @@ function handleTaskRequiredCheckbox() {
         <table cellspacing="1" cellpadding="2" border="0">
 {if $user->can('manage_basic_settings')}
           <tr>
-            <td align="right" nowrap>{$i18n.label.group_name}:</td>
+            <td align="right" nowrap>{$i18n.label.group_name} (*):</td>
             <td>{$forms.groupForm.group_name.control}</td>
           </tr>
           <tr>
@@ -109,6 +109,10 @@ function handleTaskRequiredCheckbox() {
             <td align="right" nowrap>{$i18n.form.group_edit.allow_ip}:</td>
             <td>{$forms.groupForm.allow_ip.control} <a href="https://www.anuko.com/lp/tt_21.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
+          <tr>
+            <td></td>
+            <td>{$i18n.label.required_fields}</td>
+          </tr>
   {/if}
           {* initialize preview text *}
           <script>
diff --git a/WEB-INF/templates/register.tpl b/WEB-INF/templates/register.tpl
index 96687797..3d7678af 100644
--- a/WEB-INF/templates/register.tpl
+++ b/WEB-INF/templates/register.tpl
@@ -4,7 +4,7 @@
     <td>
       <table cellspacing="1" cellpadding="2" border="0">
         <tr>
-          <td align="right" nowrap>{$i18n.label.group_name}:</td>
+          <td align="right" nowrap>{$i18n.label.group_name} (*):</td>
           <td>{$forms.groupForm.group_name.control}</td>
         </tr>
         <tr>
diff --git a/group_edit.php b/group_edit.php
index 77ddc618..84c66df9 100644
--- a/group_edit.php
+++ b/group_edit.php
@@ -191,7 +191,7 @@ if ($request->isPost()) {
   }
 
   // Validate user input.
-  if (!ttValidString($cl_group, true)) $err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
+  if (!ttValidString($cl_group)) $err->add($i18n->get('error.field'), $i18n->get('label.group_name'));
   if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
   if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency'));
   if ($advanced_settings) {