]> wagnertech.de Git - timetracker.git/commitdiff
Introduced a separate page for advanced group settings.
authorNik Okuntseff <support@anuko.com>
Sun, 19 May 2019 19:08:47 +0000 (19:08 +0000)
committerNik Okuntseff <support@anuko.com>
Sun, 19 May 2019 19:08:47 +0000 (19:08 +0000)
35 files changed:
WEB-INF/resources/ca.lang.php
WEB-INF/resources/cs.lang.php
WEB-INF/resources/da.lang.php
WEB-INF/resources/de.lang.php
WEB-INF/resources/en.lang.php
WEB-INF/resources/es.lang.php
WEB-INF/resources/et.lang.php
WEB-INF/resources/fa.lang.php
WEB-INF/resources/fi.lang.php
WEB-INF/resources/fr.lang.php
WEB-INF/resources/gr.lang.php
WEB-INF/resources/he.lang.php
WEB-INF/resources/hu.lang.php
WEB-INF/resources/it.lang.php
WEB-INF/resources/ja.lang.php
WEB-INF/resources/ko.lang.php
WEB-INF/resources/nl.lang.php
WEB-INF/resources/no.lang.php
WEB-INF/resources/pl.lang.php
WEB-INF/resources/pt-br.lang.php
WEB-INF/resources/pt.lang.php
WEB-INF/resources/ro.lang.php
WEB-INF/resources/ru.lang.php
WEB-INF/resources/sk.lang.php
WEB-INF/resources/sl.lang.php
WEB-INF/resources/sr.lang.php
WEB-INF/resources/sv.lang.php
WEB-INF/resources/tr.lang.php
WEB-INF/resources/zh-cn.lang.php
WEB-INF/resources/zh-tw.lang.php
WEB-INF/templates/footer.tpl
WEB-INF/templates/group_advanced_edit.tpl [new file with mode: 0644]
WEB-INF/templates/group_edit.tpl
group_advanced_edit.php [new file with mode: 0644]
group_edit.php

index 30183878bac9aec6ca9df7ad2429168a9f5bfe08..89172f6748fdf5296af077d50249e1cefc5ba555 100644 (file)
@@ -598,6 +598,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 07adf4fae2db45027bef6b540e10591510e5f90a..4a3b90ac1da27b3fe74a1ca837be60cc8fcdb9d2 100644 (file)
@@ -611,6 +611,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index f7ae2ff5083cb4009f905fa6bceaebf9a386db23..cd7d54f451fb20092c9623f0574c2157fc71996d 100644 (file)
@@ -572,6 +572,7 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 97f497fcb62f1ac93f7a234465861f5f372f5201..5c9a7f064077aec1261f039d660aec8c49ad88c1 100644 (file)
@@ -548,6 +548,8 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 'form.group_edit.allow_ip' => 'Erlaube IP',
+// TODO: translate the following.
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 'form.group_delete.hint' => 'Sind Sie sicher, dass Sie die gesamte Gruppe löschen möchten?',
index fb485932234cd6de40b773f5902c7d7082d309e1..add6c0b006be37cbff61ade796562893a6bf527d 100644 (file)
@@ -532,6 +532,7 @@ $i18n_key_words = array(
 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 'form.group_edit.confirm_save' => 'Confirm saving',
 'form.group_edit.allow_ip' => 'Allow IP',
+'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 'form.group_delete.hint' => 'Are you sure you want to delete the entire group?',
index 71989028a50636b918eb761e56771eca328d6e21..60b1adba0c28d19c3ca16dea28d13e2214317e40 100644 (file)
@@ -612,6 +612,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index e371fa9c499ad3d25fcd02058d33df6ba03f2082..d18ce5820f2f63699180fd60aeebaad47097a21d 100644 (file)
@@ -577,6 +577,8 @@ $i18n_key_words = array(
 'form.group_edit.uncompleted_indicators' => 'Lõpetamata kirjete indikaator', // TODO: Fix this. Indicators (plural), not indicator.
 'form.group_edit.confirm_save' => 'Kinnita salvestamine',
 'form.group_edit.allow_ip' => 'Luba IP',
+// TODO: translate the following.
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 'form.group_delete.hint' => 'Oled kindel, et soovid kogu gruppi kustutada?',
index 3daed57e0ac35d0df8332f92433339bffb46d8d2..eaae09588305bfd5811bdeb5a81c48d3c34a8d3b 100644 (file)
@@ -594,6 +594,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 6f3338ec7df3a48d94f1987d254e251a99fa61a4..8d1e44121e7d04bd486910de127e6c8af381853c 100644 (file)
@@ -577,6 +577,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index e8cc2f13d0ba3820d926eec6f46d8f8cb5f3d156..49714745ce7d9c1f7b6d63738d5c8ae336ff819e 100644 (file)
@@ -568,6 +568,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 52925c56f01d972e40752bbdb455afaab87ca9fe..ad0dcd2e0ecc8127cac278237e7d86a806eccd33 100644 (file)
@@ -558,6 +558,7 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 14469568eaf54e22a750c0847a5b2136f8f748f1..aa9fafb2881b0856a5e1d0ac82d47273b21687b7 100644 (file)
@@ -598,6 +598,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 3f194d1e02a37b0d4392529078cee55606fa6776..9639f8fbc554cb5e96be9828d1be88887282fb57 100644 (file)
@@ -604,6 +604,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 0582444542e21ccce9ef70d71d546d2eae41339a..d895558ef3741c6bb81498409dd8c8ed7418980b 100644 (file)
@@ -573,6 +573,7 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 39cc49c621f519b201d21a6a8992613244af841b..9a58c2d05eebfbdd00b1213a540158363a603744 100644 (file)
@@ -606,6 +606,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index f0156d0a1ccc5e4fae261784758a2f6d5fc3a093..84e1cdf8a4b41f55c94add507c1b2384467b0885 100644 (file)
@@ -604,6 +604,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index a288dac17385d231de54462174792587dc0d6d13..39cfaef592991c803e51fdb839e188aa2a9c2967 100644 (file)
@@ -525,6 +525,8 @@ $i18n_key_words = array(
 'form.group_edit.uncompleted_indicators' => 'Onvolledige indicatoren',
 'form.group_edit.confirm_save' => 'Bevestigen dat je wilt opslaan',
 'form.group_edit.allow_ip' => 'Toegestane IP adressen',
+// TODO: translate the following.
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 'form.group_delete.hint' => 'Bent u er zeker van dat u de hele groep wilt verwijderen?',
index 5d826ce9c3a4772835df3c4da03d5d88614b7c03..bfeabdd3217864bfba2401916e9de81d7a6cf7c9 100644 (file)
@@ -603,6 +603,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 7a34834bbe879c679692662a574635574d4b0345..828af7823cd01f2f98ff2077b2aab8edaad058ef 100644 (file)
@@ -580,6 +580,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 69e9dd06923ce793fcdaa6353f09968947211c30..cb8d68f13eed6baccc48156cde9f07c8828df992 100644 (file)
@@ -575,6 +575,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 5007d58589dfddf5863e5d7a4f5f6adcd54f7381..9b87642dbe158d6e9ba5175ef5932b4faa97a2e8 100644 (file)
@@ -585,6 +585,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 950ed7723ae39edf843883589b0af1e98f0a6cbf..057714eac2a08f5093fec99dc0a70b4d21bb9570 100644 (file)
@@ -606,6 +606,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index e502890a5755d8ae4c4a89c4376d422fdec69ca7..bc1963be177122e8dd69e5be526b0f9c2bd58251 100644 (file)
@@ -523,6 +523,7 @@ $i18n_key_words = array(
 'form.group_edit.uncompleted_indicators' => 'Индикаторы незавершения',
 'form.group_edit.confirm_save' => 'Предупреждать при сохранении',
 'form.group_edit.allow_ip' => 'Разрешить доступ с IP',
+'form.group_edit.advanced_settings' => 'Продвинутые настройки',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 'form.group_delete.hint' => 'Вы уверены, что хотите удалить всю группу?',
index 8e381c9bfbced540c380f4f942418875bd968bf6..e681070773ca5a7d628bc38b8607d339d5f61fde 100644 (file)
@@ -587,6 +587,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 6aab8d2c615abdc6cfd7a0652ec17b320f00835e..2157ff5122b3d1d693590d5296a25242aed5156e 100644 (file)
@@ -580,6 +580,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index c43570581b2d6e5b94676c575cfaf5d42e7c8bc4..63ec330978c84fd35d6109c7aa9c6d5ead879d8d 100644 (file)
@@ -578,6 +578,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 89c1c7c612d34df9257a0c5358b94a6a96441614..7d756a5162bae8ca4040b5f174826175e148e6d4 100644 (file)
@@ -577,6 +577,7 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index b7433d5dc9f15468d059ef30df89a986f86a7d7b..479c8cd4931decc05f7c854987c0b98f73e82d5c 100644 (file)
@@ -619,6 +619,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index f63b2885313dce43cb45568738053c28aaac71cf..a1fc15d80cce30c35ee290a2b69f2fc2fa68617c 100644 (file)
@@ -590,6 +590,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index 577663bd93fdad411ab9e96ebac5a4bc751a5bd0..9c97297d04787f0a59ac97685d672495a36a1ac7 100644 (file)
@@ -596,6 +596,7 @@ $i18n_key_words = array(
 // 'form.group_edit.uncompleted_indicators' => 'Uncompleted indicators',
 // 'form.group_edit.confirm_save' => 'Confirm saving',
 // 'form.group_edit.allow_ip' => 'Allow IP',
+// 'form.group_edit.advanced_settings' => 'Advanced settings',
 
 // Deleting Group form. See example at https://timetracker.anuko.com/delete_group.php
 // TODO: translate the following.
index a989f27c5b6bfa5e3fe6cd81dd36ba4d4792c632..a3ce2484154003d3c92fd452c8ede11e36ecfacd 100644 (file)
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.19.4.5006 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.19.4.5007 | 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_advanced_edit.tpl b/WEB-INF/templates/group_advanced_edit.tpl
new file mode 100644 (file)
index 0000000..a936978
--- /dev/null
@@ -0,0 +1,37 @@
+{$forms.groupAdvancedForm.open}
+
+<table cellspacing="4" cellpadding="7" border="0">
+    <tr>
+      <td>
+        <table cellspacing="1" cellpadding="2" border="0">
+          <tr>
+            <td align="right" nowrap>{$i18n.label.group_name} (*):</td>
+            <td>{$forms.groupAdvancedForm.group_name.control}</td>
+          </tr>
+          <tr>
+            <td align = "right">{$i18n.label.description}:</td>
+            <td>{$forms.groupAdvancedForm.description.control}</td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.label.bcc}:</td>
+            <td>{$forms.groupAdvancedForm.bcc_email.control} <a href="https://www.anuko.com/lp/tt_10.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
+          </tr>
+          <tr>
+            <td align="right" nowrap>{$i18n.form.group_edit.allow_ip}:</td>
+            <td>{$forms.groupAdvancedForm.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>
+          <tr>
+            <td colspan="2">&nbsp;</td>
+          </tr>
+          <tr>
+            <td colspan="2" height="50" align="center">{$forms.groupAdvancedForm.btn_save.control}</td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+</table>
+{$forms.groupForm.close}
index 0da797ffdaa0d812fd7b84ca487d00df1bd9f614..be8c46c1052a736a7f6b25c7e8fd5e8abfdd89d8 100644 (file)
@@ -17,10 +17,7 @@ function handleTaskRequiredCheckbox() {
 </script>
 
 {$forms.groupForm.open}
-
-{if $user->can('manage_basic_settings')}
 {include file="datetime_format_preview.tpl"}
-{/if}
 
 <table cellspacing="4" cellpadding="7" border="0">
     <tr>
@@ -32,25 +29,16 @@ function handleTaskRequiredCheckbox() {
             <td>{$forms.groupForm.group.control}</td>
           </tr>
 {/if}
-{if $user->can('manage_basic_settings')}
-          <tr>
-            <td align="right" nowrap>{$i18n.label.group_name} (*):</td>
-            <td>{$forms.groupForm.group_name.control}</td>
-          </tr>
-          <tr>
-            <td align = "right">{$i18n.label.description}:</td>
-            <td>{$forms.groupForm.description.control}</td>
-          </tr>
           <tr>
             <td align="right">{$i18n.label.currency}:</td>
             <td>{$forms.groupForm.currency.control}</td>
           </tr>
-  {if $user->can('manage_roles')}
+{if $user->can('manage_roles')}
           <tr>
             <td align="right" nowrap>{$i18n.label.roles}:</td>
             <td><a href="roles.php">{$i18n.label.configure}</a></td>
           </tr>
-  {/if}
+{/if}
           <tr>
            <td align="right" nowrap>{$i18n.label.language}:</td>
            <td>{$forms.groupForm.lang.control}</td>
@@ -106,20 +94,16 @@ function handleTaskRequiredCheckbox() {
             <td align="right" nowrap>{$i18n.form.group_edit.confirm_save}:</td>
             <td>{$forms.groupForm.confirm_save.control} <a href="https://www.anuko.com/lp/tt_26.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
           </tr>
-  {if $user->can('manage_advanced_settings')}
-          <tr>
-            <td align="right" nowrap>{$i18n.label.bcc}:</td>
-            <td>{$forms.groupForm.bcc_email.control} <a href="https://www.anuko.com/lp/tt_10.htm" target="_blank">{$i18n.label.what_is_it}</a></td>
-          </tr>
+{if $user->can('manage_advanced_settings')}
           <tr>
-            <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>
+            <td align="right" nowrap>{$i18n.form.group_edit.advanced_settings}:</td>
+            <td><a href="group_advanced_edit.php">{$i18n.label.configure}</a></td>
           </tr>
+{/if}
           <tr>
             <td></td>
             <td>{$i18n.label.required_fields}</td>
           </tr>
-  {/if}
           {* initialize preview text *}
           <script>
             MakeFormatPreview("date_format_preview", document.getElementById("date_format"));
@@ -133,7 +117,6 @@ function handleTaskRequiredCheckbox() {
             }
             adjustDecimalPreview();
           </script>
-{/if}
 
           <tr>
             <td colspan="2">&nbsp;</td>
diff --git a/group_advanced_edit.php b/group_advanced_edit.php
new file mode 100644 (file)
index 0000000..03c7711
--- /dev/null
@@ -0,0 +1,90 @@
+<?php
+// +----------------------------------------------------------------------+
+// | Anuko Time Tracker
+// +----------------------------------------------------------------------+
+// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
+// +----------------------------------------------------------------------+
+// | LIBERAL FREEWARE LICENSE: This source code document may be used
+// | by anyone for any purpose, and freely redistributed alone or in
+// | combination with other software, provided that the license is obeyed.
+// |
+// | There are only two ways to violate the license:
+// |
+// | 1. To redistribute this code in source form, with the copyright
+// |    notice or license removed or altered. (Distributing in compiled
+// |    forms without embedded copyright notices is permitted).
+// |
+// | 2. To redistribute modified versions of this code in *any* form
+// |    that bears insufficient indications that the modifications are
+// |    not the work of the original author(s).
+// |
+// | This license applies to this document only, not any other software
+// | that it may be combined with.
+// |
+// +----------------------------------------------------------------------+
+// | Contributors:
+// | https://www.anuko.com/time_tracker/credits.htm
+// +----------------------------------------------------------------------+
+
+require_once('initialize.php');
+import('form.Form');
+import('ttUserHelper');
+import('ttRoleHelper');
+import('ttConfigHelper');
+
+// Access checks.
+if (!ttAccessAllowed('manage_advanced_settings')) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+$group = ttGroupHelper::getGroupAttrs($user->getGroup());
+
+if ($request->isPost()) {
+  $cl_group = trim($request->getParameter('group_name'));
+  $cl_description = trim($request->getParameter('description'));
+  $cl_bcc_email = trim($request->getParameter('bcc_email'));
+  $cl_allow_ip = trim($request->getParameter('allow_ip'));
+} else {
+  $cl_group = $group['name'];
+  $cl_description = $group['description'];
+  $cl_bcc_email = $group['bcc_email'];
+  $cl_allow_ip = $group['allow_ip'];
+}
+
+$form = new Form('groupAdvancedForm');
+$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group,'enable'=>$advanced_settings));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'bcc_email','value'=>$cl_bcc_email));
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'allow_ip','value'=>$cl_allow_ip));
+
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
+
+if ($request->isPost()) {
+  if ($request->getParameter('btn_save')) {
+    // Validate user input.
+    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 (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));
+    if (!ttValidIP($cl_allow_ip, true)) $err->add($i18n->get('error.field'), $i18n->get('form.group_edit.allow_ip'));
+    // Finished validating user input.
+
+    if ($err->no()) {
+      if ($user->updateGroup(array(
+        'name' => $cl_group,
+        'description' => $cl_description,
+        'bcc_email' => $cl_bcc_email,
+        'allow_ip' => $cl_allow_ip))) {
+        header('Location: success.php');
+        exit();
+      } else
+        $err->add($i18n->get('error.db'));
+    }
+  }
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+$smarty->assign('title', $i18n->get('title.edit_group'));
+$smarty->assign('content_page_name', 'group_advanced_edit.tpl');
+$smarty->display('index.tpl');
index abc06b469099cfe02181751d9035f7b26b217510..1df99a1c534806a847042cd942988c3521dccfbb 100644 (file)
@@ -45,7 +45,7 @@ if ($request->isGet()) {
 $home_group = $user->group_id == $group_id;
 if ($home_group) {
   // Editing home group.
-  if (!(ttAccessAllowed('manage_basic_settings') || ttAccessAllowed('manage_advanced_settings'))) {
+  if (!ttAccessAllowed('manage_basic_settings')) {
     header('Location: access_denied.php'); // Not allowed to edit home group settings.
     exit();
   }
@@ -72,12 +72,9 @@ $groups = $user->getGroupsForDropdown();
 $group = ttGroupHelper::getGroupAttrs($group_id);
 $config = $user->getConfigHelper();
 
-$advanced_settings = $home_group ? $user->can('manage_advanced_settings') : true;
 if (!defined('CURRENCY_DEFAULT')) define('CURRENCY_DEFAULT', '$');
 
 if ($request->isPost() && !$groupChanged) {
-  $cl_group = trim($request->getParameter('group_name'));
-  $cl_description = trim($request->getParameter('description'));
   $cl_currency = trim($request->getParameter('currency'));
   if (!$cl_currency) $cl_currency = CURRENCY_DEFAULT;
   $cl_lang = $request->getParameter('lang');
@@ -95,11 +92,7 @@ if ($request->isPost() && !$groupChanged) {
   $cl_future_entries = $request->getParameter('future_entries');
   $cl_uncompleted_indicators = $request->getParameter('uncompleted_indicators');
   $cl_confirm_save = $request->getParameter('confirm_save');
-  $cl_bcc_email = trim($request->getParameter('bcc_email'));
-  $cl_allow_ip = trim($request->getParameter('allow_ip'));
 } else {
-  $cl_group = $group['name'];
-  $cl_description = $group['description'];
   $cl_currency = ($group['currency'] == ''? CURRENCY_DEFAULT : $group['currency']);
   $cl_lang = $group['lang'];
   $cl_decimal_mark = $group['decimal_mark'];
@@ -116,8 +109,6 @@ if ($request->isPost() && !$groupChanged) {
   $cl_future_entries = $config->getDefinedValue('future_entries');
   $cl_uncompleted_indicators = $config->getDefinedValue('uncompleted_indicators');
   $cl_confirm_save = $config->getDefinedValue('confirm_save');
-  $cl_bcc_email = $group['bcc_email'];
-  $cl_allow_ip = $group['allow_ip'];
 }
 
 $form = new Form('groupForm');
@@ -133,8 +124,6 @@ if (count($groups) > 1) {
   $form->addInput(array('type'=>'hidden','name'=>'group_changed'));
   $smarty->assign('group_dropdown', 1);
 }
-$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group,'enable'=>$advanced_settings));
-$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 $form->addInput(array('type'=>'text','maxlength'=>'7','name'=>'currency','value'=>$cl_currency));
 
 // Prepare an array of available languages.
@@ -213,12 +202,6 @@ $form->addInput(array('type'=>'checkbox','name'=>'uncompleted_indicators','value
 // Confirm save checkbox.
 $form->addInput(array('type'=>'checkbox','name'=>'confirm_save','value'=>$cl_confirm_save));
 
-// Add bcc email control.
-if ($advanced_settings) {
-  $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'bcc_email','value'=>$cl_bcc_email));
-  $form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'allow_ip','value'=>$cl_allow_ip));
-}
-
 $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
 if ($user->can('delete_group')) $form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('button.delete')));
 
@@ -234,14 +217,8 @@ if ($request->isPost()) {
 
   if ($request->getParameter('btn_save')) {
     // Validate user input.
-    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 (!ttValidHolidays($cl_holidays)) $err->add($i18n->get('error.field'), $i18n->get('form.group_edit.holidays'));
-    if ($advanced_settings) {
-      if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));
-      if (!ttValidIP($cl_allow_ip, true)) $err->add($i18n->get('error.field'), $i18n->get('form.group_edit.allow_ip'));
-    }
     // Finished validating user input.
 
     if ($err->no()) {
@@ -254,8 +231,6 @@ if ($request->isPost()) {
 
       if ($user->updateGroup(array(
         'group_id' => $group_id,
-        'name' => $cl_group,
-        'description' => $cl_description,
         'currency' => $cl_currency,
         'lang' => $cl_lang,
         'decimal_mark' => $cl_decimal_mark,
@@ -268,8 +243,6 @@ if ($request->isPost()) {
         'task_required' => $cl_task_required,
         'record_type' => $cl_record_type,
         'uncompleted_indicators' => $cl_uncompleted_indicators,
-        'bcc_email' => $cl_bcc_email,
-        'allow_ip' => $cl_allow_ip,
         'config' => $config->getConfig()))) {
         header('Location: success.php');
         exit();
@@ -279,8 +252,6 @@ if ($request->isPost()) {
   }
 } // isPost
 
-$smarty->assign('auth_external', $auth->isPasswordExternal());
-$smarty->assign('group_id', $group_id);
 $smarty->assign('group_dropdown', count($groups) > 1);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('onload', 'onLoad="handleTaskRequiredCheckbox(); handlePluginCheckboxes();"');